crewplus 0.2.23__py3-none-any.whl → 0.2.25__py3-none-any.whl

crewplus/services/model_load_balancer.py

@@ -63,7 +63,11 @@ class ModelLoadBalancer:
             # Instantiate models
             for model_config in self.models_config:
                 model_id = model_config['id']
-                self.models[model_id] = self._instantiate_model(model_config)
+                model_instance = self._instantiate_model(model_config)
+                if model_instance is not None:
+                    self.models[model_id] = model_instance
+                else:
+                    self.logger.warning(f"Model with id {model_id} was not loaded due to instantiation error.")
 
             self._config_loaded = True
             self.logger.debug("Model balancer: configuration loaded successfully.")
@@ -141,15 +145,21 @@ class ModelLoadBalancer:
                 kwargs['temperature'] = model_config['temperature']
             return ChatOpenAI(**kwargs)
         elif provider == 'azure-openai-embeddings':
-            return AzureOpenAIEmbeddings(
-                model=model_config['model_name'],
-                azure_deployment=model_config['deployment_name'],
-                openai_api_version=model_config['api_version'],
-                api_key=model_config['api_key'],
-                azure_endpoint=model_config['api_base'],
-                dimensions=model_config.get('dimensions', 1536),
-                chunk_size=16, request_timeout=60, max_retries=2
-            )
+            try:
+                emb_kwargs = dict(
+                    model=model_config['model_name'],
+                    azure_deployment=model_config['deployment_name'],
+                    openai_api_version=model_config['api_version'],
+                    api_key=model_config['api_key'],
+                    azure_endpoint=model_config['api_base'],
+                    chunk_size=16, request_timeout=60, max_retries=2
+                )
+                if 'dimensions' in model_config:
+                    emb_kwargs['dimensions'] = model_config['dimensions']
+                return AzureOpenAIEmbeddings(**emb_kwargs)
+            except Exception as e:
+                self.logger.error(f"Failed to instantiate AzureOpenAIEmbeddings: {e}")
+                return None
         elif provider == 'google-genai':
             kwargs = {
                 'google_api_key': model_config['api_key'],

crewplus/vectorstores/milvus/vdb_service.py

@@ -373,49 +373,6 @@ class VDBService(object):
 
         return vdb
 
-    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 (Milvus): Milvus/Zilliz instance
-        """
-        self.logger.info(f"Delete old indexes of the same source_url:{url}")
-
-        if url is None or vdb is None:
-            return None
-
-        # Delete indexes of the same source_url
-        expr = f'source_url == "{url}" or source == "{url}"'
-        pks = vdb.get_pks(expr)
-
-        # Delete entities by pks
-        if pks is not None and len(pks) > 0 :
-            res = vdb.delete(pks)
-            self.logger.info("Deleted old indexes result: " + str(res))
-            return res
-
-    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:
-            source_id (str): source id
-        """
-        self.logger.info(f"Delete old indexes of the same source_id:{source_id}")
-
-        if source_id is None or vdb is None:
-            return None
-
-        # Delete indexes of the same source_id
-        expr = f'source_id == "{source_id}"'
-        pks = vdb.get_pks(expr)
-
-        # Delete entities by pks
-        if pks is not None and len(pks) > 0 :
-            res = vdb.delete(pks)
-            self.logger.info("Deleted old indexes result: " + str(res))
-            return res
-
     def drop_collection(self, collection_name: str) -> None:
         """
         Deletes a collection from the vector database and removes it from the cache.
@@ -461,4 +418,46 @@ class VDBService(object):
                 return RuntimeError(f"collection_name must be not null or check out your client to link milvus")
             client.delete(collection_name=collection_name, filter=filter)
         except Exception as e:
-            raise RuntimeError(f"delete collection data failed: {str(e)}")
+            raise RuntimeError(f"delete collection data failed: {str(e)}")
+
+    @staticmethod
+    def delete_old_indexes(url: str = None, vdb: Milvus = None) -> (bool | None):
+        """ Delete old indexes of the same source_url
+
+        Args:
+            url (str): source url
+            vdb (Milvus): Milvus/Zilliz instance
+        """
+        # Logging is not performed in static method
+        if url is None or vdb is None:
+            return None
+
+        # Delete indexes of the same source_url
+        expr = f'source_url == "{url}" or source == "{url}"'
+        pks = vdb.get_pks(expr)
+
+        # Delete entities by pks
+        if pks is not None and len(pks) > 0 :
+            res = vdb.delete(pks)
+            return res
+
+    @staticmethod
+    def delete_old_indexes_by_id(source_id: str = None, vdb: Milvus = None) -> (bool | None):
+        """ Delete old indexes of the same source_id
+
+        Args:
+            source_id (str): source id
+        """
+        # Logging is not performed in static method
+        if source_id is None or vdb is None:
+            return None
+
+        # Delete indexes of the same source_id
+        expr = f'source_id == "{source_id}"'
+        pks = vdb.get_pks(expr)
+
+        # Delete entities by pks
+        if pks is not None and len(pks) > 0 :
+            res = vdb.delete(pks)
+            return res
+        

{crewplus-0.2.23.dist-info → crewplus-0.2.25.dist-info}/METADATA

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

{crewplus-0.2.23.dist-info → crewplus-0.2.25.dist-info}/RECORD

@@ -1,22 +1,22 @@
-crewplus-0.2.23.dist-info/METADATA,sha256=1JXSjwepooQSfWJsmXsYlX0OiuyJPUuA4TnxDLG6saA,4991
-crewplus-0.2.23.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
-crewplus-0.2.23.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-crewplus-0.2.23.dist-info/licenses/LICENSE,sha256=2_NHSHRTKB_cTcT_GXgcenOCtIZku8j343mOgAguTfc,1087
+crewplus-0.2.25.dist-info/METADATA,sha256=NynftFjnRM1sFSQfe8PUWMRDuo1YOWyyyjgODaegtBs,4991
+crewplus-0.2.25.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+crewplus-0.2.25.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+crewplus-0.2.25.dist-info/licenses/LICENSE,sha256=2_NHSHRTKB_cTcT_GXgcenOCtIZku8j343mOgAguTfc,1087
 crewplus/__init__.py,sha256=m46HkZL1Y4toD619NL47Sn2Qe084WFFSFD7e6VoYKZc,284
 crewplus/services/__init__.py,sha256=zUM4ZwUfGMBDx-j7Wehf_KC5yYXPTK8BK_oeO5veIXQ,398
 crewplus/services/azure_chat_model.py,sha256=xPuIsQpLV5Y3Ntwe3eqvquhBjh35g65VlF22AWJdEcU,8648
 crewplus/services/gemini_chat_model.py,sha256=HMDt7TKlLpQ43ZPxY9omG64EGFkP846BXT_SfyBeM0I,38415
 crewplus/services/init_services.py,sha256=U91zoMNJlOEKyldarNnATjeZDT2V-0CrXPAwI64hZkw,758
-crewplus/services/model_load_balancer.py,sha256=lRCMKOUl-buLBsOKbtUT2gJEIjoc-WzB7kseztkM4EE,8857
+crewplus/services/model_load_balancer.py,sha256=HH_eHxFfxgarPWFGpANg7dgShnWca4q46Jz0b1vJ4Sw,9405
 crewplus/utils/__init__.py,sha256=2Gk1n5srFJQnFfBuYTxktdtKOVZyNrFcNaZKhXk35Pw,142
 crewplus/utils/schema_action.py,sha256=GDaBoVFQD1rXqrLVSMTfXYW1xcUu7eDcHsn57XBSnIg,422
 crewplus/utils/schema_document_updater.py,sha256=frvffxn2vbi71fHFPoGb9hq7gH2azmmdq17p-Fumnvg,7322
 crewplus/vectorstores/milvus/__init__.py,sha256=egGncAdjlXG6ekTQvKMKqhvKBifrUrPlsSB0-bpvq4A,229
 crewplus/vectorstores/milvus/milvus_schema_manager.py,sha256=2IZT61LVui21Pt5Z3y8YYS2dYcwzkgUKxMq2NA0-lQE,9222
 crewplus/vectorstores/milvus/schema_milvus.py,sha256=IvKdUCH451HJ-F3TUR5jDjqwQlQs4SEXAQ_th4JAnfc,12117
-crewplus/vectorstores/milvus/vdb_service.py,sha256=ojKzwk_SIXw89nJIeMa9fi_IbtWe96HB__hlmwEAn0s,21287
+crewplus/vectorstores/milvus/vdb_service.py,sha256=wCltxZc0aD27iTu7wjveHqQWPEF2VyO4B2WGQCheeVs,21118
 docs/GeminiChatModel.md,sha256=_IQyup3ofAa2HxfSurO1GYUEezTHYYt5Q1khYNVThGM,8040
 docs/ModelLoadBalancer.md,sha256=aGHES1dcXPz4c7Y8kB5-vsCNJjriH2SWmjBkSGoYKiI,4398
 docs/VDBService.md,sha256=Dw286Rrf_fsi13jyD3Bo4Sy7nZ_G7tYm7d8MZ2j9hxk,9375
 docs/index.md,sha256=3tlc15uR8lzFNM5WjdoZLw0Y9o1P1gwgbEnOdIBspqc,1643
-crewplus-0.2.23.dist-info/RECORD,,
+crewplus-0.2.25.dist-info/RECORD,,