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

autogpts/autogpt/autogpt/agent_factory/profile_generator.py

@@ -4,15 +4,15 @@
 from forge.config.ai_directives import AIDirectives
 from forge.config.ai_profile import AIProfile
 from forge.config.config import Config
-from forge.config.schema import SystemConfiguration, UserConfigurable
-from forge.json.schema import JSONSchema
+from forge.json.model import JSONSchema
+from forge.llm.prompting import ChatPrompt, LanguageModelClassification, PromptStrategy
 from forge.llm.providers.schema import (
  AssistantChatMessage,
  ChatMessage,
  ChatModelProvider,
  CompletionModelFunction,
 )
-from forge.prompts import ChatPrompt, LanguageModelClassification, PromptStrategy
+from forge.models.config import SystemConfiguration, UserConfigurable
 
 logger = logging.getLogger(__name__)
 

autogpts/autogpt/autogpt/agents/agent.py

@@ -15,40 +15,35 @@
  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,
- EpisodicActionHistory,
+from forge.components.action_history.event_history_component import (
+ EventHistoryComponent,
 )
-from forge.components.event_history.event_history import EventHistoryComponent
+from forge.components.action_history.model import EpisodicActionHistory
+from forge.components.code_executor.code_executor import CodeExecutorComponent
+from forge.components.context.context import AgentContext, ContextComponent
 from forge.components.file_manager import FileManagerComponent
 from forge.components.git_operations import GitOperationsComponent
 from forge.components.image_gen import ImageGeneratorComponent
 from forge.components.system import SystemComponent
 from forge.components.user_interaction import UserInteractionComponent
 from forge.components.watchdog import WatchdogComponent
-from forge.components.web_search import WebSearchComponent
-from forge.components.web_selenium import WebSeleniumComponent
-from forge.config.schema import Configurable
+from forge.components.web_search import WebSearchComponent, WebSeleniumComponent
 from forge.file_storage.base import FileStorage
+from forge.llm.prompting.schema import ChatPrompt
 from forge.llm.providers import (
  AssistantFunctionCall,
  ChatMessage,
  ChatModelProvider,
  ChatModelResponse,
 )
 from forge.llm.providers.utils import function_specs_from_commands
-from forge.logging.log_cycle import (
- CURRENT_CONTEXT_FILE_NAME,
- NEXT_ACTION_FILE_NAME,
- USER_INPUT_FILE_NAME,
- LogCycleHandler,
+from forge.models.action import (
+ ActionErrorResult,
+ ActionInterruptedByHuman,
+ ActionResult,
+ ActionSuccessResult,
 )
-from forge.prompts import ChatPrompt
+from forge.models.config import Configurable
 from forge.utils.exceptions import (
  AgentException,
  AgentTerminated,
@@ -57,11 +52,18 @@
 )
 from pydantic import Field
 
-from autogpt.agents.prompt_strategies.one_shot import (
+from autogpt.app.log_cycle import (
+ CURRENT_CONTEXT_FILE_NAME,
+ NEXT_ACTION_FILE_NAME,
+ USER_INPUT_FILE_NAME,
+ LogCycleHandler,
+)
+from autogpt.core.runner.client_lib.logging.helpers import dump_prompt
+
+from .prompt_strategies.one_shot import (
  OneShotAgentActionProposal,
  OneShotAgentPromptStrategy,
 )
-from autogpt.core.runner.client_lib.logging.helpers import dump_prompt
 
 if TYPE_CHECKING:
  from forge.config.config import Config
@@ -119,7 +121,7 @@ def __init__(
  lambda x: self.llm_provider.count_tokens(x, self.llm.name),
  legacy_config,
  llm_provider,
- )
+ ).run_after(WatchdogComponent)
  self.user_interaction = UserInteractionComponent(legacy_config)
  self.file_manager = FileManagerComponent(settings, file_storage)
  self.code_executor = CodeExecutorComponent(
@@ -134,7 +136,9 @@ def __init__(
  self.web_search = WebSearchComponent(legacy_config)
  self.web_selenium = WebSeleniumComponent(legacy_config, llm_provider, self.llm)
  self.context = ContextComponent(self.file_manager.workspace, settings.context)
- self.watchdog = WatchdogComponent(settings.config, settings.history)
+ self.watchdog = WatchdogComponent(settings.config, settings.history).run_after(
+ ContextComponent
+ )
 
  self.created_at = datetime.now().strftime("%Y%m%d_%H%M%S")
  """Timestamp the agent was created; only used for structured debug logging."""

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

@@ -6,20 +6,20 @@
 from logging import Logger
 
 import distro
-from forge.agent.base import ActionProposal
 from forge.config.ai_directives import AIDirectives
 from forge.config.ai_profile import AIProfile
-from forge.config.schema import SystemConfiguration, UserConfigurable
+from forge.json.model import JSONSchema
 from forge.json.parsing import extract_dict_from_json
-from forge.json.schema import JSONSchema
+from forge.llm.prompting import ChatPrompt, LanguageModelClassification, PromptStrategy
+from forge.llm.prompting.utils import format_numbered_list
 from forge.llm.providers.schema import (
  AssistantChatMessage,
  ChatMessage,
  CompletionModelFunction,
 )
+from forge.models.action import ActionProposal
+from forge.models.config import SystemConfiguration, UserConfigurable
 from forge.models.utils import ModelWithSummary
-from forge.prompts import ChatPrompt, LanguageModelClassification, PromptStrategy
-from forge.prompts.utils import format_numbered_list
 from forge.utils.exceptions import InvalidAgentResponseError
 from pydantic import Field
 

autogpts/autogpt/autogpt/app/agent_protocol_server.py

@@ -10,10 +10,10 @@
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import RedirectResponse, StreamingResponse
 from fastapi.staticfiles import StaticFiles
-from forge.components.event_history import ActionErrorResult, ActionSuccessResult
 from forge.config.config import Config
 from forge.file_storage import FileStorage
 from forge.llm.providers import ChatModelProvider, ModelProviderBudget
+from forge.models.action import ActionErrorResult, ActionSuccessResult
 from forge.sdk.db import AgentDB
 from forge.sdk.middlewares import AgentMiddleware
 from forge.sdk.model import (
@@ -27,7 +27,7 @@
  TaskStepsListResponse,
 )
 from forge.sdk.routes.agent_protocol import base_router
-from forge.utils.const import DEFAULT_ASK_COMMAND, DEFAULT_FINISH_COMMAND
+from forge.utils.const import ASK_COMMAND, FINISH_COMMAND
 from forge.utils.exceptions import AgentFinished, NotFoundError
 from hypercorn.asyncio import serve as hypercorn_serve
 from hypercorn.config import Config as HypercornConfig
@@ -225,7 +225,7 @@ async def execute_step(self, task_id: str, step_request: StepRequestBody) -> Ste
  input=step_request,
  is_last=(
  last_proposal is not None
- and last_proposal.use_tool.name == DEFAULT_FINISH_COMMAND
+ and last_proposal.use_tool.name == FINISH_COMMAND
  and execute_approved
  ),
  )
@@ -239,7 +239,7 @@ async def execute_step(self, task_id: str, step_request: StepRequestBody) -> Ste
  )
  )
 
- if last_proposal.use_tool.name == DEFAULT_ASK_COMMAND:
+ if last_proposal.use_tool.name == ASK_COMMAND:
  tool_result = ActionSuccessResult(outputs=user_input)
  agent.event_history.register_result(tool_result)
  elif execute_approved:
@@ -295,13 +295,13 @@ async def execute_step(self, task_id: str, step_request: StepRequestBody) -> Ste
  + ("\n\n" if "\n" in str(tool_result) else " ")
  + f"{tool_result}\n\n"
  )
- if last_proposal and last_proposal.use_tool.name != DEFAULT_ASK_COMMAND
+ if last_proposal and last_proposal.use_tool.name != ASK_COMMAND
  else ""
  )
  output += f"{assistant_response.thoughts.speak}\n\n"
  output += (
  f"Next Command: {next_tool_to_use}"
- if next_tool_to_use.name != DEFAULT_ASK_COMMAND
+ if next_tool_to_use.name != ASK_COMMAND
  else next_tool_to_use.arguments["question"]
  )
 

autogpts/forge/forge/logging/log_cycle.py → autogpts/autogpt/autogpt/app/log_cycle.py

@@ -3,7 +3,7 @@
 from pathlib import Path
 from typing import Any, Dict, Union
 
-from .config import LOG_DIR
+from forge.logging.config import LOG_DIR
 
 DEFAULT_PREFIX = "agent"
 CURRENT_CONTEXT_FILE_NAME = "current_context.json"

autogpts/autogpt/autogpt/app/main.py

@@ -18,7 +18,6 @@
  is_docker_available,
  we_are_running_in_a_docker_container,
 )
-from forge.components.event_history import ActionInterruptedByHuman
 from forge.config.ai_directives import AIDirectives
 from forge.config.ai_profile import AIProfile
 from forge.config.config import Config, ConfigBuilder, assert_config_has_openai_api_key
@@ -27,10 +26,10 @@
 from forge.llm.providers import MultiProvider
 from forge.logging.config import configure_logging
 from forge.logging.helpers import print_attribute, speak
+from forge.models.action import ActionInterruptedByHuman, ActionProposal
 from forge.models.utils import ModelWithSummary
-from forge.utils.const import DEFAULT_FINISH_COMMAND
+from forge.utils.const import FINISH_COMMAND
 from forge.utils.exceptions import AgentTerminated, InvalidAgentResponseError
-from forge.utils.input import clean_input
 
 from autogpt.agent_factory.configurators import configure_agent_with_state, create_agent
 from autogpt.agent_factory.profile_generator import generate_agent_profile_for_task
@@ -40,9 +39,9 @@
 
 if TYPE_CHECKING:
  from autogpt.agents.agent import Agent
- from forge.agent.base import ActionProposal
 
 from .configurator import apply_overrides_to_config
+from .input import clean_input
 from .setup import apply_overrides_to_ai_settings, interactively_revise_ai_settings
 from .spinner import Spinner
 from .utils import (
@@ -225,7 +224,7 @@ async def run_auto_gpt(
 
  if (
  (current_episode := agent.event_history.current_episode)
- and current_episode.action.use_tool.name == DEFAULT_FINISH_COMMAND
+ and current_episode.action.use_tool.name == FINISH_COMMAND
  and not current_episode.result
  ):
  # Agent was resumed after `finish` -> rewrite result of `finish` action

autogpts/autogpt/autogpt/app/setup.py

@@ -6,7 +6,8 @@
 from forge.config.ai_profile import AIProfile
 from forge.config.config import Config
 from forge.logging.helpers import print_attribute
-from forge.utils.input import clean_input
+
+from .input import clean_input
 
 logger = logging.getLogger(__name__)
 

autogpts/autogpt/autogpt/core/ability/base.py

@@ -3,9 +3,9 @@
 from typing import Any, ClassVar
 
 import inflection
-from forge.config.schema import SystemConfiguration
-from forge.json.schema import JSONSchema
+from forge.json.model import JSONSchema
 from forge.llm.providers import CompletionModelFunction
+from forge.models.config import SystemConfiguration
 from pydantic import Field
 
 from autogpt.core.planning.simple import LanguageModelConfiguration

autogpts/autogpt/autogpt/core/ability/builtins/create_new_ability.py

@@ -1,7 +1,7 @@
 import logging
 from typing import ClassVar
 
-from forge.json.schema import JSONSchema
+from forge.json.model import JSONSchema
 
 from autogpt.core.ability.base import Ability, AbilityConfiguration
 from autogpt.core.ability.schema import AbilityResult

autogpts/autogpt/autogpt/core/ability/builtins/file_operations.py

@@ -2,7 +2,7 @@
 import os
 from typing import ClassVar
 
-from forge.json.schema import JSONSchema
+from forge.json.model import JSONSchema
 
 from autogpt.core.ability.base import Ability, AbilityConfiguration
 from autogpt.core.ability.schema import AbilityResult, ContentType, Knowledge

autogpts/autogpt/autogpt/core/ability/builtins/query_language_model.py

@@ -1,7 +1,7 @@
 import logging
 from typing import ClassVar
 
-from forge.json.schema import JSONSchema
+from forge.json.model import JSONSchema
 from forge.llm.providers import (
  ChatMessage,
  ChatModelProvider,

autogpts/autogpt/autogpt/core/ability/simple.py

@@ -1,11 +1,11 @@
 import logging
 
-from forge.config.schema import Configurable, SystemConfiguration, SystemSettings
 from forge.llm.providers import (
  ChatModelProvider,
  CompletionModelFunction,
  ModelProviderName,
 )
+from forge.models.config import Configurable, SystemConfiguration, SystemSettings
 
 from autogpt.core.ability.base import Ability, AbilityConfiguration, AbilityRegistry
 from autogpt.core.ability.builtins import BUILTIN_ABILITIES

autogpts/autogpt/autogpt/core/agent/simple.py

@@ -3,8 +3,8 @@
 from pathlib import Path
 from typing import Any
 
-from forge.config.schema import Configurable, SystemConfiguration, SystemSettings
 from forge.llm.providers import CompletionModelFunction, OpenAIProvider, OpenAISettings
+from forge.models.config import Configurable, SystemConfiguration, SystemSettings
 from pydantic import BaseModel
 
 from autogpt.core.ability import (

autogpts/autogpt/autogpt/core/memory/simple.py

@@ -1,7 +1,7 @@
 import json
 import logging
 
-from forge.config.schema import Configurable, SystemConfiguration, SystemSettings
+from forge.models.config import Configurable, SystemConfiguration, SystemSettings
 
 from autogpt.core.memory.base import Memory
 from autogpt.core.workspace import Workspace

autogpts/autogpt/autogpt/core/planning/prompt_strategies/initial_plan.py

@@ -1,15 +1,14 @@
 import logging
 
-from forge.config.schema import SystemConfiguration, UserConfigurable
-from forge.json.schema import JSONSchema
+from forge.json.model import JSONSchema
+from forge.llm.prompting import ChatPrompt, LanguageModelClassification, PromptStrategy
+from forge.llm.prompting.utils import to_numbered_list
 from forge.llm.providers import (
  AssistantChatMessage,
  ChatMessage,
  CompletionModelFunction,
 )
-from forge.prompts import PromptStrategy
-from forge.prompts.schema import ChatPrompt, LanguageModelClassification
-from forge.prompts.utils import to_numbered_list
+from forge.models.config import SystemConfiguration, UserConfigurable
 
 from autogpt.core.planning.schema import Task, TaskType
 

autogpts/autogpt/autogpt/core/planning/prompt_strategies/name_and_goals.py

@@ -1,14 +1,13 @@
 import logging
 
-from forge.config.schema import SystemConfiguration, UserConfigurable
-from forge.json.schema import JSONSchema
+from forge.json.model import JSONSchema
+from forge.llm.prompting import ChatPrompt, LanguageModelClassification, PromptStrategy
 from forge.llm.providers import (
  AssistantChatMessage,
  ChatMessage,
  CompletionModelFunction,
 )
-from forge.prompts import PromptStrategy
-from forge.prompts.schema import ChatPrompt, LanguageModelClassification
+from forge.models.config import SystemConfiguration, UserConfigurable
 
 logger = logging.getLogger(__name__)
 

autogpts/autogpt/autogpt/core/planning/prompt_strategies/next_ability.py

@@ -1,15 +1,14 @@
 import logging
 
-from forge.config.schema import SystemConfiguration, UserConfigurable
-from forge.json.schema import JSONSchema
+from forge.json.model import JSONSchema
+from forge.llm.prompting import ChatPrompt, LanguageModelClassification, PromptStrategy
+from forge.llm.prompting.utils import to_numbered_list
 from forge.llm.providers import (
  AssistantChatMessage,
  ChatMessage,
  CompletionModelFunction,
 )
-from forge.prompts import PromptStrategy
-from forge.prompts.schema import ChatPrompt, LanguageModelClassification
-from forge.prompts.utils import to_numbered_list
+from forge.models.config import SystemConfiguration, UserConfigurable
 
 from autogpt.core.planning.schema import Task