code-puppy 0.0.143__py3-none-any.whl → 0.0.145__py3-none-any.whl

code_puppy/model_factory.py

@@ -255,6 +255,9 @@ class ModelFactory:
             if not model_names or not isinstance(model_names, list):
                 raise ValueError(f"Round-robin model '{model_name}' requires a 'models' list in its configuration.")
             
+            # Get the rotate_every parameter (default: 1)
+            rotate_every = model_config.get("rotate_every", 1)
+            
             # Resolve each model name to an actual model instance
             models = []
             for name in model_names:
@@ -263,7 +266,7 @@ class ModelFactory:
                 models.append(model)
             
             # Create and return the round-robin model
-            return RoundRobinModel(*models)
+            return RoundRobinModel(*models, rotate_every=rotate_every)
         
         else:
             raise ValueError(f"Unsupported model type: {model_type}")

code_puppy/round_robin_model.py

@@ -1,10 +1,24 @@
+
+from contextlib import asynccontextmanager, suppress
 from dataclasses import dataclass, field
 from typing import Any, Callable, AsyncIterator, List
-from contextlib import asynccontextmanager, suppress
+
 from pydantic_ai.models import Model, ModelMessage, ModelSettings, ModelRequestParameters, ModelResponse, StreamedResponse
 from pydantic_ai.models.fallback import KnownModelName, infer_model, merge_model_settings
 from pydantic_ai.result import RunContext
 
+try:
+    from opentelemetry.context import get_current_span
+except ImportError:
+    # If opentelemetry is not installed, provide a dummy implementation
+    def get_current_span():
+        class DummySpan:
+            def is_recording(self):
+                return False
+            def set_attributes(self, attributes):
+                pass
+        return DummySpan()
+
 @dataclass(init=False)
 class RoundRobinModel(Model):
     """A model that cycles through multiple models in a round-robin fashion.
@@ -16,26 +30,39 @@ class RoundRobinModel(Model):
     models: List[Model]
     _current_index: int = field(default=0, repr=False)
     _model_name: str = field(repr=False)
+    _rotate_every: int = field(default=1, repr=False)
+    _request_count: int = field(default=0, repr=False)
 
     def __init__(
         self,
-        *models: Model | KnownModelName | str,
+        *models: Model,
+        rotate_every: int = 1,
+        settings: ModelSettings | None = None
     ):
         """Initialize a round-robin model instance.
         
         Args:
-            models: The names or instances of models to cycle through.
+            models: The model instances to cycle through.
+            rotate_every: Number of requests before rotating to the next model (default: 1).
+            settings: Model settings that will be used as defaults for this model.
         """
-        super().__init__()
+        super().__init__(settings=settings)
         if not models:
             raise ValueError("At least one model must be provided")
-        self.models = [infer_model(m) for m in models]
+        if rotate_every < 1:
+            raise ValueError("rotate_every must be at least 1")
+        self.models = list(models)
         self._current_index = 0
+        self._request_count = 0
+        self._rotate_every = rotate_every
 
     @property
     def model_name(self) -> str:
         """The model name showing this is a round-robin model with its candidates."""
-        return f'round_robin:{",".join(model.model_name for model in self.models)}'
+        base_name = f'round_robin:{",".join(model.model_name for model in self.models)}'
+        if self._rotate_every != 1:
+            return f'{base_name}:rotate_every={self._rotate_every}'
+        return base_name
 
     @property
     def system(self) -> str:
@@ -50,7 +77,10 @@ class RoundRobinModel(Model):
     def _get_next_model(self) -> Model:
         """Get the next model in the round-robin sequence and update the index."""
         model = self.models[self._current_index]
-        self._current_index = (self._current_index + 1) % len(self.models)
+        self._request_count += 1
+        if self._request_count >= self._rotate_every:
+            self._current_index = (self._current_index + 1) % len(self.models)
+            self._request_count = 0
         return model
 
     async def request(
@@ -61,6 +91,7 @@ class RoundRobinModel(Model):
     ) -> ModelResponse:
         """Make a request using the next model in the round-robin sequence."""
         current_model = self._get_next_model()
+        # Use the current model's settings as base, then merge with provided settings
         merged_settings = merge_model_settings(current_model.settings, model_settings)
         customized_model_request_parameters = current_model.customize_request_parameters(model_request_parameters)
         
@@ -83,6 +114,7 @@ class RoundRobinModel(Model):
     ) -> AsyncIterator[StreamedResponse]:
         """Make a streaming request using the next model in the round-robin sequence."""
         current_model = self._get_next_model()
+        # Use the current model's settings as base, then merge with provided settings
         merged_settings = merge_model_settings(current_model.settings, model_settings)
         customized_model_request_parameters = current_model.customize_request_parameters(model_request_parameters)
         

{code_puppy-0.0.143.dist-info → code_puppy-0.0.145.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.143
+Version: 0.0.145
 Summary: Code generation agent
 Project-URL: repository, https://github.com/mpfaffenberger/code_puppy
 Project-URL: HomePage, https://github.com/mpfaffenberger/code_puppy
@@ -189,6 +189,71 @@ If you need to run more exotic setups or connect to remote MCPs, just update you
 
 ---
 
+## Round Robin Model Distribution
+
+Code Puppy supports **Round Robin model distribution** to help you overcome rate limits and distribute load across multiple AI models. This feature automatically cycles through configured models with each request, maximizing your API usage while staying within rate limits.
+
+### Configuration
+Add a round-robin model configuration to your `extra_models.json` file:
+
+```bash
+export CEREBRAS_API_KEY1=csk-...
+export CEREBRAS_API_KEY2=csk-...
+export CEREBRAS_API_KEY3=csk-...
+
+```
+
+```json
+{
+  "qwen1": {
+    "type": "cerebras",
+    "name": "qwen-3-coder-480b",
+    "custom_endpoint": {
+      "url": "https://api.cerebras.ai/v1",
+      "api_key": "$CEREBRAS_API_KEY1"
+    },
+    "context_length": 131072
+  },
+  "qwen2": {
+    "type": "cerebras",
+    "name": "qwen-3-coder-480b",
+    "custom_endpoint": {
+      "url": "https://api.cerebras.ai/v1",
+      "api_key": "$CEREBRAS_API_KEY2"
+    },
+    "context_length": 131072
+  },
+  "qwen3": {
+    "type": "cerebras",
+    "name": "qwen-3-coder-480b",
+    "custom_endpoint": {
+      "url": "https://api.cerebras.ai/v1",
+      "api_key": "$CEREBRAS_API_KEY3"
+    },
+    "context_length": 131072
+  },
+  "cerebras_round_robin": {
+    "type": "round_robin",
+    "models": ["qwen1", "qwen2", "qwen3"],
+    "rotate_every": 5
+  }
+}
+```
+
+Then just use /model and tab to select your round-robin model!
+
+The `rotate_every` parameter controls how many requests are made to each model before rotating to the next one. In this example, the round-robin model will use each Qwen model for 5 consecutive requests before moving to the next model in the sequence.
+
+### Benefits
+- **Rate Limit Protection**: Automatically distribute requests across multiple models
+- **Load Balancing**: Share workload between different model providers
+- **Fallback Resilience**: Continue working even if one model has temporary issues
+- **Cost Optimization**: Use different models for different types of tasks
+
+**NOTE:** Unlike fallback models, round-robin models distribute load but don't automatically retry with another model on failure. If a request fails, it will raise the exception directly.
+
+---
+
 ## Create your own Agent!!!
 
 Code Puppy features a flexible agent system that allows you to work with specialized AI assistants tailored for different coding tasks. The system supports both built-in Python agents and custom JSON agents that you can create yourself.

{code_puppy-0.0.143.dist-info → code_puppy-0.0.145.dist-info}/RECORD

@@ -6,10 +6,10 @@ code_puppy/config.py,sha256=9yWKHKjLJ2Ddl4frrBI9VRIwPvoWpIx1fAd1YpAvOSQ,15330
 code_puppy/http_utils.py,sha256=BAvt4hed7fVMXglA7eS9gOb08h2YTuOyai6VmQq09fg,3432
 code_puppy/main.py,sha256=Vv5HSJnkgZhCvvOoXrJ2zqM5P-i47-RcYAU00Z1Pfx0,21733
 code_puppy/message_history_processor.py,sha256=O2rKp7W6YeIg93W8b0XySTUEQgIZm0f_06--_kzHugM,16145
-code_puppy/model_factory.py,sha256=kTVaHNm6S1cLw6vHE6kH0WS6JZLRoZ8qFGKCp_fdDM4,11756
+code_puppy/model_factory.py,sha256=-_0kJ7qYmRTDk0v3mfp-UrYf0IaDLyG8IMBweDECwJg,11917
 code_puppy/models.json,sha256=dAfpMMI2EEeOMv0ynHSmMuJAYDLcZrs5gCLX3voC4-A,3252
 code_puppy/reopenable_async_client.py,sha256=4UJRaMp5np8cbef9F0zKQ7TPKOfyf5U-Kv-0zYUWDho,8274
-code_puppy/round_robin_model.py,sha256=3-WmVDbxrPATHFbmYp_sskn5669jYDtDq9P6lrWrl0o,4300
+code_puppy/round_robin_model.py,sha256=VWGCbK0-0rLpnrdxlmND5JsKXiNZZWFMIjF4_OL3STE,5594
 code_puppy/state_management.py,sha256=o4mNBCPblRyVrNBH-992-1YqffgH6AKHU7iZRqgP1LI,5925
 code_puppy/status_display.py,sha256=F6eEAkGePDp4StM2BWj-uLLQTDGtJrf0IufzCeP1rRg,8336
 code_puppy/summarization_agent.py,sha256=-e6yUGZ22ahSaF0y7QhgVcQBfx5ktNUkPxBIWQfPaA4,3275
@@ -126,9 +126,9 @@ code_puppy/tui/tests/test_sidebar_history_navigation.py,sha256=JGiyua8A2B8dLfwiE
 code_puppy/tui/tests/test_status_bar.py,sha256=nYT_FZGdmqnnbn6o0ZuOkLtNUtJzLSmtX8P72liQ5Vo,1797
 code_puppy/tui/tests/test_timestamped_history.py,sha256=nVXt9hExZZ_8MFP-AZj4L4bB_1Eo_mc-ZhVICzTuw3I,1799
 code_puppy/tui/tests/test_tools.py,sha256=kgzzAkK4r0DPzQwHHD4cePpVNgrHor6cFr05Pg6DBWg,2687
-code_puppy-0.0.143.data/data/code_puppy/models.json,sha256=dAfpMMI2EEeOMv0ynHSmMuJAYDLcZrs5gCLX3voC4-A,3252
-code_puppy-0.0.143.dist-info/METADATA,sha256=XbQIbiQFjwgUAnpB0_-ObMgoro79rBMivTNi_5Zzebk,19873
-code_puppy-0.0.143.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-code_puppy-0.0.143.dist-info/entry_points.txt,sha256=d8YkBvIUxF-dHNJAj-x4fPEqizbY5d_TwvYpc01U5kw,58
-code_puppy-0.0.143.dist-info/licenses/LICENSE,sha256=31u8x0SPgdOq3izJX41kgFazWsM43zPEF9eskzqbJMY,1075
-code_puppy-0.0.143.dist-info/RECORD,,
+code_puppy-0.0.145.data/data/code_puppy/models.json,sha256=dAfpMMI2EEeOMv0ynHSmMuJAYDLcZrs5gCLX3voC4-A,3252
+code_puppy-0.0.145.dist-info/METADATA,sha256=i8WX2P4dcHB7_rGZGug23IafcwjtNPYsy1rcSbsKm9o,22019
+code_puppy-0.0.145.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+code_puppy-0.0.145.dist-info/entry_points.txt,sha256=d8YkBvIUxF-dHNJAj-x4fPEqizbY5d_TwvYpc01U5kw,58
+code_puppy-0.0.145.dist-info/licenses/LICENSE,sha256=31u8x0SPgdOq3izJX41kgFazWsM43zPEF9eskzqbJMY,1075
+code_puppy-0.0.145.dist-info/RECORD,,