github/langchain
1
0
Fork 0
mirror of https://github.com/hwchase17/langchain.git synced 2025-08-14 07:07:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

community[minor]: Relax constraints on Cassandra VectorStore constructors (#21209)

Browse Source 
If Session and/or keyspace are not provided, they are resolved from
cassio's context. So they are not required.
This change is fully backward compatible.
This commit is contained in:
Christophe Bornet 2024-05-06 20:32:32 +02:00 committed by GitHub
parent 27e73ebe57
commit 484a009012
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
libs/community/langchain_community/vectorstores/cassandra.py
View File

@ -31,8 +31,6 @@ from langchain_community.vectorstores.utils import maximal_marginal_relevance
CVST = TypeVar("CVST", bound="Cassandra") CVST = TypeVar("CVST", bound="Cassandra")
_NOT_SET = object()
class Cassandra(VectorStore): class Cassandra(VectorStore):
"""Apache Cassandra(R) for vector-store workloads. """Apache Cassandra(R) for vector-store workloads.
@ -56,9 +54,9 @@ class Cassandra(VectorStore):
Args: Args:
embedding: Embedding function to use. embedding: Embedding function to use.
session: Cassandra driver session. session: Cassandra driver session. If not provided, it is resolved from cassio.
keyspace: Cassandra key space. keyspace: Cassandra key space. If not provided, it is resolved from cassio.
table_name: Cassandra table. table_name: Cassandra table (required).
ttl_seconds: Optional time-to-live for the added texts. ttl_seconds: Optional time-to-live for the added texts.
body_index_options: Optional options used to create the body index. body_index_options: Optional options used to create the body index.
Eg. body_index_options = [cassio.table.cql.STANDARD_ANALYZER] Eg. body_index_options = [cassio.table.cql.STANDARD_ANALYZER]
@ -83,9 +81,9 @@ class Cassandra(VectorStore):
def __init__( def __init__(
self, self,
embedding: Embeddings, embedding: Embeddings,
session: Session, session: Optional[Session] = None,
keyspace: str, keyspace: Optional[str] = None,
table_name: str, table_name: str = "",
ttl_seconds: Optional[int] = None, ttl_seconds: Optional[int] = None,
*, *,
body_index_options: Optional[List[Tuple[str, Any]]] = None, body_index_options: Optional[List[Tuple[str, Any]]] = None,
@ -98,7 +96,8 @@ class Cassandra(VectorStore):
"Could not import cassio python package. " "Could not import cassio python package. "
"Please install it with `pip install cassio`." "Please install it with `pip install cassio`."
) )
"""Create a vector table.""" if not table_name:
raise ValueError("Missing required parameter 'table_name'.")
self.embedding = embedding self.embedding = embedding
self.session = session self.session = session
self.keyspace = keyspace self.keyspace = keyspace
@ -779,8 +778,8 @@ class Cassandra(VectorStore):
embedding: Embeddings, embedding: Embeddings,
metadatas: Optional[List[dict]] = None, metadatas: Optional[List[dict]] = None,
*, *,
session: Session = _NOT_SET, session: Optional[Session] = None,
keyspace: str = "", keyspace: Optional[str] = None,
table_name: str = "", table_name: str = "",
ids: Optional[List[str]] = None, ids: Optional[List[str]] = None,
batch_size: int = 16, batch_size: int = 16,
@ -794,8 +793,10 @@ class Cassandra(VectorStore):
texts: Texts to add to the vectorstore. texts: Texts to add to the vectorstore.
embedding: Embedding function to use. embedding: Embedding function to use.
metadatas: Optional list of metadatas associated with the texts. metadatas: Optional list of metadatas associated with the texts.
session: Cassandra driver session (required). session: Cassandra driver session.
keyspace: Cassandra key space (required). If not provided, it is resolved from cassio.
keyspace: Cassandra key space.
If not provided, it is resolved from cassio.
table_name: Cassandra table (required). table_name: Cassandra table (required).
ids: Optional list of IDs associated with the texts. ids: Optional list of IDs associated with the texts.
batch_size: Number of concurrent requests to send to the server. batch_size: Number of concurrent requests to send to the server.
@ -807,12 +808,6 @@ class Cassandra(VectorStore):
Returns: Returns:
a Cassandra vectorstore. a Cassandra vectorstore.
""" """
if session is _NOT_SET:
raise ValueError("session parameter is required")
if not keyspace:
raise ValueError("keyspace parameter is required")
if not table_name:
raise ValueError("table_name parameter is required")
store = cls( store = cls(
embedding=embedding, embedding=embedding,
session=session, session=session,
@ -833,8 +828,8 @@ class Cassandra(VectorStore):
embedding: Embeddings, embedding: Embeddings,
metadatas: Optional[List[dict]] = None, metadatas: Optional[List[dict]] = None,
*, *,
session: Session = _NOT_SET, session: Optional[Session] = None,
keyspace: str = "", keyspace: Optional[str] = None,
table_name: str = "", table_name: str = "",
ids: Optional[List[str]] = None, ids: Optional[List[str]] = None,
concurrency: int = 16, concurrency: int = 16,
@ -848,8 +843,10 @@ class Cassandra(VectorStore):
texts: Texts to add to the vectorstore. texts: Texts to add to the vectorstore.
embedding: Embedding function to use. embedding: Embedding function to use.
metadatas: Optional list of metadatas associated with the texts. metadatas: Optional list of metadatas associated with the texts.
session: Cassandra driver session (required). session: Cassandra driver session.
keyspace: Cassandra key space (required). If not provided, it is resolved from cassio.
keyspace: Cassandra key space.
If not provided, it is resolved from cassio.
table_name: Cassandra table (required). table_name: Cassandra table (required).
ids: Optional list of IDs associated with the texts. ids: Optional list of IDs associated with the texts.
concurrency: Number of concurrent queries to send to the database. concurrency: Number of concurrent queries to send to the database.
@ -861,12 +858,6 @@ class Cassandra(VectorStore):
Returns: Returns:
a Cassandra vectorstore. a Cassandra vectorstore.
""" """
if session is _NOT_SET:
raise ValueError("session parameter is required")
if not keyspace:
raise ValueError("keyspace parameter is required")
if not table_name:
raise ValueError("table_name parameter is required")
store = cls( store = cls(
embedding=embedding, embedding=embedding,
session=session, session=session,
@ -887,8 +878,8 @@ class Cassandra(VectorStore):
documents: List[Document], documents: List[Document],
embedding: Embeddings, embedding: Embeddings,
*, *,
session: Session = _NOT_SET, session: Optional[Session] = None,
keyspace: str = "", keyspace: Optional[str] = None,
table_name: str = "", table_name: str = "",
ids: Optional[List[str]] = None, ids: Optional[List[str]] = None,
batch_size: int = 16, batch_size: int = 16,
@ -901,8 +892,10 @@ class Cassandra(VectorStore):
Args: Args:
documents: Documents to add to the vectorstore. documents: Documents to add to the vectorstore.
embedding: Embedding function to use. embedding: Embedding function to use.
session: Cassandra driver session (required). session: Cassandra driver session.
keyspace: Cassandra key space (required). If not provided, it is resolved from cassio.
keyspace: Cassandra key space.
If not provided, it is resolved from cassio.
table_name: Cassandra table (required). table_name: Cassandra table (required).
ids: Optional list of IDs associated with the documents. ids: Optional list of IDs associated with the documents.
batch_size: Number of concurrent requests to send to the server. batch_size: Number of concurrent requests to send to the server.
@ -936,8 +929,8 @@ class Cassandra(VectorStore):
documents: List[Document], documents: List[Document],
embedding: Embeddings, embedding: Embeddings,
*, *,
session: Session = _NOT_SET, session: Optional[Session] = None,
keyspace: str = "", keyspace: Optional[str] = None,
table_name: str = "", table_name: str = "",
ids: Optional[List[str]] = None, ids: Optional[List[str]] = None,
concurrency: int = 16, concurrency: int = 16,
@ -950,8 +943,10 @@ class Cassandra(VectorStore):
Args: Args:
documents: Documents to add to the vectorstore. documents: Documents to add to the vectorstore.
embedding: Embedding function to use. embedding: Embedding function to use.
session: Cassandra driver session (required). session: Cassandra driver session.
keyspace: Cassandra key space (required). If not provided, it is resolved from cassio.
keyspace: Cassandra key space.
If not provided, it is resolved from cassio.
table_name: Cassandra table (required). table_name: Cassandra table (required).
ids: Optional list of IDs associated with the documents. ids: Optional list of IDs associated with the documents.
concurrency: Number of concurrent queries to send to the database. concurrency: Number of concurrent queries to send to the database.