Merge branch 'main' into renovate/migrate-config

Author: averikitsch

.github/workflows/docs.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
     - name: Setup Python
       uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
       with:
@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
     - name: Setup Python
       uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
       with:

.github/workflows/lint.yml

@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
 
       - name: Setup Python
         uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0

.github/workflows/schedule_reporter.yml

@@ -24,6 +24,6 @@ jobs:
       issues: 'write'
       checks: 'read'
       contents: 'read'
-    uses: googleapis/langchain-google-alloydb-pg-python/.github/workflows/cloud_build_failure_reporter.yml@6fbd4b557d0784569dd246e386acd01a264d7de4
+    uses: googleapis/langchain-google-alloydb-pg-python/.github/workflows/cloud_build_failure_reporter.yml@3423e9aea159d63dee57d11d2667358ae233c081
     with:
       trigger_names: "pg-integration-test-nightly,pg-continuous-test-on-merge"

README.rst

@@ -111,6 +111,26 @@ Use a Vector Store to store embedded data and perform vector search.
             embeddings=embedding_service
         )
 
+Hybrid search
+~~~~~~~~~~~~~
+
+The `PostgresVectorStore` supports hybrid search (dense vectors + full text) for more comprehensive and relevant search results.
+
+.. code-block:: python
+
+  from langchain_google_cloud_sql_pg import HybridSearchConfig, reciprocal_rank_fusion
+
+  vs = PostgresVectorStore.create_sync(
+      engine=engine,
+      table_name=TABLE_NAME,
+      embedding_service=embedding,
+      hybrid_search_config=HybridSearchConfig(
+        fusion_function=reciprocal_rank_fusion
+      ),
+  )
+  hybrid_docs = vector_store.similarity_search("products", k=5)
+
+
 See the full `Vector Store`_ tutorial.
 
 .. _`Vector Store`: https://github.com/googleapis/langchain-google-cloud-sql-pg-python/tree/main/docs/vector_store.ipynb

docs/vector_store.ipynb

@@ -11,12 +11,10 @@ authors = [
 
 dependencies = [
     "cloud-sql-python-connector[asyncpg] >= 1.10.0, <2.0.0",
-    "langchain-core>=0.2.36, <1.0.0 ",
     "numpy>=1.24.4, <3.0.0; python_version >= '3.11'",
     "numpy>=1.24.4, <=2.2.6; python_version == '3.10'",
     "numpy>=1.24.4, <=2.0.2; python_version <= '3.9'",
-    "pgvector>=0.2.5, <1.0.0",
-    "SQLAlchemy[asyncio]>=2.0.25, <3.0.0"
+    "langchain-postgres>=0.0.15",
 ]
 
 classifiers = [
@@ -46,12 +44,12 @@ langgraph = [
 test = [
     "black[jupyter]==25.1.0",
     "isort==6.0.1",
-    "mypy==1.15.0",
+    "mypy==1.17.1",
     "pytest-asyncio==0.26.0",
     "pytest==8.4.1",
     "pytest-cov==6.2.1",
     "langchain-tests==0.3.20",
-    "langgraph==0.5.2"
+    "langgraph==0.6.5"
 ]
 
 [build-system]

pyproject.toml

@@ -1,8 +1,6 @@
-cloud-sql-python-connector[asyncpg]==1.18.2
-langchain-core==0.3.68
-numpy==2.3.1; python_version >= "3.11"
+cloud-sql-python-connector[asyncpg]==1.18.4
+numpy==2.3.2; python_version >= "3.11"
 numpy==2.2.6; python_version == "3.10"
 numpy==2.0.2; python_version <= "3.9"
-pgvector==0.4.1
-SQLAlchemy[asyncio]==2.0.41
-langgraph==0.5.2
+langgraph==0.6.5
+langchain-postgres==0.0.15

requirements.txt

@@ -12,10 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from langchain_postgres import Column
+from langchain_postgres.v2.hybrid_search_config import (
+    HybridSearchConfig,
+    reciprocal_rank_fusion,
+    weighted_sum_ranking,
+)
+
 from . import indexes
 from .chat_message_history import PostgresChatMessageHistory
 from .checkpoint import PostgresSaver
-from .engine import Column, PostgresEngine
+from .engine import PostgresEngine
 from .loader import PostgresDocumentSaver, PostgresLoader
 from .vectorstore import PostgresVectorStore
 from .version import __version__
@@ -29,5 +36,8 @@
     "PostgresLoader",
     "PostgresDocumentSaver",
     "PostgresSaver",
+    "HybridSearchConfig",
+    "reciprocal_rank_fusion",
+    "weighted_sum_ranking",
     "__version__",
 ]