Merge branch 'master' of https://github.com/Torantulino/Auto-GPT into…

… swyx/extendLocalCache

.devcontainer/Dockerfile

@@ -0,0 +1,23 @@
+# [Choice] Python version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.10, 3.9, 3.8, 3.7, 3.6, 3-bullseye, 3.10-bullseye, 3.9-bullseye, 3.8-bullseye, 3.7-bullseye, 3.6-bullseye, 3-buster, 3.10-buster, 3.9-buster, 3.8-buster, 3.7-buster, 3.6-buster
+ARG VARIANT=3-bullseye
+FROM python:3.8
+
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    # Remove imagemagick due to https://security-tracker.debian.org/tracker/CVE-2019-10131
+    && apt-get purge -y imagemagick imagemagick-6-common 
+
+# Temporary: Upgrade python packages due to https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-40897
+# They are installed by the base image (python) which does not have the patch.
+RUN python3 -m pip install --upgrade setuptools
+
+# [Optional] If your pip requirements rarely change, uncomment this section to add them to the image.
+# COPY requirements.txt /tmp/pip-tmp/
+# RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \
+#    && rm -rf /tmp/pip-tmp
+
+# [Optional] Uncomment this section to install additional OS packages.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
+
+# [Optional] Uncomment this line to install global node packages.
+# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1

.devcontainer/devcontainer.json

@@ -0,0 +1,39 @@
+{
+  "build": {
+    "dockerfile": "./Dockerfile",
+    "context": "."
+  },
+  "features": {
+    "ghcr.io/devcontainers/features/common-utils:2": {
+      "installZsh": "true",
+      "username": "vscode",
+      "userUid": "1000",
+      "userGid": "1000",
+      "upgradePackages": "true"
+    },
+    "ghcr.io/devcontainers/features/python:1": "none",
+    "ghcr.io/devcontainers/features/node:1": "none",
+    "ghcr.io/devcontainers/features/git:1": {
+      "version": "latest",
+      "ppa": "false"
+    }
+  },
+  // Configure tool-specific properties.
+  "customizations": {
+    // Configure properties specific to VS Code.
+    "vscode": {
+      // Set *default* container specific settings.json values on container create.
+      "settings": {
+        "python.defaultInterpreterPath": "/usr/local/bin/python"
+      }
+    }
+  },
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // "forwardPorts": [],
+
+  // Use 'postCreateCommand' to run commands after the container is created.
+  // "postCreateCommand": "pip3 install --user -r requirements.txt",
+
+  // Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+  "remoteUser": "vscode"
+}

.env.template

@@ -1,17 +1,123 @@
-PINECONE_API_KEY=your-pinecone-api-key
-PINECONE_ENV=your-pinecone-region
+################################################################################
+### AUTO-GPT - GENERAL SETTINGS
+################################################################################
+# EXECUTE_LOCAL_COMMANDS - Allow local command execution (Example: False)
+EXECUTE_LOCAL_COMMANDS=False
+# BROWSE_CHUNK_MAX_LENGTH - When browsing website, define the length of chunk stored in memory
+BROWSE_CHUNK_MAX_LENGTH=8192
+# BROWSE_SUMMARY_MAX_TOKEN - Define the maximum length of the summary generated by GPT agent when browsing website
+BROWSE_SUMMARY_MAX_TOKEN=300
+# USER_AGENT - Define the user-agent used by the requests library to browse website (string)
+# USER_AGENT="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.97 Safari/537.36"
+# AI_SETTINGS_FILE - Specifies which AI Settings file to use (defaults to ai_settings.yaml)
+AI_SETTINGS_FILE=ai_settings.yaml
+
+################################################################################
+### LLM PROVIDER
+################################################################################
+
+### OPENAI
+# OPENAI_API_KEY - OpenAI API Key (Example: my-openai-api-key)
+# TEMPERATURE - Sets temperature in OpenAI (Default: 1)
+# USE_AZURE - Use Azure OpenAI or not (Default: False)
 OPENAI_API_KEY=your-openai-api-key
 TEMPERATURE=1
-ELEVENLABS_API_KEY=your-elevenlabs-api-key
-ELEVENLABS_VOICE_1_ID=your-voice-id
-ELEVENLABS_VOICE_2_ID=your-voice-id
+USE_AZURE=False
+
+### AZURE
+# OPENAI_AZURE_API_BASE - OpenAI API base URL for Azure (Example: https://my-azure-openai-url.com)
+# OPENAI_AZURE_API_VERSION - OpenAI API version for Azure (Example: v1)
+# OPENAI_AZURE_DEPLOYMENT_ID - OpenAI deployment ID for Azure (Example: my-deployment-id)
+# OPENAI_AZURE_CHAT_DEPLOYMENT_ID - OpenAI deployment ID for Azure Chat (Example: my-deployment-id-for-azure-chat)
+# OPENAI_AZURE_EMBEDDINGS_DEPLOYMENT_ID - OpenAI deployment ID for Embedding (Example: my-deployment-id-for-azure-embeddigs)
+OPENAI_AZURE_API_BASE=your-base-url-for-azure
+OPENAI_AZURE_API_VERSION=api-version-for-azure
+OPENAI_AZURE_DEPLOYMENT_ID=deployment-id-for-azure
+OPENAI_AZURE_CHAT_DEPLOYMENT_ID=deployment-id-for-azure-chat
+OPENAI_AZURE_EMBEDDINGS_DEPLOYMENT_ID=deployment-id-for-azure-embeddigs
+
+################################################################################
+### LLM MODELS
+################################################################################
+
+# SMART_LLM_MODEL - Smart language model (Default: gpt-4)
+# FAST_LLM_MODEL - Fast language model (Default: gpt-3.5-turbo)
 SMART_LLM_MODEL=gpt-4
 FAST_LLM_MODEL=gpt-3.5-turbo
-GOOGLE_API_KEY=
-CUSTOM_SEARCH_ENGINE_ID=
-USE_AZURE=False
-EXECUTE_LOCAL_COMMANDS=False
+
+### LLM MODEL SETTINGS
+# FAST_TOKEN_LIMIT - Fast token limit for OpenAI (Default: 4000)
+# SMART_TOKEN_LIMIT - Smart token limit for OpenAI (Default: 8000)
+# When using --gpt3onlythis needs to be set to 4000.
+FAST_TOKEN_LIMIT=4000
+SMART_TOKEN_LIMIT=8000
+
+################################################################################
+### MEMORY
+################################################################################
+
+# MEMORY_BACKEND - Memory backend type (Default: local)
+MEMORY_BACKEND=local
+
+### PINECONE
+# PINECONE_API_KEY - Pinecone API Key (Example: my-pinecone-api-key)
+# PINECONE_ENV - Pinecone environment (region) (Example: us-west-2)
+PINECONE_API_KEY=your-pinecone-api-key
+PINECONE_ENV=your-pinecone-region
+
+### REDIS
+# REDIS_HOST - Redis host (Default: localhost)
+# REDIS_PORT - Redis port (Default: 6379)
+# REDIS_PASSWORD - Redis password (Default: "")
+# WIPE_REDIS_ON_START - Wipes data / index on start (Default: False)
+# MEMORY_INDEX - Name of index created in Redis database (Default: auto-gpt)
+REDIS_HOST=localhost
+REDIS_PORT=6379
+REDIS_PASSWORD=
+WIPE_REDIS_ON_START=False
+MEMORY_INDEX=auto-gpt
+
+################################################################################
+### IMAGE GENERATION PROVIDER
+################################################################################
+
+### OPEN AI
+# IMAGE_PROVIDER - Image provider (Example: dalle)
 IMAGE_PROVIDER=dalle
-HUGGINGFACE_API_TOKEN=
+
+### HUGGINGFACE
+# STABLE DIFFUSION
+# (Default URL: https://api-inference.huggingface.co/models/CompVis/stable-diffusion-v1-4)
+# Set in image_gen.py)
+# HUGGINGFACE_API_TOKEN - HuggingFace API token (Example: my-huggingface-api-token)
+HUGGINGFACE_API_TOKEN=your-huggingface-api-token
+
+################################################################################
+### SEARCH PROVIDER
+################################################################################
+
+### GOOGLE
+# GOOGLE_API_KEY - Google API key (Example: my-google-api-key)
+# CUSTOM_SEARCH_ENGINE_ID - Custom search engine ID (Example: my-custom-search-engine-id)
+GOOGLE_API_KEY=your-google-api-key
+CUSTOM_SEARCH_ENGINE_ID=your-custom-search-engine-id
+
+################################################################################
+### TTS PROVIDER
+################################################################################
+
+### MAC OS
+# USE_MAC_OS_TTS - Use Mac OS TTS or not (Default: False)
 USE_MAC_OS_TTS=False
-MEMORY_BACKEND=local
+
+### STREAMELEMENTS
+# USE_BRIAN_TTS - Use Brian TTS or not (Default: False)
+USE_BRIAN_TTS=False
+
+### ELEVENLABS
+# ELEVENLABS_API_KEY - Eleven Labs API key (Example: my-elevenlabs-api-key)
+# ELEVENLABS_VOICE_1_ID - Eleven Labs voice 1 ID (Example: my-voice-id-1)
+# ELEVENLABS_VOICE_2_ID - Eleven Labs voice 2 ID (Example: my-voice-id-2)
+ELEVENLABS_API_KEY=your-elevenlabs-api-key
+ELEVENLABS_VOICE_1_ID=your-voice-id-1
+ELEVENLABS_VOICE_2_ID=your-voice-id-2

.flake8

@@ -0,0 +1,12 @@
+[flake8]
+max-line-length = 88
+extend-ignore = E203
+exclude =
+    .tox,
+    __pycache__,
+    *.pyc,
+    .env
+    venv/*
+    .venv/*
+    reports/*
+    dist/*

.github/workflows/ci.yml

@@ -32,11 +32,11 @@ jobs:
 
     - name: Lint with flake8
       continue-on-error: false
-      run: flake8 scripts/ tests/ --select E303,W293,W291,W292,E305,E231,E302
+      run: flake8 autogpt/ tests/ --select E303,W293,W291,W292,E305,E231,E302
 
     - name: Run unittest tests with coverage
       run: |
-        coverage run --source=scripts -m unittest discover tests
+        coverage run --source=autogpt -m unittest discover tests
 
     - name: Generate coverage report
       run: |

.gitignore

@@ -1,7 +1,8 @@
-scripts/keys.py
-scripts/*json
-scripts/node_modules/
-scripts/__pycache__/keys.cpython-310.pyc
+## Original ignores
+autogpt/keys.py
+autogpt/*json
+autogpt/node_modules/
+autogpt/__pycache__/keys.cpython-310.pyc
 package-lock.json
 *.pyc
 auto_gpt_workspace/*
@@ -16,11 +17,138 @@ last_run_ai_settings.yaml
 .idea/*
 auto-gpt.json
 log.txt
+log-ingestion.txt
+logs
 
-# Coverage reports
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+plugins/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
 .coverage
+.coverage.*
+.cache
+nosetests.xml
 coverage.xml
-htmlcov/
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
 
-# For Macs Dev Environs: ignoring .Desktop Services_Store
-.DS_Store
+# Pyre type checker
+.pyre/
+llama-*
+vicuna-*

.isort.cfg

@@ -0,0 +1,10 @@
+[settings]
+profile = black
+multi_line_output = 3
+include_trailing_comma = True
+force_grid_wrap = 0
+use_parentheses = True
+ensure_newline_before_comments = True
+line_length = 88
+skip = venv,env,node_modules,.env,.venv,dist
+sections = FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER