Linter and format fix

examples/vectorstore.ipynb

@@ -72,7 +72,7 @@
     "from langchain_core.documents import Document\n",
     "\n",
     "# See docker command above to launch a postgres instance with pgvector enabled.\n",
-    "connection = \"postgresql+psycopg://langchain:langchain@localhost:6024/langchain\" \n",
+    "connection = \"postgresql+psycopg://langchain:langchain@localhost:6024/langchain\"\n",
     "collection_name = \"my_docs\"\n",
     "embeddings = CohereEmbeddings()\n",
     "\n",
@@ -126,17 +126,47 @@
    "outputs": [],
    "source": [
     "docs = [\n",
-    "    Document(page_content='there are cats in the pond', metadata={\"id\": 1, \"location\": \"pond\", \"topic\": \"animals\"}),\n",
-    "    Document(page_content='ducks are also found in the pond', metadata={\"id\": 2, \"location\": \"pond\", \"topic\": \"animals\"}),\n",
-    "    Document(page_content='fresh apples are available at the market', metadata={\"id\": 3, \"location\": \"market\", \"topic\": \"food\"}),\n",
-    "    Document(page_content='the market also sells fresh oranges', metadata={\"id\": 4, \"location\": \"market\", \"topic\": \"food\"}),\n",
-    "    Document(page_content='the new art exhibit is fascinating', metadata={\"id\": 5, \"location\": \"museum\", \"topic\": \"art\"}),\n",
-    "    Document(page_content='a sculpture exhibit is also at the museum', metadata={\"id\": 6, \"location\": \"museum\", \"topic\": \"art\"}),\n",
-    "    Document(page_content='a new coffee shop opened on Main Street', metadata={\"id\": 7, \"location\": \"Main Street\", \"topic\": \"food\"}),\n",
-    "    Document(page_content='the book club meets at the library', metadata={\"id\": 8, \"location\": \"library\", \"topic\": \"reading\"}),\n",
-    "    Document(page_content='the library hosts a weekly story time for kids', metadata={\"id\": 9, \"location\": \"library\", \"topic\": \"reading\"}),\n",
-    "    Document(page_content='a cooking class for beginners is offered at the community center', metadata={\"id\": 10, \"location\": \"community center\", \"topic\": \"classes\"})\n",
-    "]\n"
+    "    Document(\n",
+    "        page_content=\"there are cats in the pond\",\n",
+    "        metadata={\"id\": 1, \"location\": \"pond\", \"topic\": \"animals\"},\n",
+    "    ),\n",
+    "    Document(\n",
+    "        page_content=\"ducks are also found in the pond\",\n",
+    "        metadata={\"id\": 2, \"location\": \"pond\", \"topic\": \"animals\"},\n",
+    "    ),\n",
+    "    Document(\n",
+    "        page_content=\"fresh apples are available at the market\",\n",
+    "        metadata={\"id\": 3, \"location\": \"market\", \"topic\": \"food\"},\n",
+    "    ),\n",
+    "    Document(\n",
+    "        page_content=\"the market also sells fresh oranges\",\n",
+    "        metadata={\"id\": 4, \"location\": \"market\", \"topic\": \"food\"},\n",
+    "    ),\n",
+    "    Document(\n",
+    "        page_content=\"the new art exhibit is fascinating\",\n",
+    "        metadata={\"id\": 5, \"location\": \"museum\", \"topic\": \"art\"},\n",
+    "    ),\n",
+    "    Document(\n",
+    "        page_content=\"a sculpture exhibit is also at the museum\",\n",
+    "        metadata={\"id\": 6, \"location\": \"museum\", \"topic\": \"art\"},\n",
+    "    ),\n",
+    "    Document(\n",
+    "        page_content=\"a new coffee shop opened on Main Street\",\n",
+    "        metadata={\"id\": 7, \"location\": \"Main Street\", \"topic\": \"food\"},\n",
+    "    ),\n",
+    "    Document(\n",
+    "        page_content=\"the book club meets at the library\",\n",
+    "        metadata={\"id\": 8, \"location\": \"library\", \"topic\": \"reading\"},\n",
+    "    ),\n",
+    "    Document(\n",
+    "        page_content=\"the library hosts a weekly story time for kids\",\n",
+    "        metadata={\"id\": 9, \"location\": \"library\", \"topic\": \"reading\"},\n",
+    "    ),\n",
+    "    Document(\n",
+    "        page_content=\"a cooking class for beginners is offered at the community center\",\n",
+    "        metadata={\"id\": 10, \"location\": \"community center\", \"topic\": \"classes\"},\n",
+    "    ),\n",
+    "]"
    ]
   },
   {
@@ -159,7 +189,7 @@
     }
    ],
    "source": [
-    "vectorstore.add_documents(docs, ids=[doc.metadata['id'] for doc in docs])"
+    "vectorstore.add_documents(docs, ids=[doc.metadata[\"id\"] for doc in docs])"
    ]
   },
   {
@@ -191,7 +221,7 @@
     }
    ],
    "source": [
-    "vectorstore.similarity_search('kitty', k=10)"
+    "vectorstore.similarity_search(\"kitty\", k=10)"
    ]
   },
   {
@@ -212,17 +242,47 @@
    "outputs": [],
    "source": [
     "docs = [\n",
-    "    Document(page_content='there are cats in the pond', metadata={\"id\": 1, \"location\": \"pond\", \"topic\": \"animals\"}),\n",
-    "    Document(page_content='ducks are also found in the pond', metadata={\"id\": 2, \"location\": \"pond\", \"topic\": \"animals\"}),\n",
-    "    Document(page_content='fresh apples are available at the market', metadata={\"id\": 3, \"location\": \"market\", \"topic\": \"food\"}),\n",
-    "    Document(page_content='the market also sells fresh oranges', metadata={\"id\": 4, \"location\": \"market\", \"topic\": \"food\"}),\n",
-    "    Document(page_content='the new art exhibit is fascinating', metadata={\"id\": 5, \"location\": \"museum\", \"topic\": \"art\"}),\n",
-    "    Document(page_content='a sculpture exhibit is also at the museum', metadata={\"id\": 6, \"location\": \"museum\", \"topic\": \"art\"}),\n",
-    "    Document(page_content='a new coffee shop opened on Main Street', metadata={\"id\": 7, \"location\": \"Main Street\", \"topic\": \"food\"}),\n",
-    "    Document(page_content='the book club meets at the library', metadata={\"id\": 8, \"location\": \"library\", \"topic\": \"reading\"}),\n",
-    "    Document(page_content='the library hosts a weekly story time for kids', metadata={\"id\": 9, \"location\": \"library\", \"topic\": \"reading\"}),\n",
-    "    Document(page_content='a cooking class for beginners is offered at the community center', metadata={\"id\": 10, \"location\": \"community center\", \"topic\": \"classes\"})\n",
-    "]\n"
+    "    Document(\n",
+    "        page_content=\"there are cats in the pond\",\n",
+    "        metadata={\"id\": 1, \"location\": \"pond\", \"topic\": \"animals\"},\n",
+    "    ),\n",
+    "    Document(\n",
+    "        page_content=\"ducks are also found in the pond\",\n",
+    "        metadata={\"id\": 2, \"location\": \"pond\", \"topic\": \"animals\"},\n",
+    "    ),\n",
+    "    Document(\n",
+    "        page_content=\"fresh apples are available at the market\",\n",
+    "        metadata={\"id\": 3, \"location\": \"market\", \"topic\": \"food\"},\n",
+    "    ),\n",
+    "    Document(\n",
+    "        page_content=\"the market also sells fresh oranges\",\n",
+    "        metadata={\"id\": 4, \"location\": \"market\", \"topic\": \"food\"},\n",
+    "    ),\n",
+    "    Document(\n",
+    "        page_content=\"the new art exhibit is fascinating\",\n",
+    "        metadata={\"id\": 5, \"location\": \"museum\", \"topic\": \"art\"},\n",
+    "    ),\n",
+    "    Document(\n",
+    "        page_content=\"a sculpture exhibit is also at the museum\",\n",
+    "        metadata={\"id\": 6, \"location\": \"museum\", \"topic\": \"art\"},\n",
+    "    ),\n",
+    "    Document(\n",
+    "        page_content=\"a new coffee shop opened on Main Street\",\n",
+    "        metadata={\"id\": 7, \"location\": \"Main Street\", \"topic\": \"food\"},\n",
+    "    ),\n",
+    "    Document(\n",
+    "        page_content=\"the book club meets at the library\",\n",
+    "        metadata={\"id\": 8, \"location\": \"library\", \"topic\": \"reading\"},\n",
+    "    ),\n",
+    "    Document(\n",
+    "        page_content=\"the library hosts a weekly story time for kids\",\n",
+    "        metadata={\"id\": 9, \"location\": \"library\", \"topic\": \"reading\"},\n",
+    "    ),\n",
+    "    Document(\n",
+    "        page_content=\"a cooking class for beginners is offered at the community center\",\n",
+    "        metadata={\"id\": 10, \"location\": \"community center\", \"topic\": \"classes\"},\n",
+    "    ),\n",
+    "]"
    ]
   },
   {
@@ -275,9 +335,7 @@
     }
    ],
    "source": [
-    "vectorstore.similarity_search('kitty', k=10, filter={\n",
-    "    'id': {'$in': [1, 5, 2, 9]}\n",
-    "})"
+    "vectorstore.similarity_search(\"kitty\", k=10, filter={\"id\": {\"$in\": [1, 5, 2, 9]}})"
    ]
   },
   {
@@ -309,10 +367,11 @@
     }
    ],
    "source": [
-    "vectorstore.similarity_search('ducks', k=10, filter={\n",
-    "    'id': {'$in': [1, 5, 2, 9]},\n",
-    "    'location': {'$in': [\"pond\", \"market\"]}\n",
-    "})"
+    "vectorstore.similarity_search(\n",
+    "    \"ducks\",\n",
+    "    k=10,\n",
+    "    filter={\"id\": {\"$in\": [1, 5, 2, 9]}, \"location\": {\"$in\": [\"pond\", \"market\"]}},\n",
+    ")"
    ]
   },
   {
@@ -336,12 +395,15 @@
     }
    ],
    "source": [
-    "vectorstore.similarity_search('ducks', k=10, filter={\n",
-    "    '$and': [\n",
-    "        {'id': {'$in': [1, 5, 2, 9]}},\n",
-    "        {'location': {'$in': [\"pond\", \"market\"]}},\n",
-    "    ]\n",
-    "}\n",
+    "vectorstore.similarity_search(\n",
+    "    \"ducks\",\n",
+    "    k=10,\n",
+    "    filter={\n",
+    "        \"$and\": [\n",
+    "            {\"id\": {\"$in\": [1, 5, 2, 9]}},\n",
+    "            {\"location\": {\"$in\": [\"pond\", \"market\"]}},\n",
+    "        ]\n",
+    "    },\n",
     ")"
    ]
   },
@@ -372,9 +434,7 @@
     }
    ],
    "source": [
-    "vectorstore.similarity_search('bird', k=10, filter={\n",
-    "    'location': { \"$ne\": 'pond'}\n",
-    "})"
+    "vectorstore.similarity_search(\"bird\", k=10, filter={\"location\": {\"$ne\": \"pond\"}})"
    ]
   }
  ],

langchain_postgres/__init__.py

@@ -1,7 +1,6 @@
 from importlib import metadata
 
-from langchain_postgres.chat_message_histories import \
-    PostgresChatMessageHistory
+from langchain_postgres.chat_message_histories import PostgresChatMessageHistory
 from langchain_postgres.engine import Column, PGEngine
 from langchain_postgres.translator import PGVectorTranslator
 from langchain_postgres.vectorstore import PGVectorStore

langchain_postgres/async_vectorstore.py

@@ -14,9 +14,14 @@
 from sqlalchemy.ext.asyncio import AsyncEngine
 
 from .engine import PGEngine
-from .indexes import (DEFAULT_DISTANCE_STRATEGY, DEFAULT_INDEX_NAME_SUFFIX,
-                      BaseIndex, DistanceStrategy, ExactNearestNeighbor,
-                      QueryOptions)
+from .indexes import (
+    DEFAULT_DISTANCE_STRATEGY,
+    DEFAULT_INDEX_NAME_SUFFIX,
+    BaseIndex,
+    DistanceStrategy,
+    ExactNearestNeighbor,
+    QueryOptions,
+)
 
 COMPARISONS_TO_NATIVE = {
     "$eq": "=",
@@ -775,7 +780,7 @@ async def aapply_vector_index(
             if index.name == None:
                 index.name = self.table_name + DEFAULT_INDEX_NAME_SUFFIX
             name = index.name
-        stmt = f"CREATE INDEX {'CONCURRENTLY' if concurrently else ''} {name} ON \"{self.schema_name}\".\"{self.table_name}\" USING {index.index_type} ({self.embedding_column} {function}) {params} {filter};"
+        stmt = f'CREATE INDEX {"CONCURRENTLY" if concurrently else ""} {name} ON "{self.schema_name}"."{self.table_name}" USING {index.index_type} ({self.embedding_column} {function}) {params} {filter};'
         if concurrently:
             async with self.engine.connect() as conn:
                 await conn.execute(text("COMMIT"))

langchain_postgres/chat_message_histories.py

@@ -2,6 +2,7 @@
 
 This client provides support for both sync and async via psycopg 3.
 """
+
 from __future__ import annotations
 
 import json

langchain_postgres/vectorstore.py

@@ -9,8 +9,12 @@
 
 from .async_vectorstore import AsyncPGVectorStore
 from .engine import PGEngine
-from .indexes import (DEFAULT_DISTANCE_STRATEGY, BaseIndex, DistanceStrategy,
-                      QueryOptions)
+from .indexes import (
+    DEFAULT_DISTANCE_STRATEGY,
+    BaseIndex,
+    DistanceStrategy,
+    QueryOptions,
+)
 
 
 class PGVectorStore(VectorStore):

pyproject.toml

@@ -18,6 +18,7 @@ psycopg-pool = "^3.2.1"
 sqlalchemy = "^2"
 pgvector = "<0.4"
 numpy = ">=1.21"
+asyncpg = ">=0.30.0"
 
 [tool.poetry.group.docs.dependencies]
 

tests/unit_tests/fake_embeddings.py

@@ -1,4 +1,5 @@
 """Copied from community."""
+
 from typing import List
 
 from langchain_core.embeddings import Embeddings

tests/unit_tests/fixtures/filtering_test_cases.py

@@ -1,4 +1,5 @@
 """Module needs to move to a stasndalone package."""
+
 from langchain_core.documents import Document
 
 metadatas = [

tests/unit_tests/test_async_pg_vectorstore.py

@@ -10,8 +10,7 @@
 
 from langchain_postgres import Column, PGEngine
 from langchain_postgres.async_vectorstore import AsyncPGVectorStore
-from tests.utils import \
-    VECTORSTORE_CONNECTION_STRING_ASYNCPG as CONNECTION_STRING
+from tests.utils import VECTORSTORE_CONNECTION_STRING_ASYNCPG as CONNECTION_STRING
 
 DEFAULT_TABLE = "test_table" + str(uuid.uuid4())
 DEFAULT_TABLE_SYNC = "test_table_sync" + str(uuid.uuid4())
@@ -43,7 +42,7 @@ async def afetch(engine: PGEngine, query: str) -> Sequence[RowMapping]:
     return result_fetch
 
 
-@pytest.mark.asyncio(loop_scope="class")
+@pytest.mark.asyncio(cope="class")
 class TestVectorStore:
     @pytest_asyncio.fixture(scope="class")
     async def engine(self) -> AsyncIterator[PGEngine]:

tests/unit_tests/test_async_pg_vectorstore_from_methods.py

@@ -11,8 +11,7 @@
 
 from langchain_postgres import Column, PGEngine
 from langchain_postgres.async_vectorstore import AsyncPGVectorStore
-from tests.utils import \
-    VECTORSTORE_CONNECTION_STRING_ASYNCPG as CONNECTION_STRING
+from tests.utils import VECTORSTORE_CONNECTION_STRING_ASYNCPG as CONNECTION_STRING
 
 DEFAULT_TABLE = "test_table" + str(uuid.uuid4()).replace("-", "_")
 DEFAULT_TABLE_SYNC = "test_table_sync" + str(uuid.uuid4()).replace("-", "_")

tests/unit_tests/test_async_pg_vectorstore_index.py

@@ -10,11 +10,13 @@
 
 from langchain_postgres import PGEngine
 from langchain_postgres.async_vectorstore import AsyncPGVectorStore
-from langchain_postgres.indexes import (DEFAULT_INDEX_NAME_SUFFIX,
-                                        DistanceStrategy, HNSWIndex,
-                                        IVFFlatIndex)
-from tests.utils import \
-    VECTORSTORE_CONNECTION_STRING_ASYNCPG as CONNECTION_STRING
+from langchain_postgres.indexes import (
+    DEFAULT_INDEX_NAME_SUFFIX,
+    DistanceStrategy,
+    HNSWIndex,
+    IVFFlatIndex,
+)
+from tests.utils import VECTORSTORE_CONNECTION_STRING_ASYNCPG as CONNECTION_STRING
 
 DEFAULT_TABLE = "test_table" + str(uuid.uuid4()).replace("-", "_")
 DEFAULT_INDEX_NAME = DEFAULT_TABLE + DEFAULT_INDEX_NAME_SUFFIX
@@ -45,7 +47,7 @@ async def aexecute(engine: PGEngine, query: str) -> None:
         await conn.commit()
 
 
-@pytest.mark.asyncio(loop_scope="class")
+@pytest.mark.asyncio(cope="class")
 class TestIndex:
     @pytest_asyncio.fixture(scope="class")
     async def engine(self) -> AsyncIterator[PGEngine]:

tests/unit_tests/test_async_pg_vectorstore_search.py

@@ -12,9 +12,10 @@
 from langchain_postgres.async_vectorstore import AsyncPGVectorStore
 from langchain_postgres.indexes import DistanceStrategy, HNSWQueryOptions
 from tests.unit_tests.fixtures.metadata_filtering_data import (
-    FILTERING_TEST_CASES, METADATAS)
-from tests.utils import \
-    VECTORSTORE_CONNECTION_STRING_ASYNCPG as CONNECTION_STRING
+    FILTERING_TEST_CASES,
+    METADATAS,
+)
+from tests.utils import VECTORSTORE_CONNECTION_STRING_ASYNCPG as CONNECTION_STRING
 
 DEFAULT_TABLE = "test_table" + str(uuid.uuid4()).replace("-", "_")
 CUSTOM_TABLE = "test_table_custom" + str(uuid.uuid4()).replace("-", "_")
@@ -58,7 +59,7 @@ async def aexecute(
         await conn.commit()
 
 
-@pytest.mark.asyncio(loop_scope="class")
+@pytest.mark.asyncio(cope="class")
 class TestVectorStoreSearch:
     @pytest_asyncio.fixture(scope="class")
     async def engine(self) -> AsyncIterator[PGEngine]:
@@ -212,7 +213,8 @@ async def test_similarity_search_with_relevance_scores_threshold_euclidean(
 
         score_threshold = {"score_threshold": 0.9}
         results = await vs.asimilarity_search_with_relevance_scores(
-            "foo", **score_threshold  # type: ignore
+            "foo",
+            **score_threshold,  # type: ignore
         )
         assert len(results) == 1
         assert results[0][0] == Document(page_content="foo", id=ids[0])

tests/unit_tests/test_engine.py

@@ -12,8 +12,7 @@
 from sqlalchemy.pool import NullPool
 
 from langchain_postgres import Column, PGEngine
-from tests.utils import \
-    VECTORSTORE_CONNECTION_STRING_ASYNCPG as CONNECTION_STRING
+from tests.utils import VECTORSTORE_CONNECTION_STRING_ASYNCPG as CONNECTION_STRING
 
 DEFAULT_TABLE = "test_table" + str(uuid.uuid4()).replace("-", "_")
 CUSTOM_TABLE = "test_table_custom" + str(uuid.uuid4()).replace("-", "_")
@@ -26,7 +25,6 @@
 VECTOR_SIZE = 768
 
 embeddings_service = DeterministicFakeEmbedding(size=VECTOR_SIZE)
-host = os.environ["IP_ADDRESS"]
 
 
 def get_env_var(key: str, desc: str) -> str:
@@ -135,7 +133,6 @@ async def test_init_table_with_int_id(self, engine: PGEngine) -> None:
             assert row in expected
 
     async def test_from_engine(self) -> None:
-
         engine = create_async_engine(
             CONNECTION_STRING,
         )