Skip to content

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]

Breaking change: Rename defaults tool bundle (#1147)

Kilian Lieret1998ce1168ba
diff --git a/config/coding_challenge.yaml b/config/coding_challenge.yaml
index 9bddc180..b873cb4d 100644
--- a/config/coding_challenge.yaml
+++ b/config/coding_challenge.yaml
@@ -87,9 +87,9 @@ agent:
SEARCH_INDEX: 0
bundles:
- path: tools/registry
- - path: tools/defaults
+ - path: tools/windowed
- path: tools/search
- - path: tools/edit_replace
+ - path: tools/windowed_edit_replace
- path: tools/submit
parse_function:
type: thought_action
diff --git a/config/exotic/windowed_replace.yaml b/config/exotic/windowed_replace.yaml
index 86d90936..e51b1f64 100644
--- a/config/exotic/windowed_replace.yaml
+++ b/config/exotic/windowed_replace.yaml
@@ -107,9 +107,9 @@ agent:
OVERLAP: 2
bundles:
- path: tools/registry
- - path: tools/defaults
+ - path: tools/windowed
- path: tools/search
- - path: tools/edit_replace
+ - path: tools/windowed_edit_replace
- path: tools/submit
enable_bash_tool: true
parse_function:
diff --git a/config/exotic/windowed_replace_late_repro.yaml b/config/exotic/windowed_replace_late_repro.yaml
index 196f9a58..fc195967 100644
--- a/config/exotic/windowed_replace_late_repro.yaml
+++ b/config/exotic/windowed_replace_late_repro.yaml
@@ -109,9 +109,9 @@ agent:
OVERLAP: 2
bundles:
- path: tools/registry
- - path: tools/defaults
+ - path: tools/windowed
- path: tools/search
- - path: tools/edit_replace
+ - path: tools/windowed_edit_replace
- path: tools/submit
enable_bash_tool: true
parse_function:
diff --git a/config/human/human.yaml b/config/human/human.yaml
index 3be9b8d2..1c8cca3b 100644
--- a/config/human/human.yaml
+++ b/config/human/human.yaml
@@ -8,9 +8,9 @@ agent:
OVERLAP: 2
bundles:
- path: tools/registry
- - path: tools/defaults
+ - path: tools/windowed
- path: tools/search
- - path: tools/edit_linting
+ - path: tools/windowed_edit_linting
- path: tools/submit
parse_function:
type: thought_action
diff --git a/config/human/human_demo.yaml b/config/human/human_demo.yaml
index 92239172..313bdda0 100644
--- a/config/human/human_demo.yaml
+++ b/config/human/human_demo.yaml
@@ -33,9 +33,9 @@ agent:
OVERLAP: 2
bundles:
- path: tools/registry
- - path: tools/defaults
+ - path: tools/windowed
- path: tools/search
- - path: tools/edit_linting
+ - path: tools/windowed_edit_linting
- path: tools/submit
parse_function:
type: thought_action
diff --git a/config/sweagent_0_7/07.yaml b/config/sweagent_0_7/07.yaml
index ffe84e40..05f867b4 100644
--- a/config/sweagent_0_7/07.yaml
+++ b/config/sweagent_0_7/07.yaml
@@ -90,9 +90,9 @@ agent:
OVERLAP: 2
bundles:
- path: tools/registry
- - path: tools/defaults
+ - path: tools/windowed
- path: tools/search
- - path: tools/edit_linting
+ - path: tools/windowed_edit_linting
- path: tools/submit
parse_function:
type: thought_action
diff --git a/config/sweagent_0_7/07_fcalling.yaml b/config/sweagent_0_7/07_fcalling.yaml
index b8d7fad5..dfaa0874 100644
--- a/config/sweagent_0_7/07_fcalling.yaml
+++ b/config/sweagent_0_7/07_fcalling.yaml
@@ -88,9 +88,9 @@ agent:
OVERLAP: 2
bundles:
- path: tools/registry
- - path: tools/defaults
+ - path: tools/windowed
- path: tools/search
- - path: tools/edit_linting
+ - path: tools/windowed_edit_linting
- path: tools/submit
enable_bash_tool: true
parse_function:
diff --git a/config/sweagent_0_7/07_from_url.yaml b/config/sweagent_0_7/07_from_url.yaml
index ace0ccac..dac0c5d0 100644
--- a/config/sweagent_0_7/07_from_url.yaml
+++ b/config/sweagent_0_7/07_from_url.yaml
@@ -102,9 +102,9 @@ agent:
OVERLAP: 2
bundles:
- path: tools/registry
- - path: tools/defaults
+ - path: tools/windowed
- path: tools/search
- - path: tools/edit_replace
+ - path: tools/windowed_edit_replace
- path: tools/submit
enable_bash_tool: true
parse_function:
diff --git a/config/sweagent_0_7/07_thought_action.yaml b/config/sweagent_0_7/07_thought_action.yaml
index ee5df329..4f706c4e 100644
--- a/config/sweagent_0_7/07_thought_action.yaml
+++ b/config/sweagent_0_7/07_thought_action.yaml
@@ -90,9 +90,9 @@ agent:
WINDOW: 100
OVERLAP: 2
bundles:
- - path: tools/defaults
+ - path: tools/windowed
- path: tools/search
- - path: tools/edit_linting
+ - path: tools/windowed_edit_linting
- path: tools/submit
parse_function:
type: thought_action
diff --git a/config/sweagent_0_7/07_thought_action_xml.yaml b/config/sweagent_0_7/07_thought_action_xml.yaml
index 4d9bbe17..0dff22ed 100644
--- a/config/sweagent_0_7/07_thought_action_xml.yaml
+++ b/config/sweagent_0_7/07_thought_action_xml.yaml
@@ -84,9 +84,9 @@ agent:
WINDOW: 100
OVERLAP: 2
bundles:
- - path: tools/defaults
+ - path: tools/windowed
- path: tools/search
- - path: tools/edit_linting
+ - path: tools/windowed_edit_linting
- path: tools/submit
parse_function:
type: xml_thought_action
diff --git a/docs/config/tools.md b/docs/config/tools.md
index d9a638e6..dca42fef 100644
--- a/docs/config/tools.md
+++ b/docs/config/tools.md
@@ -44,7 +44,7 @@ The `state` command is a special command that is executed after every action and
The resulting dictionary can be used to format prompt templates.
For example, for the classical SWE-agent tools, we extract the working directory and the currently open file like so:
-```python title="tools/defaults/bin/_state"
+```python title="tools/windowed/bin/_state"
#!/usr/bin/env python3
import json
diff --git a/tests/test_data/trajectories/gpt4__swe-agent-test-repo__default_from_url__t-0.00__p-0.95__c-3.00__install-1/6e44b9__sweagenttestrepo-1c2844.traj b/tests/test_data/trajectories/gpt4__swe-agent-test-repo__default_from_url__t-0.00__p-0.95__c-3.00__install-1/6e44b9__sweagenttestrepo-1c2844.traj
index 1f6ab09d..7c6fa329 100644
--- a/tests/test_data/trajectories/gpt4__swe-agent-test-repo__default_from_url__t-0.00__p-0.95__c-3.00__install-1/6e44b9__sweagenttestrepo-1c2844.traj
+++ b/tests/test_data/trajectories/gpt4__swe-agent-test-repo__default_from_url__t-0.00__p-0.95__c-3.00__install-1/6e44b9__sweagenttestrepo-1c2844.traj
@@ -265,7 +265,7 @@
"hidden_tools": []
},
{
- "path": "tools/defaults",
+ "path": "tools/windowed",
"hidden_tools": []
},
{
@@ -273,7 +273,7 @@
"hidden_tools": []
},
{
- "path": "tools/edit_replace",
+ "path": "tools/windowed_edit_replace",
"hidden_tools": []
},
{
diff --git a/tests/test_run_single.py b/tests/test_run_single.py
index 893d0f36..46d23a5a 100644
--- a/tests/test_run_single.py
+++ b/tests/test_run_single.py
@@ -34,7 +34,7 @@ def agent_config_with_commands():
ac = DefaultAgentConfig(model=InstantEmptySubmitModelConfig())
ac.tools.bundles = [
Bundle(path=TOOLS_DIR / "registry"),
- Bundle(path=TOOLS_DIR / "defaults"),
+ Bundle(path=TOOLS_DIR / "windowed"),
Bundle(path=TOOLS_DIR / "submit"),
]
ac.tools.env_variables = {"WINDOW": 100}
@@ -50,7 +50,7 @@ def test_hidden_tools(tmpdir):
ac.tools.env_variables = {"WINDOW": 100}
ac.tools.bundles = [
Bundle(path=TOOLS_DIR / "registry"),
- Bundle(path=TOOLS_DIR / "defaults", hidden_tools=["scroll_up"]),
+ Bundle(path=TOOLS_DIR / "windowed", hidden_tools=["scroll_up"]),
Bundle(path=TOOLS_DIR / "submit"),
]
ac.model.name = "instant_empty_submit"
diff --git a/tests/tools/test_default_utils.py b/tests/tools/test_default_utils.py
index 4dfc54e2..0a1c52f2 100644
--- a/tests/tools/test_default_utils.py
+++ b/tests/tools/test_default_utils.py
@@ -7,7 +7,7 @@ import pytest
from sweagent import TOOLS_DIR
from tests.utils import make_python_tool_importable
-DEFAULT_TOOLS_DIR = TOOLS_DIR / "defaults"
+DEFAULT_TOOLS_DIR = TOOLS_DIR / "windowed"
DEFAULT_TOOLS_BIN = DEFAULT_TOOLS_DIR / "bin"
make_python_tool_importable(DEFAULT_TOOLS_DIR / "lib/windowed_file.py", "windowed_file")
diff --git a/tests/tools/test_split_string.py b/tests/tools/test_split_string.py
index 07f0fd2c..3f5a1df3 100644
--- a/tests/tools/test_split_string.py
+++ b/tests/tools/test_split_string.py
@@ -2,7 +2,7 @@ from __future__ import annotations
from tests.utils import make_python_tool_importable
-make_python_tool_importable("tools/defaults/lib/flake8_utils.py", "flake8_utils")
+make_python_tool_importable("tools/windowed/lib/flake8_utils.py", "flake8_utils")
from flake8_utils import Flake8Error, format_flake8_output # type: ignore
diff --git a/tools/defaults/bin/_state b/tools/windowed/bin/_state
similarity index 100%
rename from tools/defaults/bin/_state
rename to tools/windowed/bin/_state
diff --git a/tools/defaults/bin/create b/tools/windowed/bin/create
similarity index 100%
rename from tools/defaults/bin/create
rename to tools/windowed/bin/create
diff --git a/tools/defaults/bin/goto b/tools/windowed/bin/goto
similarity index 100%
rename from tools/defaults/bin/goto
rename to tools/windowed/bin/goto
diff --git a/tools/defaults/bin/open b/tools/windowed/bin/open
similarity index 100%
rename from tools/defaults/bin/open
rename to tools/windowed/bin/open
diff --git a/tools/defaults/bin/scroll_down b/tools/windowed/bin/scroll_down
similarity index 100%
rename from tools/defaults/bin/scroll_down
rename to tools/windowed/bin/scroll_down
diff --git a/tools/defaults/bin/scroll_up b/tools/windowed/bin/scroll_up
similarity index 100%
rename from tools/defaults/bin/scroll_up
rename to tools/windowed/bin/scroll_up
diff --git a/tools/defaults/config.yaml b/tools/windowed/config.yaml
similarity index 100%
rename from tools/defaults/config.yaml
rename to tools/windowed/config.yaml
diff --git a/tools/defaults/install.sh b/tools/windowed/install.sh
similarity index 100%
rename from tools/defaults/install.sh
rename to tools/windowed/install.sh
diff --git a/tools/defaults/lib/__init__.py b/tools/windowed/lib/__init__.py
similarity index 100%
rename from tools/defaults/lib/__init__.py
rename to tools/windowed/lib/__init__.py
diff --git a/tools/defaults/lib/flake8_utils.py b/tools/windowed/lib/flake8_utils.py
similarity index 99%
rename from tools/defaults/lib/flake8_utils.py
rename to tools/windowed/lib/flake8_utils.py
index 3be17cad..0b449500 100644
--- a/tools/defaults/lib/flake8_utils.py
+++ b/tools/windowed/lib/flake8_utils.py
@@ -15,7 +15,7 @@ except ImportError:
else:
import sys
- default_lib = TOOLS_DIR / "defaults" / "lib"
+ default_lib = TOOLS_DIR / "windowed" / "lib"
assert default_lib.is_dir()
sys.path.append(str(default_lib))
sys.path.append(str(TOOLS_DIR / "registry" / "lib"))
diff --git a/tools/defaults/lib/windowed_file.py b/tools/windowed/lib/windowed_file.py
similarity index 100%
rename from tools/defaults/lib/windowed_file.py
rename to tools/windowed/lib/windowed_file.py
diff --git a/tools/edit_linting/bin/edit b/tools/windowed_edit_linting/bin/edit
similarity index 98%
rename from tools/edit_linting/bin/edit
rename to tools/windowed_edit_linting/bin/edit
index 115ad31a..2909209c 100644
--- a/tools/edit_linting/bin/edit
+++ b/tools/windowed_edit_linting/bin/edit
@@ -9,7 +9,7 @@ try:
except ImportError:
pass
else:
- default_lib = TOOLS_DIR / "defaults" / "lib"
+ default_lib = TOOLS_DIR / "windowed" / "lib"
assert default_lib.is_dir()
sys.path.append(str(default_lib))
sys.path.append(str(TOOLS_DIR / "registry" / "lib"))
diff --git a/tools/edit_linting/config.yaml b/tools/windowed_edit_linting/config.yaml
similarity index 100%
rename from tools/edit_linting/config.yaml
rename to tools/windowed_edit_linting/config.yaml
diff --git a/tools/edit_linting/install.sh b/tools/windowed_edit_linting/install.sh
similarity index 100%
rename from tools/edit_linting/install.sh
rename to tools/windowed_edit_linting/install.sh
diff --git a/tools/edit_replace/bin/edit b/tools/windowed_edit_replace/bin/edit
similarity index 99%
rename from tools/edit_replace/bin/edit
rename to tools/windowed_edit_replace/bin/edit
index 2613457a..caaf4092 100644
--- a/tools/edit_replace/bin/edit
+++ b/tools/windowed_edit_replace/bin/edit
@@ -9,7 +9,7 @@ except ImportError:
else:
import sys
- default_lib = TOOLS_DIR / "defaults" / "lib"
+ default_lib = TOOLS_DIR / "windowed" / "lib"
assert default_lib.is_dir()
sys.path.append(str(default_lib))
sys.path.append(str(TOOLS_DIR / "registry" / "lib"))
diff --git a/tools/edit_replace/bin/insert b/tools/windowed_edit_replace/bin/insert
similarity index 100%
rename from tools/edit_replace/bin/insert
rename to tools/windowed_edit_replace/bin/insert
diff --git a/tools/edit_replace/config.yaml b/tools/windowed_edit_replace/config.yaml
similarity index 100%
rename from tools/edit_replace/config.yaml
rename to tools/windowed_edit_replace/config.yaml
diff --git a/tools/edit_replace/install.sh b/tools/windowed_edit_replace/install.sh
similarity index 100%
rename from tools/edit_replace/install.sh
rename to tools/windowed_edit_replace/install.sh
diff --git a/tools/edit_rewrite/bin/edit b/tools/windowed_edit_rewrite/bin/edit
similarity index 100%
rename from tools/edit_rewrite/bin/edit
rename to tools/windowed_edit_rewrite/bin/edit
diff --git a/tools/edit_rewrite/config.yaml b/tools/windowed_edit_rewrite/config.yaml
similarity index 100%
rename from tools/edit_rewrite/config.yaml
rename to tools/windowed_edit_rewrite/config.yaml
diff --git a/tools/edit_rewrite/install.sh b/tools/windowed_edit_rewrite/install.sh
similarity index 100%
rename from tools/edit_rewrite/install.sh
rename to tools/windowed_edit_rewrite/install.sh