crewplus 0.1.0__tar.gz → 0.1.2__tar.gz

{crewplus-0.1.0 → crewplus-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: crewplus
-Version: 0.1.0
+Version: 0.1.2
 Summary: Base services for CrewPlus AI applications
 Author-Email: Tim Liu <tim@opsmateai.com>
 License: MIT
@@ -74,18 +74,17 @@ print(response)
 The `crewplus-base` repository is organized to separate core logic, tests, and documentation. 
 
 ```
-crewplus-base/                    # GitHub repo 名称
+crewplus-base/                    # GitHub repo name
 ├── pyproject.toml
 ├── README.md
 ├── LICENSE
 ├── CHANGELOG.md
-├── crewplus/                 # PyPI包名对应的目录
+├── crewplus/                 # PyPI package name
 │   └──  __init__.py
 │   └──  services/
 │       └──  __init__.py
 │       └──  gemini_chat_model.py
 │       └──  model_load_balancer.py
-│       └──  vdb_service.py
 │       └──  ...
 │   └──  vectorstores/
 │       └──  ...
@@ -114,4 +113,4 @@ python -m twine upload --repository testpypi dist/*
 pip install -i https://test.pypi.org/simple/ crewplus
 
 # Deploy to official PyPI
-python -m twine upload dist/*
+python -m twine upload dist/*

{crewplus-0.1.0 → crewplus-0.1.2}/README.md

@@ -58,18 +58,17 @@ print(response)
 The `crewplus-base` repository is organized to separate core logic, tests, and documentation. 
 
 ```
-crewplus-base/                    # GitHub repo 名称
+crewplus-base/                    # GitHub repo name
 ├── pyproject.toml
 ├── README.md
 ├── LICENSE
 ├── CHANGELOG.md
-├── crewplus/                 # PyPI包名对应的目录
+├── crewplus/                 # PyPI package name
 │   └──  __init__.py
 │   └──  services/
 │       └──  __init__.py
 │       └──  gemini_chat_model.py
 │       └──  model_load_balancer.py
-│       └──  vdb_service.py
 │       └──  ...
 │   └──  vectorstores/
 │       └──  ...
@@ -98,4 +97,4 @@ python -m twine upload --repository testpypi dist/*
 pip install -i https://test.pypi.org/simple/ crewplus
 
 # Deploy to official PyPI
-python -m twine upload dist/*
+python -m twine upload dist/*

crewplus-0.1.2/crewplus/services/model_load_balancer.py

@@ -0,0 +1,184 @@
+import json
+import random
+import logging
+from typing import Dict, List, Optional, Union
+from collections import defaultdict
+from langchain_openai import AzureChatOpenAI, ChatOpenAI, AzureOpenAIEmbeddings
+from .gemini_chat_model import GeminiChatModel
+
+
+class ModelLoadBalancer:
+    def __init__(self,
+                 config_path: Optional[str] = "config/models_config.json",
+                 config_data: Optional[Dict] = None,
+                 logger: Optional[logging.Logger] = None):
+        """
+        Initializes the ModelLoadBalancer.
+
+        Args:
+            config_path: Path to the JSON configuration file.
+            config_data: A dictionary containing the model configuration.
+            logger: An optional logger instance. If not provided, a default one is created.
+
+        Raises:
+            ValueError: If neither config_path nor config_data is provided.
+        """
+        if not config_path and not config_data:
+            raise ValueError("Either 'config_path' or 'config_data' must be provided.")
+
+        self.config_path = config_path
+        self.config_data = config_data
+        self.logger = logger or logging.getLogger(__name__)
+        self.models_config: List[Dict] = []
+        self.models: Dict[int, Union[AzureChatOpenAI, ChatOpenAI, AzureOpenAIEmbeddings, GeminiChatModel]] = {}
+        self._initialize_state()
+        self._config_loaded = False  # Flag to check if config is loaded
+
+    def load_config(self):
+        """Load and validate model configurations from a file path or a dictionary."""
+        self.logger.debug("Model balancer: loading configuration.")
+        try:
+            config = None
+            if self.config_data:
+                config = self.config_data
+            elif self.config_path:
+                with open(self.config_path, 'r') as f:
+                    config = json.load(f)
+            else:
+                # This case is handled in __init__, but as a safeguard:
+                raise RuntimeError("No configuration source provided (path or data).")
+
+            # Validate config
+            if 'models' not in config or not isinstance(config['models'], list):
+                raise ValueError("Configuration must contain a 'models' list.")
+
+            for model in config.get('models', []):
+                if 'provider' not in model or 'type' not in model or 'id' not in model:
+                    self.logger.error("Model config must contain 'id', 'provider', and 'type' fields.")
+                    raise ValueError("Model config must contain 'id', 'provider', and 'type' fields.")
+
+            self.models_config = config['models']
+
+            # Instantiate models
+            for model_config in self.models_config:
+                model_id = model_config['id']
+                self.models[model_id] = self._instantiate_model(model_config)
+
+            self._config_loaded = True
+            self.logger.debug("Model balancer: configuration loaded successfully.")
+        except (FileNotFoundError, json.JSONDecodeError, ValueError) as e:
+            self._config_loaded = False
+            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):
+        """
+        Get a model instance.
+
+        Can fetch a model in two ways:
+        1. By its specific `deployment_name`.
+        2. By `provider` and `model_type`, which will select a model using round-robin.
+
+        Args:
+            provider: The model provider (e.g., 'azure-openai', 'google-genai').
+            model_type: The type of model (e.g., 'inference', 'embedding').
+            deployment_name: The unique name for the model deployment.
+
+        Returns:
+            An instantiated language model object.
+
+        Raises:
+            RuntimeError: If the model configuration has not been loaded.
+            ValueError: If the requested model cannot be found or if parameters are insufficient.
+        """
+        if not self._config_loaded:
+            self.logger.error("Model configuration not loaded")
+            raise RuntimeError("Model configuration not loaded")
+
+        if deployment_name:
+            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]
+            self.logger.error(f"No model found for deployment name: {deployment_name}")
+            raise ValueError(f"No model found for deployment name: {deployment_name}")
+
+        if provider and model_type:
+            candidates = [model for model in self.models_config if model.get('provider') == provider and model.get('type') == model_type]
+            if not candidates:
+                self.logger.error(f"No models found for provider '{provider}' and type '{model_type}'")
+                raise ValueError(f"No models found for provider '{provider}' and type '{model_type}'")
+
+            selected_model_config = self._round_robin_selection(candidates)
+            model_id = selected_model_config['id']
+            return self.models[model_id]
+
+        raise ValueError("Either 'deployment_name' or both 'provider' and 'model_type' must be provided.")
+
+    def _instantiate_model(self, model_config: Dict):
+        """Instantiate and return an LLM object based on the model configuration"""
+        provider = model_config['provider']
+        self.logger.debug(f"Model balancer: instantiating {provider} -- {model_config.get('deployment_name')}")
+
+        if provider == 'azure-openai':
+            kwargs = {
+                'azure_deployment': model_config['deployment_name'],
+                'openai_api_version': model_config['api_version'],
+                'azure_endpoint': model_config['api_base'],
+                'openai_api_key': model_config['api_key']
+            }
+            if 'temperature' in model_config:
+                kwargs['temperature'] = model_config['temperature']
+            if model_config.get('deployment_name') == 'o1-mini':
+                kwargs['disable_streaming'] = True
+            return AzureChatOpenAI(**kwargs)
+        elif provider == 'openai':
+            kwargs = {
+                'openai_api_key': model_config['api_key']
+            }
+            if 'temperature' in model_config:
+                kwargs['temperature'] = model_config['temperature']
+            return ChatOpenAI(**kwargs)
+        elif provider == 'azure-openai-embeddings':
+            return AzureOpenAIEmbeddings(
+                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
+            )
+        elif provider == 'google-genai':
+            kwargs = {
+                'google_api_key': model_config['api_key'],
+                'model_name': model_config['deployment_name']  # Map deployment_name to model_name
+            }
+            if 'temperature' in model_config:
+                kwargs['temperature'] = model_config['temperature']
+            if 'max_tokens' in model_config:
+                kwargs['max_tokens'] = model_config['max_tokens']
+            return GeminiChatModel(**kwargs)
+        else:
+            self.logger.error(f"Unsupported provider: {provider}")
+            raise ValueError(f"Unsupported provider: {provider}")
+
+    def _initialize_state(self):
+        self.active_models = []
+        self.usage_counter = defaultdict(int)
+        self.current_indices = {}
+
+    def _round_robin_selection(self, candidates: list) -> Dict:
+        if id(candidates) not in self.current_indices:
+            self.current_indices[id(candidates)] = 0
+        idx = self.current_indices[id(candidates)]
+        model = candidates[idx]
+        self.current_indices[id(candidates)] = (idx + 1) % len(candidates)
+        self.usage_counter[model['id']] += 1
+
+        return model
+
+    def _least_used_selection(self, candidates: list) -> Dict:
+        min_usage = min(self.usage_counter[m['model_id']] for m in candidates)
+        least_used = [m for m in candidates if self.usage_counter[m['model_id']] == min_usage]
+        model = random.choice(least_used)
+        self.usage_counter[model['id']] += 1
+        return model

{crewplus-0.1.0 → crewplus-0.1.2}/pyproject.toml

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