mini-swe-agent 1.14.1__tar.gz → 1.14.3__tar.gz

{mini_swe_agent-1.14.1/src/mini_swe_agent.egg-info → mini_swe_agent-1.14.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mini-swe-agent
-Version: 1.14.1
+Version: 1.14.3
 Summary: Nano SWE Agent - A simple AI software engineering agent
 Author-email: Kilian Lieret <kilian.lieret@posteo.de>, "Carlos E. Jimenez" <carlosej@princeton.edu>
 License: MIT License

{mini_swe_agent-1.14.1 → mini_swe_agent-1.14.3/src/mini_swe_agent.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mini-swe-agent
-Version: 1.14.1
+Version: 1.14.3
 Summary: Nano SWE Agent - A simple AI software engineering agent
 Author-email: Kilian Lieret <kilian.lieret@posteo.de>, "Carlos E. Jimenez" <carlosej@princeton.edu>
 License: MIT License

{mini_swe_agent-1.14.1 → mini_swe_agent-1.14.3}/src/minisweagent/__init__.py

@@ -8,7 +8,7 @@ This file provides:
   unless you want the static type checking.
 """
 
-__version__ = "1.14.1"
+__version__ = "1.14.3"
 
 import os
 from pathlib import Path

{mini_swe_agent-1.14.1 → mini_swe_agent-1.14.3}/src/minisweagent/models/litellm_model.py

@@ -38,7 +38,7 @@ class LitellmModel:
             litellm.utils.register_model(json.loads(Path(self.config.litellm_model_registry).read_text()))
 
     @retry(
-        stop=stop_after_attempt(10),
+        stop=stop_after_attempt(int(os.getenv("MSWEA_MODEL_RETRY_STOP_AFTER_ATTEMPT", "10"))),
         wait=wait_exponential(multiplier=1, min=4, max=60),
         before_sleep=before_sleep_log(logger, logging.WARNING),
         retry=retry_if_not_exception_type(
@@ -76,6 +76,7 @@ class LitellmModel:
             )
             raise
         self.n_calls += 1
+        assert cost >= 0.0, f"Cost is negative: {cost}"
         self.cost += cost
         GLOBAL_MODEL_STATS.add(cost)
         return {

{mini_swe_agent-1.14.1 → mini_swe_agent-1.14.3}/src/minisweagent/models/openrouter_model.py

@@ -54,7 +54,7 @@ class OpenRouterModel:
         self._api_key = os.getenv("OPENROUTER_API_KEY", "")
 
     @retry(
-        stop=stop_after_attempt(10),
+        stop=stop_after_attempt(int(os.getenv("MSWEA_MODEL_RETRY_STOP_AFTER_ATTEMPT", "10"))),
         wait=wait_exponential(multiplier=1, min=4, max=60),
         before_sleep=before_sleep_log(logger, logging.WARNING),
         retry=retry_if_not_exception_type(
@@ -100,6 +100,7 @@ class OpenRouterModel:
         # Extract cost from usage information
         usage = response.get("usage", {})
         cost = usage.get("cost", 0.0)
+        assert cost >= 0.0, f"Cost is negative: {cost}"
 
         # If total_cost is not available, raise an error
         if cost == 0.0:

{mini_swe_agent-1.14.1 → mini_swe_agent-1.14.3}/src/minisweagent/models/portkey_model.py

@@ -74,7 +74,7 @@ class PortkeyModel:
         self.client = Portkey(**client_kwargs)
 
     @retry(
-        stop=stop_after_attempt(10),
+        stop=stop_after_attempt(int(os.getenv("MSWEA_MODEL_RETRY_STOP_AFTER_ATTEMPT", "10"))),
         wait=wait_exponential(multiplier=1, min=4, max=60),
         before_sleep=before_sleep_log(logger, logging.WARNING),
         retry=retry_if_not_exception_type((KeyboardInterrupt, TypeError, ValueError)),
@@ -95,6 +95,17 @@ class PortkeyModel:
         if self.config.litellm_model_name_override:
             if response_for_cost_calc.model:
                 response_for_cost_calc.model = self.config.litellm_model_name_override
+        prompt_tokens = response_for_cost_calc.usage.prompt_tokens
+        total_tokens = response_for_cost_calc.usage.total_tokens
+        completion_tokens = response_for_cost_calc.usage.completion_tokens
+        if total_tokens - prompt_tokens - completion_tokens != 0:
+            # This is most likely related to how portkey treats cached tokens: It doesn't count them towards the prompt tokens (?)
+            logger.warning(
+                f"WARNING: Total tokens - prompt tokens - completion tokens != 0: {response_for_cost_calc.model_dump()}."
+                " This is probably a portkey bug or incompatibility with litellm cost tracking. "
+                "Setting prompt tokens based on total tokens and completion tokens. You might want to double check your costs."
+            )
+            response_for_cost_calc.usage.prompt_tokens = total_tokens - completion_tokens
         try:
             cost = litellm.cost_calculator.completion_cost(
                 response_for_cost_calc, model=self.config.litellm_model_name_override or None
@@ -106,6 +117,7 @@ class PortkeyModel:
                 "https://klieret.short.gy/litellm-model-registry Still stuck? Please open a github issue for help!"
             )
             raise
+        assert cost >= 0.0, f"Cost is negative: {cost}"
 
         self.n_calls += 1
         self.cost += cost

{mini_swe_agent-1.14.1 → mini_swe_agent-1.14.3}/src/minisweagent/run/mini.py

@@ -77,7 +77,7 @@ def main(
 
     if yolo:
         config.setdefault("agent", {})["mode"] = "yolo"
-    if cost_limit:
+    if cost_limit is not None:
         config.setdefault("agent", {})["cost_limit"] = cost_limit
     if exit_immediately:
         config.setdefault("agent", {})["confirm_exit"] = False