mini-swe-agent 1.9.0__py3-none-any.whl → 1.9.1__py3-none-any.whl

{mini_swe_agent-1.9.0.dist-info → mini_swe_agent-1.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mini-swe-agent
-Version: 1.9.0
+Version: 1.9.1
 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
@@ -48,6 +48,7 @@ Requires-Dist: typer
 Requires-Dist: platformdirs
 Requires-Dist: textual
 Requires-Dist: prompt_toolkit
+Requires-Dist: openai<=1.99.5
 Provides-Extra: full
 Requires-Dist: mini-swe-agent[dev]; extra == "full"
 Requires-Dist: swe-rex>=1.4.0; extra == "full"

{mini_swe_agent-1.9.0.dist-info → mini_swe_agent-1.9.1.dist-info}/RECORD

@@ -1,11 +1,11 @@
-mini_swe_agent-1.9.0.dist-info/licenses/LICENSE.md,sha256=D3luWPkdHAe7LBsdD4vzqDAXw6Xewb3G-uczss0uh1s,1094
-minisweagent/__init__.py,sha256=qO_mqMrgTR4dyM2Eih8wQvc_Gd_0SJ6vpZ6khgGIM9g,1909
+mini_swe_agent-1.9.1.dist-info/licenses/LICENSE.md,sha256=D3luWPkdHAe7LBsdD4vzqDAXw6Xewb3G-uczss0uh1s,1094
+minisweagent/__init__.py,sha256=28OQ0MKY6EvqfdiNiDiiP-a1aGELpGBdUjRR5rsc3-Y,1997
 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
 minisweagent/agents/default.py,sha256=znoeQPSnSLNvrvVC07kwgEb-rqi0yxf3Kv7JPeMDNsI,5624
-minisweagent/agents/interactive.py,sha256=7HW2cffaV5f66DIjxvtIbL8mo_S5aZSwgNLSmHp6VC0,7450
-minisweagent/agents/interactive_textual.py,sha256=yYVtgHXdrKkirMyyHehYs5S3e7ddzqtoMSx8rU8_zBo,17944
+minisweagent/agents/interactive.py,sha256=NBeNamRuqww9ZRhOg1q8xPO9ziUw2gpAVV6hCPbpBxU,7470
+minisweagent/agents/interactive_textual.py,sha256=rvD1zoEQSjWd1MklCRGT01cCFoMh46iFrDPBklAWW_A,17984
 minisweagent/config/README.md,sha256=ABd9anA4aRWtx7Oh37z36Wv6ARvcxD2w9lPUE24R2mY,435
 minisweagent/config/__init__.py,sha256=0KzHaaIqWgRy2zbwIzhrg6BJPDzOvYi3jb4eBNY4sAU,823
 minisweagent/config/default.yaml,sha256=OHK9-7PkCa9ZzgYykF1zGYC_AWkiAdOrEpDuurF-1Rk,5143
@@ -16,12 +16,12 @@ minisweagent/config/mini_no_temp.yaml,sha256=n0W-017tBmMx57U9SLt7Fy9WJxI9x2vdTWB
 minisweagent/config/extra/__init__.py,sha256=e1MoAlDn_wc9HnXNoncf1P-B4DQ-iRf6n7Q_txjZGRI,52
 minisweagent/config/extra/swebench.yaml,sha256=5FKblpcNTHmVUNE1JLHo5_AsupvlwsrLj8I3R2mRItk,7680
 minisweagent/environments/__init__.py,sha256=tTnNjNAhMvIuB1mlesreBV5TLdQBp79qj_Mxr7HGzNk,1180
-minisweagent/environments/docker.py,sha256=mj9I1HhwwyWBEm_lGVWEvBDyDzRKypiKoln5uSY58zw,4146
+minisweagent/environments/docker.py,sha256=tL0XL2kIxNGLswcmPTDklpoa3RGkQJr7HkEEE2rxzNQ,4049
 minisweagent/environments/local.py,sha256=dV05j4jPrmY0k5O_UtF_qrRqqdilyPUUkbn-YUhRC3M,1236
-minisweagent/environments/singularity.py,sha256=sVZ1L_4ud7WbJxYIhi4WPNOK3dosqfYKZxak1V9LEjg,2765
+minisweagent/environments/singularity.py,sha256=dHH_SS4MOm3cP7k1kSErvIjVijTL_-VFTOHtCyjUKVw,2671
 minisweagent/environments/extra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 minisweagent/environments/extra/swerex_docker.py,sha256=wu2F_9moa8yj5IgCEquFOoxEXJ8Vi6BF19rJvRdoJIs,1665
-minisweagent/models/__init__.py,sha256=J4bnvfMByTVG0cL_6p51sm8gdargXhARfbG5c0UZ8Z4,2890
+minisweagent/models/__init__.py,sha256=wZguR-mGijqlxovIYfs1WcCiaHyYPywml0AacBJtg5c,2890
 minisweagent/models/anthropic.py,sha256=D8nHvvbgzPjla0He8p0O9kaXASPWg1Sai0pHsAj_Yn8,855
 minisweagent/models/litellm_model.py,sha256=tEwAV2dzslJ4HFDXApXSPo5OWsiz8soy52P8-r9p4Xg,2538
 minisweagent/models/test_models.py,sha256=ItCA6ddntzkYA7dzSuUEaLMV-AE8TBuXBFP8CzpiO3U,1351
@@ -32,20 +32,20 @@ minisweagent/run/__init__.py,sha256=WIoYgHVl7iZF2YncrfV3IttupG6P5KogroKHKECka3A,
 minisweagent/run/github_issue.py,sha256=GWOkGM09jOYV93p6xIM_kKWmC1yP_d5lprafWlqoBN0,2748
 minisweagent/run/hello_world.py,sha256=erLnEwNmPFLxq3-8zyv66Vy1kIqMqQf97vISX7LrQXg,959
 minisweagent/run/inspector.py,sha256=QnY3oYzm-yq3w9Jzs112Lco2Rg84vSocAWrQRVz_1lc,7127
-minisweagent/run/mini.py,sha256=d-dtnddRDvs0Ub3mFuXJYsNh3sSfRnSPjp6877Y9O2I,4215
+minisweagent/run/mini.py,sha256=09WKk4ERzhQ_hoSg0kNUYGtCRjLqMrLOSUqQtxjVwlo,4459
 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=CEsEr8AdEm64Jods2ZRURChHKMILSatkBLkLmRywkrw,3672
-minisweagent/run/extra/swebench.py,sha256=mth9nqayjDZw07CHcXUD-ABmISLkVkJDl7G-MQ-8CjY,10828
-minisweagent/run/extra/swebench_single.py,sha256=xbKjCLgDBPTKWAZa2H4gGWy6k3kadJYTJBGn-kytlu4,3023
+minisweagent/run/extra/swebench.py,sha256=3zGn7PUZCCf5vcVYy6vsIgjdJHUVh8cr-ztJwTsUWUo,10826
+minisweagent/run/extra/swebench_single.py,sha256=RGfs0FPD_3cznR5Y-J90CopYCC0_Vg9NYusRB1wKllc,3309
 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=MzIvUyCiqbq3EaQc8cKtaD0MEkcyXmUyl4ZcxYzZW_Y,1680
 minisweagent/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-minisweagent/utils/log.py,sha256=cObZMmhncD1HoRiAnEGQ65jGUgXXofMu59SH9naXIuI,915
-mini_swe_agent-1.9.0.dist-info/METADATA,sha256=NKTT4AES1ZOPVoW5cTPtzRYXv5hFLyiKgHo1Fxd2NBA,13798
-mini_swe_agent-1.9.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mini_swe_agent-1.9.0.dist-info/entry_points.txt,sha256=d1_yRbTaGjs1UXHa6JQK0sKDGBIVGm8oeW0k2kfbJgQ,182
-mini_swe_agent-1.9.0.dist-info/top_level.txt,sha256=zKF4t8bFpV87fdVABZt2Da-vnb4Vkh_CxkwQx5YT4Ew,13
-mini_swe_agent-1.9.0.dist-info/RECORD,,
+minisweagent/utils/log.py,sha256=ruDMNKMrVC9NPvCeHwO3QYz5jsVNUGQB2dRAEAPAWp8,996
+mini_swe_agent-1.9.1.dist-info/METADATA,sha256=iJsC920Z-2YoGsdpRgwk1wwKvq9SWi9qcTHSQjqPetc,13828
+mini_swe_agent-1.9.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mini_swe_agent-1.9.1.dist-info/entry_points.txt,sha256=d1_yRbTaGjs1UXHa6JQK0sKDGBIVGm8oeW0k2kfbJgQ,182
+mini_swe_agent-1.9.1.dist-info/top_level.txt,sha256=zKF4t8bFpV87fdVABZt2Da-vnb4Vkh_CxkwQx5YT4Ew,13
+mini_swe_agent-1.9.1.dist-info/RECORD,,

minisweagent/__init__.py

@@ -8,7 +8,7 @@ This file provides:
   unless you want the static type checking.
 """
 
-__version__ = "1.9.0"
+__version__ = "1.9.1"
 
 import os
 from pathlib import Path
@@ -18,6 +18,8 @@ import dotenv
 from platformdirs import user_config_dir
 from rich.console import Console
 
+from minisweagent.utils.log import logger
+
 package_dir = Path(__file__).resolve().parent
 
 global_config_dir = Path(os.getenv("MSWEA_GLOBAL_CONFIG_DIR") or user_config_dir("mini-swe-agent"))
@@ -68,4 +70,13 @@ class Agent(Protocol):
     def run(self, task: str, **kwargs) -> tuple[str, str]: ...
 
 
-__all__ = ["Agent", "Model", "Environment", "package_dir", "__version__", "global_config_file", "global_config_dir"]
+__all__ = [
+    "Agent",
+    "Model",
+    "Environment",
+    "package_dir",
+    "__version__",
+    "global_config_file",
+    "global_config_dir",
+    "logger",
+]

minisweagent/agents/interactive.py

@@ -39,9 +39,9 @@ class InteractiveAgent(DefaultAgent):
         super().__init__(*args, config_class=config_class, **kwargs)
         self.cost_last_confirmed = 0.0
 
-    def add_message(self, role: str, content: str):
+    def add_message(self, role: str, content: str, **kwargs):
         # Extend supermethod to print messages
-        super().add_message(role, content)
+        super().add_message(role, content, **kwargs)
         if role == "assistant":
             console.print(
                 f"\n[red][bold]mini-swe-agent[/bold] (step [bold]{self.model.n_calls}[/bold], [bold]${self.model.cost:.2f}[/bold]):[/red]\n",

minisweagent/agents/interactive_textual.py

@@ -44,8 +44,8 @@ class _TextualAgent(DefaultAgent):
         super().__init__(*args, config_class=TextualAgentConfig, **kwargs)
         self._current_action_from_human = False
 
-    def add_message(self, role: str, content: str):
-        super().add_message(role, content)
+    def add_message(self, role: str, content: str, **kwargs):
+        super().add_message(role, content, **kwargs)
         if self.app.agent_state != "UNINITIALIZED":
             self.app.call_from_thread(self.app.on_message_added)
 
@@ -276,8 +276,8 @@ class TextualAgent(App):
 
         self._vscroll = VerticalScroll()
 
-    def run(self, task: str) -> tuple[str, str]:
-        threading.Thread(target=lambda: self.agent.run(task), daemon=True).start()
+    def run(self, task: str, **kwargs) -> tuple[str, str]:
+        threading.Thread(target=lambda: self.agent.run(task, **kwargs), daemon=True).start()
         super().run()
         return self.exit_status, self.result
 

minisweagent/environments/docker.py

@@ -1,3 +1,4 @@
+import logging
 import os
 import shlex
 import subprocess
@@ -5,8 +6,6 @@ import uuid
 from dataclasses import asdict, dataclass, field
 from typing import Any
 
-from minisweagent.utils.log import get_logger
-
 
 @dataclass
 class DockerEnvironmentConfig:
@@ -35,7 +34,7 @@ class DockerEnvironment:
         """This class executes bash commands in a Docker container using direct docker commands.
         See `DockerEnvironmentConfig` for keyword arguments.
         """
-        self.logger = get_logger("minisweagent.environment")
+        self.logger = logging.getLogger("minisweagent.environment")
         self.container_id: str | None = None
         self.config = config_class(**kwargs)
         self._start_container()
@@ -97,7 +96,6 @@ class DockerEnvironment:
     def cleanup(self):
         """Stop and remove the Docker container."""
         if getattr(self, "container_id", None) is not None:  # if init fails early, container_id might not be set
-            self.logger.info(f"Stopping container {self.container_id}")
             cmd = f"(timeout 60 {self.config.executable} stop {self.container_id} || {self.config.executable} rm -f {self.container_id}) >/dev/null 2>&1 &"
             subprocess.Popen(cmd, shell=True)
 

minisweagent/environments/singularity.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 
+import logging
 import os
 import shutil
 import subprocess
@@ -9,8 +10,6 @@ from dataclasses import asdict, dataclass, field
 from pathlib import Path
 from typing import Any
 
-from minisweagent.utils.log import get_logger
-
 
 @dataclass
 class SingularityEnvironmentConfig:
@@ -29,7 +28,7 @@ class SingularityEnvironmentConfig:
 class SingularityEnvironment:
     def __init__(self, **kwargs):
         """Singularity environment. See `SingularityEnvironmentConfig` for kwargs."""
-        self.logger = get_logger("minisweagent.environment")
+        self.logger = logging.getLogger("minisweagent.environment")
         self.config = SingularityEnvironmentConfig(**kwargs)
         self.sandbox_dir = Path(tempfile.gettempdir()) / f"minisweagent-{uuid.uuid4().hex[:8]}"
         subprocess.run(
@@ -71,7 +70,6 @@ class SingularityEnvironment:
 
     def cleanup(self):
         if self.sandbox_dir.exists():
-            self.logger.info(f"Removing sandbox {self.sandbox_dir}")
             shutil.rmtree(self.sandbox_dir)
 
     def __del__(self):

minisweagent/models/__init__.py

@@ -63,10 +63,10 @@ def get_model_name(input_model_name: str | None = None, config: dict | None = No
         config = {}
     if input_model_name:
         return input_model_name
-    if from_env := os.getenv("MSWEA_MODEL_NAME"):
-        return from_env
     if from_config := config.get("model_name"):
         return from_config
+    if from_env := os.getenv("MSWEA_MODEL_NAME"):
+        return from_env
     raise ValueError("No default model set. Please run `mini-extra config setup` to set one.")
 
 

minisweagent/run/extra/swebench.py

@@ -24,7 +24,7 @@ from minisweagent.environments import get_environment
 from minisweagent.models import get_model
 from minisweagent.run.extra.utils.batch_progress import RunBatchProgressManager
 from minisweagent.run.utils.save import save_traj
-from minisweagent.utils.log import add_file_handlers, logger
+from minisweagent.utils.log import add_file_handler, logger
 
 _HELP_TEXT = """Run mini-SWE-agent on SWEBench instances.
 
@@ -198,7 +198,7 @@ def main(
     output_path = Path(output)
     output_path.mkdir(parents=True, exist_ok=True)
     logger.info(f"Results will be saved to {output_path}")
-    add_file_handlers(output_path / "minisweagent.log")
+    add_file_handler(output_path / "minisweagent.log")
 
     dataset_path = DATASET_MAPPING.get(subset, subset)
     logger.info(f"Loading dataset {dataset_path}, split {split}...")

minisweagent/run/extra/swebench_single.py

@@ -1,5 +1,6 @@
 """Run on a single SWE-Bench instance."""
 
+import traceback
 from pathlib import Path
 
 import typer
@@ -58,11 +59,15 @@ def main(
         **({"mode": "yolo"} | config.get("agent", {})),
     )
 
-    exit_status, result = None, None
+    exit_status, result, extra_info = None, None, None
     try:
         exit_status, result = agent.run(instance["problem_statement"])  # type: ignore[arg-type]
+    except Exception as e:
+        logger.error(f"Error processing instance {instance_spec}: {e}", exc_info=True)
+        exit_status, result = type(e).__name__, str(e)
+        extra_info = {"traceback": traceback.format_exc()}
     finally:
-        save_traj(agent, output, exit_status=exit_status, result=result)  # type: ignore[arg-type]
+        save_traj(agent, output, exit_status=exit_status, result=result, extra_info=extra_info)  # type: ignore[arg-type]
 
 
 if __name__ == "__main__":

minisweagent/run/mini.py

@@ -4,6 +4,7 @@
 # Read this first: https://mini-swe-agent.com/latest/usage/mini/  (usage)
 
 import os
+import traceback
 from pathlib import Path
 from typing import Any
 
@@ -22,6 +23,7 @@ from minisweagent.environments.local import LocalEnvironment
 from minisweagent.models import get_model
 from minisweagent.run.extra.config import configure_if_first_time
 from minisweagent.run.utils.save import save_traj
+from minisweagent.utils.log import logger
 
 DEFAULT_CONFIG = Path(os.getenv("MSWEA_MINI_CONFIG_PATH", builtin_config_dir / "mini.yaml"))
 DEFAULT_OUTPUT = global_config_dir / "last_mini_run.traj.json"
@@ -41,29 +43,19 @@ More information about the usage: [bold green]https://mini-swe-agent.com/latest/
 """
 
 
+# fmt: off
 @app.command(help=_HELP_TEXT)
 def main(
-    visual: bool = typer.Option(
-        False,
-        "-v",
-        "--visual",
-        help="Toggle (pager-style) UI (Textual) depending on the MSWEA_VISUAL_MODE_DEFAULT environment setting",
-    ),
-    model_name: str | None = typer.Option(
-        None,
-        "-m",
-        "--model",
-        help="Model to use",
-    ),
+    visual: bool = typer.Option(False, "-v", "--visual", help="Toggle (pager-style) UI (Textual) depending on the MSWEA_VISUAL_MODE_DEFAULT environment setting",),
+    model_name: str | None = typer.Option( None, "-m", "--model", help="Model to use",),
     task: str | None = typer.Option(None, "-t", "--task", help="Task/problem statement", show_default=False),
     yolo: bool = typer.Option(False, "-y", "--yolo", help="Run without confirmation"),
     cost_limit: float | None = typer.Option(None, "-l", "--cost-limit", help="Cost limit. Set to 0 to disable."),
     config_spec: Path = typer.Option(DEFAULT_CONFIG, "-c", "--config", help="Path to config file"),
     output: Path | None = typer.Option(DEFAULT_OUTPUT, "-o", "--output", help="Output trajectory file"),
-    exit_immediately: bool = typer.Option(
-        False, "--exit-immediately", help="Exit immediately when the agent wants to finish instead of prompting."
-    ),
+    exit_immediately: bool = typer.Option( False, "--exit-immediately", help="Exit immediately when the agent wants to finish instead of prompting."),
 ) -> Any:
+    # fmt: on
     configure_if_first_time()
     config = yaml.safe_load(get_config_path(config_spec).read_text())
 
@@ -92,13 +84,18 @@ def main(
     agent_class = InteractiveAgent
     if visual == (os.getenv("MSWEA_VISUAL_MODE_DEFAULT", "false") == "false"):
         agent_class = TextualAgent
-    exit_status, result = None, None
+
     agent = agent_class(model, env, **config.get("agent", {}))
+    exit_status, result, extra_info = None, None, None
     try:
         exit_status, result = agent.run(task)  # type: ignore[arg-type]
+    except Exception as e:
+        logger.error(f"Error running agent: {e}", exc_info=True)
+        exit_status, result = type(e).__name__, str(e)
+        extra_info = {"traceback": traceback.format_exc()}
     finally:
         if output:
-            save_traj(agent, output, exit_status=exit_status, result=result)  # type: ignore[arg-type]
+            save_traj(agent, output, exit_status=exit_status, result=result, extra_info=extra_info)  # type: ignore[arg-type]
     return agent
 
 

minisweagent/utils/log.py

@@ -1,32 +1,36 @@
 import logging
 from pathlib import Path
 
-MINI_LOGGERS = {}
-_EXTRA_HANDLERS = []
+from rich.logging import RichHandler
 
 
-def get_logger(name: str) -> logging.Logger:
-    if name in MINI_LOGGERS:
-        return MINI_LOGGERS[name]
-    logger = logging.getLogger(name)
+def _setup_root_logger() -> None:
+    logger = logging.getLogger("minisweagent")
     logger.setLevel(logging.DEBUG)
-    handler = logging.StreamHandler()
-    formatter = logging.Formatter("%(name)s: %(levelname)s: %(message)s")
-    handler.setFormatter(formatter)
-    logger.addHandler(handler)
-    for handler in _EXTRA_HANDLERS:
-        logger.addHandler(handler)
-    MINI_LOGGERS[name] = logger
-    return logger
+    _handler = RichHandler(
+        show_path=False,
+        show_time=False,
+        show_level=False,
+        markup=True,
+    )
+    _formatter = logging.Formatter("%(name)s: %(levelname)s: %(message)s")
+    _handler.setFormatter(_formatter)
+    logger.addHandler(_handler)
 
 
-def add_file_handlers(path: Path):
+def add_file_handler(path: Path | str, level: int = logging.DEBUG, *, print_path: bool = True) -> None:
+    logger = logging.getLogger("minisweagent")
     handler = logging.FileHandler(path)
+    handler.setLevel(level)
     formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
     handler.setFormatter(formatter)
-    _EXTRA_HANDLERS.append(handler)
-    for logger in MINI_LOGGERS.values():
-        logger.addHandler(handler)
+    logger.addHandler(handler)
+    if print_path:
+        print(f"Logging to '{path}'")
+
+
+_setup_root_logger()
+logger = logging.getLogger("minisweagent")
 
 
-logger = get_logger("minisweagent")
+__all__ = ["logger"]