refactor(agent, forge): Move library code from autogpt to forge

autogpts/autogpt/.env.template

@@ -44,9 +44,6 @@ OPENAI_API_KEY=your-openai-api-key
 ## AI_SETTINGS_FILE - Specifies which AI Settings file to use, relative to the AutoGPT root directory. (defaults to ai_settings.yaml)
 # AI_SETTINGS_FILE=ai_settings.yaml
 
-## PLUGINS_CONFIG_FILE - The path to the plugins_config.yaml file, relative to the AutoGPT root directory. (Default plugins_config.yaml)
-# PLUGINS_CONFIG_FILE=plugins_config.yaml
-
 ## PROMPT_SETTINGS_FILE - Specifies which Prompt Settings file to use, relative to the AutoGPT root directory. (defaults to prompt_settings.yaml)
 # PROMPT_SETTINGS_FILE=prompt_settings.yaml
 

autogpts/autogpt/agbenchmark_config/benchmarks.py

@@ -5,7 +5,6 @@
 
 from autogpt.agent_manager.agent_manager import AgentManager
 from autogpt.agents.agent import Agent, AgentConfiguration, AgentSettings
-from autogpt.agents.prompt_strategies.one_shot import OneShotAgentPromptStrategy
 from autogpt.app.main import _configure_openai_provider, run_interaction_loop
 from autogpt.config import AIProfile, ConfigBuilder
 from autogpt.file_storage import FileStorageBackendName, get_storage
@@ -38,10 +37,6 @@ def bootstrap_agent(task: str, continuous_mode: bool) -> Agent:
         ai_goals=[task],
     )
 
-    agent_prompt_config = OneShotAgentPromptStrategy.default_configuration.copy(
-        deep=True
-    )
-    agent_prompt_config.use_functions_api = config.openai_functions
     agent_settings = AgentSettings(
         name=Agent.default_settings.name,
         agent_id=AgentManager.generate_id("AutoGPT-benchmark"),
@@ -52,9 +47,7 @@ def bootstrap_agent(task: str, continuous_mode: bool) -> Agent:
             smart_llm=config.smart_llm,
             allow_fs_access=not config.restrict_to_workspace,
             use_functions_api=config.openai_functions,
-            plugins=config.plugins,
         ),
-        prompt_config=agent_prompt_config,
         history=Agent.default_settings.history.copy(deep=True),
     )
 

autogpts/autogpt/autogpt/agent_factory/configurators.py

@@ -1,11 +1,10 @@
 from typing import Optional
 
+from forge.config import AIDirectives, AIProfile, Config
+from forge.file_storage.base import FileStorage
+
 from autogpt.agents.agent import Agent, AgentConfiguration, AgentSettings
-from autogpt.config import AIDirectives, AIProfile, Config
 from autogpt.core.resource.model_providers import ChatModelProvider
-from autogpt.file_storage.base import FileStorage
-from autogpt.logs.config import configure_chat_plugins
-from autogpt.plugins import scan_plugins
 
 
 def create_agent(
@@ -65,9 +64,6 @@ def _configure_agent(
             " must be specified"
         )
 
-    app_config.plugins = scan_plugins(app_config)
-    configure_chat_plugins(app_config)
-
     agent_state = state or create_agent_state(
         agent_id=agent_id,
         task=task,
@@ -105,7 +101,6 @@ def create_agent_state(
             smart_llm=app_config.smart_llm,
             allow_fs_access=not app_config.restrict_to_workspace,
             use_functions_api=app_config.openai_functions,
-            plugins=app_config.plugins,
         ),
         history=Agent.default_settings.history.copy(deep=True),
     )

autogpts/autogpt/autogpt/agent_factory/generators.py

@@ -2,17 +2,17 @@
 
 from typing import TYPE_CHECKING
 
-from autogpt.config.ai_directives import AIDirectives
-from autogpt.file_storage.base import FileStorage
-
-from .configurators import _configure_agent
-from .profile_generator import generate_agent_profile_for_task
+from forge.config import AIDirectives
+from forge.file_storage.base import FileStorage
 
 if TYPE_CHECKING:
     from autogpt.agents.agent import Agent
     from autogpt.config import Config
     from autogpt.core.resource.model_providers.schema import ChatModelProvider
 
+from .configurators import _configure_agent
+from .profile_generator import generate_agent_profile_for_task
+
 
 async def generate_agent_for_task(
     agent_id: str,

autogpts/autogpt/autogpt/agent_factory/profile_generator.py

@@ -1,8 +1,10 @@
 import json
 import logging
 
-from autogpt.config import AIDirectives, AIProfile, Config
-from autogpt.core.configuration import SystemConfiguration, UserConfigurable
+from forge.config import AIDirectives, AIProfile, Config
+from forge.config.schema import SystemConfiguration, UserConfigurable
+from forge.json.schema import JSONSchema
+
 from autogpt.core.prompting import (
     ChatPrompt,
     LanguageModelClassification,
@@ -14,7 +16,6 @@
     ChatModelProvider,
     CompletionModelFunction,
 )
-from autogpt.core.utils.json_schema import JSONSchema
 
 logger = logging.getLogger(__name__)
 

autogpts/autogpt/autogpt/agent_manager/agent_manager.py

@@ -3,8 +3,9 @@
 import uuid
 from pathlib import Path
 
+from forge.file_storage.base import FileStorage
+
 from autogpt.agents.agent import AgentSettings
-from autogpt.file_storage.base import FileStorage
 
 
 class AgentManager:

autogpts/autogpt/autogpt/agents/__init__.py

@@ -1,4 +0,0 @@
-from .agent import Agent
-from .base import AgentThoughts, BaseAgent, CommandArgs, CommandName
-
-__all__ = ["BaseAgent", "Agent", "CommandName", "CommandArgs", "AgentThoughts"]

autogpts/autogpt/autogpt/agents/agent.py

@@ -6,26 +6,50 @@
 from typing import TYPE_CHECKING, Optional
 
 import sentry_sdk
+from forge.agent.protocols import (
+    AfterExecute,
+    AfterParse,
+    CommandProvider,
+    DirectiveProvider,
+    MessageProvider,
+)
+from forge.command.command import Command, CommandOutput
+from forge.components.code_executor.code_executor import CodeExecutorComponent
+from forge.components.context.context import ContextComponent
+from forge.components.event_history.action_history import (
+    ActionErrorResult,
+    ActionInterruptedByHuman,
+    ActionResult,
+    ActionSuccessResult,
+)
+from forge.components.event_history.event_history import EventHistoryComponent
+from forge.components.file_manager.file_manager import FileManagerComponent
+from forge.components.git_operations.git_operations import GitOperationsComponent
+from forge.components.image_gen.image_gen import ImageGeneratorComponent
+from forge.components.system.system import SystemComponent
+from forge.components.user_interaction.user_interaction import UserInteractionComponent
+from forge.components.watchdog.watchdog import WatchdogComponent
+from forge.components.web_search.web_search import WebSearchComponent
+from forge.components.web_selenium.web_selenium import WebSeleniumComponent
+from forge.config.schema import Configurable
+from forge.file_storage.base import FileStorage
+from forge.utils.exceptions import (
+    AgentException,
+    AgentTerminated,
+    CommandExecutionError,
+    InvalidArgumentError,
+    UnknownCommandError,
+)
 from pydantic import Field
 
 from autogpt.agents.prompt_strategies.one_shot import OneShotAgentPromptStrategy
-from autogpt.commands.execute_code import CodeExecutorComponent
-from autogpt.commands.git_operations import GitOperationsComponent
-from autogpt.commands.image_gen import ImageGeneratorComponent
-from autogpt.commands.system import SystemComponent
-from autogpt.commands.user_interaction import UserInteractionComponent
-from autogpt.commands.web_search import WebSearchComponent
-from autogpt.commands.web_selenium import WebSeleniumComponent
-from autogpt.components.event_history import EventHistoryComponent
-from autogpt.core.configuration import Configurable
 from autogpt.core.prompting import ChatPrompt
 from autogpt.core.resource.model_providers import ChatMessage, ChatModelProvider
 from autogpt.core.resource.model_providers.schema import (
     AssistantChatMessage,
     ChatModelResponse,
 )
 from autogpt.core.runner.client_lib.logging.helpers import dump_prompt
-from autogpt.file_storage.base import FileStorage
 from autogpt.llm.providers.openai import get_openai_command_specs
 from autogpt.logs.log_cycle import (
     CURRENT_CONTEXT_FILE_NAME,
@@ -34,37 +58,13 @@
     LogCycleHandler,
 )
 from autogpt.logs.utils import fmt_kwargs
-from autogpt.models.action_history import (
-    ActionErrorResult,
-    ActionInterruptedByHuman,
-    ActionResult,
-    ActionSuccessResult,
-)
-from autogpt.models.command import Command, CommandOutput
-from autogpt.utils.exceptions import (
-    AgentException,
-    AgentTerminated,
-    CommandExecutionError,
-    InvalidArgumentError,
-    UnknownCommandError,
-)
 
 from .base import (
     BaseAgent,
     BaseAgentConfiguration,
     BaseAgentSettings,
     ThoughtProcessOutput,
 )
-from .features.agent_file_manager import FileManagerComponent
-from .features.context import ContextComponent
-from .features.watchdog import WatchdogComponent
-from .protocols import (
-    AfterExecute,
-    AfterParse,
-    CommandProvider,
-    DirectiveProvider,
-    MessageProvider,
-)
 
 if TYPE_CHECKING:
     from autogpt.config import Config

autogpts/autogpt/autogpt/agents/base.py

@@ -15,36 +15,37 @@
     overload,
 )
 
-from auto_gpt_plugin_template import AutoGPTPluginTemplate
 from colorama import Fore
-from pydantic import BaseModel, Field, validator
-
-if TYPE_CHECKING:
-    from autogpt.core.resource.model_providers.schema import (
-        ChatModelInfo,
-    )
-
-from autogpt.agents import protocols as _protocols
-from autogpt.agents.components import (
+from forge.agent import protocols as _protocols
+from forge.agent.components import (
     AgentComponent,
     ComponentEndpointError,
     EndpointPipelineError,
 )
-from autogpt.config import ConfigBuilder
-from autogpt.config.ai_directives import AIDirectives
-from autogpt.config.ai_profile import AIProfile
-from autogpt.core.configuration import (
+from forge.components.event_history.action_history import (
+    ActionResult,
+    EpisodicActionHistory,
+)
+from forge.config import AIDirectives, AIProfile
+from forge.config.schema import (
     Configurable,
     SystemConfiguration,
     SystemSettings,
     UserConfigurable,
 )
+from forge.prompts.prompt import DEFAULT_TRIGGERING_PROMPT
+from pydantic import BaseModel, Field, validator
+
+if TYPE_CHECKING:
+    from autogpt.core.resource.model_providers.schema import (
+        ChatModelInfo,
+    )
+
+from autogpt.config import ConfigBuilder
 from autogpt.core.resource.model_providers.openai import (
     OPEN_AI_CHAT_MODELS,
     OpenAIModelName,
 )
-from autogpt.models.action_history import ActionResult, EpisodicActionHistory
-from autogpt.prompts.prompt import DEFAULT_TRIGGERING_PROMPT
 
 logger = logging.getLogger(__name__)
 
@@ -96,21 +97,6 @@ class BaseAgentConfiguration(SystemConfiguration):
     summary_max_tlength: Optional[int] = None
     # TODO: move to ActionHistoryConfiguration
 
-    plugins: list[AutoGPTPluginTemplate] = Field(default_factory=list, exclude=True)
-
-    class Config:
-        arbitrary_types_allowed = True  # Necessary for plugins
-
-    @validator("plugins", each_item=True)
-    def validate_plugins(cls, p: AutoGPTPluginTemplate | Any):
-        assert issubclass(
-            p.__class__, AutoGPTPluginTemplate
-        ), f"{p} does not subclass AutoGPTPluginTemplate"
-        assert (
-            p.__class__.__name__ != "AutoGPTPluginTemplate"
-        ), f"Plugins must subclass AutoGPTPluginTemplate; {p} is a template instance"
-        return p
-
     @validator("use_functions_api")
     def validate_openai_functions(cls, v: bool, values: dict[str, Any]):
         if v:

autogpts/autogpt/autogpt/agents/prompt_strategies/one_shot.py

@@ -6,10 +6,13 @@
 from logging import Logger
 
 import distro
+from autogpts.autogpt.autogpt.agents.base import ThoughtProcessOutput
+from forge.config.schema import SystemConfiguration, UserConfigurable
+from forge.json.parsing import extract_dict_from_json
+from forge.json.schema import JSONSchema
+from forge.prompts.utils import format_numbered_list
+from forge.utils.exceptions import InvalidAgentResponseError
 
-from autogpt.agents.base import ThoughtProcessOutput
-from autogpt.config import AIDirectives, AIProfile
-from autogpt.core.configuration.schema import SystemConfiguration, UserConfigurable
 from autogpt.core.prompting import (
     ChatPrompt,
     LanguageModelClassification,
@@ -20,10 +23,6 @@
     ChatMessage,
     CompletionModelFunction,
 )
-from autogpt.core.utils.json_schema import JSONSchema
-from autogpt.core.utils.json_utils import extract_dict_from_json
-from autogpt.prompts.utils import format_numbered_list
-from autogpt.utils.exceptions import InvalidAgentResponseError
 
 
 class OneShotAgentPromptConfiguration(SystemConfiguration):

autogpts/autogpt/autogpt/app/agent_protocol_server.py

@@ -10,8 +10,13 @@
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import RedirectResponse, StreamingResponse
 from fastapi.staticfiles import StaticFiles
-from forge.sdk.db import AgentDB
-from forge.sdk.errors import NotFoundError
+from forge.agent.agent_protocol import base_router
+from forge.components.event_history.action_history import (
+    ActionErrorResult,
+    ActionSuccessResult,
+)
+from forge.database.agent_db import AgentDB
+from forge.file_storage import FileStorage
 from forge.sdk.middlewares import AgentMiddleware
 from forge.sdk.model import (
     Artifact,
@@ -23,7 +28,8 @@
     TaskRequestBody,
     TaskStepsListResponse,
 )
-from forge.sdk.routes.agent_protocol import base_router
+from forge.utils.const import DEFAULT_ASK_COMMAND, DEFAULT_FINISH_COMMAND
+from forge.utils.exceptions import AgentFinished, NotFoundError
 from hypercorn.asyncio import serve as hypercorn_serve
 from hypercorn.config import Config as HypercornConfig
 from sentry_sdk import set_user
@@ -36,11 +42,7 @@
 from autogpt.core.resource.model_providers import ChatModelProvider
 from autogpt.core.resource.model_providers.openai import OpenAIProvider
 from autogpt.core.resource.model_providers.schema import ModelProviderBudget
-from autogpt.file_storage import FileStorage
 from autogpt.logs.utils import fmt_kwargs
-from autogpt.models.action_history import ActionErrorResult, ActionSuccessResult
-from autogpt.utils.exceptions import AgentFinished
-from autogpt.utils.utils import DEFAULT_ASK_COMMAND, DEFAULT_FINISH_COMMAND
 
 logger = logging.getLogger(__name__)