Skip to content

Add support to specify custom table schema #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Add support to specify custom table schema #138

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5da6c24
Add support to specify custom table schema
anupkg1985 Nov 10, 2024
4c05345
Merge branch 'main' into main
anupkg1985 Nov 26, 2024
a232cbf
Merge branch 'main' into main
anupkg1985 Jan 20, 2025
7d8c729
Merge branch 'main' into main
anupkg1985 Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions langchain_postgres/vectorstores.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class DistanceStrategy(str, enum.Enum):
)


def _get_embedding_collection_store(vector_dimension: Optional[int] = None) -> Any:
def _get_embedding_collection_store(vector_dimension: Optional[int] = None, table_schema: Optional[str] = "public") -> Any:
global _classes
if _classes is not None:
return _classes
Expand All @@ -109,6 +109,7 @@ class CollectionStore(Base):
"""Collection store."""

__tablename__ = "langchain_pg_collection"
__table_args__ = {"schema":table_schema}

uuid = sqlalchemy.Column(
UUID(as_uuid=True), primary_key=True, default=uuid.uuid4
Expand Down Expand Up @@ -204,7 +205,7 @@ class EmbeddingStore(Base):
collection_id = sqlalchemy.Column(
UUID(as_uuid=True),
sqlalchemy.ForeignKey(
f"{CollectionStore.__tablename__}.uuid",
f"{table_schema}.{CollectionStore.__tablename__}.uuid",
ondelete="CASCADE",
),
)
Expand All @@ -220,7 +221,8 @@ class EmbeddingStore(Base):
"cmetadata",
postgresql_using="gin",
postgresql_ops={"cmetadata": "jsonb_path_ops"},
),
)
, {"schema": table_schema}
)

_classes = (EmbeddingStore, CollectionStore)
Expand Down Expand Up @@ -386,6 +388,7 @@ def __init__(
use_jsonb: bool = True,
create_extension: bool = True,
async_mode: bool = False,
table_schema: str = 'public'
) -> None:
"""Initialize the PGVector store.
For an async version, use `PGVector.acreate()` instead.
Expand Down Expand Up @@ -422,6 +425,7 @@ def __init__(
self.collection_metadata = collection_metadata
self._distance_strategy = distance_strategy
self.pre_delete_collection = pre_delete_collection
self.table_schema = table_schema
self.logger = logger or logging.getLogger(__name__)
self.override_relevance_score_fn = relevance_score_fn
self._engine: Optional[Engine] = None
Expand Down Expand Up @@ -469,7 +473,8 @@ def __post_init__(
self.create_vector_extension()

EmbeddingStore, CollectionStore = _get_embedding_collection_store(
self._embedding_length
self._embedding_length,
table_schema = self.table_schema
)
self.CollectionStore = CollectionStore
self.EmbeddingStore = EmbeddingStore
Expand All @@ -485,7 +490,8 @@ async def __apost_init__(
self._async_init = True

EmbeddingStore, CollectionStore = _get_embedding_collection_store(
self._embedding_length
self._embedding_length,
table_schema = self.table_schema
)
self.CollectionStore = CollectionStore
self.EmbeddingStore = EmbeddingStore
Expand Down