Merge branch 'main' into issue_173

Author: averikitsch

.github/workflows/docs.yml

@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
     - name: Setup Python
-      uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
+      uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
       with:
         python-version: "3.10"
     - name: Install nox
@@ -26,9 +26,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
     - name: Setup Python
-      uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
+      uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
       with:
         python-version: "3.10"
     - name: Install nox

.github/workflows/lint.yml

@@ -34,7 +34,7 @@ jobs:
         uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
 
       - name: Setup Python
-        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: "3.11"
 

README.rst

@@ -73,7 +73,7 @@ Use a vector store to store embedded data and perform vector search.
 
 .. code-block:: python
 
-    from langchain_google_sapnner import SpannerVectorstore
+    from langchain_google_spanner import SpannerVectorstore
     from langchain.embeddings import VertexAIEmbeddings
 
     embeddings_service = VertexAIEmbeddings(model_name="textembedding-gecko@003")

integration.cloudbuild.yaml

@@ -36,8 +36,8 @@ steps:
 timeout: "7200s"
 substitutions:
   _INSTANCE_ID: test-instance
-  _GOOGLE_DATABASE: test-google-db
-  _PG_DATABASE: test-pg-db
+  _GOOGLE_DATABASE: test-gsql-db
+  _PG_DATABASE: test-pgsql-db
   _VERSION: "3.9"
 
 options:

src/langchain_google_spanner/graph_qa.py

@@ -71,6 +71,12 @@ class VerifyGqlOutput(BaseModel):
 INTERMEDIATE_STEPS_KEY = "intermediate_steps"
 
 
+class InvalidGQLGenerationError(ValueError):
+    def __init__(self, message, intermediate_steps=None):
+        self.intermediate_steps = intermediate_steps
+        super().__init__(message)
+
+
 class SpannerGraphQAChain(Chain):
     """Chain for question-answering against a Spanner Graph database by
         generating GQL statements from natural language questions.
@@ -268,7 +274,9 @@ def execute_with_retry(
             finally:
                 retries += 1
 
-        raise ValueError("The generated gql query is invalid")
+        raise InvalidGQLGenerationError(
+            "The generated gql query is invalid", intermediate_steps
+        )
 
     def log_invalid_query(
         self,
@@ -323,7 +331,9 @@ def _call(
                 _run_manager, intermediate_steps, question, verified_gql
             )
             if not final_gql:
-                raise ValueError("No GQL was generated.")
+                raise InvalidGQLGenerationError(
+                    "No GQL was generated.", intermediate_steps
+                )
             _run_manager.on_text("Full Context:", end="\n", verbose=self.verbose)
             _run_manager.on_text(
                 str(context), color="green", end="\n", verbose=self.verbose