code-puppy 0.0.144__py3-none-any.whl → 0.0.146__py3-none-any.whl

code_puppy/agent.py

@@ -193,8 +193,9 @@ def get_code_generation_agent(force_reload=False, message_group: str | None = No
 
 def get_custom_usage_limits():
     """
-    Returns custom usage limits with increased request limit of 100 requests per minute.
+    Returns custom usage limits with configurable request limit.
     This centralizes the configuration of rate limiting for the agent.
-    Default pydantic-ai limit is 50, this increases it to 100.
+    Default pydantic-ai limit is 50, this increases it to the configured value (default 100).
     """
-    return UsageLimits(request_limit=100)
+    from code_puppy.config import get_message_limit
+    return UsageLimits(request_limit=get_message_limit())

code_puppy/command_line/meta_command_handler.py

@@ -17,7 +17,7 @@ META_COMMANDS_HELP = """
 ~m <model>            Set active model
 ~motd                 Show the latest message of the day (MOTD)
 ~show                 Show puppy config key-values
-~set                  Set puppy config key-values
+~set                  Set puppy config key-values (message_limit, protected_token_count, compaction_threshold, etc.)
 ~<unknown>            Show unknown meta command warning
 """
 
@@ -62,21 +62,21 @@ def handle_meta_command(command: str, console: Console) -> bool:
             get_owner_name,
             get_puppy_name,
             get_yolo_mode,
-            get_message_history_limit,
+            get_message_limit,
         )
 
         puppy_name = get_puppy_name()
         owner_name = get_owner_name()
         model = get_active_model()
         yolo_mode = get_yolo_mode()
-        msg_limit = get_message_history_limit()
+        msg_limit = get_message_limit()
         console.print(f"""[bold magenta]🐶 Puppy Status[/bold magenta]
 
 [bold]puppy_name:[/bold]     [cyan]{puppy_name}[/cyan]
 [bold]owner_name:[/bold]     [cyan]{owner_name}[/cyan]
 [bold]model:[/bold]          [green]{model}[/green]
 [bold]YOLO_MODE:[/bold]      {"[red]ON[/red]" if yolo_mode else "[yellow]off[/yellow]"}
-[bold]message_history_limit:[/bold]   Keeping last [cyan]{msg_limit}[/cyan] messages in context
+[bold]message_limit:[/bold]   [cyan]{msg_limit}[/cyan] requests per minute
 """)
         return True
 

code_puppy/config.py

@@ -93,9 +93,9 @@ def get_model_context_length() -> int:
 def get_config_keys():
     """
     Returns the list of all config keys currently in puppy.cfg,
-    plus certain preset expected keys (e.g. "yolo_mode", "model", "compaction_strategy").
+    plus certain preset expected keys (e.g. "yolo_mode", "model", "compaction_strategy", "message_limit").
     """
-    default_keys = ["yolo_mode", "model", "compaction_strategy"]
+    default_keys = ["yolo_mode", "model", "compaction_strategy", "message_limit"]
     config = configparser.ConfigParser()
     config.read(CONFIG_FILE)
     keys = set(config[DEFAULT_SECTION].keys()) if DEFAULT_SECTION in config else set()
@@ -435,6 +435,20 @@ def get_compaction_strategy() -> str:
     return "truncation"
 
 
+def get_message_limit(default: int = 100) -> int:
+    """
+    Returns the user-configured message/request limit for the agent.
+    This controls how many steps/requests the agent can take.
+    Defaults to 100 if unset or misconfigured.
+    Configurable by 'message_limit' key.
+    """
+    val = get_value("message_limit")
+    try:
+        return int(val) if val else default
+    except (ValueError, TypeError):
+        return default
+
+
 def save_command_to_history(command: str):
     """Save a command to the history file with an ISO format timestamp.
 

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,3 +1,4 @@
+
 from contextlib import asynccontextmanager, suppress
 from dataclasses import dataclass, field
 from typing import Any, Callable, AsyncIterator, List
@@ -29,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:
@@ -63,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(
@@ -74,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)
         
@@ -96,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.144.dist-info → code_puppy-0.0.146.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.144
+Version: 0.0.146
 Summary: Code generation agent
 Project-URL: repository, https://github.com/mpfaffenberger/code_puppy
 Project-URL: HomePage, https://github.com/mpfaffenberger/code_puppy
@@ -234,13 +234,16 @@ export CEREBRAS_API_KEY3=csk-...
   },
   "cerebras_round_robin": {
     "type": "round_robin",
-    "models": ["qwen1", "qwen2", "qwen3"]
+    "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

{code_puppy-0.0.144.dist-info → code_puppy-0.0.146.dist-info}/RECORD

@@ -1,15 +1,15 @@
 code_puppy/__init__.py,sha256=ehbM1-wMjNmOXk_DBhhJECFyBv2dRHwwo7ucjHeM68E,107
 code_puppy/__main__.py,sha256=pDVssJOWP8A83iFkxMLY9YteHYat0EyWDQqMkKHpWp4,203
-code_puppy/agent.py,sha256=ZQb1YWvBJXzGzXML1wI4gPf_-2kClMrYFleFMtA-9RA,6925
+code_puppy/agent.py,sha256=3pbcyM_WjY4OsOYtWxfglpcnD7H8TxUJLNFELVMgJcA,7000
 code_puppy/callbacks.py,sha256=6wYB6K_fGSCkKKEFaYOYkJT45WaV5W_NhUIzcvVH_nU,5060
-code_puppy/config.py,sha256=9yWKHKjLJ2Ddl4frrBI9VRIwPvoWpIx1fAd1YpAvOSQ,15330
+code_puppy/config.py,sha256=n4Em_txe-mz5UVTyCO2OQe4JzX2yUyVG7WT3NdvOVbU,15800
 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=DmbO1_SIWevdhb9nN1eNVh0dNIF-XzLYX-9gra5xVsY,4670
+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
@@ -27,7 +27,7 @@ code_puppy/command_line/__init__.py,sha256=y7WeRemfYppk8KVbCGeAIiTuiOszIURCDjOMZ
 code_puppy/command_line/command_handler.py,sha256=1o9tKAGycpHFDBldYRAAvY5HJ6QAfikLPrXTEkfw37o,21137
 code_puppy/command_line/file_path_completion.py,sha256=gw8NpIxa6GOpczUJRyh7VNZwoXKKn-yvCqit7h2y6Gg,2931
 code_puppy/command_line/load_context_completion.py,sha256=6eZxV6Bs-EFwZjN93V8ZDZUC-6RaWxvtZk-04Wtikyw,2240
-code_puppy/command_line/meta_command_handler.py,sha256=02NU4Lspf5qRMPTsrGiMRLSUshZhdmS0XQA26k8vUjw,5665
+code_puppy/command_line/meta_command_handler.py,sha256=xWa3_V1xQPi25V86eaTXa3NXPT3ygiKACb50uuy6TiM,5695
 code_puppy/command_line/model_picker_completion.py,sha256=adxp3NZaDV67YqaGv0SG7WVvOTXN0UwkkLqxTsknAvs,4126
 code_puppy/command_line/motd.py,sha256=PEdkp3ZnydVfvd7mNJylm8YyFNUKg9jmY6uwkA1em8c,2152
 code_puppy/command_line/prompt_toolkit_completion.py,sha256=vmsA0F4TfXZ3gjVzCfSNM3TIY-w3z_fSteTCcia2zAU,9379
@@ -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.144.data/data/code_puppy/models.json,sha256=dAfpMMI2EEeOMv0ynHSmMuJAYDLcZrs5gCLX3voC4-A,3252
-code_puppy-0.0.144.dist-info/METADATA,sha256=86kIwQ2Vf9hFT7PL6NBbHaMZGBzJ6L-CtXVn3IXULk0,21743
-code_puppy-0.0.144.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-code_puppy-0.0.144.dist-info/entry_points.txt,sha256=d8YkBvIUxF-dHNJAj-x4fPEqizbY5d_TwvYpc01U5kw,58
-code_puppy-0.0.144.dist-info/licenses/LICENSE,sha256=31u8x0SPgdOq3izJX41kgFazWsM43zPEF9eskzqbJMY,1075
-code_puppy-0.0.144.dist-info/RECORD,,
+code_puppy-0.0.146.data/data/code_puppy/models.json,sha256=dAfpMMI2EEeOMv0ynHSmMuJAYDLcZrs5gCLX3voC4-A,3252
+code_puppy-0.0.146.dist-info/METADATA,sha256=wciu-hCWux40BXIFeOy3xtNnZ66bebBHJYMOU9AgQHs,22019
+code_puppy-0.0.146.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+code_puppy-0.0.146.dist-info/entry_points.txt,sha256=d8YkBvIUxF-dHNJAj-x4fPEqizbY5d_TwvYpc01U5kw,58
+code_puppy-0.0.146.dist-info/licenses/LICENSE,sha256=31u8x0SPgdOq3izJX41kgFazWsM43zPEF9eskzqbJMY,1075
+code_puppy-0.0.146.dist-info/RECORD,,