change imports

Author: dishaprakash

tests/test_async_loader.py

@@ -19,9 +19,10 @@
 import pytest
 import pytest_asyncio
 from langchain_core.documents import Document
+from langchain_postgres import Column
 from sqlalchemy import text
 
-from langchain_google_alloydb_pg import AlloyDBEngine, Column
+from langchain_google_alloydb_pg import AlloyDBEngine
 from langchain_google_alloydb_pg.async_loader import (
     AsyncAlloyDBDocumentSaver,
     AsyncAlloyDBLoader,

tests/test_async_vectorstore.py

@@ -21,11 +21,12 @@
 import pytest_asyncio
 from langchain_core.documents import Document
 from langchain_core.embeddings import DeterministicFakeEmbedding
+from langchain_postgres import Column
 from PIL import Image
 from sqlalchemy import text
 from sqlalchemy.engine.row import RowMapping
 
-from langchain_google_alloydb_pg import AlloyDBEngine, Column
+from langchain_google_alloydb_pg import AlloyDBEngine
 from langchain_google_alloydb_pg.async_vectorstore import AsyncAlloyDBVectorStore
 
 DEFAULT_TABLE = "test_table" + str(uuid.uuid4())

tests/test_async_vectorstore_from_methods.py

@@ -20,10 +20,11 @@
 import pytest_asyncio
 from langchain_core.documents import Document
 from langchain_core.embeddings import DeterministicFakeEmbedding
+from langchain_postgres import Column
 from sqlalchemy import text
 from sqlalchemy.engine.row import RowMapping
 
-from langchain_google_alloydb_pg import AlloyDBEngine, Column
+from langchain_google_alloydb_pg import AlloyDBEngine
 from langchain_google_alloydb_pg.async_vectorstore import AsyncAlloyDBVectorStore
 
 DEFAULT_TABLE = "test_table" + str(uuid.uuid4()).replace("-", "_")

tests/test_async_vectorstore_search.py

@@ -19,6 +19,7 @@
 import pytest_asyncio
 from langchain_core.documents import Document
 from langchain_core.embeddings import DeterministicFakeEmbedding
+from langchain_postgres import Column
 from langchain_postgres.v2.indexes import (
     DistanceStrategy,
     HNSWQueryOptions,
@@ -27,7 +28,7 @@
 from PIL import Image
 from sqlalchemy import text
 
-from langchain_google_alloydb_pg import AlloyDBEngine, Column
+from langchain_google_alloydb_pg import AlloyDBEngine
 from langchain_google_alloydb_pg.async_vectorstore import AsyncAlloyDBVectorStore
 from langchain_google_alloydb_pg.indexes import (
     ScaNNQueryOptions,

tests/test_engine.py

@@ -21,13 +21,14 @@
 import pytest_asyncio
 from google.cloud.alloydb.connector import AsyncConnector, IPTypes
 from langchain_core.embeddings import DeterministicFakeEmbedding
+from langchain_postgres import Column
 from sqlalchemy import VARCHAR, text
 from sqlalchemy.engine import URL
 from sqlalchemy.engine.row import RowMapping
 from sqlalchemy.ext.asyncio import create_async_engine
 from sqlalchemy.pool import NullPool
 
-from langchain_google_alloydb_pg import AlloyDBEngine, Column
+from langchain_google_alloydb_pg import AlloyDBEngine
 
 DEFAULT_TABLE = "test_table" + str(uuid.uuid4()).replace("-", "_")
 CUSTOM_TABLE = "test_table_custom" + str(uuid.uuid4()).replace("-", "_")

tests/test_loader.py

@@ -19,13 +19,13 @@
 import pytest
 import pytest_asyncio
 from langchain_core.documents import Document
+from langchain_postgres import Column
 from sqlalchemy import text
 
 from langchain_google_alloydb_pg import (
     AlloyDBDocumentSaver,
     AlloyDBEngine,
     AlloyDBLoader,
-    Column,
 )
 
 project_id = os.environ["PROJECT_ID"]

tests/test_standard_test_suite.py

@@ -17,11 +17,12 @@
 
 import pytest
 import pytest_asyncio
+from langchain_postgres import Column
 from langchain_tests.integration_tests import VectorStoreIntegrationTests
 from langchain_tests.integration_tests.vectorstores import EMBEDDING_SIZE
 from sqlalchemy import text
 
-from langchain_google_alloydb_pg import AlloyDBEngine, AlloyDBVectorStore, Column
+from langchain_google_alloydb_pg import AlloyDBEngine, AlloyDBVectorStore
 
 DEFAULT_TABLE = "test_table_standard_test_suite" + str(uuid.uuid4())
 DEFAULT_TABLE_SYNC = "test_table_sync_standard_test_suite" + str(uuid.uuid4())

tests/test_vectorstore.py

@@ -24,12 +24,13 @@
 from google.cloud.alloydb.connector import AsyncConnector, IPTypes
 from langchain_core.documents import Document
 from langchain_core.embeddings import DeterministicFakeEmbedding
+from langchain_postgres import Column
 from PIL import Image
 from sqlalchemy import text
 from sqlalchemy.engine.row import RowMapping
 from sqlalchemy.ext.asyncio import AsyncEngine, create_async_engine
 
-from langchain_google_alloydb_pg import AlloyDBEngine, AlloyDBVectorStore, Column
+from langchain_google_alloydb_pg import AlloyDBEngine, AlloyDBVectorStore
 
 DEFAULT_TABLE = "test_table" + str(uuid.uuid4())
 DEFAULT_TABLE_SYNC = "test_table_sync" + str(uuid.uuid4())

tests/test_vectorstore_embeddings.py

@@ -18,16 +18,16 @@
 import pytest
 import pytest_asyncio
 from langchain_core.documents import Document
+from langchain_postgres import Column
+from langchain_postgres.v2.indexes import DistanceStrategy, HNSWQueryOptions
 from sqlalchemy import text
 
 from langchain_google_alloydb_pg import (
     AlloyDBEmbeddings,
     AlloyDBEngine,
     AlloyDBModelManager,
     AlloyDBVectorStore,
-    Column,
 )
-from langchain_google_alloydb_pg.indexes import DistanceStrategy, HNSWQueryOptions
 
 DEFAULT_TABLE = "test_table" + str(uuid.uuid4()).replace("-", "_")
 DEFAULT_TABLE_SYNC = "test_table" + str(uuid.uuid4()).replace("-", "_")

tests/test_vectorstore_from_methods.py

@@ -20,11 +20,12 @@
 import pytest_asyncio
 from langchain_core.documents import Document
 from langchain_core.embeddings import DeterministicFakeEmbedding
+from langchain_postgres import Column
 from sqlalchemy import VARCHAR, text
 from sqlalchemy.engine.row import RowMapping
 from sqlalchemy.ext.asyncio import create_async_engine
 
-from langchain_google_alloydb_pg import AlloyDBEngine, AlloyDBVectorStore, Column
+from langchain_google_alloydb_pg import AlloyDBEngine, AlloyDBVectorStore
 
 DEFAULT_TABLE = "test_table" + str(uuid.uuid4()).replace("-", "_")
 DEFAULT_TABLE_SYNC = "test_table_sync" + str(uuid.uuid4()).replace("-", "_")