crewplus 0.2.27__tar.gz → 0.2.29__tar.gz

{crewplus-0.2.27 → crewplus-0.2.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: crewplus
-Version: 0.2.27
+Version: 0.2.29
 Summary: Base services for CrewPlus AI applications
 Author-Email: Tim Liu <tim@opsmateai.com>
 License: MIT
@@ -14,6 +14,7 @@ Requires-Dist: langchain-openai==0.3.24
 Requires-Dist: google-genai==1.21.1
 Requires-Dist: langchain-milvus<0.3.0,>=0.2.1
 Requires-Dist: langfuse<4.0.0,>=3.1.3
+Requires-Dist: langchain-mcp-adapters>=0.1.4
 Description-Content-Type: text/markdown
 
 # CrewPlus
@@ -34,16 +35,17 @@ This repository, `crewplus-base`, contains the core `crewplus` Python package. I
 CrewPlus is designed as a modular and extensible ecosystem of packages. This allows you to adopt only the components you need for your specific use case.
 
 -   **`crewplus` (This package):** The core package containing foundational services for chat, model load balancing, and vector stores.
--   **`crewplus-agents`:** An extension for creating and managing autonomous AI agents.
+-   **`crewplus-agent`:** crewplus agent core: agentic task planner and executor, with context-aware memory.
 -   **`crewplus-ingestion`:** Provides robust pipelines for knowledge ingestion and data processing.
 -   **`crewplus-memory`:** Provides agent memory services for Crewplus AI Agents.
 -   **`crewplus-integrations`:** A collection of third-party integrations to connect CrewPlus with other services and platforms.
 
 ## Features
 
--   **Chat Services:** A unified interface for interacting with various chat models (e.g., `GeminiChatModel`).
+-   **Chat Services:** A unified interface for interacting with various chat models (e.g., `GeminiChatModel`, `TracedAzureChatOpenAI`).
 -   **Model Load Balancer:** Intelligently distribute requests across multiple LLM endpoints.
 -   **Vector DB Services:** working with popular vector stores (e.g. Milvus, Zilliz Cloud) for retrieval-augmented generation (RAG) and agent memory.
+-   **Observability & Tracing:** Automatic integration with tracing tools like Langfuse, with an extensible design for adding others (e.g., Helicone, ...).
 
 
 ## Documentation
@@ -92,15 +94,17 @@ crewplus-base/                    # GitHub repo name
 │   └──  services/
 │       └──  __init__.py
 │       └──  gemini_chat_model.py
+│       └──  azure_chat_model.py
 │       └──  model_load_balancer.py
+│       └──  tracing_manager.py
 │       └──  ...
 │   └──  vectorstores/milvus
 │       └──  __init__.py
 │       └──  schema_milvus.py
 │       └──  vdb_service.py
-│   └──  core/
+│   └──  utils/
 │       └──  __init__.py
-│       └──  config.py
+│       └──  schema_action.py
 │       └──  ...
 ├── tests/
 │   └── ...

{crewplus-0.2.27 → crewplus-0.2.29}/README.md

@@ -16,16 +16,17 @@ This repository, `crewplus-base`, contains the core `crewplus` Python package. I
 CrewPlus is designed as a modular and extensible ecosystem of packages. This allows you to adopt only the components you need for your specific use case.
 
 -   **`crewplus` (This package):** The core package containing foundational services for chat, model load balancing, and vector stores.
--   **`crewplus-agents`:** An extension for creating and managing autonomous AI agents.
+-   **`crewplus-agent`:** crewplus agent core: agentic task planner and executor, with context-aware memory.
 -   **`crewplus-ingestion`:** Provides robust pipelines for knowledge ingestion and data processing.
 -   **`crewplus-memory`:** Provides agent memory services for Crewplus AI Agents.
 -   **`crewplus-integrations`:** A collection of third-party integrations to connect CrewPlus with other services and platforms.
 
 ## Features
 
--   **Chat Services:** A unified interface for interacting with various chat models (e.g., `GeminiChatModel`).
+-   **Chat Services:** A unified interface for interacting with various chat models (e.g., `GeminiChatModel`, `TracedAzureChatOpenAI`).
 -   **Model Load Balancer:** Intelligently distribute requests across multiple LLM endpoints.
 -   **Vector DB Services:** working with popular vector stores (e.g. Milvus, Zilliz Cloud) for retrieval-augmented generation (RAG) and agent memory.
+-   **Observability & Tracing:** Automatic integration with tracing tools like Langfuse, with an extensible design for adding others (e.g., Helicone, ...).
 
 
 ## Documentation
@@ -74,15 +75,17 @@ crewplus-base/                    # GitHub repo name
 │   └──  services/
 │       └──  __init__.py
 │       └──  gemini_chat_model.py
+│       └──  azure_chat_model.py
 │       └──  model_load_balancer.py
+│       └──  tracing_manager.py
 │       └──  ...
 │   └──  vectorstores/milvus
 │       └──  __init__.py
 │       └──  schema_milvus.py
 │       └──  vdb_service.py
-│   └──  core/
+│   └──  utils/
 │       └──  __init__.py
-│       └──  config.py
+│       └──  schema_action.py
 │       └──  ...
 ├── tests/
 │   └── ...

crewplus-0.2.29/crewplus/services/init_services.py

@@ -0,0 +1,37 @@
+import os
+from .model_load_balancer import ModelLoadBalancer
+
+model_balancer = None
+
+def init_load_balancer(config_path: str = None):
+    """
+    Initializes the global ModelLoadBalancer instance.
+
+    This function is idempotent. If the balancer is already initialized,
+    it does nothing. It follows a safe initialization pattern where the
+    global instance is only assigned after successful configuration loading.
+    """
+    global model_balancer
+    if model_balancer is None:
+        # 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"
+        )
+        try:
+            # 1. Create a local instance first.
+            balancer = ModelLoadBalancer(final_config_path)
+            # 2. Attempt to load its configuration.
+            balancer.load_config()
+            # 3. Only assign to the global variable on full success.
+            model_balancer = balancer
+        except Exception as e:
+            # If any step fails, the global model_balancer remains None,
+            # allowing for another initialization attempt later.
+            # Re-raise the exception to notify the caller of the failure.
+            raise RuntimeError(f"Failed to initialize and configure ModelLoadBalancer from {final_config_path}: {e}") from e
+
+def get_model_balancer() -> ModelLoadBalancer:
+    if model_balancer is None:
+        raise RuntimeError("ModelLoadBalancer not initialized. Please call init_load_balancer() first.")
+    return model_balancer

{crewplus-0.2.27 → crewplus-0.2.29}/crewplus/services/model_load_balancer.py

@@ -76,7 +76,7 @@ class ModelLoadBalancer:
             self.logger.error(f"Failed to load model configuration: {e}", exc_info=True)
             raise RuntimeError(f"Failed to load model configuration: {e}")
 
-    def get_model(self, provider: str = None, model_type: str = None, deployment_name: str = None):
+    def get_model(self, provider: str = None, model_type: str = None, deployment_name: str = None, with_metadata: bool = False):
         """
         Get a model instance.
 
@@ -104,7 +104,11 @@ class ModelLoadBalancer:
             for model_config in self.models_config:
                 if model_config.get('deployment_name') == deployment_name:
                     model_id = model_config['id']
-                    return self.models[model_id]
+                    model = self.models[model_id]
+                    if with_metadata:
+                        return model, deployment_name
+                    return model
+                
             self.logger.error(f"No model found for deployment name: {deployment_name}")
             raise ValueError(f"No model found for deployment name: {deployment_name}")
 
@@ -116,7 +120,10 @@ class ModelLoadBalancer:
 
             selected_model_config = self._round_robin_selection(candidates)
             model_id = selected_model_config['id']
-            return self.models[model_id]
+            model = self.models[model_id]
+            if with_metadata:
+                return model, selected_model_config.get('deployment_name')
+            return model
 
         raise ValueError("Either 'deployment_name' or both 'provider' and 'model_type' must be provided.")
 

{crewplus-0.2.27 → crewplus-0.2.29}/crewplus/vectorstores/milvus/vdb_service.py

@@ -10,6 +10,7 @@ from langchain_milvus import Milvus
 from langchain_core.embeddings import Embeddings
 from langchain_openai import AzureOpenAIEmbeddings
 from pymilvus import MilvusClient
+import time
 
 from ...services.init_services import get_model_balancer
 from .schema_milvus import SchemaMilvus, DEFAULT_SCHEMA
@@ -361,10 +362,9 @@ class VDBService(object):
             "params": {}
         }
         
-        vdb = Milvus(
-            embedding_function=embeddings,
+        vdb = self._create_milvus_instance_with_retry(
             collection_name=collection_name,
-            connection_args=self.connection_args,
+            embeddings=embeddings,
             index_params=index_params
         )
 
@@ -373,6 +373,32 @@ class VDBService(object):
 
         return vdb
 
+    def _create_milvus_instance_with_retry(self, collection_name: str, embeddings: Embeddings, index_params: dict) -> Milvus:
+        """
+        Creates a Milvus instance with a retry mechanism for connection failures.
+        """
+        retries = 2
+        for attempt in range(retries + 1):
+            try:
+                vdb = Milvus(
+                    embedding_function=embeddings,
+                    collection_name=collection_name,
+                    connection_args=self.connection_args,
+                    index_params=index_params
+                )
+                self.logger.info(f"Successfully connected to Milvus for collection '{collection_name}' on attempt {attempt + 1}.")
+                return vdb  # Return on success
+            except Exception as e:
+                self.logger.warning(
+                    f"Attempt {attempt + 1}/{retries + 1} to connect to Milvus for collection '{collection_name}' failed: {e}"
+                )
+                if attempt < retries:
+                    self.logger.info("Retrying in 3 seconds...")
+                    time.sleep(3)
+                else:
+                    self.logger.error(f"Failed to connect to Milvus for collection '{collection_name}' after {retries + 1} attempts.")
+                    raise RuntimeError(f"Could not connect to Milvus after {retries + 1} attempts.") from e
+
     def drop_collection(self, collection_name: str) -> None:
         """
         Deletes a collection from the vector database and removes it from the cache.

{crewplus-0.2.27 → crewplus-0.2.29}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "crewplus"
-version = "0.2.27"
+version = "0.2.29"
 description = "Base services for CrewPlus AI applications"
 authors = [
     { name = "Tim Liu", email = "tim@opsmateai.com" },
@@ -19,6 +19,7 @@ dependencies = [
     "google-genai==1.21.1",
     "langchain-milvus (>=0.2.1,<0.3.0)",
     "langfuse (>=3.1.3,<4.0.0)",
+    "langchain-mcp-adapters>=0.1.4",
 ]
 
 [project.license]

crewplus-0.2.27/crewplus/services/init_services.py

@@ -1,20 +0,0 @@
-import os
-from .model_load_balancer import ModelLoadBalancer
-
-model_balancer = None
-
-def init_load_balancer(config_path: str = None):
-    global model_balancer
-    if model_balancer is None:
-        # 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:
-    if model_balancer is None:
-        raise RuntimeError("ModelLoadBalancer not initialized")
-    return model_balancer