mini-swe-agent 1.12.0__py3-none-any.whl → 1.13.0__py3-none-any.whl

{mini_swe_agent-1.12.0.dist-info → mini_swe_agent-1.13.0.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
-mini_swe_agent-1.12.0.dist-info/licenses/LICENSE.md,sha256=D3luWPkdHAe7LBsdD4vzqDAXw6Xewb3G-uczss0uh1s,1094
-minisweagent/__init__.py,sha256=Pz8DDlFm1wJkbLSGvLgg4ejkc-R413muhKqEuhSN4r8,2014
+mini_swe_agent-1.13.0.dist-info/licenses/LICENSE.md,sha256=D3luWPkdHAe7LBsdD4vzqDAXw6Xewb3G-uczss0uh1s,1094
+minisweagent/__init__.py,sha256=AV8y_FPibz99WsO-rGjKRkyf0gJhEx5RGP6IBamLGG0,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
@@ -23,10 +23,11 @@ minisweagent/environments/singularity.py,sha256=HSwRTWef7cMCgBiGAh5DIrxW8HkZ9C9Z
 minisweagent/environments/extra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 minisweagent/environments/extra/bubblewrap.py,sha256=G12Dm63N30qByfLb1SKNsI4G4gLyKBfomnOIsPqRNZk,3662
 minisweagent/environments/extra/swerex_docker.py,sha256=WPYbohT_vqTHkde9cxpbV6chLXCpLl0PDAcgMbZsV0M,1707
-minisweagent/models/__init__.py,sha256=Boq3-r9eo4ptqnADMxAwtfevq9TmmE75mxSK5rS4ij0,4016
+minisweagent/models/__init__.py,sha256=hMRTK5yfn2vymiXecZsSAGusxsTvrnQQVm8ih0y_PNM,4081
 minisweagent/models/anthropic.py,sha256=D8nHvvbgzPjla0He8p0O9kaXASPWg1Sai0pHsAj_Yn8,855
 minisweagent/models/litellm_model.py,sha256=RSvNzK6ksOOcTEY-kM36KJql9-iSH29kq0cKYXj2mxE,3034
 minisweagent/models/openrouter_model.py,sha256=ugI3322pyUQ8wBOuMysPoKlp0oRAmR38a6GcdjE6qHI,3748
+minisweagent/models/portkey_model.py,sha256=hsaZJhQvzGSM88BJqTEZGvR7G_wczdKayhbtC5jex44,3814
 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
@@ -34,23 +35,23 @@ minisweagent/models/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 minisweagent/models/utils/cache_control.py,sha256=mG9cE56HQaUwXfoqvXoH6LcbMV_G1vlEE1aBBpikXYg,1608
 minisweagent/models/utils/key_per_thread.py,sha256=Vlxt--rapNNYCgIHrMCu1WVAkuiVIhC_awbarkbnkZQ,644
 minisweagent/run/__init__.py,sha256=WIoYgHVl7iZF2YncrfV3IttupG6P5KogroKHKECka3A,38
-minisweagent/run/github_issue.py,sha256=LS4_7LktE0pitcFZJyBJADF74xZMBDgovUa4KwU9RN0,3073
+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=EMU-hXAaTsgbdtTmZRxPYZ2bjYRTD6NQDr5Eta5Ybe8,4814
+minisweagent/run/mini.py,sha256=m916OtSd8Wj2bUjfLGedNN-d2axTwZirM4AYmymXip8,4933
 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=L5Xe7VGX1HMBlPac9aBufPnHA9duJpZYrbqXVtr8O6w,3845
-minisweagent/run/extra/swebench.py,sha256=sheaYoTxFmw5NdRGiRHPd_epVHRdhYtfIgI-RMvTSQc,11650
-minisweagent/run/extra/swebench_single.py,sha256=BwalUCgQTDlg4WOFmhPmW8K0wzbNoktTdGWzPoAiryE,3607
+minisweagent/run/extra/swebench.py,sha256=sO3LnjLXdU6Zbo409YhxVdizU8LaQcJUdcD8Tj6saMw,11741
+minisweagent/run/extra/swebench_single.py,sha256=KmoUkD6UQ1P0MY_73-OtYuQAsNPmOLlZIZSYKZGs5MQ,3699
 minisweagent/run/extra/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 minisweagent/run/extra/utils/batch_progress.py,sha256=xhJ7FmsaTBGz-yh8pzYl4yMoUGjn7GA24eYrP-nHj60,6804
 minisweagent/run/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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.12.0.dist-info/METADATA,sha256=_Om37mtSfMAUudlH9y90u1qXd4JfNlaCPheYJIl4dOM,14102
-mini_swe_agent-1.12.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mini_swe_agent-1.12.0.dist-info/entry_points.txt,sha256=d1_yRbTaGjs1UXHa6JQK0sKDGBIVGm8oeW0k2kfbJgQ,182
-mini_swe_agent-1.12.0.dist-info/top_level.txt,sha256=zKF4t8bFpV87fdVABZt2Da-vnb4Vkh_CxkwQx5YT4Ew,13
-mini_swe_agent-1.12.0.dist-info/RECORD,,
+mini_swe_agent-1.13.0.dist-info/METADATA,sha256=Orz3vqB1mYJeHD0WXH4-IWS3GQkHKaFsd8rAxLKDItU,14102
+mini_swe_agent-1.13.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mini_swe_agent-1.13.0.dist-info/entry_points.txt,sha256=d1_yRbTaGjs1UXHa6JQK0sKDGBIVGm8oeW0k2kfbJgQ,182
+mini_swe_agent-1.13.0.dist-info/top_level.txt,sha256=zKF4t8bFpV87fdVABZt2Da-vnb4Vkh_CxkwQx5YT4Ew,13
+mini_swe_agent-1.13.0.dist-info/RECORD,,

minisweagent/__init__.py

@@ -8,7 +8,7 @@ This file provides:
   unless you want the static type checking.
 """
 
-__version__ = "1.12.0"
+__version__ = "1.13.0"
 
 import os
 from pathlib import Path
@@ -29,7 +29,7 @@ global_config_file = Path(global_config_dir) / ".env"
 if not os.getenv("MSWEA_SILENT_STARTUP"):
     Console().print(
         f"👋 This is [bold green]mini-swe-agent[/bold green] version [bold green]{__version__}[/bold green].\n"
-        f"Your config is stored in [bold green]'{global_config_file}'[/bold green]"
+        f"Loading global config from [bold green]'{global_config_file}'[/bold green]"
     )
 dotenv.load_dotenv(dotenv_path=global_config_file)
 

minisweagent/models/__init__.py

@@ -75,6 +75,7 @@ _MODEL_CLASS_MAPPING = {
     "anthropic": "minisweagent.models.anthropic.AnthropicModel",
     "litellm": "minisweagent.models.litellm_model.LitellmModel",
     "openrouter": "minisweagent.models.openrouter_model.OpenRouterModel",
+    "portkey": "minisweagent.models.portkey_model.PortkeyModel",
     "deterministic": "minisweagent.models.test_models.DeterministicModel",
 }
 

minisweagent/models/portkey_model.py

@@ -0,0 +1,107 @@
+import json
+import logging
+import os
+from dataclasses import asdict, dataclass, field
+from pathlib import Path
+from typing import Any
+
+import litellm
+from tenacity import (
+    before_sleep_log,
+    retry,
+    retry_if_not_exception_type,
+    stop_after_attempt,
+    wait_exponential,
+)
+
+from minisweagent.models import GLOBAL_MODEL_STATS
+
+logger = logging.getLogger("portkey_model")
+
+try:
+    from portkey_ai import Portkey
+except ImportError:
+    Portkey = None
+
+
+@dataclass
+class PortkeyModelConfig:
+    model_name: str
+    model_kwargs: dict[str, Any] = field(default_factory=dict)
+    litellm_model_registry: Path | str | None = os.getenv("LITELLM_MODEL_REGISTRY_PATH")
+    """We currently use litellm to calculate costs. Here you can register additional models to litellm's model registry.
+    Note that this might change if we get better support for Portkey.
+    """
+
+
+class PortkeyModel:
+    def __init__(self, **kwargs):
+        if Portkey is None:
+            raise ImportError(
+                "The portkey-ai package is required to use PortkeyModel. Please install it with: pip install portkey-ai"
+            )
+        self.config = PortkeyModelConfig(**kwargs)
+        self.cost = 0.0
+        self.n_calls = 0
+        if self.config.litellm_model_registry and Path(self.config.litellm_model_registry).is_file():
+            litellm.utils.register_model(json.loads(Path(self.config.litellm_model_registry).read_text()))
+
+        # Get API key from environment or raise error
+        self._api_key = os.getenv("PORTKEY_API_KEY")
+        if not self._api_key:
+            raise ValueError(
+                "Portkey API key is required. Set it via the "
+                "PORTKEY_API_KEY environment variable. You can permanently set it with "
+                "`mini-extra config set PORTKEY_API_KEY YOUR_KEY`."
+            )
+
+        # Get virtual key from environment
+        virtual_key = os.getenv("PORTKEY_VIRTUAL_KEY")
+
+        # Initialize Portkey client
+        client_kwargs = {"api_key": self._api_key}
+        if virtual_key:
+            client_kwargs["virtual_key"] = virtual_key
+
+        self.client = Portkey(**client_kwargs)
+
+    @retry(
+        stop=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)),
+    )
+    def _query(self, messages: list[dict[str, str]], **kwargs):
+        # return self.client.with_options(metadata={"request_id": request_id}).chat.completions.create(
+        return self.client.chat.completions.create(
+            model=self.config.model_name,
+            messages=messages,
+            **(self.config.model_kwargs | kwargs),
+        )
+
+    def query(self, messages: list[dict[str, str]], **kwargs) -> dict:
+        response = self._query(messages, **kwargs)
+        try:
+            cost = litellm.cost_calculator.completion_cost(response)
+        except Exception as e:
+            logger.critical(
+                f"Error calculating cost for model {self.config.model_name}: {e}. "
+                "Please check the 'Updating the model registry' section in the documentation at "
+                "https://klieret.short.gy/litellm-model-registry Still stuck? Please open a github issue for help!"
+            )
+            raise
+
+        self.n_calls += 1
+        self.cost += cost
+        GLOBAL_MODEL_STATS.add(cost)
+
+        return {
+            "content": response.choices[0].message.content or "",
+            "extra": {
+                "response": response.model_dump(),
+                "cost": cost,
+            },
+        }
+
+    def get_template_vars(self) -> dict[str, Any]:
+        return asdict(self.config) | {"n_model_calls": self.n_calls, "model_cost": self.cost}

minisweagent/run/extra/swebench.py

@@ -221,8 +221,9 @@ def main(
         instances = [instance for instance in instances if instance["instance_id"] not in existing_instances]
     logger.info(f"Running on {len(instances)} instances...")
 
-
-    config = yaml.safe_load(get_config_path(config_spec).read_text())
+    config_path = get_config_path(config_spec)
+    logger.info(f"Loading agent config from '{config_path}'")
+    config = yaml.safe_load(config_path.read_text())
     if environment_class is not None:
         config.setdefault("environment", {})["environment_class"] = environment_class
     if model is not None:

minisweagent/run/extra/swebench_single.py

@@ -48,7 +48,9 @@ def main(
         instance_spec = sorted(instances.keys())[int(instance_spec)]
     instance: dict = instances[instance_spec]  # type: ignore
 
-    config = yaml.safe_load(get_config_path(config_path).read_text())
+    config_path = get_config_path(config_path)
+    logger.info(f"Loading agent config from '{config_path}'")
+    config = yaml.safe_load(config_path.read_text())
     if environment_class is not None:
         config.setdefault("environment", {})["environment_class"] = environment_class
     if model_class is not None:

minisweagent/run/github_issue.py

@@ -50,7 +50,9 @@ def main(
     """Run mini-SWE-agent on a GitHub issue"""
     configure_if_first_time()
 
-    _config = yaml.safe_load(get_config_path(config).read_text())
+    config_path = get_config_path(config)
+    console.print(f"Loading agent config from [bold green]'{config_path}'[/bold green]")
+    _config = yaml.safe_load(config_path.read_text())
     _agent_config = _config.setdefault("agent", {})
     if yolo:
         _agent_config["mode"] = "yolo"

minisweagent/run/mini.py

@@ -58,7 +58,9 @@ def main(
 ) -> Any:
     # fmt: on
     configure_if_first_time()
-    config = yaml.safe_load(get_config_path(config_spec).read_text())
+    config_path = get_config_path(config_spec)
+    console.print(f"Loading agent config from [bold green]'{config_path}'[/bold green]")
+    config = yaml.safe_load(config_path.read_text())
 
     if not task:
         console.print("[bold yellow]What do you want to do?")