crewplus 0.2.13__tar.gz → 0.2.15__tar.gz

{crewplus-0.2.13 → crewplus-0.2.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: crewplus
-Version: 0.2.13
+Version: 0.2.15
 Summary: Base services for CrewPlus AI applications
 Author-Email: Tim Liu <tim@opsmateai.com>
 License: MIT

{crewplus-0.2.13 → crewplus-0.2.15}/crewplus/vectorstores/milvus/vdb_service.py

@@ -6,7 +6,7 @@
 
 import logging
 from typing import List, Dict, Union, Optional
-from langchain_milvus import Zilliz
+from langchain_milvus import Milvus
 from langchain_core.embeddings import Embeddings
 from langchain_openai import AzureOpenAIEmbeddings
 from pymilvus import MilvusClient
@@ -60,8 +60,8 @@ class VDBService(object):
         ...         }
         ...     },
         ...     "index_params": {
-        ...         "metric_type": "L2",
-        ...         "index_type": "AUTOINDEX",
+        ...         "metric_type": "IP",
+        ...         "index_type": "HNSW",
         ...         "params": {}
         ...     }
         ... }
@@ -83,7 +83,7 @@ class VDBService(object):
         >>> assert vector_store is same_vector_store
     """
     _client: MilvusClient
-    _instances: Dict[str, Zilliz] = {}
+    _instances: Dict[str, Milvus] = {}
 
     schema: str
     embedding_function: Embeddings
@@ -245,7 +245,7 @@ class VDBService(object):
             self.logger.error(f"Unsupported embedding provider: {provider}")
             raise NotImplementedError(f"Embedding provider '{provider}' is not supported yet.")
         
-    def _ensure_collection_exists(self, collection_name: str, embeddings: Embeddings):
+    def _ensure_collection_exists(self, collection_name: str, embeddings: Embeddings, check_existence: bool = True):
         """
         Checks if a collection exists and creates it if it doesn't.
         This operation is wrapped in a try-except block to handle potential failures
@@ -253,7 +253,7 @@ class VDBService(object):
         """
         try:
             client = self.get_vector_client()
-            if not client.has_collection(collection_name):
+            if check_existence and not client.has_collection(collection_name):
                 self.logger.info(f"Collection '{collection_name}' does not exist. Creating it.")
                 
                 schema_milvus = SchemaMilvus(
@@ -275,7 +275,32 @@ class VDBService(object):
             self.logger.error(f"An error occurred while ensuring collection '{collection_name}' : {e}")
             raise RuntimeError(f"Failed to ensure collection '{collection_name}' .") from e
 
-    def get_vector_store(self, collection_name: str, embeddings: Embeddings = None, metric_type: str = "L2") -> Zilliz:
+    def _is_good_connection(self, vdb_instance: Milvus, collection_name: str) -> tuple[bool, bool | None]:
+        """
+        Checks if the Milvus instance has a good connection by verifying collection existence.
+        
+        Args:
+            vdb_instance (Milvus): The cached vector store instance.
+            collection_name (str): The name of the collection to check.
+
+        Returns:
+            tuple[bool, bool | None]: A tuple of (is_connected, collection_exists).
+                                     collection_exists is None if the connection failed.
+        """
+        try:
+            # Use has_collection as a lightweight way to verify the connection and collection status.
+            # If the server is unreachable, this will raise an exception.
+            collection_exists = vdb_instance.client.has_collection(collection_name)
+            if collection_exists:
+                self.logger.debug(f"Connection for cached instance of '{collection_name}' is alive.")
+            else:
+                self.logger.warning(f"Collection '{collection_name}' not found for cached instance. It may have been dropped.")
+            return True, collection_exists
+        except Exception as e:
+            self.logger.warning(f"Connection check failed for cached instance of '{collection_name}': {e}")
+            return False, None
+
+    def get_vector_store(self, collection_name: str, embeddings: Embeddings = None, metric_type: str = "IP") -> Milvus:
         """
         Gets a vector store instance, creating it if it doesn't exist for the collection.
         This method validates both the embedding function and the vector store connection
@@ -284,26 +309,38 @@ class VDBService(object):
         Args:
             collection_name (str): The name of the collection in the vector database.
             embeddings (Embeddings, optional): An embedding model instance. If None, one is created.
-            metric_type (str): The distance metric for the index. Defaults to "L2".
+            metric_type (str): The distance metric for the index. Defaults to "IP".
 
         Returns:
-            Zilliz: LangChain Zilliz instance, which is compatible with both Zilliz and Milvus.
+            Milvus: LangChain Milvus instance, which is compatible with both Zilliz and Milvus.
         """
         if not collection_name:
             self.logger.error("get_vector_store called with no collection_name.")
             raise ValueError("collection_name must be provided.")
 
-        # Return the cached instance if it already exists.
+        check_existence = True
+        # Check for a cached instance and validate its connection before returning.
         if collection_name in self._instances:
-            self.logger.info(f"Returning existing vector store instance for collection: {collection_name}")
-            return self._instances[collection_name]
+            instance = self._instances[collection_name]
+            is_connected, collection_exists = self._is_good_connection(instance, collection_name)
+            
+            if is_connected and collection_exists:
+                self.logger.info(f"Returning existing vector store instance for collection: {collection_name}")
+                return instance
+            
+            self.logger.warning(f"Cached instance for '{collection_name}' is invalid. Removing it from cache.")
+            del self._instances[collection_name]
+            
+            if is_connected and not collection_exists:
+                # We know the collection doesn't exist, so no need to check again.
+                check_existence = False
 
         self.logger.info(f"Creating new vector store instance for collection: {collection_name}")
         if embeddings is None:
             embeddings = self.get_embeddings()
 
         # Ensure the collection exists before proceeding.
-        self._ensure_collection_exists(collection_name, embeddings)
+        self._ensure_collection_exists(collection_name, embeddings, check_existence=check_existence)
 
         # 1. Validate the embedding function before proceeding.
         try:
@@ -317,14 +354,14 @@ class VDBService(object):
             )
             raise RuntimeError(f"Invalid embedding function provided.") from e
 
-        # If embeddings are valid, proceed to create the Zilliz instance.
+        # If embeddings are valid, proceed to create the Milvus instance.
         index_params = self.index_params or {
             "metric_type": metric_type,
             "index_type": "AUTOINDEX",
             "params": {}
         }
         
-        vdb = Zilliz(
+        vdb = Milvus(
             embedding_function=embeddings,
             collection_name=collection_name,
             connection_args=self.connection_args,
@@ -336,12 +373,12 @@ class VDBService(object):
 
         return vdb
 
-    def delete_old_indexes(self, url: str = None, vdb: Zilliz = None) -> (bool | None):
+    def delete_old_indexes(self, url: str = None, vdb: Milvus = None) -> (bool | None):
         """ Delete old indexes of the same source_url
 
         Args:
             url (str): source url
-            vdb (Zilliz): Zilliz instance
+            vdb (Milvus): Milvus/Zilliz instance
         """
         self.logger.info(f"Delete old indexes of the same source_url:{url}")
 
@@ -358,7 +395,7 @@ class VDBService(object):
             self.logger.info("Deleted old indexes result: " + str(res))
             return res
 
-    def delete_old_indexes_by_id(self, source_id: str = None, vdb: Zilliz = None) -> (bool | None):
+    def delete_old_indexes_by_id(self, source_id: str = None, vdb: Milvus = None) -> (bool | None):
         """ Delete old indexes of the same source_id
 
         Args:

{crewplus-0.2.13 → crewplus-0.2.15}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "crewplus"
-version = "0.2.13"
+version = "0.2.15"
 description = "Base services for CrewPlus AI applications"
 authors = [
     { name = "Tim Liu", email = "tim@opsmateai.com" },