mirror of
https://github.com/Significant-Gravitas/AutoGPT.git
synced 2026-01-09 15:17:59 -05:00
e8d7dfa386
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>
60 lines
1.6 KiB
Python
60 lines
1.6 KiB
Python
import pytest
|
|
from forge.components.git_operations import GitOperationsComponent
|
|
from forge.file_storage.base import FileStorage
|
|
from forge.utils.exceptions import CommandExecutionError
|
|
from git.exc import GitCommandError
|
|
from git.repo.base import Repo
|
|
|
|
from autogpt.agents.agent import Agent
|
|
|
|
|
|
@pytest.fixture
|
|
def mock_clone_from(mocker):
|
|
return mocker.patch.object(Repo, "clone_from")
|
|
|
|
|
|
@pytest.fixture
|
|
def git_ops_component(agent: Agent):
|
|
return agent.git_ops
|
|
|
|
|
|
def test_clone_auto_gpt_repository(
|
|
git_ops_component: GitOperationsComponent,
|
|
storage: FileStorage,
|
|
mock_clone_from,
|
|
agent: Agent,
|
|
):
|
|
mock_clone_from.return_value = None
|
|
|
|
repo = "github.com/Significant-Gravitas/Auto-GPT.git"
|
|
scheme = "https://"
|
|
url = scheme + repo
|
|
clone_path = storage.get_path("auto-gpt-repo")
|
|
|
|
expected_output = f"Cloned {url} to {clone_path}"
|
|
|
|
clone_result = git_ops_component.clone_repository(url, clone_path)
|
|
|
|
assert clone_result == expected_output
|
|
mock_clone_from.assert_called_once_with(
|
|
url=f"{scheme}{agent.legacy_config.github_username}:{agent.legacy_config.github_api_key}@{repo}", # noqa: E501
|
|
to_path=clone_path,
|
|
)
|
|
|
|
|
|
def test_clone_repository_error(
|
|
git_ops_component: GitOperationsComponent,
|
|
storage: FileStorage,
|
|
mock_clone_from,
|
|
agent: Agent,
|
|
):
|
|
url = "https://github.com/this-repository/does-not-exist.git"
|
|
clone_path = storage.get_path("does-not-exist")
|
|
|
|
mock_clone_from.side_effect = GitCommandError(
|
|
"clone", "fatal: repository not found", ""
|
|
)
|
|
|
|
with pytest.raises(CommandExecutionError):
|
|
git_ops_component.clone_repository(url, clone_path)
|