SWE-agent takes a GitHub issue and tries to automatically fix it, using your LM of choice. It can also be employed for offensive cybersecurity or competitive coding challenges. [NeurIPS 2024]
Lots of bug fixes for new retry
Kilian Lieret264987bf5616
diff --git a/sweagent/agent/agents.py b/sweagent/agent/agents.pyindex fd451002..5a1de0a5 100644--- a/sweagent/agent/agents.py+++ b/sweagent/agent/agents.py@@ -3,9 +3,10 @@ from __future__ import annotationsimport copyimport jsonimport logging+import pprintimport timefrom pathlib import Path-from typing import Any, Literal+from typing import Annotated, Any, Literalimport yamlfrom jinja2 import Template@@ -152,7 +153,7 @@ class RetryAgentConfig(BaseModel):model_config = ConfigDict(extra="forbid")-AgentConfig = DefaultAgentConfig | RetryAgentConfig+AgentConfig = Annotated[DefaultAgentConfig | RetryAgentConfig, Field(discriminator="type")]class _BlockedActionError(Exception):@@ -187,6 +188,17 @@ class AbstractAgent:def run(self, *args, **kwargs) -> AgentRunResult: ...+def get_agent_from_config(config: AgentConfig) -> AbstractAgent:+ pprint.pprint(config)+ if config.type == "default":+ return DefaultAgent.from_config(config)+ elif config.type == "retry":+ return RetryAgent.from_config(config)+ else:+ msg = f"Unknown agent type: {config.type}"+ raise ValueError(msg)++class RetryAgent(AbstractAgent):def __init__(self, config: RetryAgentConfig):self.config = config@@ -198,6 +210,7 @@ class RetryAgent(AbstractAgent):self._total_instance_stats = InstanceStats()self._chook = CombinedAgentHook()self._traj_path: Path | None = None+ self._problem_statement: ProblemStatement | None = None@classmethoddef from_config(cls, config: RetryAgentConfig) -> Self:@@ -210,9 +223,9 @@ class RetryAgent(AbstractAgent):def setup(self, env: SWEEnv, problem_statement: ProblemStatement | ProblemStatementConfig, output_dir: Path = Path(".")) -> None:- self.traj_path = output_dir / (self._problem_statement.id + ".traj")- self._env = envself._problem_statement = problem_statement+ self._traj_path = output_dir / (self._problem_statement.id + ".traj")+ self._env = envself._output_dir = output_dirself._rloop = get_retry_loop_from_config(self.config.retry_loop, problem_statement=problem_statement)@@ -224,6 +237,7 @@ class RetryAgent(AbstractAgent):for hook in self._hooks:self._agent.add_hook(hook)sub_agent_output_dir = self._output_dir / f"attempt_{self._i_attempt}"+ assert self._problem_statement is not Noneself._agent.setup(env=self._env, problem_statement=self._problem_statement, output_dir=sub_agent_output_dir)return self._agent@@ -234,7 +248,11 @@ class RetryAgent(AbstractAgent):def step(self) -> StepOutput:assert self._agent is not None- return self._agent.step()+ try:+ return self._agent.step()+ except Exception as e:+ self._finalize_agent_run()+ raise edef _finalize_agent_run(self) -> None:assert self._agent is not None@@ -246,10 +264,13 @@ class RetryAgent(AbstractAgent):assert self._rloop is not Nonebest_attempt_idx = self._rloop.get_best()- data = {- "attempts": [self._attempt_data[i] for i in range(self._i_attempt + 1)],- **self._attempt_data[best_attempt_idx],- }+ if best_attempt_idx is None:+ data = {"info": {}}+ else:+ data = {+ "attempts": self._attempt_data,+ **self._attempt_data[best_attempt_idx],+ }data["info"]["best_attempt_idx"] = best_attempt_idx# Overwrite model stats with total statsdata["info"]["model_stats"] = self._total_instance_stats.model_dump()@@ -287,17 +308,19 @@ class RetryAgent(AbstractAgent):step_output = self.step()self.save_trajectory()if step_output.done:+ self._finalize_agent_run()if self._rloop is not None:self._rloop.on_submit(ReviewSubmission(trajectory=self._agent.trajectory, info=self._agent.info))- self.info["review"] = self._rloop.reviews[-1].model_dump() # type: ignore+ self._agent.info["review"] = self._rloop.reviews[-1].model_dump() # type: ignoreself.save_trajectory()if self._rloop.retry():assert self._env is not Noneself._next_attempt()step_output.done = False+ self.save_trajectory() # call again after we finalizedself._chook.on_run_done(trajectory=self._agent.trajectory, info=self._agent.info)- self.logger.info("Trajectory saved to %s", self.traj_path)+ self.logger.info("Trajectory saved to %s", self._traj_path)# Here we want to return the "global" information (e.g., submission should# be the best submission instead of the last one, etc.), so we get it from the traj filediff --git a/sweagent/agent/reviewer.py b/sweagent/agent/reviewer.pyindex 9442b4b8..aa7738ec 100644--- a/sweagent/agent/reviewer.py+++ b/sweagent/agent/reviewer.py@@ -377,9 +377,9 @@ class ScoreRetryLoop(AbstractRetryLoop):return True- def get_best(self) -> int:+ def get_best(self) -> int | None:if len(self._reviews) == 0:- return 0+ return Nonebest_score = max([r.accept for r in self._reviews])best_indices = [i for i, r in enumerate(self._reviews) if abs(r.accept - best_score) <= 1e-10]return best_indices[0]diff --git a/sweagent/run/batch_instances.py b/sweagent/run/batch_instances.pyindex 33ffaa9a..82741e5b 100644--- a/sweagent/run/batch_instances.py+++ b/sweagent/run/batch_instances.py@@ -103,8 +103,6 @@ class SimpleBatchInstance(BaseModel):def to_full_batch_instance(self, deployment: DeploymentConfig) -> BatchInstance:"""Merge the deployment options into the `SimpleBatchInstance` object to get a full `BatchInstance`."""- # Combine image name and deployment options into a DeploymentConfig object. Because this can be one of many- # subclasses, we use a TypeAdapter to validate/instantiate the object.# Very important: Make a copy of the deployment config because it will be shared among instances!!!deployment = deployment.model_copy()problem_statement = TextProblemStatement(diff --git a/sweagent/run/run_single.py b/sweagent/run/run_single.pyindex 2548c433..6cf8f59b 100644--- a/sweagent/run/run_single.py+++ b/sweagent/run/run_single.py@@ -36,7 +36,7 @@ import yamlfrom pydantic import BaseModel, ConfigDict, Fieldfrom pydantic_settings import BaseSettings-from sweagent.agent.agents import AgentConfig, DefaultAgent+from sweagent.agent.agents import AbstractAgent, AgentConfig, get_agent_from_configfrom sweagent.agent.problem_statement import (EmptyProblemStatement,ProblemStatement,@@ -84,7 +84,10 @@ class RunSingleConfig(BaseSettings, cli_implicit_flags=False):if self.output_dir == Path("DEFAULT"):user_id = getpass.getuser()problem_id = self.problem_statement.id- model_id = self.agent.model.id+ try:+ model_id = self.agent.model.id+ except AttributeError:+ model_id = "unknown_model"config_file = getattr(self, "_config_files", ["no_config"])[0]if isinstance(config_file, Path):config_file = config_file.stem@@ -114,7 +117,7 @@ class RunSingle:def __init__(self,env: SWEEnv,- agent: DefaultAgent,+ agent: AbstractAgent,problem_statement: ProblemStatement | ProblemStatementConfig,*,output_dir: Path = Path("."),@@ -154,7 +157,7 @@ class RunSingle:load_environment_variables(config.env_var_path)config.set_default_output_dir()config.output_dir.mkdir(parents=True, exist_ok=True)- agent = DefaultAgent.from_config(config.agent)+ agent = get_agent_from_config(config.agent)agent.replay_config = configself = cls(env=SWEEnv.from_config(config.env),