mirror of
https://github.com/Significant-Gravitas/AutoGPT.git
synced 2026-01-09 07:08:09 -05:00
f107ff8cf0
- **FIX ALL LINT/TYPE ERRORS IN AUTOGPT, FORGE, AND BENCHMARK** ### Linting - Clean up linter configs for `autogpt`, `forge`, and `benchmark` - Add type checking with Pyright - Create unified pre-commit config - Create unified linting and type checking CI workflow ### Testing - Synchronize CI test setups for `autogpt`, `forge`, and `benchmark` - Add missing pytest-cov to benchmark dependencies - Mark GCS tests as slow to speed up pre-commit test runs - Repair `forge` test suite - Add `AgentDB.close()` method for test DB teardown in db_test.py - Use actual temporary dir instead of forge/test_workspace/ - Move left-behind dependencies for moved `forge`-code to from autogpt to forge ### Notable type changes - Replace uses of `ChatModelProvider` by `MultiProvider` - Removed unnecessary exports from various __init__.py - Simplify `FileStorage.open_file` signature by removing `IOBase` from return type union - Implement `S3BinaryIOWrapper(BinaryIO)` type interposer for `S3FileStorage` - Expand overloads of `GCSFileStorage.open_file` for improved typing of read and write modes Had to silence type checking for the extra overloads, because (I think) Pyright is reporting a false-positive: https://github.com/microsoft/pyright/issues/8007 - Change `count_tokens`, `get_tokenizer`, `count_message_tokens` methods on `ModelProvider`s from class methods to instance methods - Move `CompletionModelFunction.schema` method -> helper function `format_function_def_for_openai` in `forge.llm.providers.openai` - Rename `ModelProvider` -> `BaseModelProvider` - Rename `ChatModelProvider` -> `BaseChatModelProvider` - Add type `ChatModelProvider` which is a union of all subclasses of `BaseChatModelProvider` ### Removed rather than fixed - Remove deprecated and broken autogpt/agbenchmark_config/benchmarks.py - Various base classes and properties on base classes in `forge.llm.providers.schema` and `forge.models.providers` ### Fixes for other issues that came to light - Clean up `forge.agent_protocol.api_router`, `forge.agent_protocol.database`, and `forge.agent.agent` - Add fallback behavior to `ImageGeneratorComponent` - Remove test for deprecated failure behavior - Fix `agbenchmark.challenges.builtin` challenge exclusion mechanism on Windows - Fix `_tool_calls_compat_extract_calls` in `forge.llm.providers.openai` - Add support for `any` (= no type specified) in `JSONSchema.typescript_type`
107 lines
2.6 KiB
Python
107 lines
2.6 KiB
Python
from __future__ import annotations
|
|
|
|
import os
|
|
import uuid
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
from forge.config.ai_profile import AIProfile
|
|
from forge.config.config import Config, ConfigBuilder
|
|
from forge.file_storage.local import (
|
|
FileStorage,
|
|
FileStorageConfiguration,
|
|
LocalFileStorage,
|
|
)
|
|
from forge.llm.providers import MultiProvider
|
|
from forge.logging.config import configure_logging
|
|
|
|
from autogpt.agents.agent import Agent, AgentConfiguration, AgentSettings
|
|
from autogpt.app.main import _configure_llm_provider
|
|
|
|
pytest_plugins = [
|
|
"tests.integration.agent_factory",
|
|
"tests.vcr",
|
|
]
|
|
|
|
|
|
@pytest.fixture()
|
|
def tmp_project_root(tmp_path: Path) -> Path:
|
|
return tmp_path
|
|
|
|
|
|
@pytest.fixture()
|
|
def app_data_dir(tmp_project_root: Path) -> Path:
|
|
dir = tmp_project_root / "data"
|
|
dir.mkdir(parents=True, exist_ok=True)
|
|
return dir
|
|
|
|
|
|
@pytest.fixture()
|
|
def storage(app_data_dir: Path) -> FileStorage:
|
|
storage = LocalFileStorage(
|
|
FileStorageConfiguration(root=app_data_dir, restrict_to_root=False)
|
|
)
|
|
storage.initialize()
|
|
return storage
|
|
|
|
|
|
@pytest.fixture(scope="function")
|
|
def config(
|
|
tmp_project_root: Path,
|
|
app_data_dir: Path,
|
|
):
|
|
if not os.environ.get("OPENAI_API_KEY"):
|
|
os.environ["OPENAI_API_KEY"] = "sk-dummy"
|
|
config = ConfigBuilder.build_config_from_env(project_root=tmp_project_root)
|
|
|
|
config.app_data_dir = app_data_dir
|
|
|
|
config.noninteractive_mode = True
|
|
|
|
yield config
|
|
|
|
|
|
@pytest.fixture(scope="session")
|
|
def setup_logger(config: Config):
|
|
configure_logging(
|
|
debug=True,
|
|
log_dir=Path(__file__).parent / "logs",
|
|
plain_console_output=True,
|
|
)
|
|
|
|
|
|
@pytest.fixture
|
|
def llm_provider(config: Config) -> MultiProvider:
|
|
return _configure_llm_provider(config)
|
|
|
|
|
|
@pytest.fixture
|
|
def agent(config: Config, llm_provider: MultiProvider, storage: FileStorage) -> Agent:
|
|
ai_profile = AIProfile(
|
|
ai_name="Base",
|
|
ai_role="A base AI",
|
|
ai_goals=[],
|
|
)
|
|
|
|
agent_settings = AgentSettings(
|
|
name=Agent.default_settings.name,
|
|
description=Agent.default_settings.description,
|
|
agent_id=f"AutoGPT-test-agent-{str(uuid.uuid4())[:8]}",
|
|
ai_profile=ai_profile,
|
|
config=AgentConfiguration(
|
|
fast_llm=config.fast_llm,
|
|
smart_llm=config.smart_llm,
|
|
allow_fs_access=not config.restrict_to_workspace,
|
|
use_functions_api=config.openai_functions,
|
|
),
|
|
history=Agent.default_settings.history.copy(deep=True),
|
|
)
|
|
|
|
agent = Agent(
|
|
settings=agent_settings,
|
|
llm_provider=llm_provider,
|
|
file_storage=storage,
|
|
legacy_config=config,
|
|
)
|
|
return agent
|