From 3ae376c58475a576e6fcb30fc4c01d006ec9ad64 Mon Sep 17 00:00:00 2001 From: Reinier van der Leer Date: Mon, 16 Oct 2023 18:07:10 -0700 Subject: [PATCH] Fix AutoGPT dependencies (step 3) --- autogpts/autogpt/autogpt/app/main.py | 3 ++- autogpts/autogpt/poetry.lock | 39 ++++++++++++++++++++++++++-- autogpts/autogpt/pyproject.toml | 1 + 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/autogpts/autogpt/autogpt/app/main.py b/autogpts/autogpt/autogpt/app/main.py index 66de7638..3b0c0fa9 100644 --- a/autogpts/autogpt/autogpt/app/main.py +++ b/autogpts/autogpt/autogpt/app/main.py @@ -36,7 +36,6 @@ from autogpt.logs.helpers import print_attribute, speak from autogpt.plugins import scan_plugins from scripts.install_plugin_deps import install_plugin_dependencies -from .agent_protocol_server import AgentProtocolServer from .configurator import apply_overrides_to_config from .setup import ( apply_overrides_to_ai_settings, @@ -307,6 +306,8 @@ async def run_auto_gpt_server( allow_downloads: bool, install_plugin_deps: bool, ): + from .agent_protocol_server import AgentProtocolServer + config = ConfigBuilder.build_config_from_env() # TODO: fill in llm values here diff --git a/autogpts/autogpt/poetry.lock b/autogpts/autogpt/poetry.lock index e2c28192..141313cf 100644 --- a/autogpts/autogpt/poetry.lock +++ b/autogpts/autogpt/poetry.lock @@ -279,7 +279,7 @@ uvicorn = "^0.23.2" type = "git" url = "https://github.com/Significant-Gravitas/AutoGPT.git" reference = "autogpt/agent-protocol" -resolved_reference = "abb77fc5b15c949e5b5a8aedce79c14768cba14b" +resolved_reference = "0f555693f71bec5b2b64f53ed707d8888b214376" subdirectory = "autogpts/forge" [[package]] @@ -1848,6 +1848,30 @@ files = [ [package.dependencies] pyreadline3 = {version = "*", markers = "sys_platform == \"win32\" and python_version >= \"3.8\""} +[[package]] +name = "hypercorn" +version = "0.14.4" +description = "A ASGI Server based on Hyper libraries and inspired by Gunicorn" +optional = false +python-versions = ">=3.7" +files = [ + {file = "hypercorn-0.14.4-py3-none-any.whl", hash = "sha256:f956200dbf8677684e6e976219ffa6691d6cf795281184b41dbb0b135ab37b8d"}, + {file = "hypercorn-0.14.4.tar.gz", hash = "sha256:3fa504efc46a271640023c9b88c3184fd64993f47a282e8ae1a13ccb285c2f67"}, +] + +[package.dependencies] +h11 = "*" +h2 = ">=3.1.0" +priority = "*" +tomli = {version = "*", markers = "python_version < \"3.11\""} +wsproto = ">=0.14.0" + +[package.extras] +docs = ["pydata_sphinx_theme"] +h3 = ["aioquic (>=0.9.0,<1.0)"] +trio = ["exceptiongroup (>=1.1.0)", "trio (>=0.22.0)"] +uvloop = ["uvloop"] + [[package]] name = "hyperframe" version = "6.0.1" @@ -2957,6 +2981,17 @@ files = [ cymem = ">=2.0.2,<2.1.0" murmurhash = ">=0.28.0,<1.1.0" +[[package]] +name = "priority" +version = "2.0.0" +description = "A pure-Python implementation of the HTTP/2 priority tree" +optional = false +python-versions = ">=3.6.1" +files = [ + {file = "priority-2.0.0-py3-none-any.whl", hash = "sha256:6f8eefce5f3ad59baf2c080a664037bb4725cd0a790d53d59ab4059288faf6aa"}, + {file = "priority-2.0.0.tar.gz", hash = "sha256:c965d54f1b8d0d0b19479db3924c7c36cf672dbf2aec92d43fbdaf4492ba18c0"}, +] + [[package]] name = "prompt-toolkit" version = "3.0.39" @@ -5218,4 +5253,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "186f82f849f87f1ddd97817da12e6899c7b68be3a625dc56d30551fc987f5596" +content-hash = "667077f0e5845e92cab8e1ff64f4022cacefaae9bebb75fd4a8fe83a031c6870" diff --git a/autogpts/autogpt/pyproject.toml b/autogpts/autogpt/pyproject.toml index d7fa611b..def56954 100644 --- a/autogpts/autogpt/pyproject.toml +++ b/autogpts/autogpt/pyproject.toml @@ -36,6 +36,7 @@ autogpt-forge = {git = "https://github.com/Significant-Gravitas/AutoGPT.git", su ftfy = "^6.1.1" google-api-python-client = "*" gTTS = "^2.3.1" +hypercorn = "^0.14.4" inflection = "*" jsonschema = "*" markdown = "*"