crewplus 0.2.4__py3-none-any.whl → 0.2.6__py3-none-any.whl

crewplus/services/init_services.py

@@ -3,11 +3,15 @@ from crewplus.services.model_load_balancer import ModelLoadBalancer
 
 model_balancer = None
 
-def init_load_balancer():
+def init_load_balancer(config_path: str = None):
     global model_balancer
     if model_balancer is None:
-        config_path = os.getenv("MODEL_CONFIG_PATH", "config/models_config.json")
-        model_balancer = ModelLoadBalancer(config_path)
+        # Use parameter if provided, otherwise check env var, then default
+        final_config_path = config_path or os.getenv(
+            "MODEL_CONFIG_PATH", 
+            "config/models_config.json"  # Fixed default path
+        )
+        model_balancer = ModelLoadBalancer(final_config_path)
         model_balancer.load_config()  # Load initial configuration synchronously
 
 def get_model_balancer() -> ModelLoadBalancer:

crewplus/vectorstores/milvus/vdb_service.py

@@ -197,7 +197,7 @@ class VDBService(object):
         """
         return self._client
 
-    def get_embeddings(self, from_model_balancer: bool = False, model_type: Optional[str] = "embedding-large") -> Embeddings:
+    def get_embeddings(self, from_model_balancer: bool = False, provider: Optional[str] = "azure-openai", model_type: Optional[str] = "embedding-large") -> Embeddings:
         """
         Gets an embedding function, either from the model balancer or directly from settings.
 
@@ -211,7 +211,7 @@ class VDBService(object):
         """
         if from_model_balancer:
             model_balancer = get_model_balancer()
-            return model_balancer.get_model(model_type=model_type)
+            return model_balancer.get_model(provider=provider, model_type=model_type)
 
         embedder_config = self.settings.get("embedder")
         if not embedder_config:
@@ -248,8 +248,8 @@ class VDBService(object):
     def get_vector_store(self, collection_name: str, embeddings: Embeddings = None, metric_type: str = "L2") -> Zilliz:
         """
         Gets a vector store instance, creating it if it doesn't exist for the collection.
-
-        This method caches instances by collection name to avoid re-instantiation.
+        This method validates both the embedding function and the vector store connection
+        before caching the instance to prevent faulty instances from being reused.
 
         Args:
             collection_name (str): The name of the collection in the vector database.
@@ -272,6 +272,19 @@ class VDBService(object):
         if embeddings is None:
             embeddings = self.get_embeddings()
 
+        # 1. Validate the embedding function before proceeding.
+        try:
+            self.logger.debug(f"Testing embedding function for collection '{collection_name}'...")
+            embeddings.embed_query("validation_test_string")
+            self.logger.debug("Embedding function is valid.")
+        except Exception as e:
+            self.logger.error(
+                f"The provided embedding function is invalid and failed with error: {e}. "
+                f"Cannot create a vector store for collection '{collection_name}'."
+            )
+            raise RuntimeError(f"Invalid embedding function provided.") from e
+
+        # If embeddings are valid, proceed to create the Zilliz instance.
         index_params = self.index_params or {
             "metric_type": metric_type,
             "index_type": "AUTOINDEX",

{crewplus-0.2.4.dist-info → crewplus-0.2.6.dist-info}/METADATA

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

{crewplus-0.2.4.dist-info → crewplus-0.2.6.dist-info}/RECORD

@@ -1,20 +1,20 @@
-crewplus-0.2.4.dist-info/METADATA,sha256=GanuWO7TBC2DPca7TZwW3WtVg7rZXpBQ1hWhM22G_-8,4909
-crewplus-0.2.4.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-crewplus-0.2.4.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-crewplus-0.2.4.dist-info/licenses/LICENSE,sha256=2_NHSHRTKB_cTcT_GXgcenOCtIZku8j343mOgAguTfc,1087
+crewplus-0.2.6.dist-info/METADATA,sha256=EWHY3KjrDXJjYeO-WqNITUVJ_3gzhjMwE6f6trstGD0,4909
+crewplus-0.2.6.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+crewplus-0.2.6.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+crewplus-0.2.6.dist-info/licenses/LICENSE,sha256=2_NHSHRTKB_cTcT_GXgcenOCtIZku8j343mOgAguTfc,1087
 crewplus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 crewplus/services/__init__.py,sha256=MmH2v3N0ZMsuqFNAupkXENjUqvgf5ehQ99H6EzPqLZU,48
 crewplus/services/gemini_chat_model.py,sha256=i9p5KvSJYaHSUBLPKM_bpyGVLWCDQoNeah_WjQVJRXs,26227
-crewplus/services/init_services.py,sha256=5MlvZbyGPNgVA_2bPuxhhbw9TgD5rrvC0e_62YJh340,589
+crewplus/services/init_services.py,sha256=yD6gMbXnHfABa3yBxEYihiq2Kv5zxhBcyK4eNCTAETs,775
 crewplus/services/model_load_balancer.py,sha256=a2BfcWV-OEItVf7_tTBYY0HiXxFzA5Uk7d-6AG-jLNU,8692
 crewplus/utils/schema_action.py,sha256=GDaBoVFQD1rXqrLVSMTfXYW1xcUu7eDcHsn57XBSnIg,422
 crewplus/utils/schema_document_updater.py,sha256=frvffxn2vbi71fHFPoGb9hq7gH2azmmdq17p-Fumnvg,7322
 crewplus/vectorstores/milvus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 crewplus/vectorstores/milvus/milvus_schema_manager.py,sha256=qHMVIM0NS3rLfACb8d3-tQS9hJo6_7_YP8AxVx4t1Cc,9019
 crewplus/vectorstores/milvus/schema_milvus.py,sha256=GhHTtCH5HsIJc3RHa25RXl3aZdkS3Rba5KeuUk_Hi0k,11425
-crewplus/vectorstores/milvus/vdb_service.py,sha256=J7B6TOZmJl9_K2euJFKJFvSYqvruKbXuYkFiugWnXXs,16657
+crewplus/vectorstores/milvus/vdb_service.py,sha256=iCiSXcmtpD9tW1WYyJ1P0SRJEFEsUoH3lY65mnwf6R8,17524
 docs/GeminiChatModel.md,sha256=_IQyup3ofAa2HxfSurO1GYUEezTHYYt5Q1khYNVThGM,8040
-docs/ModelLoadBalancer.md,sha256=mgwDtiKBlAJMBhXck97SPahCt395QJzHyrKmxmkfRtw,3082
-docs/VDBService.md,sha256=YwYpyYsZ-YkLD8WQjFYAHmEkPmVheTKUEJn0mVqrirA,8945
+docs/ModelLoadBalancer.md,sha256=aGHES1dcXPz4c7Y8kB5-vsCNJjriH2SWmjBkSGoYKiI,4398
+docs/VDBService.md,sha256=Dw286Rrf_fsi13jyD3Bo4Sy7nZ_G7tYm7d8MZ2j9hxk,9375
 docs/index.md,sha256=3tlc15uR8lzFNM5WjdoZLw0Y9o1P1gwgbEnOdIBspqc,1643
-crewplus-0.2.4.dist-info/RECORD,,
+crewplus-0.2.6.dist-info/RECORD,,

docs/ModelLoadBalancer.md

@@ -88,3 +88,47 @@ The model `o3mini` is identified by the deployment name `gpt-o3mini-eastus2-RPM2
 ```python
 o3mini_model = balancer.get_model(deployment_name="gpt-o3mini-eastus2-RPM25")
 ```
+
+## 5. Global Access with `init_load_balancer`
+
+The `init_load_balancer` function provides a convenient singleton pattern for accessing the `ModelLoadBalancer` throughout your application without passing the instance around.
+
+First, you initialize the balancer once at the start of your application.
+
+### Initialization
+
+You can initialize it in several ways:
+
+**1. Default Initialization**
+
+This will look for the `MODEL_CONFIG_PATH` environment variable, or use the default path `_config/models_config.json`.
+
+```python
+from crewplus.services.init_services import init_load_balancer
+
+init_load_balancer()
+```
+
+**2. Initialization with a Custom Path**
+
+You can also provide a direct path to your configuration file.
+
+```python
+from crewplus.services.init_services import init_load_balancer
+
+init_load_balancer(config_path="path/to/your/models_config.json")
+```
+
+### Getting the Balancer and Models
+
+Once initialized, you can retrieve the `ModelLoadBalancer` instance from anywhere in your code using `get_model_balancer`.
+
+```python
+from crewplus.services.init_services import get_model_balancer
+
+# Get the balancer instance
+balancer = get_model_balancer()
+
+# Get a model by deployment name
+gemini_flash_model = balancer.get_model(deployment_name="gemini-2.5-flash")
+```

docs/VDBService.md

@@ -60,6 +60,20 @@ vdb_service = VDBService(settings=settings)
 print("VDBService initialized successfully!")
 ```
 
+**Alternative Initialization for Zilliz**
+
+For a simpler Zilliz Cloud connection, you can initialize the service directly with your endpoint and token.
+
+```python
+# Initialize directly with Zilliz credentials
+vdb_service_zilliz = VDBService(
+    endpoint="YOUR_ZILLIZ_ENDPOINT", 
+    token="YOUR_ZILLIZ_TOKEN"
+)
+
+print("VDBService for Zilliz initialized successfully!")
+```
+
 ## 3. Usage Examples
 
 ### Basic Usage: Get Vector Store with Default Embeddings
@@ -86,7 +100,8 @@ This requires the `ModelLoadBalancer` to have been initialized, as shown in the
 # 1. Get a specific embedding model from the ModelLoadBalancer
 # The service will call get_model_balancer() internally to get the initialized instance.
 embedding_model = vdb_service.get_embeddings(
-    from_model_balancer=True, 
+    from_model_balancer=True,
+    provider="azure-openai-embeddings", 
     model_type="embedding-large" # Specify the model type configured in the balancer
 )