mini-swe-agent 1.14.0__py3-none-any.whl → 1.14.2__py3-none-any.whl

{mini_swe_agent-1.14.0.dist-info → mini_swe_agent-1.14.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mini-swe-agent
-Version: 1.14.0
+Version: 1.14.2
 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.0.dist-info → mini_swe_agent-1.14.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
-mini_swe_agent-1.14.0.dist-info/licenses/LICENSE.md,sha256=D3luWPkdHAe7LBsdD4vzqDAXw6Xewb3G-uczss0uh1s,1094
-minisweagent/__init__.py,sha256=x76NxcXdWcajgoVsrPVO4EaR79r1Bnk3bF6wifAmcYo,2016
+mini_swe_agent-1.14.2.dist-info/licenses/LICENSE.md,sha256=D3luWPkdHAe7LBsdD4vzqDAXw6Xewb3G-uczss0uh1s,1094
+minisweagent/__init__.py,sha256=2IFYCWunKVGyxCxI2odK8QE4qIrVNJ4bg1ekPF-7izA,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,14 +25,14 @@ 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=2kPpmVLvt306FoLdEYnNfTprEkWl3PCxZldQxLLdp0k,3475
+minisweagent/models/openrouter_model.py,sha256=cyy1scXegAwpta9QeSX7J7nJrZDt1Hre5MybHKgm4Pk,4151
+minisweagent/models/portkey_model.py,sha256=MZP6VF_TvHqlcuR7s6JeiE8LzHn9CE99G1Q_eeRTdHg,5835
 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
 minisweagent/models/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-minisweagent/models/utils/cache_control.py,sha256=rAjW_FPWxG7bnuNe94CARAq9LKaTgFtSSp9zMQvssRs,2535
+minisweagent/models/utils/cache_control.py,sha256=zgi9e_72Y1pc0qNirW8_rMyi8RcLonGJNtfavqGX5_I,1917
 minisweagent/models/utils/key_per_thread.py,sha256=4YZXATIw-Fozi7M-1i-wyjIBf-GtQM71kkOHxSPkwrE,748
 minisweagent/run/__init__.py,sha256=WIoYgHVl7iZF2YncrfV3IttupG6P5KogroKHKECka3A,38
 minisweagent/run/github_issue.py,sha256=35mZoPLc4JV6XXJKRv55lnuKbXf5lDftd51N89-x9J0,3192
@@ -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.0.dist-info/METADATA,sha256=_quEJiibMIZ98LVaarGvBumSvBXWihTaeelQMGF7Wf8,14151
-mini_swe_agent-1.14.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mini_swe_agent-1.14.0.dist-info/entry_points.txt,sha256=d1_yRbTaGjs1UXHa6JQK0sKDGBIVGm8oeW0k2kfbJgQ,182
-mini_swe_agent-1.14.0.dist-info/top_level.txt,sha256=zKF4t8bFpV87fdVABZt2Da-vnb4Vkh_CxkwQx5YT4Ew,13
-mini_swe_agent-1.14.0.dist-info/RECORD,,
+mini_swe_agent-1.14.2.dist-info/METADATA,sha256=FZdq-wii7a27AFfe8jv5pUCEC2hRvUxOZNqUVNS6yFc,14151
+mini_swe_agent-1.14.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mini_swe_agent-1.14.2.dist-info/entry_points.txt,sha256=d1_yRbTaGjs1UXHa6JQK0sKDGBIVGm8oeW0k2kfbJgQ,182
+mini_swe_agent-1.14.2.dist-info/top_level.txt,sha256=zKF4t8bFpV87fdVABZt2Da-vnb4Vkh_CxkwQx5YT4Ew,13
+mini_swe_agent-1.14.2.dist-info/RECORD,,

minisweagent/__init__.py

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

minisweagent/models/litellm_model.py

@@ -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

@@ -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

@@ -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/models/utils/cache_control.py

@@ -38,35 +38,17 @@ def set_cache_control(
     messages: list[dict], *, mode: Literal["default_end"] | None = "default_end", last_n_messages_offset: int = 0
 ) -> list[dict]:
     """This messages processor adds manual cache control marks to the messages."""
+    # ONLY ADD TO THE LAST MESSAGE
     if mode != "default_end":
         raise ValueError(f"Invalid mode: {mode}")
     if last_n_messages_offset:
-        warnings.warn("last_n_messages_offset is deprecated and will be removed in the future")
-    messages = copy.deepcopy(messages)
-
-    # Find all user messages
-    user_message_indices = []
-    for i, msg in enumerate(messages):
-        if msg["role"] == "user":
-            user_message_indices.append(i)
+        warnings.warn("last_n_messages_offset is deprecated and will be removed in the future. It has no effect.")
 
-    # Clear cache control from all messages first
-    for entry in messages:
+    messages = copy.deepcopy(messages)
+    new_messages = []
+    for i_entry, entry in enumerate(reversed(messages)):
         _clear_cache_control(entry)
-
-    # Add cache control to user messages, respecting offset
-    if user_message_indices:
-        # If offset is specified, exclude the last N messages from getting cache control
-        messages_to_cache = user_message_indices
-        if last_n_messages_offset > 0:
-            messages_to_cache = (
-                user_message_indices[:-last_n_messages_offset]
-                if last_n_messages_offset < len(user_message_indices)
-                else []
-            )
-
-        # Add cache control to the selected user messages
-        for idx in messages_to_cache:
-            _set_cache_control(messages[idx])
-
-    return messages
+        if i_entry == 0:
+            _set_cache_control(entry)
+        new_messages.append(entry)
+    return list(reversed(new_messages))