diff --git a/forge/autogpt/__main__.py b/forge/autogpt/__main__.py deleted file mode 100644 index 1f4b741e..00000000 --- a/forge/autogpt/__main__.py +++ /dev/null @@ -1,28 +0,0 @@ -import os - -from dotenv import load_dotenv - -load_dotenv() -import autogpt.sdk.forge_log - -autogpt.sdk.forge_log.setup_logger() - - -LOG = autogpt.sdk.forge_log.ForgeLogger(__name__) - -if __name__ == "__main__": - """Runs the agent server""" - - # modules are imported here so that logging is setup first - import autogpt.agent - import autogpt.sdk.db - from autogpt.sdk.workspace import LocalWorkspace - - database_name = os.getenv("DATABASE_STRING") - workspace = LocalWorkspace(os.getenv("AGENT_WORKSPACE")) - port = os.getenv("PORT") - - database = autogpt.sdk.db.AgentDB(database_name, debug_enabled=True) - agent = autogpt.agent.AutoGPTAgent(database=database, workspace=workspace) - - agent.start(port=port) diff --git a/forge/autogpt/__init__.py b/forge/forge/__init__.py similarity index 100% rename from forge/autogpt/__init__.py rename to forge/forge/__init__.py diff --git a/forge/forge/__main__.py b/forge/forge/__main__.py new file mode 100644 index 00000000..c4dc999a --- /dev/null +++ b/forge/forge/__main__.py @@ -0,0 +1,28 @@ +import os + +from dotenv import load_dotenv + +load_dotenv() +import forge.sdk.forge_log + +forge.sdk.forge_log.setup_logger() + + +LOG = forge.sdk.forge_log.ForgeLogger(__name__) + +if __name__ == "__main__": + """Runs the agent server""" + + # modules are imported here so that logging is setup first + import forge.agent + import forge.sdk.db + from forge.sdk.workspace import LocalWorkspace + + database_name = os.getenv("DATABASE_STRING") + workspace = LocalWorkspace(os.getenv("AGENT_WORKSPACE")) + port = os.getenv("PORT") + + database = forge.sdk.db.AgentDB(database_name, debug_enabled=True) + agent = forge.agent.forgeAgent(database=database, workspace=workspace) + + agent.start(port=port) diff --git a/forge/autogpt/agent.py b/forge/forge/agent.py similarity index 98% rename from forge/autogpt/agent.py rename to forge/forge/agent.py index 2b5a1424..ae68edf6 100644 --- a/forge/autogpt/agent.py +++ b/forge/forge/agent.py @@ -1,4 +1,4 @@ -from autogpt.sdk import Agent, AgentDB, Step, StepRequestBody, Workspace +from forge.sdk import Agent, AgentDB, Step, StepRequestBody, Workspace class AutoGPTAgent(Agent): diff --git a/forge/autogpt/benchmark_integration.py b/forge/forge/benchmark_integration.py similarity index 93% rename from forge/autogpt/benchmark_integration.py rename to forge/forge/benchmark_integration.py index d59bacdf..b4cc729f 100644 --- a/forge/autogpt/benchmark_integration.py +++ b/forge/forge/benchmark_integration.py @@ -5,7 +5,7 @@ from fastapi import ( ) from fastapi.responses import FileResponse -from autogpt.sdk.routes.agent_protocol import base_router +from forge.sdk.routes.agent_protocol import base_router def add_benchmark_routes(): diff --git a/forge/autogpt/prompts/gpt-3.5-turbo/role_selection.j2 b/forge/forge/prompts/gpt-3.5-turbo/role_selection.j2 similarity index 100% rename from forge/autogpt/prompts/gpt-3.5-turbo/role_selection.j2 rename to forge/forge/prompts/gpt-3.5-turbo/role_selection.j2 diff --git a/forge/autogpt/prompts/techniques/chain-of-thought.j2 b/forge/forge/prompts/techniques/chain-of-thought.j2 similarity index 100% rename from forge/autogpt/prompts/techniques/chain-of-thought.j2 rename to forge/forge/prompts/techniques/chain-of-thought.j2 diff --git a/forge/autogpt/prompts/techniques/expert.j2 b/forge/forge/prompts/techniques/expert.j2 similarity index 100% rename from forge/autogpt/prompts/techniques/expert.j2 rename to forge/forge/prompts/techniques/expert.j2 diff --git a/forge/autogpt/prompts/techniques/few-shot.j2 b/forge/forge/prompts/techniques/few-shot.j2 similarity index 100% rename from forge/autogpt/prompts/techniques/few-shot.j2 rename to forge/forge/prompts/techniques/few-shot.j2 diff --git a/forge/autogpt/sdk/__init__.py b/forge/forge/sdk/__init__.py similarity index 100% rename from forge/autogpt/sdk/__init__.py rename to forge/forge/sdk/__init__.py diff --git a/forge/autogpt/sdk/abilities/__init__.py b/forge/forge/sdk/abilities/__init__.py similarity index 100% rename from forge/autogpt/sdk/abilities/__init__.py rename to forge/forge/sdk/abilities/__init__.py diff --git a/forge/autogpt/sdk/abilities/file_system/files.py b/forge/forge/sdk/abilities/file_system/files.py similarity index 100% rename from forge/autogpt/sdk/abilities/file_system/files.py rename to forge/forge/sdk/abilities/file_system/files.py diff --git a/forge/autogpt/sdk/abilities/registry.py b/forge/forge/sdk/abilities/registry.py similarity index 100% rename from forge/autogpt/sdk/abilities/registry.py rename to forge/forge/sdk/abilities/registry.py diff --git a/forge/autogpt/sdk/agent.py b/forge/forge/sdk/agent.py similarity index 100% rename from forge/autogpt/sdk/agent.py rename to forge/forge/sdk/agent.py diff --git a/forge/autogpt/sdk/agent_test.py b/forge/forge/sdk/agent_test.py similarity index 100% rename from forge/autogpt/sdk/agent_test.py rename to forge/forge/sdk/agent_test.py diff --git a/forge/autogpt/sdk/ai_actions.py b/forge/forge/sdk/ai_actions.py similarity index 100% rename from forge/autogpt/sdk/ai_actions.py rename to forge/forge/sdk/ai_actions.py diff --git a/forge/autogpt/sdk/ai_memory.py b/forge/forge/sdk/ai_memory.py similarity index 100% rename from forge/autogpt/sdk/ai_memory.py rename to forge/forge/sdk/ai_memory.py diff --git a/forge/autogpt/sdk/ai_planning.py b/forge/forge/sdk/ai_planning.py similarity index 100% rename from forge/autogpt/sdk/ai_planning.py rename to forge/forge/sdk/ai_planning.py diff --git a/forge/autogpt/sdk/ai_profile.py b/forge/forge/sdk/ai_profile.py similarity index 94% rename from forge/autogpt/sdk/ai_profile.py rename to forge/forge/sdk/ai_profile.py index b477833d..7fa4d7d0 100644 --- a/forge/autogpt/sdk/ai_profile.py +++ b/forge/forge/sdk/ai_profile.py @@ -14,7 +14,7 @@ aspects of the agent such as memory, planning, and actions available. The possibilities are limited just by your imagination. """ -from autogpt.sdk import PromptEngine +from forge.sdk import PromptEngine class ProfileGenerator: diff --git a/forge/autogpt/sdk/db.py b/forge/forge/sdk/db.py similarity index 100% rename from forge/autogpt/sdk/db.py rename to forge/forge/sdk/db.py diff --git a/forge/autogpt/sdk/db_test.py b/forge/forge/sdk/db_test.py similarity index 98% rename from forge/autogpt/sdk/db_test.py rename to forge/forge/sdk/db_test.py index dc58f80c..5346eb3b 100644 --- a/forge/autogpt/sdk/db_test.py +++ b/forge/forge/sdk/db_test.py @@ -4,7 +4,7 @@ from datetime import datetime import pytest -from autogpt.sdk.db import ( +from forge.sdk.db import ( AgentDB, ArtifactModel, StepModel, @@ -13,8 +13,8 @@ from autogpt.sdk.db import ( convert_to_step, convert_to_task, ) -from autogpt.sdk.errors import NotFoundError as DataNotFoundError -from autogpt.sdk.schema import * +from forge.sdk.errors import NotFoundError as DataNotFoundError +from forge.sdk.schema import * @pytest.mark.asyncio diff --git a/forge/autogpt/sdk/errors.py b/forge/forge/sdk/errors.py similarity index 100% rename from forge/autogpt/sdk/errors.py rename to forge/forge/sdk/errors.py diff --git a/forge/autogpt/sdk/forge_log.py b/forge/forge/sdk/forge_log.py similarity index 100% rename from forge/autogpt/sdk/forge_log.py rename to forge/forge/sdk/forge_log.py diff --git a/forge/autogpt/sdk/llm.py b/forge/forge/sdk/llm.py similarity index 100% rename from forge/autogpt/sdk/llm.py rename to forge/forge/sdk/llm.py diff --git a/forge/autogpt/sdk/memory/__init__.py b/forge/forge/sdk/memory/__init__.py similarity index 100% rename from forge/autogpt/sdk/memory/__init__.py rename to forge/forge/sdk/memory/__init__.py diff --git a/forge/autogpt/sdk/memory/memstore.py b/forge/forge/sdk/memory/memstore.py similarity index 100% rename from forge/autogpt/sdk/memory/memstore.py rename to forge/forge/sdk/memory/memstore.py diff --git a/forge/autogpt/sdk/memory/memstore_test.py b/forge/forge/sdk/memory/memstore_test.py similarity index 97% rename from forge/autogpt/sdk/memory/memstore_test.py rename to forge/forge/sdk/memory/memstore_test.py index 5ade2d46..3eb24309 100644 --- a/forge/autogpt/sdk/memory/memstore_test.py +++ b/forge/forge/sdk/memory/memstore_test.py @@ -3,7 +3,7 @@ import shutil import pytest -from autogpt.sdk.memory.memstore import ChromaMemStore +from forge.sdk.memory.memstore import ChromaMemStore @pytest.fixture diff --git a/forge/autogpt/sdk/middlewares.py b/forge/forge/sdk/middlewares.py similarity index 100% rename from forge/autogpt/sdk/middlewares.py rename to forge/forge/sdk/middlewares.py diff --git a/forge/autogpt/sdk/prompting.py b/forge/forge/sdk/prompting.py similarity index 100% rename from forge/autogpt/sdk/prompting.py rename to forge/forge/sdk/prompting.py diff --git a/forge/autogpt/sdk/routes/__init__.py b/forge/forge/sdk/routes/__init__.py similarity index 100% rename from forge/autogpt/sdk/routes/__init__.py rename to forge/forge/sdk/routes/__init__.py diff --git a/forge/autogpt/sdk/routes/agent_protocol.py b/forge/forge/sdk/routes/agent_protocol.py similarity index 99% rename from forge/autogpt/sdk/routes/agent_protocol.py rename to forge/forge/sdk/routes/agent_protocol.py index ced59908..3fb6c3a4 100644 --- a/forge/autogpt/sdk/routes/agent_protocol.py +++ b/forge/forge/sdk/routes/agent_protocol.py @@ -28,9 +28,9 @@ from typing import Optional from fastapi import APIRouter, Query, Request, Response, UploadFile from fastapi.responses import FileResponse -from autogpt.sdk.errors import * -from autogpt.sdk.forge_log import ForgeLogger -from autogpt.sdk.schema import * +from forge.sdk.errors import * +from forge.sdk.forge_log import ForgeLogger +from forge.sdk.schema import * base_router = APIRouter() diff --git a/forge/autogpt/sdk/schema.py b/forge/forge/sdk/schema.py similarity index 100% rename from forge/autogpt/sdk/schema.py rename to forge/forge/sdk/schema.py diff --git a/forge/autogpt/sdk/workspace.py b/forge/forge/sdk/workspace.py similarity index 100% rename from forge/autogpt/sdk/workspace.py rename to forge/forge/sdk/workspace.py diff --git a/forge/autogpt/sdk/workspace_test.py b/forge/forge/sdk/workspace_test.py similarity index 100% rename from forge/autogpt/sdk/workspace_test.py rename to forge/forge/sdk/workspace_test.py