mirror of
https://github.com/Significant-Gravitas/AutoGPT.git
synced 2026-01-09 15:17:59 -05:00
Moved from `autogpt` to `forge`:
- `autogpt.config` -> `forge.config`
- `autogpt.processing` -> `forge.content_processing`
- `autogpt.file_storage` -> `forge.file_storage`
- `autogpt.logs` -> `forge.logging`
- `autogpt.speech` -> `forge.speech`
- `autogpt.agents.(base|components|protocols)` -> `forge.agent.*`
- `autogpt.command_decorator` -> `forge.command.decorator`
- `autogpt.models.(command|command_parameter)` -> `forge.command.(command|parameter)`
- `autogpt.(commands|components|features)` -> `forge.components`
- `autogpt.core.utils.json_utils` -> `forge.json.parsing`
- `autogpt.prompts.utils` -> `forge.llm.prompting.utils`
- `autogpt.core.prompting.(base|schema|utils)` -> `forge.llm.prompting.*`
- `autogpt.core.resource.model_providers` -> `forge.llm.providers`
- `autogpt.llm.providers.openai` + `autogpt.core.resource.model_providers.utils`
-> `forge.llm.providers.utils`
- `autogpt.models.action_history:Action*` -> `forge.models.action`
- `autogpt.core.configuration.schema` -> `forge.models.config`
- `autogpt.core.utils.json_schema` -> `forge.models.json_schema`
- `autogpt.core.resource.schema` -> `forge.models.providers`
- `autogpt.models.utils` -> `forge.models.utils`
- `forge.sdk.(errors|utils)` + `autogpt.utils.(exceptions|file_operations_utils|validators)`
-> `forge.utils.(exceptions|file_operations|url_validator)`
- `autogpt.utils.utils` -> `forge.utils.const` + `forge.utils.yaml_validator`
Moved within `forge`:
- forge/prompts/* -> forge/llm/prompting/*
The rest are mostly import updates, and some sporadic removals and necessary updates (for example to fix circular deps):
- Changed `CommandOutput = Any` to remove coupling with `ContextItem` (no longer needed)
- Removed unused `Singleton` class
- Reluctantly moved `speech` to forge due to coupling (tts needs to be changed into component)
- Moved `function_specs_from_commands` and `core/resource/model_providers` to `llm/providers` (resources were a `core` thing and are no longer relevant)
- Keep tests in `autogpt` to reduce changes in this PR
- Removed unused memory-related code from tests
- Removed duplicated classes: `FancyConsoleFormatter`, `BelowLevelFilter`
- `prompt_settings.yaml` is in both `autogpt` and `forge` because for some reason doesn't work when placed in just one dir (need to be taken care of)
- Removed `config` param from `clean_input`, it wasn't used and caused circular dependency
- Renamed `BaseAgentActionProposal` to `ActionProposal`
- Updated `pyproject.toml` in `forge` and `autogpt`
- Moved `Action*` models from `forge/components/action_history/model.py` to `forge/models/action.py` as those are relevant to the entire agent and not just `EventHistoryComponent` + to reduce coupling
- Renamed `DEFAULT_ASK_COMMAND` to `ASK_COMMAND` and `DEFAULT_FINISH_COMMAND` to `FINISH_COMMAND`
- Renamed `AutoGptFormatter` to `ForgeFormatter` and moved to `forge`
Includes changes from PR https://github.com/Significant-Gravitas/AutoGPT/pull/7148
---------
Co-authored-by: Reinier van der Leer <pwuts@agpt.co>
168 lines
5.2 KiB
Python
168 lines
5.2 KiB
Python
import random
|
|
import string
|
|
import tempfile
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
from forge.components.code_executor import (
|
|
ALLOWLIST_CONTROL,
|
|
CodeExecutorComponent,
|
|
is_docker_available,
|
|
we_are_running_in_a_docker_container,
|
|
)
|
|
from forge.utils.exceptions import InvalidArgumentError, OperationNotAllowedError
|
|
|
|
from autogpt.agents.agent import Agent
|
|
|
|
|
|
@pytest.fixture
|
|
def code_executor_component(agent: Agent):
|
|
return agent.code_executor
|
|
|
|
|
|
@pytest.fixture
|
|
def random_code(random_string) -> str:
|
|
return f"print('Hello {random_string}!')"
|
|
|
|
|
|
@pytest.fixture
|
|
def python_test_file(agent: Agent, random_code: str):
|
|
temp_file = tempfile.NamedTemporaryFile(
|
|
dir=agent.file_manager.workspace.root, suffix=".py"
|
|
)
|
|
temp_file.write(str.encode(random_code))
|
|
temp_file.flush()
|
|
|
|
yield Path(temp_file.name)
|
|
temp_file.close()
|
|
|
|
|
|
@pytest.fixture
|
|
def python_test_args_file(agent: Agent):
|
|
temp_file = tempfile.NamedTemporaryFile(
|
|
dir=agent.file_manager.workspace.root, suffix=".py"
|
|
)
|
|
temp_file.write(str.encode("import sys\nprint(sys.argv[1], sys.argv[2])"))
|
|
temp_file.flush()
|
|
|
|
yield Path(temp_file.name)
|
|
temp_file.close()
|
|
|
|
|
|
@pytest.fixture
|
|
def random_string():
|
|
return "".join(random.choice(string.ascii_lowercase) for _ in range(10))
|
|
|
|
|
|
def test_execute_python_file(
|
|
code_executor_component: CodeExecutorComponent,
|
|
python_test_file: Path,
|
|
random_string: str,
|
|
agent: Agent,
|
|
):
|
|
if not (is_docker_available() or we_are_running_in_a_docker_container()):
|
|
pytest.skip("Docker is not available")
|
|
|
|
result: str = code_executor_component.execute_python_file(python_test_file)
|
|
assert result.replace("\r", "") == f"Hello {random_string}!\n"
|
|
|
|
|
|
def test_execute_python_file_args(
|
|
code_executor_component: CodeExecutorComponent,
|
|
python_test_args_file: Path,
|
|
random_string: str,
|
|
agent: Agent,
|
|
):
|
|
if not (is_docker_available() or we_are_running_in_a_docker_container()):
|
|
pytest.skip("Docker is not available")
|
|
|
|
random_args = [random_string] * 2
|
|
random_args_string = " ".join(random_args)
|
|
result = code_executor_component.execute_python_file(
|
|
python_test_args_file, args=random_args
|
|
)
|
|
assert result == f"{random_args_string}\n"
|
|
|
|
|
|
def test_execute_python_code(
|
|
code_executor_component: CodeExecutorComponent,
|
|
random_code: str,
|
|
random_string: str,
|
|
agent: Agent,
|
|
):
|
|
if not (is_docker_available() or we_are_running_in_a_docker_container()):
|
|
pytest.skip("Docker is not available")
|
|
|
|
result: str = code_executor_component.execute_python_code(random_code)
|
|
assert result.replace("\r", "") == f"Hello {random_string}!\n"
|
|
|
|
|
|
def test_execute_python_file_invalid(
|
|
code_executor_component: CodeExecutorComponent, agent: Agent
|
|
):
|
|
with pytest.raises(InvalidArgumentError):
|
|
code_executor_component.execute_python_file(Path("not_python.txt"))
|
|
|
|
|
|
def test_execute_python_file_not_found(
|
|
code_executor_component: CodeExecutorComponent, agent: Agent
|
|
):
|
|
with pytest.raises(
|
|
FileNotFoundError,
|
|
match=r"python: can't open file '([a-zA-Z]:)?[/\\\-\w]*notexist.py': "
|
|
r"\[Errno 2\] No such file or directory",
|
|
):
|
|
code_executor_component.execute_python_file(Path("notexist.py"))
|
|
|
|
|
|
def test_execute_shell(
|
|
code_executor_component: CodeExecutorComponent, random_string: str, agent: Agent
|
|
):
|
|
result = code_executor_component.execute_shell(f"echo 'Hello {random_string}!'")
|
|
assert f"Hello {random_string}!" in result
|
|
|
|
|
|
def test_execute_shell_local_commands_not_allowed(
|
|
code_executor_component: CodeExecutorComponent, random_string: str, agent: Agent
|
|
):
|
|
result = code_executor_component.execute_shell(f"echo 'Hello {random_string}!'")
|
|
assert f"Hello {random_string}!" in result
|
|
|
|
|
|
def test_execute_shell_denylist_should_deny(
|
|
code_executor_component: CodeExecutorComponent, agent: Agent, random_string: str
|
|
):
|
|
agent.legacy_config.shell_denylist = ["echo"]
|
|
|
|
with pytest.raises(OperationNotAllowedError, match="not allowed"):
|
|
code_executor_component.execute_shell(f"echo 'Hello {random_string}!'")
|
|
|
|
|
|
def test_execute_shell_denylist_should_allow(
|
|
code_executor_component: CodeExecutorComponent, agent: Agent, random_string: str
|
|
):
|
|
agent.legacy_config.shell_denylist = ["cat"]
|
|
|
|
result = code_executor_component.execute_shell(f"echo 'Hello {random_string}!'")
|
|
assert "Hello" in result and random_string in result
|
|
|
|
|
|
def test_execute_shell_allowlist_should_deny(
|
|
code_executor_component: CodeExecutorComponent, agent: Agent, random_string: str
|
|
):
|
|
agent.legacy_config.shell_command_control = ALLOWLIST_CONTROL
|
|
agent.legacy_config.shell_allowlist = ["cat"]
|
|
|
|
with pytest.raises(OperationNotAllowedError, match="not allowed"):
|
|
code_executor_component.execute_shell(f"echo 'Hello {random_string}!'")
|
|
|
|
|
|
def test_execute_shell_allowlist_should_allow(
|
|
code_executor_component: CodeExecutorComponent, agent: Agent, random_string: str
|
|
):
|
|
agent.legacy_config.shell_command_control = ALLOWLIST_CONTROL
|
|
agent.legacy_config.shell_allowlist = ["echo"]
|
|
|
|
result = code_executor_component.execute_shell(f"echo 'Hello {random_string}!'")
|
|
assert "Hello" in result and random_string in result
|