Merge branch 'master' into kpczerwinski/open-1346-update-pydantic-to-v2

.github/workflows/autogpt-builder-ci.yml

@@ -0,0 +1,36 @@
+name: AutoGPT Builder CI
+
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - '.github/workflows/autogpt-builder-ci.yml'
+      - 'rnd/autogpt_builder/**'
+  pull_request:
+    paths:
+      - '.github/workflows/autogpt-builder-ci.yml'
+      - 'rnd/autogpt_builder/**'
+
+defaults:
+  run:
+    shell: bash
+    working-directory: rnd/autogpt_builder
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: '21'
+
+    - name: Install dependencies
+      run: |
+        npm install
+
+    - name: Run lint
+      run: |
+        npm run lint

.github/workflows/autogpt-server-ci.yml

@@ -265,4 +265,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: autogptserver-AppImage-${{ matrix.platform-os }}
-          path: /Users/runner/work/AutoGPT/AutoGPT/rnd/autogpt_server/build/*.AppImage
+          path: /Users/runner/work/AutoGPT/AutoGPT/rnd/autogpt_server/dist/*.AppImage

.gitignore

@@ -162,11 +162,13 @@ agbenchmark/reports/
 
 # Nodejs
 package-lock.json
-package.json
+
 
 # Allow for locally private items
 # private
 pri* 
 # ignore
 ig*
 .github_access_token
+LICENSE.rtf
+rnd/autogpt_server/settings.py

.pre-commit-config.yaml

@@ -97,7 +97,7 @@ repos:
         alias: pyright-benchmark
         entry: poetry -C benchmark run pyright
         args: [-p, benchmark, benchmark]
-        files: ^benchmark/(agbenchmark|tests)/
+        files: ^benchmark/(agbenchmark/|tests/|poetry\.lock$)
         types: [file]
         language: system
         pass_filenames: false

autogpt/pyproject.toml

@@ -20,68 +20,50 @@ 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.21.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 = "7.0.0"
+cx-freeze = { git = "https://github.com/ntindle/cx_Freeze.git", rev = "main", develop = true }
 
 [tool.poetry.extras]
 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 = "*"

autogpt/setup.py

@@ -1,7 +1,9 @@
+import platform
+from pathlib import Path
 from pkgutil import iter_modules
-from shutil import which
+from typing import Union
 
-from cx_Freeze import Executable, setup
+from cx_Freeze import Executable, setup  # type: ignore
 
 packages = [
     m.name
@@ -11,11 +13,47 @@
     and ("poetry" in m.module_finder.path)  # type: ignore
 ]
 
-icon = (
-    "../../assets/gpt_dark_RGB.icns"
-    if which("sips")
-    else "../../assets/gpt_dark_RGB.ico"
-)
+# set the icon based on the platform
+icon = "../../assets/gpt_dark_RGB.ico"
+if platform.system() == "Darwin":
+    icon = "../../assets/gpt_dark_RGB.icns"
+elif platform.system() == "Linux":
+    icon = "../../assets/gpt_dark_RGB.png"
+
+
+def txt_to_rtf(input_file: Union[str, Path], output_file: Union[str, Path]) -> None:
+    """
+    Convert a text file to RTF format.
+
+    Args:
+    input_file (Union[str, Path]): Path to the input text file.
+    output_file (Union[str, Path]): Path to the output RTF file.
+
+    Returns:
+    None
+    """
+    input_path = Path(input_file)
+    output_path = Path(output_file)
+
+    with input_path.open("r", encoding="utf-8") as txt_file:
+        content = txt_file.read()
+
+    # RTF header
+    rtf = r"{\rtf1\ansi\deff0 {\fonttbl {\f0 Times New Roman;}}\f0\fs24 "
+
+    # Replace newlines with RTF newline
+    rtf += content.replace("\n", "\\par ")
+
+    # Close RTF document
+    rtf += "}"
+
+    with output_path.open("w", encoding="utf-8") as rtf_file:
+        rtf_file.write(rtf)
+
+
+# Convert LICENSE to LICENSE.rtf
+license_file = "LICENSE.rtf"
+txt_to_rtf("../LICENSE", license_file)
 
 
 setup(
@@ -55,6 +93,7 @@
             "target_name": "AutoGPT",
             "add_to_path": True,
             "install_icon": "../assets/gpt_dark_RGB.ico",
+            "license_file": license_file,
         },
     },
 )

benchmark/pyproject.toml

@@ -9,44 +9,45 @@ packages = [{ include = "agbenchmark" }]
 
 [tool.poetry.dependencies]
 python = "^3.10"
-pytest = "^7.3.2"
-requests = "^2.31.0"
-openai = "^1.7.2"
 pydantic = "^2.7.2"
-python-dotenv = "^1.0.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"
-gitpython = "^3.1.32"
-networkx = "^3.1"
+click-default-group = "^1.2.4"
 colorama = "^0.4.6"
-pyvis = "^0.3.2"
-selenium = "^4.11.2"
-pytest-asyncio = "^0.21.1"
-uvicorn = "^0.23.2"
 fastapi = "^0.109.1"
-python-multipart = "^0.0.7"
-toml = "^0.10.2"
-# helicone = "^1.0.9"  # incompatible with openai@^1.0.0
+gitpython = "^3.1.32"
 httpx = "^0.24.0"
+matplotlib = "^3.7.2"
+networkx = "^3.1"
+openai = "^1.7.2"
+pandas = "^2.0.3"
+pexpect = "^4.8.0"
+psutil = "^5.9.5"
+pytest = "^7.3.2"
+pytest-asyncio = "^0.23.3"
+python-dotenv = "^1.0.0"
+python-multipart = "^0.0.7"
 agent-protocol-client = {git = "https://github.com/AI-Engineer-Foundation/agent-protocol.git", subdirectory = "packages/client/python"}
-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"