diff --git a/autogpt/__main__.py b/autogpt/__main__.py index b81219a0..5eed2391 100644 --- a/autogpt/__main__.py +++ b/autogpt/__main__.py @@ -10,7 +10,7 @@ ENABLE_TRACING = os.environ.get("ENABLE_TRACING", "false").lower() == "true" autogpt.sdk.forge_log.setup_logger() -LOG = autogpt.sdk.forge_log.CustomLogger(__name__) +LOG = autogpt.sdk.forge_log.ForgeLogger(__name__) if __name__ == "__main__": """Runs the agent server""" diff --git a/autogpt/agent.py b/autogpt/agent.py index 6a2cc56a..99c001df 100644 --- a/autogpt/agent.py +++ b/autogpt/agent.py @@ -1,10 +1,7 @@ -import autogpt.sdk.agent -from autogpt.sdk.db import AgentDB -from autogpt.sdk.schema import Step, StepRequestBody -from autogpt.sdk.workspace import Workspace +from autogpt.sdk import Agent, AgentDB, Step, StepRequestBody, Workspace -class AutoGPTAgent(autogpt.sdk.agent.Agent): +class AutoGPTAgent(Agent): """ The goal of the Forge is to take care of the boilerplate code so you can focus on agent design. diff --git a/autogpt/sdk/__init__.py b/autogpt/sdk/__init__.py index e69de29b..041b7f34 100644 --- a/autogpt/sdk/__init__.py +++ b/autogpt/sdk/__init__.py @@ -0,0 +1,24 @@ +""" +The Forge SDK. This is the core of the Forge. It contains the agent protocol, which is the +core of the Forge. +""" +from .agent import Agent +from .db import AgentDB +from .forge_log import ForgeLogger +from .schema import ( + Artifact, + ArtifactUpload, + Pagination, + Status, + Step, + StepInput, + StepOutput, + StepRequestBody, + Task, + TaskArtifactsListResponse, + TaskInput, + TaskListResponse, + TaskRequestBody, + TaskStepsListResponse, +) +from .workspace import LocalWorkspace, Workspace diff --git a/autogpt/sdk/agent.py b/autogpt/sdk/agent.py index 11e67079..2b54b420 100644 --- a/autogpt/sdk/agent.py +++ b/autogpt/sdk/agent.py @@ -10,14 +10,14 @@ from prometheus_fastapi_instrumentator import Instrumentator from .db import AgentDB from .errors import NotFoundError -from .forge_log import CustomLogger +from .forge_log import ForgeLogger from .middlewares import AgentMiddleware from .routes.agent_protocol import base_router from .schema import * from .tracing import setup_tracing from .workspace import Workspace -LOG = CustomLogger(__name__) +LOG = ForgeLogger(__name__) class Agent: diff --git a/autogpt/sdk/db.py b/autogpt/sdk/db.py index 46d224c0..eec35002 100644 --- a/autogpt/sdk/db.py +++ b/autogpt/sdk/db.py @@ -22,10 +22,10 @@ from sqlalchemy.exc import SQLAlchemyError from sqlalchemy.orm import DeclarativeBase, joinedload, relationship, sessionmaker from .errors import NotFoundError -from .forge_log import CustomLogger +from .forge_log import ForgeLogger from .schema import Artifact, Pagination, Status, Step, StepRequestBody, Task, TaskInput -LOG = CustomLogger(__name__) +LOG = ForgeLogger(__name__) class Base(DeclarativeBase): diff --git a/autogpt/sdk/forge_log.py b/autogpt/sdk/forge_log.py index 13b15b9a..fd6939e4 100644 --- a/autogpt/sdk/forge_log.py +++ b/autogpt/sdk/forge_log.py @@ -101,7 +101,7 @@ class ConsoleFormatter(logging.Formatter): return logging.Formatter.format(self, rec) -class CustomLogger(logging.Logger): +class ForgeLogger(logging.Logger): """ This adds extra logging functions such as logger.trade and also sets the logger to use the custom formatter @@ -173,7 +173,7 @@ logging_config: dict = dict( formatters={ "console": { "()": ConsoleFormatter, - "format": CustomLogger.COLOR_FORMAT, + "format": ForgeLogger.COLOR_FORMAT, }, }, handlers={ diff --git a/autogpt/sdk/routes/agent_protocol.py b/autogpt/sdk/routes/agent_protocol.py index 2e75fef2..3159382c 100644 --- a/autogpt/sdk/routes/agent_protocol.py +++ b/autogpt/sdk/routes/agent_protocol.py @@ -29,13 +29,13 @@ from fastapi import APIRouter, Query, Request, Response, UploadFile from fastapi.responses import FileResponse from autogpt.sdk.errors import * -from autogpt.sdk.forge_log import CustomLogger +from autogpt.sdk.forge_log import ForgeLogger from autogpt.sdk.schema import * from autogpt.sdk.tracing import tracing base_router = APIRouter() -LOG = CustomLogger(__name__) +LOG = ForgeLogger(__name__) @base_router.get("/", tags=["root"]) diff --git a/autogpt/sdk/schema.py b/autogpt/sdk/schema.py index cc7ce868..64d79d95 100644 --- a/autogpt/sdk/schema.py +++ b/autogpt/sdk/schema.py @@ -174,11 +174,6 @@ class Step(StepRequestBody): ) -class AgentTasksTaskIdArtifactsPostRequest(BaseModel): - file: Optional[bytes] = Field(None, description="File to upload.") - uri: Optional[str] = Field(None, description="URI of the artifact.") - - class TaskListResponse(BaseModel): tasks: Optional[List[Task]] = None pagination: Optional[Pagination] = None diff --git a/autogpt/sdk/tracing.py b/autogpt/sdk/tracing.py index 4c335a46..b86decfe 100644 --- a/autogpt/sdk/tracing.py +++ b/autogpt/sdk/tracing.py @@ -3,13 +3,13 @@ from functools import wraps from dotenv import load_dotenv -from autogpt.sdk.forge_log import CustomLogger +from autogpt.sdk.forge_log import ForgeLogger load_dotenv() ENABLE_TRACING = os.environ.get("ENABLE_TRACING", "false").lower() == "true" -LOG = CustomLogger(__name__) +LOG = ForgeLogger(__name__) def setup_tracing(app):