mini-swe-agent 1.14.1__py3-none-any.whl → 1.14.3__py3-none-any.whl

{mini_swe_agent-1.14.1.dist-info → mini_swe_agent-1.14.3.dist-info}/METADATA

@@ -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.dist-info → mini_swe_agent-1.14.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
-mini_swe_agent-1.14.1.dist-info/licenses/LICENSE.md,sha256=D3luWPkdHAe7LBsdD4vzqDAXw6Xewb3G-uczss0uh1s,1094
-minisweagent/__init__.py,sha256=l2yZYzSivwa3ZX_aqoY48UoKLgDbx-FoXIyWBiu2MOg,2016
+mini_swe_agent-1.14.3.dist-info/licenses/LICENSE.md,sha256=D3luWPkdHAe7LBsdD4vzqDAXw6Xewb3G-uczss0uh1s,1094
+minisweagent/__init__.py,sha256=EwS3u5P_ms-e-uhpEGYcAoM93ejSAkrWV0saNM3r--c,2016
 minisweagent/__main__.py,sha256=FIyAOiw--c3FQ2g240FOM1FdL0lk_PxSpixu0pQ7WFo,194
 minisweagent/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 minisweagent/agents/__init__.py,sha256=cpjJLzg1IGxLM-tZpoMJV9S33ye13XtdBO0x7DU_Lrk,48
@@ -25,9 +25,9 @@ minisweagent/environments/extra/bubblewrap.py,sha256=G12Dm63N30qByfLb1SKNsI4G4gL
 minisweagent/environments/extra/swerex_docker.py,sha256=WPYbohT_vqTHkde9cxpbV6chLXCpLl0PDAcgMbZsV0M,1707
 minisweagent/models/__init__.py,sha256=Ol95N3oEDlojz7IBw10A7xf5rKfxtjESyJuEWOwZyzo,4171
 minisweagent/models/anthropic.py,sha256=4p-LxQ_RYQUX1rBsffAj3T1bBb2uMRhA4IyKfDcMpgo,1517
-minisweagent/models/litellm_model.py,sha256=qAYsFBzZGPRGGQfbNCJXKH9eRpzmJKZ9ORTJHsOdhL0,3419
-minisweagent/models/openrouter_model.py,sha256=7SwS4Raw-i_gAM9AGJ8EWoTrnCP8MfHqWf7UZ0sb4ds,4095
-minisweagent/models/portkey_model.py,sha256=lARromtKwiXJtxxXScOkp9PCl3oS76QMQh_6DeehoiI,4895
+minisweagent/models/litellm_model.py,sha256=wtGeCwjvCbL2pRN8PTDDIaGYoCnPyMjD0dGn0fkjcLo,3533
+minisweagent/models/openrouter_model.py,sha256=RMVcj74yO0TMzEPn35NjUzJ_PIOeO6TZpP-MmLJbGRw,4209
+minisweagent/models/portkey_model.py,sha256=3bfs1_6fGfjjHm_95QrCRmoiuP1MRdOkRE92fEWCBUw,5893
 minisweagent/models/test_models.py,sha256=ItCA6ddntzkYA7dzSuUEaLMV-AE8TBuXBFP8CzpiO3U,1351
 minisweagent/models/extra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 minisweagent/models/extra/roulette.py,sha256=SqLj_wz9Vkbxou7i9Ef4Uzmg_eheDouNySkkV7pm2Ys,2093
@@ -38,7 +38,7 @@ minisweagent/run/__init__.py,sha256=WIoYgHVl7iZF2YncrfV3IttupG6P5KogroKHKECka3A,
 minisweagent/run/github_issue.py,sha256=35mZoPLc4JV6XXJKRv55lnuKbXf5lDftd51N89-x9J0,3192
 minisweagent/run/hello_world.py,sha256=erLnEwNmPFLxq3-8zyv66Vy1kIqMqQf97vISX7LrQXg,959
 minisweagent/run/inspector.py,sha256=QnY3oYzm-yq3w9Jzs112Lco2Rg84vSocAWrQRVz_1lc,7127
-minisweagent/run/mini.py,sha256=m916OtSd8Wj2bUjfLGedNN-d2axTwZirM4AYmymXip8,4933
+minisweagent/run/mini.py,sha256=uDRb_gac9WcVBVF7kZxknHCwoAPRtLwtPi77ox6Zhjw,4945
 minisweagent/run/mini_extra.py,sha256=ecA1PnTWElpO60G9RktvVLtUOf3bZ_ESmnSttS6izhQ,1465
 minisweagent/run/extra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 minisweagent/run/extra/config.py,sha256=5s0ZjjE4QTphOqQzCJqHD2APq5jCdod5jFjGo3sXDms,3868
@@ -50,8 +50,8 @@ minisweagent/run/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 minisweagent/run/utils/save.py,sha256=2xd-UnUzI7Fr_AUZ5KEJ53Aa4kpuuGYxkLwyUcvqyMM,2503
 minisweagent/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 minisweagent/utils/log.py,sha256=ruDMNKMrVC9NPvCeHwO3QYz5jsVNUGQB2dRAEAPAWp8,996
-mini_swe_agent-1.14.1.dist-info/METADATA,sha256=wDlDQjkpkLTsa3wtyKj4cHLfMUB-RouMHZ5jR8aKvng,14151
-mini_swe_agent-1.14.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mini_swe_agent-1.14.1.dist-info/entry_points.txt,sha256=d1_yRbTaGjs1UXHa6JQK0sKDGBIVGm8oeW0k2kfbJgQ,182
-mini_swe_agent-1.14.1.dist-info/top_level.txt,sha256=zKF4t8bFpV87fdVABZt2Da-vnb4Vkh_CxkwQx5YT4Ew,13
-mini_swe_agent-1.14.1.dist-info/RECORD,,
+mini_swe_agent-1.14.3.dist-info/METADATA,sha256=dvHQUSE4yIjvxgIivgaAC97cbhsVZg4V4uEXDFQaayU,14151
+mini_swe_agent-1.14.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mini_swe_agent-1.14.3.dist-info/entry_points.txt,sha256=d1_yRbTaGjs1UXHa6JQK0sKDGBIVGm8oeW0k2kfbJgQ,182
+mini_swe_agent-1.14.3.dist-info/top_level.txt,sha256=zKF4t8bFpV87fdVABZt2Da-vnb4Vkh_CxkwQx5YT4Ew,13
+mini_swe_agent-1.14.3.dist-info/RECORD,,

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

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 {

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:

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

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