code-puppy 0.0.157__py3-none-any.whl → 0.0.158__py3-none-any.whl

code_puppy/command_line/command_handler.py

@@ -1,9 +1,6 @@
 import os
 
-from code_puppy.command_line.model_picker_completion import (
-    load_model_names,
-    update_model_in_input,
-)
+from code_puppy.command_line.model_picker_completion import update_model_in_input
 from code_puppy.command_line.motd import print_motd
 from code_puppy.command_line.utils import make_directory_table
 from code_puppy.config import get_config_keys
@@ -60,7 +57,7 @@ def get_commands_help():
     )
     help_lines.append(
         Text("/compact", style="cyan")
-        + Text("              Summarize and compact current chat history")
+        + Text("              Summarize and compact current chat history (uses compaction_strategy config)")
     )
     help_lines.append(
         Text("/dump_context", style="cyan")
@@ -137,18 +134,18 @@ def handle_command(command: str):
 
             before_tokens = sum(estimate_tokens_for_message(m) for m in history)
             compaction_strategy = get_compaction_strategy()
+            protected_tokens = get_protected_token_count()
             emit_info(
                 f"🤔 Compacting {len(history)} messages using {compaction_strategy} strategy... (~{before_tokens} tokens)"
             )
 
             if compaction_strategy == "truncation":
-                protected_tokens = get_protected_token_count()
                 compacted = truncation(history, protected_tokens)
                 summarized_messages = []  # No summarization in truncation mode
             else:
                 # Default to summarization
                 compacted, summarized_messages = summarize_messages(
-                    history, with_protection=False
+                    history, with_protection=True
                 )
 
             if not compacted:
@@ -372,6 +369,9 @@ def handle_command(command: str):
             # Convert /model to /m for internal processing
             model_command = command.replace("/model", "/m", 1)
 
+        # If no model matched, show available models
+        from code_puppy.command_line.model_picker_completion import load_model_names
+        
         new_input = update_model_in_input(model_command)
         if new_input is not None:
             from code_puppy.agents.runtime_manager import get_runtime_agent_manager
@@ -383,7 +383,6 @@ def handle_command(command: str):
             manager.reload_agent()
             emit_success(f"Active model set and loaded: {model}")
             return True
-        # If no model matched, show available models
         model_names = load_model_names()
         emit_warning("Usage: /model <model-name> or /m <model-name>")
         emit_warning(f"Available models: {', '.join(model_names)}")

code_puppy/config.py

@@ -110,6 +110,8 @@ def get_config_keys():
         "yolo_mode",
         "model",
         "compaction_strategy",
+        "protected_token_count",
+        "compaction_threshold",
         "message_limit",
         "allow_recursion",
     ]

code_puppy/model_factory.py

@@ -14,6 +14,7 @@ from pydantic_ai.providers.anthropic import AnthropicProvider
 from pydantic_ai.providers.google_gla import GoogleGLAProvider
 from pydantic_ai.providers.openai import OpenAIProvider
 from pydantic_ai.providers.cerebras import CerebrasProvider
+from pydantic_ai.providers.openrouter import OpenRouterProvider
 
 from . import callbacks
 from .config import EXTRA_MODELS_FILE
@@ -248,6 +249,34 @@ class ModelFactory:
             setattr(model, "provider", provider)
             return model
 
+        elif model_type == "openrouter":
+            # Get API key from config, which can be an environment variable reference or raw value
+            api_key_config = model_config.get("api_key")
+            api_key = None
+
+            if api_key_config:
+                if api_key_config.startswith("$"):
+                    # It's an environment variable reference
+                    env_var_name = api_key_config[1:]  # Remove the $ prefix
+                    api_key = os.environ.get(env_var_name)
+                    if api_key is None:
+                        raise ValueError(
+                            f"OpenRouter API key environment variable '{env_var_name}' not found or is empty. "
+                            f"Please set the environment variable: export {env_var_name}=your_value"
+                        )
+                else:
+                    # It's a raw API key value
+                    api_key = api_key_config
+            else:
+                # No API key in config, try to get it from the default environment variable
+                api_key = os.environ.get("OPENROUTER_API_KEY")
+
+            provider = OpenRouterProvider(api_key=api_key)
+
+            model = OpenAIChatModel(model_name=model_config["name"], provider=provider)
+            setattr(model, "provider", provider)
+            return model
+
         elif model_type == "round_robin":
             # Get the list of model names to use in the round-robin
             model_names = model_config.get("models")

code_puppy/models.json

@@ -87,12 +87,6 @@
     },
     "context_length": 64000
   },
-  "openrouter": {
-    "type": "openrouter",
-    "name": "meta-llama/llama-4-maverick:free",
-    "api_key": "$OPENROUTER_API_KEY",
-    "context_length": 131072
-  },
   "azure-gpt-4.1": {
     "type": "azure_openai",
     "name": "gpt-4.1",

{code_puppy-0.0.157.data → code_puppy-0.0.158.data}/data/code_puppy/models.json

@@ -87,12 +87,6 @@
     },
     "context_length": 64000
   },
-  "openrouter": {
-    "type": "openrouter",
-    "name": "meta-llama/llama-4-maverick:free",
-    "api_key": "$OPENROUTER_API_KEY",
-    "context_length": 131072
-  },
   "azure-gpt-4.1": {
     "type": "azure_openai",
     "name": "gpt-4.1",

{code_puppy-0.0.157.dist-info → code_puppy-0.0.158.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.157
+Version: 0.0.158
 Summary: Code generation agent
 Project-URL: repository, https://github.com/mpfaffenberger/code_puppy
 Project-URL: HomePage, https://github.com/mpfaffenberger/code_puppy

{code_puppy-0.0.157.dist-info → code_puppy-0.0.158.dist-info}/RECORD

@@ -2,12 +2,12 @@ code_puppy/__init__.py,sha256=ehbM1-wMjNmOXk_DBhhJECFyBv2dRHwwo7ucjHeM68E,107
 code_puppy/__main__.py,sha256=pDVssJOWP8A83iFkxMLY9YteHYat0EyWDQqMkKHpWp4,203
 code_puppy/agent.py,sha256=hZOrJJJDwtLtb82b6Zyt5CZb8RbzDtvHMIBUPVYsgOM,8133
 code_puppy/callbacks.py,sha256=6wYB6K_fGSCkKKEFaYOYkJT45WaV5W_NhUIzcvVH_nU,5060
-code_puppy/config.py,sha256=nD-1Ftwzd1LgZIi5Pi0P4_8DvPkZiOwFXQ5UuYFMO6E,16207
+code_puppy/config.py,sha256=k6sqdGH-RsssBYMXdRkhaXN3iYI347XTeMw9ibu3mIs,16272
 code_puppy/http_utils.py,sha256=BAvt4hed7fVMXglA7eS9gOb08h2YTuOyai6VmQq09fg,3432
 code_puppy/main.py,sha256=tYLfhUjPTJ-4S1r-pr-jSbn6kIU1iYvt2Z8lxI7zDFY,22220
 code_puppy/message_history_processor.py,sha256=aV-vcRcOQJPZPlrokB4CaLMxEU3Y4nDiabb9Ov_sJeU,15933
-code_puppy/model_factory.py,sha256=0tJWwmKHSqNGEiakk1aGdUrlZyQy0QM4yShxHqxmXpA,11758
-code_puppy/models.json,sha256=dAfpMMI2EEeOMv0ynHSmMuJAYDLcZrs5gCLX3voC4-A,3252
+code_puppy/model_factory.py,sha256=_drvOUKx2ivLY_TfE-D6gdZDJzIMyPqf2IWU83KEIE4,13158
+code_puppy/models.json,sha256=iXmLZGflnQcu2DRh4WUlgAhoXdvoxUc7KBhB8YxawXM,3088
 code_puppy/reopenable_async_client.py,sha256=4UJRaMp5np8cbef9F0zKQ7TPKOfyf5U-Kv-0zYUWDho,8274
 code_puppy/round_robin_model.py,sha256=SEN3VSwTgC5wHjx2sZsHQLPWOycf4jGwzB-EydgqkdY,5643
 code_puppy/state_management.py,sha256=o4mNBCPblRyVrNBH-992-1YqffgH6AKHU7iZRqgP1LI,5925
@@ -23,7 +23,7 @@ code_puppy/agents/base_agent.py,sha256=XYSff6IQX9Z6C7hPVbN_YXC2xfjwd268e2jtG3ZGn
 code_puppy/agents/json_agent.py,sha256=y6AYE3Fx9LhmemcPzt46d7359MNnkGIjU83YBGNer2g,4533
 code_puppy/agents/runtime_manager.py,sha256=fUOBpmETo3wTyLc5wWBfGKSX1HFRQWSpuwxYAOyA-_8,10059
 code_puppy/command_line/__init__.py,sha256=y7WeRemfYppk8KVbCGeAIiTuiOszIURCDjOMZv_YRmU,45
-code_puppy/command_line/command_handler.py,sha256=KVZySqUMJwrRadKSUCcWa62FZ_lge5XjxD0Hebzr2EE,24520
+code_puppy/command_line/command_handler.py,sha256=w0sE_oGRe6oV05a8-9vJmz0gZWRq_whE8a2mk8Tx7M8,24612
 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=80aK5JQOaqjt149qBmSsM02uy2Cikkee8zaQnu5u2KQ,5712
@@ -104,9 +104,9 @@ code_puppy/tui/screens/help.py,sha256=eJuPaOOCp7ZSUlecearqsuX6caxWv7NQszUh0tZJjB
 code_puppy/tui/screens/mcp_install_wizard.py,sha256=xqwN5omltMkfxWZwXj3D2PbXbtrxUi1dT0XT77oxOKk,27685
 code_puppy/tui/screens/settings.py,sha256=GMpv-qa08rorAE9mj3AjmqjZFPhmeJ_GWd-DBHG6iAA,10671
 code_puppy/tui/screens/tools.py,sha256=3pr2Xkpa9Js6Yhf1A3_wQVRzFOui-KDB82LwrsdBtyk,1715
-code_puppy-0.0.157.data/data/code_puppy/models.json,sha256=dAfpMMI2EEeOMv0ynHSmMuJAYDLcZrs5gCLX3voC4-A,3252
-code_puppy-0.0.157.dist-info/METADATA,sha256=NZLRr--sgoI8Mi0P8lHEzIMO4oLTP9vzTMFVOfYYYmg,19567
-code_puppy-0.0.157.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-code_puppy-0.0.157.dist-info/entry_points.txt,sha256=d8YkBvIUxF-dHNJAj-x4fPEqizbY5d_TwvYpc01U5kw,58
-code_puppy-0.0.157.dist-info/licenses/LICENSE,sha256=31u8x0SPgdOq3izJX41kgFazWsM43zPEF9eskzqbJMY,1075
-code_puppy-0.0.157.dist-info/RECORD,,
+code_puppy-0.0.158.data/data/code_puppy/models.json,sha256=iXmLZGflnQcu2DRh4WUlgAhoXdvoxUc7KBhB8YxawXM,3088
+code_puppy-0.0.158.dist-info/METADATA,sha256=YQw9I4coF7mBOkVxKtBYOC04PSk3HbghzjwgHKRurhc,19567
+code_puppy-0.0.158.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+code_puppy-0.0.158.dist-info/entry_points.txt,sha256=d8YkBvIUxF-dHNJAj-x4fPEqizbY5d_TwvYpc01U5kw,58
+code_puppy-0.0.158.dist-info/licenses/LICENSE,sha256=31u8x0SPgdOq3izJX41kgFazWsM43zPEF9eskzqbJMY,1075
+code_puppy-0.0.158.dist-info/RECORD,,