From 39fd1d6be1979875c077ef575051867f105dcb18 Mon Sep 17 00:00:00 2001 From: Reinier van der Leer Date: Tue, 16 Jan 2024 16:30:37 +0100 Subject: [PATCH] lint(forge): `black .` and `isort .` --- autogpts/forge/forge/__main__.py | 6 +++++- autogpts/forge/forge/actions/__init__.py | 2 +- autogpts/forge/forge/actions/finish.py | 1 + .../forge/forge/actions/web/web_selenium.py | 17 +++++------------ autogpts/forge/forge/agent.py | 3 +-- autogpts/forge/forge/app.py | 1 + autogpts/forge/forge/db.py | 13 +++++-------- autogpts/forge/forge/memory/__init__.py | 2 +- autogpts/forge/forge/memory/chroma_memstore.py | 5 +++-- autogpts/forge/forge/sdk/__init__.py | 6 +++--- autogpts/forge/forge/sdk/agent.py | 11 ++++++++++- autogpts/forge/forge/sdk/db_test.py | 8 +++++++- autogpts/forge/forge/sdk/workspace.py | 1 + 13 files changed, 44 insertions(+), 32 deletions(-) diff --git a/autogpts/forge/forge/__main__.py b/autogpts/forge/forge/__main__.py index 4ee4e36ec..c251fbdf3 100644 --- a/autogpts/forge/forge/__main__.py +++ b/autogpts/forge/forge/__main__.py @@ -41,5 +41,9 @@ if __name__ == "__main__": forge.sdk.forge_log.setup_logger() uvicorn.run( - "forge.app:app", host="localhost", port=int(port), log_level="error", reload=True + "forge.app:app", + host="localhost", + port=int(port), + log_level="error", + reload=True, ) diff --git a/autogpts/forge/forge/actions/__init__.py b/autogpts/forge/forge/actions/__init__.py index 46e86c8c3..36b4d1a16 100644 --- a/autogpts/forge/forge/actions/__init__.py +++ b/autogpts/forge/forge/actions/__init__.py @@ -1 +1 @@ -from .registry import ActionRegister, Action, action, ActionParameter +from .registry import Action, ActionParameter, ActionRegister, action diff --git a/autogpts/forge/forge/actions/finish.py b/autogpts/forge/forge/actions/finish.py index 77ddbfd26..db1b2804a 100644 --- a/autogpts/forge/forge/actions/finish.py +++ b/autogpts/forge/forge/actions/finish.py @@ -1,4 +1,5 @@ from sdk.forge_log import ForgeLogger + from .registry import action logger = ForgeLogger(__name__) diff --git a/autogpts/forge/forge/actions/web/web_selenium.py b/autogpts/forge/forge/actions/web/web_selenium.py index b2874d657..9e3c7494b 100644 --- a/autogpts/forge/forge/actions/web/web_selenium.py +++ b/autogpts/forge/forge/actions/web/web_selenium.py @@ -5,13 +5,16 @@ from __future__ import annotations COMMAND_CATEGORY = "web_browse" COMMAND_CATEGORY_TITLE = "Web Browsing" +import functools import logging import re from pathlib import Path from sys import platform -from typing import TYPE_CHECKING, Optional, Type, List, Tuple +from typing import TYPE_CHECKING, Any, Callable, List, Optional, Tuple, Type +from urllib.parse import urljoin, urlparse from bs4 import BeautifulSoup +from requests.compat import urljoin from selenium.common.exceptions import WebDriverException from selenium.webdriver.chrome.options import Options as ChromeOptions from selenium.webdriver.chrome.service import Service as ChromeDriverService @@ -33,19 +36,9 @@ from webdriver_manager.chrome import ChromeDriverManager from webdriver_manager.firefox import GeckoDriverManager from webdriver_manager.microsoft import EdgeChromiumDriverManager as EdgeDriverManager +from forge.sdk.errors import CommandExecutionError from ..registry import action -from forge.sdk.errors import * -import functools -import re -from typing import Any, Callable -from urllib.parse import urljoin, urlparse - -from requests.compat import urljoin - - -from bs4 import BeautifulSoup -from requests.compat import urljoin def extract_hyperlinks(soup: BeautifulSoup, base_url: str) -> list[tuple[str, str]]: diff --git a/autogpts/forge/forge/agent.py b/autogpts/forge/forge/agent.py index 9f242f0cb..7757c6680 100644 --- a/autogpts/forge/forge/agent.py +++ b/autogpts/forge/forge/agent.py @@ -1,3 +1,4 @@ +from forge.actions import ActionRegister from forge.sdk import ( Agent, AgentDB, @@ -8,8 +9,6 @@ from forge.sdk import ( TaskRequestBody, Workspace, ) -from forge.actions import ActionRegister - LOG = ForgeLogger(__name__) diff --git a/autogpts/forge/forge/app.py b/autogpts/forge/forge/app.py index b14856358..e04edd756 100644 --- a/autogpts/forge/forge/app.py +++ b/autogpts/forge/forge/app.py @@ -2,6 +2,7 @@ import os from forge.agent import ForgeAgent from forge.sdk import LocalWorkspace + from .db import ForgeDatabase database_name = os.getenv("DATABASE_STRING") diff --git a/autogpts/forge/forge/db.py b/autogpts/forge/forge/db.py index eab8916ba..cff096379 100644 --- a/autogpts/forge/forge/db.py +++ b/autogpts/forge/forge/db.py @@ -1,13 +1,10 @@ -from .sdk import AgentDB, ForgeLogger, NotFoundError, Base +import datetime +import uuid + +from sqlalchemy import Column, DateTime, String from sqlalchemy.exc import SQLAlchemyError -import datetime -from sqlalchemy import ( - Column, - DateTime, - String, -) -import uuid +from .sdk import AgentDB, Base, ForgeLogger, NotFoundError LOG = ForgeLogger(__name__) diff --git a/autogpts/forge/forge/memory/__init__.py b/autogpts/forge/forge/memory/__init__.py index ad8ced929..b0182da70 100644 --- a/autogpts/forge/forge/memory/__init__.py +++ b/autogpts/forge/forge/memory/__init__.py @@ -1,2 +1,2 @@ -from .memstore import MemStore from .chroma_memstore import ChromaMemStore +from .memstore import MemStore diff --git a/autogpts/forge/forge/memory/chroma_memstore.py b/autogpts/forge/forge/memory/chroma_memstore.py index 8dd4971d2..7764f1ab9 100644 --- a/autogpts/forge/forge/memory/chroma_memstore.py +++ b/autogpts/forge/forge/memory/chroma_memstore.py @@ -1,8 +1,9 @@ -from .memstore import MemStore +import hashlib import chromadb from chromadb.config import Settings -import hashlib + +from .memstore import MemStore class ChromaMemStore: diff --git a/autogpts/forge/forge/sdk/__init__.py b/autogpts/forge/forge/sdk/__init__.py index 366464f95..9ee9f428a 100644 --- a/autogpts/forge/forge/sdk/__init__.py +++ b/autogpts/forge/forge/sdk/__init__.py @@ -2,11 +2,11 @@ The Forge SDK. This is the core of the Forge. It contains the agent protocol, which is the core of the Forge. """ +from ..llm import chat_completion_request, create_embedding_request, transcribe_audio from .agent import Agent from .db import AgentDB, Base +from .errors import * from .forge_log import ForgeLogger -from ..llm import chat_completion_request, create_embedding_request, transcribe_audio -from .prompting import PromptEngine from .model import ( Artifact, ArtifactUpload, @@ -21,5 +21,5 @@ from .model import ( TaskRequestBody, TaskStepsListResponse, ) +from .prompting import PromptEngine from .workspace import LocalWorkspace, Workspace -from .errors import * diff --git a/autogpts/forge/forge/sdk/agent.py b/autogpts/forge/forge/sdk/agent.py index a3f5370b6..125167938 100644 --- a/autogpts/forge/forge/sdk/agent.py +++ b/autogpts/forge/forge/sdk/agent.py @@ -13,8 +13,17 @@ from .db import AgentDB from .errors import NotFoundError from .forge_log import ForgeLogger from .middlewares import AgentMiddleware +from .model import ( + Artifact, + Step, + StepRequestBody, + Task, + TaskArtifactsListResponse, + TaskListResponse, + TaskRequestBody, + TaskStepsListResponse, +) from .routes.agent_protocol import base_router -from .model import * from .workspace import Workspace LOG = ForgeLogger(__name__) diff --git a/autogpts/forge/forge/sdk/db_test.py b/autogpts/forge/forge/sdk/db_test.py index 6bcfd577a..14330435e 100644 --- a/autogpts/forge/forge/sdk/db_test.py +++ b/autogpts/forge/forge/sdk/db_test.py @@ -14,7 +14,13 @@ from forge.sdk.db import ( convert_to_task, ) from forge.sdk.errors import NotFoundError as DataNotFoundError -from autogpts.forge.forge.sdk.model import * +from forge.sdk.model import ( + Artifact, + Status, + Step, + StepRequestBody, + Task, +) @pytest.mark.asyncio diff --git a/autogpts/forge/forge/sdk/workspace.py b/autogpts/forge/forge/sdk/workspace.py index aca1fd0d2..ff7c52427 100644 --- a/autogpts/forge/forge/sdk/workspace.py +++ b/autogpts/forge/forge/sdk/workspace.py @@ -2,6 +2,7 @@ import abc import os import typing from pathlib import Path + from google.cloud import storage