Skip to content

Commit

Permalink
chore(agent, forge, benchmark): Clean up dependencies (#7286)
Browse files Browse the repository at this point in the history 
* Remove unused dependencies
* Move dependencies for moved code from `autogpt` to `forge`
* Loosen dependency for `uvicorn` to improve compatibility
  • Loading branch information
@Pwuts
Pwuts authored Jun 28, 2024
1 parent 854080f commit cbae8b5
Show file tree
Hide file tree
Showing 6 changed files with 97 additions and 405 deletions.
311 changes: 5 additions & 306 deletions autogpt/poetry.lock
View file

Large diffs are not rendered by default.

24 changes: 3 additions & 21 deletions autogpt/pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,43 +20,29 @@ serve = "autogpt.app.cli:serve"

[tool.poetry.dependencies]
python = "^3.10"
anthropic = "^0.25.1"
autogpt-forge = { path = "../forge", develop = true }
# autogpt-forge = {git = "https://github.com/Significant-Gravitas/AutoGPT.git", subdirectory = "forge"}
beautifulsoup4 = "^4.12.2"
charset-normalizer = "^3.1.0"
click = "*"
colorama = "^0.4.6"
distro = "^1.8.0"
en-core-web-sm = { url = "https://github.com/explosion/spacy-models/releases/download/en_core_web_sm-3.7.1/en_core_web_sm-3.7.1-py3-none-any.whl" }
fastapi = "^0.109.1"
ftfy = "^6.1.1"
gitpython = "^3.1.32"
google-api-python-client = "*"
hypercorn = "^0.14.4"
inflection = "*"
jsonschema = "*"
numpy = "*"
openai = "^1.7.2"
orjson = "^3.8.10"
Pillow = "*"
pydantic = "*"
python-docx = "*"
python-dotenv = "^1.0.0"
pyyaml = "^6.0"
readability-lxml = "^0.8.1"
requests = "*"
sentry-sdk = "^1.40.4"
spacy = "^3.7.4"
tenacity = "^8.2.2"

# OpenAI and Generic plugins import
openapi-python-client = "^0.14.0"

# Benchmarking
agbenchmark = { path = "../benchmark", optional = true }
# agbenchmark = {git = "https://github.com/Significant-Gravitas/AutoGPT.git", subdirectory = "benchmark", optional = true}
psycopg2-binary = "^2.9.9"
multidict = "6.0.5"
cx-freeze = { git = "https://github.com/ntindle/cx_Freeze.git", rev = "main", develop = true }

[tool.poetry.extras]
Expand All @@ -65,23 +51,19 @@ benchmark = ["agbenchmark"]
[tool.poetry.group.dev.dependencies]
black = "^23.12.1"
flake8 = "^7.0.0"
gitpython = "^3.1.32"
isort = "^5.13.1"
pre-commit = "*"
pyright = "^1.1.364"

# Type stubs
types-beautifulsoup4 = "*"
types-colorama = "*"
types-Markdown = "*"
types-Pillow = "*"

# Testing
asynctest = "*"
coverage = "*"
pytest = "*"
pytest-asyncio = "*"
pytest-benchmark = "*"
pytest-cov = "*"
pytest-integration = "*"
pytest-mock = "*"
pytest-recording = "*"
pytest-xdist = "*"
Expand Down
27 changes: 1 addition & 26 deletions benchmark/poetry.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 25 additions & 23 deletions benchmark/pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,44 +9,46 @@ packages = [{ include = "agbenchmark" }]

[tool.poetry.dependencies]
python = "^3.10"
pytest = "^7.3.2"
requests = "^2.31.0"
openai = "^1.7.2"
pydantic = "^1.10.9"
python-dotenv = "^1.0.0"
# helicone = "^1.0.9" # incompatible with openai@^1.0.0
agent-protocol-client = "^1.1.0"
click = "^8.1.3"
types-requests = "^2.31.0.1"
pexpect = "^4.8.0"
psutil = "^5.9.5"
matplotlib = "^3.7.2"
pandas = "^2.0.3"
click-default-group = "^1.2.4"
colorama = "^0.4.6"
fastapi = "^0.109.1"
gitpython = "^3.1.32"
httpx = "^0.24.0"
matplotlib = "^3.7.2"
networkx = "^3.1"
colorama = "^0.4.6"
pyvis = "^0.3.2"
selenium = "^4.11.2"
openai = "^1.7.2"
pandas = "^2.0.3"
pexpect = "^4.8.0"
psutil = "^5.9.5"
pydantic = "^1.10.9"
pytest = "^7.3.2"
pytest-asyncio = "^0.23.3"
uvicorn = "^0.23.2"
fastapi = "^0.109.1"
python-dotenv = "^1.0.0"
python-multipart = "^0.0.7"
toml = "^0.10.2"
# helicone = "^1.0.9" # incompatible with openai@^1.0.0
httpx = "^0.24.0"
agent-protocol-client = "^1.1.0"
click-default-group = "^1.2.4"
pyvis = "^0.3.2"
requests = "^2.31.0"
selenium = "^4.11.2"
tabulate = "^0.9.0"
toml = "^0.10.2"
uvicorn = ">=0.23.2,<1"

[tool.poetry.group.dev.dependencies]
black = "^23.12.1"
flake8 = "^7.0.0"
isort = "^5.13.1"
pyright = "^1.1.364"
pandas = "^2.0.3"
gspread = "^5.10.0"
oauth2client = "^4.1.3"
pre-commit = "^3.3.3"

# Testing
pytest-cov = "^5.0.0"

# Dependencies for stuff in reports/
gspread = "^5.10.0"
oauth2client = "^4.1.3"

[tool.poetry.scripts]
agbenchmark = "agbenchmark.__main__:cli"

Expand Down
81 changes: 55 additions & 26 deletions forge/poetry.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions forge/pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ aiohttp = "^3.8.5"
anthropic = "^0.25.1"
beautifulsoup4 = "^4.12.2"
boto3 = "^1.33.6"
bs4 = "^0.0.1"
charset-normalizer = "^3.1.0"
chromadb = "^0.4.10"
click = "*"
colorama = "^0.4.6"
demjson3 = "^3.0.0"
docker = "*"
duckduckgo-search = "^6.1.7"
en-core-web-sm = { url = "https://github.com/explosion/spacy-models/releases/download/en_core_web_sm-3.7.1/en_core_web_sm-3.7.1-py3-none-any.whl" }
fastapi = "^0.109.1"
gitpython = "^3.1.32"
google-api-python-client = "*"
Expand Down Expand Up @@ -51,7 +51,7 @@ spacy = "^3.0.0"
tenacity = "^8.2.2"
tiktoken = ">=0.7.0,<1.0.0"
toml = "^0.10.2"
uvicorn = "^0.23.2"
uvicorn = ">=0.23.2,<1"
watchdog = "4.0.0"
webdriver-manager = "^4.0.1"

Expand All @@ -64,13 +64,18 @@ flake8 = "^7.0.0"
isort = "^5.13.1"
pyright = "^1.1.364"
pre-commit = "^3.3.3"

# Type stubs
boto3-stubs = { extras = ["s3"], version = "^1.33.6" }
types-beautifulsoup4 = "*"
types-Pillow = "*"
types-requests = "^2.31.0.2"

# Testing
pytest = "^7.4.0"
pytest-asyncio = "^0.23.3"
pytest-cov = "^5.0.0"
mock = "^5.1.0"
pydevd-pycharm = "^233.6745.319"


[build-system]
Expand Down

0 comments on commit cbae8b5

Please sign in to comment.