From 3a8367c82705f352cb263ebfed30da02977de4cc Mon Sep 17 00:00:00 2001 From: Gaurav Purohit Date: Sat, 5 Oct 2024 01:32:20 +0530 Subject: [PATCH 1/3] fix: adding support to initialize with empty metadata columns (#99) * Adding null check on the metadata columns * style: formatting --- src/langchain_google_spanner/vector_store.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/langchain_google_spanner/vector_store.py b/src/langchain_google_spanner/vector_store.py index b818fcf2..b5084e80 100644 --- a/src/langchain_google_spanner/vector_store.py +++ b/src/langchain_google_spanner/vector_store.py @@ -383,7 +383,10 @@ def _generate_sql( ) configs = [id_column, content_column, embedding_column] - configs.extend(column_configs) + + if column_configs is not None: + configs.extend(column_configs) + column_configs = configs if primary_key is None: From 6632fe2e3ef820fe541cfe30d54d53f5ce366415 Mon Sep 17 00:00:00 2001 From: Vikram Manghnani <50720827+vmanghnani@users.noreply.github.com> Date: Fri, 4 Oct 2024 13:15:22 -0700 Subject: [PATCH 2/3] chore(docs): Update vector store notebook (#96) * Update vector_store.ipynb 1. Added Installation of additional dependencies "langchain-google-vertexai" it is needed for text embedding generation. 2. Set "GOOGLE_CLOUD_PROJECT" env variable for PROJECT_ID, it is needed for table creation / SQL execution in vector_store module. 3. Specified "id_column" value as "row_id", to match it with table creation in "init_vector_store_table" function, if "id_column" is not set then default value is "langchain_id" * Update docs/vector_store.ipynb Co-authored-by: Averi Kitsch --------- Co-authored-by: Averi Kitsch --- docs/vector_store.ipynb | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/docs/vector_store.ipynb b/docs/vector_store.ipynb index 05ad8acb..b5948543 100644 --- a/docs/vector_store.ipynb +++ b/docs/vector_store.ipynb @@ -52,7 +52,7 @@ } ], "source": [ - "%pip install --upgrade --quiet langchain-google-spanner" + "%pip install --upgrade --quiet langchain-google-spanner langchain-google-vertexai" ] }, { @@ -124,7 +124,8 @@ "PROJECT_ID = \"my-project-id\" # @param {type:\"string\"}\n", "\n", "# Set the project id\n", - "!gcloud config set project {PROJECT_ID}" + "!gcloud config set project {PROJECT_ID}\n", + "%env GOOGLE_CLOUD_PROJECT={PROJECT_ID}" ] }, { @@ -194,14 +195,16 @@ " instance_id=INSTANCE,\n", " database_id=DATABASE,\n", " table_name=TABLE_NAME,\n", - " id_column=\"row_id\",\n", - " metadata_columns=[\n", - " TableColumn(name=\"metadata\", type=\"JSON\", is_null=True),\n", - " TableColumn(name=\"title\", type=\"STRING(MAX)\", is_null=False),\n", - " ],\n", - " secondary_indexes=[\n", - " SecondaryIndex(index_name=\"row_id_and_title\", columns=[\"row_id\", \"title\"])\n", - " ],\n", + " # Customize the table creation\n", + " # id_column=\"row_id\",\n", + " # content_column=\"content_column\",\n", + " # metadata_columns=[\n", + " # TableColumn(name=\"metadata\", type=\"JSON\", is_null=True),\n", + " # TableColumn(name=\"title\", type=\"STRING(MAX)\", is_null=False),\n", + " # ],\n", + " # secondary_indexes=[\n", + " # SecondaryIndex(index_name=\"row_id_and_title\", columns=[\"row_id\", \"title\"])\n", + " # ],\n", ")" ] }, @@ -262,9 +265,11 @@ " instance_id=INSTANCE,\n", " database_id=DATABASE,\n", " table_name=TABLE_NAME,\n", - " ignore_metadata_columns=[],\n", " embedding_service=embeddings,\n", - " metadata_json_column=\"metadata\",\n", + " # Connect to a custom vector store table\n", + " # id_column=\"row_id\",\n", + " # content_column=\"content\",\n", + " # metadata_columns=[\"metadata\", \"title\"],\n", ")" ] }, From 10856a55d348b66061f1815010a2fbe0bb29e79d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:11:23 -0700 Subject: [PATCH 3/3] chore(main): release 0.4.1 (#100) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Averi Kitsch --- CHANGELOG.md | 7 +++++++ src/langchain_google_spanner/version.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00135f89..b5447344 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.4.1](https://github.com/googleapis/langchain-google-spanner-python/compare/v0.4.0...v0.4.1) (2024-10-04) + + +### Bug Fixes + +* Adding support to initialize with empty metadata columns ([#99](https://github.com/googleapis/langchain-google-spanner-python/issues/99)) ([3a8367c](https://github.com/googleapis/langchain-google-spanner-python/commit/3a8367c82705f352cb263ebfed30da02977de4cc)) + ## [0.4.0](https://github.com/googleapis/langchain-google-spanner-python/compare/v0.3.0...v0.4.0) (2024-09-24) diff --git a/src/langchain_google_spanner/version.py b/src/langchain_google_spanner/version.py index 8b521633..ed7a893a 100644 --- a/src/langchain_google_spanner/version.py +++ b/src/langchain_google_spanner/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.4.0" +__version__ = "0.4.1"