mini-swe-agent 1.11.1__tar.gz → 1.13.0__tar.gz

{mini_swe_agent-1.11.1/src/mini_swe_agent.egg-info → mini_swe_agent-1.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mini-swe-agent
-Version: 1.11.1
+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
@@ -237,7 +237,8 @@ agent.run("Write a sudoku game")
 * [Quick start](https://mini-swe-agent.com/latest/quickstart/)
 * [`mini`](https://mini-swe-agent.com/latest/usage/mini/)
 * [FAQ](https://mini-swe-agent.com/latest/faq/)
-* [Configuration](https://mini-swe-agent.com/latest/advanced/configuration/)
+* [Global configuration](https://mini-swe-agent.com/latest/advanced/global_configuration/)
+* [Yaml configuration files](https://mini-swe-agent.com/latest/advanced/yaml_configuration/)
 * [Power up](https://mini-swe-agent.com/latest/advanced/cookbook/)
 
 </td>
@@ -273,7 +274,8 @@ Read more in our [documentation](https://mini-swe-agent.com/latest/):
 
 * [Quick start guide](https://mini-swe-agent.com/latest/quickstart/)
 * More on [`mini`](https://mini-swe-agent.com/latest/usage/mini/) and [`mini -v`](https://mini-swe-agent.com/latest/usage/mini_v/)
-* [Configuration](https://mini-swe-agent.com/latest/advanced/configuration/)
+* [Global configuration](https://mini-swe-agent.com/latest/advanced/global_configuration/)
+* [Yaml configuration files](https://mini-swe-agent.com/latest/advanced/yaml_configuration/)
 * [Power up with the cookbook](https://mini-swe-agent.com/latest/advanced/cookbook/)
 * [FAQ](https://mini-swe-agent.com/latest/faq/)
 * [Contribute!](https://mini-swe-agent.com/latest/contributing/)

{mini_swe_agent-1.11.1 → mini_swe_agent-1.13.0}/README.md

@@ -168,7 +168,8 @@ agent.run("Write a sudoku game")
 * [Quick start](https://mini-swe-agent.com/latest/quickstart/)
 * [`mini`](https://mini-swe-agent.com/latest/usage/mini/)
 * [FAQ](https://mini-swe-agent.com/latest/faq/)
-* [Configuration](https://mini-swe-agent.com/latest/advanced/configuration/)
+* [Global configuration](https://mini-swe-agent.com/latest/advanced/global_configuration/)
+* [Yaml configuration files](https://mini-swe-agent.com/latest/advanced/yaml_configuration/)
 * [Power up](https://mini-swe-agent.com/latest/advanced/cookbook/)
 
 </td>
@@ -204,7 +205,8 @@ Read more in our [documentation](https://mini-swe-agent.com/latest/):
 
 * [Quick start guide](https://mini-swe-agent.com/latest/quickstart/)
 * More on [`mini`](https://mini-swe-agent.com/latest/usage/mini/) and [`mini -v`](https://mini-swe-agent.com/latest/usage/mini_v/)
-* [Configuration](https://mini-swe-agent.com/latest/advanced/configuration/)
+* [Global configuration](https://mini-swe-agent.com/latest/advanced/global_configuration/)
+* [Yaml configuration files](https://mini-swe-agent.com/latest/advanced/yaml_configuration/)
 * [Power up with the cookbook](https://mini-swe-agent.com/latest/advanced/cookbook/)
 * [FAQ](https://mini-swe-agent.com/latest/faq/)
 * [Contribute!](https://mini-swe-agent.com/latest/contributing/)

{mini_swe_agent-1.11.1 → mini_swe_agent-1.13.0/src/mini_swe_agent.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mini-swe-agent
-Version: 1.11.1
+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
@@ -237,7 +237,8 @@ agent.run("Write a sudoku game")
 * [Quick start](https://mini-swe-agent.com/latest/quickstart/)
 * [`mini`](https://mini-swe-agent.com/latest/usage/mini/)
 * [FAQ](https://mini-swe-agent.com/latest/faq/)
-* [Configuration](https://mini-swe-agent.com/latest/advanced/configuration/)
+* [Global configuration](https://mini-swe-agent.com/latest/advanced/global_configuration/)
+* [Yaml configuration files](https://mini-swe-agent.com/latest/advanced/yaml_configuration/)
 * [Power up](https://mini-swe-agent.com/latest/advanced/cookbook/)
 
 </td>
@@ -273,7 +274,8 @@ Read more in our [documentation](https://mini-swe-agent.com/latest/):
 
 * [Quick start guide](https://mini-swe-agent.com/latest/quickstart/)
 * More on [`mini`](https://mini-swe-agent.com/latest/usage/mini/) and [`mini -v`](https://mini-swe-agent.com/latest/usage/mini_v/)
-* [Configuration](https://mini-swe-agent.com/latest/advanced/configuration/)
+* [Global configuration](https://mini-swe-agent.com/latest/advanced/global_configuration/)
+* [Yaml configuration files](https://mini-swe-agent.com/latest/advanced/yaml_configuration/)
 * [Power up with the cookbook](https://mini-swe-agent.com/latest/advanced/cookbook/)
 * [FAQ](https://mini-swe-agent.com/latest/faq/)
 * [Contribute!](https://mini-swe-agent.com/latest/contributing/)

{mini_swe_agent-1.11.1 → mini_swe_agent-1.13.0}/src/mini_swe_agent.egg-info/SOURCES.txt

@@ -35,6 +35,7 @@ src/minisweagent/models/__init__.py
 src/minisweagent/models/anthropic.py
 src/minisweagent/models/litellm_model.py
 src/minisweagent/models/openrouter_model.py
+src/minisweagent/models/portkey_model.py
 src/minisweagent/models/test_models.py
 src/minisweagent/models/extra/__init__.py
 src/minisweagent/models/extra/roulette.py

{mini_swe_agent-1.11.1 → mini_swe_agent-1.13.0}/src/minisweagent/__init__.py

@@ -8,7 +8,7 @@ This file provides:
   unless you want the static type checking.
 """
 
-__version__ = "1.11.1"
+__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)
 

{mini_swe_agent-1.11.1 → mini_swe_agent-1.13.0}/src/minisweagent/agents/default.py

@@ -106,7 +106,7 @@ class DefaultAgent:
 
     def parse_action(self, response: dict) -> dict:
         """Parse the action from the message. Returns the action."""
-        actions = re.findall(r"```bash\n(.*?)\n```", response["content"], re.DOTALL)
+        actions = re.findall(r"```bash\s*\n(.*?)\n```", response["content"], re.DOTALL)
         if len(actions) == 1:
             return {"action": actions[0].strip(), **response}
         raise FormatError(self.render_template(self.config.format_error_template, actions=actions))

{mini_swe_agent-1.11.1 → mini_swe_agent-1.13.0}/src/minisweagent/environments/docker.py

@@ -73,7 +73,7 @@ class DockerEnvironment:
         self.logger.info(f"Started container {container_name} with ID {result.stdout.strip()}")
         self.container_id = result.stdout.strip()
 
-    def execute(self, command: str, cwd: str = "") -> dict[str, Any]:
+    def execute(self, command: str, cwd: str = "", *, timeout: int | None = None) -> dict[str, Any]:
         """Execute a command in the Docker container and return the result as a dict."""
         cwd = cwd or self.config.cwd
         assert self.container_id, "Container not started"
@@ -89,7 +89,7 @@ class DockerEnvironment:
         result = subprocess.run(
             cmd,
             text=True,
-            timeout=self.config.timeout,
+            timeout=timeout or self.config.timeout,
             encoding="utf-8",
             errors="replace",
             stdout=subprocess.PIPE,

{mini_swe_agent-1.11.1 → mini_swe_agent-1.13.0}/src/minisweagent/environments/extra/bubblewrap.py

@@ -77,7 +77,7 @@ class BubblewrapEnvironment:
         self.working_dir = Path(tempfile.gettempdir()) / f"minisweagent-{uuid.uuid4().hex[:8]}"
         self.working_dir.mkdir(parents=True)
 
-    def execute(self, command: str, cwd: str = "") -> dict[str, Any]:
+    def execute(self, command: str, cwd: str = "", *, timeout: int | None = None) -> dict[str, Any]:
         """Execute a command in the bubblewrap environment and return the result as a dict."""
         cwd = cwd or self.config.cwd or str(self.working_dir)
 
@@ -92,7 +92,7 @@ class BubblewrapEnvironment:
         result = subprocess.run(
             cmd,
             text=True,
-            timeout=self.config.timeout,
+            timeout=timeout or self.config.timeout,
             encoding="utf-8",
             errors="replace",
             stdout=subprocess.PIPE,

{mini_swe_agent-1.11.1 → mini_swe_agent-1.13.0}/src/minisweagent/environments/extra/swerex_docker.py

@@ -24,7 +24,7 @@ class SwerexDockerEnvironment:
         self.deployment = DockerDeployment(image=self.config.image, **self.config.deployment_extra_kwargs)
         asyncio.run(self.deployment.start())
 
-    def execute(self, command: str, cwd: str = "") -> dict[str, Any]:
+    def execute(self, command: str, cwd: str = "", *, timeout: int | None = None) -> dict[str, Any]:
         """Execute a command in the environment and return the raw output."""
         output = asyncio.run(
             self.deployment.runtime.execute(
@@ -33,7 +33,7 @@ class SwerexDockerEnvironment:
                     shell=True,
                     check=False,
                     cwd=cwd or self.config.cwd,
-                    timeout=self.config.timeout,
+                    timeout=timeout or self.config.timeout,
                     merge_output_streams=True,
                 )
             )

{mini_swe_agent-1.11.1 → mini_swe_agent-1.13.0}/src/minisweagent/environments/local.py

@@ -17,7 +17,7 @@ class LocalEnvironment:
         """This class executes bash commands directly on the local machine."""
         self.config = config_class(**kwargs)
 
-    def execute(self, command: str, cwd: str = ""):
+    def execute(self, command: str, cwd: str = "", *, timeout: int | None = None):
         """Execute a command in the local environment and return the result as a dict."""
         cwd = cwd or self.config.cwd or os.getcwd()
         result = subprocess.run(
@@ -26,7 +26,7 @@ class LocalEnvironment:
             text=True,
             cwd=cwd,
             env=os.environ | self.config.env,
-            timeout=self.config.timeout,
+            timeout=timeout or self.config.timeout,
             encoding="utf-8",
             errors="replace",
             stdout=subprocess.PIPE,

{mini_swe_agent-1.11.1 → mini_swe_agent-1.13.0}/src/minisweagent/environments/singularity.py

@@ -60,7 +60,7 @@ class SingularityEnvironment:
     def get_template_vars(self) -> dict[str, Any]:
         return asdict(self.config)
 
-    def execute(self, command: str, cwd: str = "") -> dict[str, Any]:
+    def execute(self, command: str, cwd: str = "", *, timeout: int | None = None) -> dict[str, Any]:
         """Execute a command in a Singularity container and return the result as a dict."""
         cmd = [self.config.executable, "exec"]
 
@@ -81,7 +81,7 @@ class SingularityEnvironment:
         result = subprocess.run(
             cmd,
             text=True,
-            timeout=self.config.timeout,
+            timeout=timeout or self.config.timeout,
             encoding="utf-8",
             errors="replace",
             stdout=subprocess.PIPE,

{mini_swe_agent-1.11.1 → mini_swe_agent-1.13.0}/src/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",
 }
 

mini_swe_agent-1.13.0/src/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}

{mini_swe_agent-1.11.1 → mini_swe_agent-1.13.0}/src/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:

{mini_swe_agent-1.11.1 → mini_swe_agent-1.13.0}/src/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:

{mini_swe_agent-1.11.1 → mini_swe_agent-1.13.0}/src/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"

{mini_swe_agent-1.11.1 → mini_swe_agent-1.13.0}/src/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?")