Merge branch 'master' of https://github.com/BillSchumacher/Auto-GPT i…

…nto plugin-support

.env.template

@@ -5,15 +5,10 @@
 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
-# USE_WEB_BROWSER - Sets the web-browser drivers to use with selenium (defaults to chrome).
-# Note: set this to either 'chrome', 'firefox', or 'safari' depending on your current browser
-# USE_WEB_BROWSER=chrome
 
 ################################################################################
 ### LLM PROVIDER
@@ -54,6 +49,7 @@ SMART_TOKEN_LIMIT=8000
 # local - Default
 # pinecone - Pinecone (if configured)
 # redis - Redis (if configured)
+# milvus - Milvus (if configured)
 MEMORY_BACKEND=local
 
 ### PINECONE
@@ -63,7 +59,7 @@ PINECONE_API_KEY=your-pinecone-api-key
 PINECONE_ENV=your-pinecone-region
 
 ### REDIS
-# REDIS_HOST - Redis host (Default: localhost)
+# REDIS_HOST - Redis host (Default: localhost, use "redis" for docker-compose)
 # REDIS_PORT - Redis port (Default: 6379)
 # REDIS_PASSWORD - Redis password (Default: "")
 # WIPE_REDIS_ON_START - Wipes data / index on start (Default: False)
@@ -135,9 +131,16 @@ GITHUB_API_KEY=github_pat_123
 GITHUB_USERNAME=your-github-username
 
 ################################################################################
-### SEARCH PROVIDER
+### WEB BROWSING
 ################################################################################
 
+### BROWSER
+# USE_WEB_BROWSER - Sets the web-browser drivers to use with selenium (defaults to chrome).
+# HEADLESS_BROWSER - Whether to run the browser in headless mode (defaults to True)
+#   Note: set this to either 'chrome', 'firefox', or 'safari' depending on your current browser
+# USE_WEB_BROWSER=chrome
+# HEADLESS_BROWSER=True
+
 ### 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)

.envrc

@@ -0,0 +1,4 @@
+# Upon entering directory, direnv requests user permission once to automatically load project dependencies onwards.
+# Eliminating the need of running "nix develop github:superherointj/nix-auto-gpt" for Nix users to develop/use Auto-GPT.
+
+[[ -z $IN_NIX_SHELL ]] && use flake github:superherointj/nix-auto-gpt

.flake8

@@ -1,12 +1,12 @@
 [flake8]
 max-line-length = 88
-extend-ignore = E203
+select = "E303, W293, W291, W292, E305, E231, E302"
 exclude =
     .tox,
     __pycache__,
     *.pyc,
     .env
-    venv/*
-    .venv/*
-    reports/*
-    dist/*
+    venv*/*,
+    .venv/*,
+    reports/*,
+    dist/*,

.github/ISSUE_TEMPLATE/1.bug.yml

@@ -2,6 +2,20 @@ name: Bug report 🐛
 description: Create a bug report for Auto-GPT.
 labels: ['status: needs triage']
 body:
+  - type: markdown
+    attributes:
+      value: |
+        ### ⚠️ Before you continue
+        * Check out our [backlog], [roadmap] and join our [discord] to discuss what's going on
+        * If you need help, you can ask in the [discussions] section or in [#tech-support]
+        * **Throughly search the [existing issues] before creating a new one**
+
+        [backlog]: https://github.com/orgs/Significant-Gravitas/projects/1
+        [roadmap]: https://github.com/orgs/Significant-Gravitas/projects/2  
+        [discord]: https://discord.gg/autogpt
+        [discussions]: https://github.com/Significant-Gravitas/Auto-GPT/discussions
+        [#tech-support]: https://discord.com/channels/1092243196446249134/1092275629602394184
+        [existing issues]: https://github.com/Significant-Gravitas/Auto-GPT/issues?q=is%3Aissue
   - type: checkboxes
     attributes:
       label: ⚠️ Search for existing issues first ⚠️
@@ -28,14 +42,32 @@ body:
           - Provide commit-hash (`git rev-parse HEAD` gets it)
           - If it's a pip/packages issue, provide pip version, python version
           - If it's a crash, provide traceback.
-  - type: checkboxes
+  - type: dropdown
     attributes:
-      label: GPT-3 or GPT-4
+      label: Which Operating System are you using?
+      description: >
+        Please select the operating system you were using to run Auto-GPT when this problem occurred.
+      options:
+        - Windows
+        - Linux
+        - MacOS
+        - Docker
+        - Devcontainer / Codespace
+        - Windows Subsystem for Linux (WSL)
+        - Other (Please specify in your problem)
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: GPT-3 or GPT-4?
       description: >
         If you are using Auto-GPT with `--gpt3only`, your problems may be caused by
-        the limitations of GPT-3.5
+        the [limitations](https://github.com/Significant-Gravitas/Auto-GPT/issues?q=is%3Aissue+label%3A%22AI+model+limitation%22) of GPT-3.5.
       options:
-        - label: I am using Auto-GPT with GPT-3 (GPT-3.5)
+        - GPT-3.5
+        - GPT-4
+    validations:
+      required: true
   - type: textarea
     attributes:
       label: Steps to reproduce 🕹
@@ -52,9 +84,34 @@ body:
   - type: textarea
     attributes:
       label: Your prompt 📝
-      description: |
-        If applicable please provide the prompt you are using. You can find your last-used prompt in last_run_ai_settings.yaml.
+      description: >
+        If applicable please provide the prompt you are using. Your prompt is stored in your `ai_settings.yaml` file.
       value: |
         ```yaml
         # Paste your prompt here
         ```
+  - type: textarea
+    attributes:
+      label: Your Logs 📒
+      description: |
+        Please include the log showing your error and the command that caused it, if applicable.
+        You can copy it from your terminal or from `logs/activity.log`.
+        This will help us understand your issue better!
+        
+        <details>
+        <summary><i>Example</i></summary>
+        ```log
+        INFO NEXT ACTION:  COMMAND = execute_shell  ARGUMENTS = {'command_line': 'some_command'}
+        INFO -=-=-=-=-=-=-= COMMAND AUTHORISED BY USER -=-=-=-=-=-=-=
+        Traceback (most recent call last):
+        File "/home/anaconda3/lib/python3.9/site-packages/openai/api_requestor.py", line 619, in _interpret_response
+        self._interpret_response_line(
+        File "/home/anaconda3/lib/python3.9/site-packages/openai/api_requestor.py", line 682, in _interpret_response_line
+        raise self.handle_error_response(
+        openai.error.InvalidRequestError: This model's maximum context length is 8191 tokens, however you requested 10982 tokens (10982 in your prompt; 0 for the completion). Please reduce your prompt; or completion length.
+        ```
+        </details>
+      value: |
+        ```log
+        <insert your logs here>
+        ```

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,3 +1,10 @@
+<!-- ⚠️ At the moment any non-essential commands are not being merged.
+If you want to add non-essential commands to Auto-GPT, please create a plugin instead.
+We are expecting to ship plugin support within the week (PR #757).
+Resources:
+* https://github.com/Significant-Gravitas/Auto-GPT-Plugin-Template
+-->
+
 <!-- 📢 Announcement
 We've recently noticed an increase in pull requests focusing on combining multiple changes. While the intentions behind these PRs are appreciated, it's essential to maintain a clean and manageable git history. To ensure the quality of our repository, we kindly ask you to adhere to the following guidelines when submitting PRs:
 
@@ -30,4 +37,4 @@ By following these guidelines, your PRs are more likely to be merged quickly aft
 
 <!-- If you haven't added tests, please explain why. If you have, check the appropriate box. If you've ensured your PR is atomic and well-documented, check the corresponding boxes. -->
 
-<!-- By submitting this, I agree that my pull request should be closed if I do not fill this out or follow the guide lines. -->
+<!-- By submitting this, I agree that my pull request should be closed if I do not fill this out or follow the guidelines. -->

.github/workflows/ci.yml

@@ -6,7 +6,10 @@ on:
       - master
   pull_request:
     branches:
-      - master
+      - '**'
+  pull_request_target:
+    branches:
+      - '**'
 
 jobs:
   build:
@@ -32,7 +35,15 @@ jobs:
 
     - name: Lint with flake8
       continue-on-error: false
-      run: flake8 autogpt/ tests/ --select E303,W293,W291,W292,E305,E231,E302
+      run: flake8
+
+    - name: Check black formatting
+      continue-on-error: false
+      run: black . --check
+
+    - name: Check isort formatting
+      continue-on-error: false
+      run: isort . --check
 
     - name: Run unittest tests with coverage
       run: |

.github/workflows/pr-label.yml

@@ -0,0 +1,28 @@
+name: "Pull Request auto-label"
+on:
+  # So that PRs touching the same files as the push are updated
+  push:
+  # So that the `dirtyLabel` is removed if conflicts are resolve
+  # We recommend `pull_request_target` so that github secrets are available.
+  # In `pull_request` we wouldn't be able to change labels of fork PRs
+  pull_request_target:
+    types: [opened, synchronize]
+concurrency:
+  group: ${{ format('pr-label-{0}', github.event.pull_request.number || github.sha) }}
+  cancel-in-progress: true
+
+jobs:
+  conflicts:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: Update PRs with conflict labels
+        uses: eps1lon/actions-label-merge-conflict@releases/2.x
+        with:
+          dirtyLabel: "conflicts"
+          #removeOnDirtyLabel: "PR: ready to ship"
+          repoToken: "${{ secrets.GITHUB_TOKEN }}"
+          commentOnDirty: "This pull request has conflicts with the base branch, please resolve those so we can evaluate the pull request."
+          commentOnClean: "Conflicts have been resolved! 🎉 A maintainer will review the pull request shortly."

.gitignore

@@ -127,6 +127,7 @@ celerybeat.pid
 *.sage.py
 
 # Environments
+.direnv/
 .env
 .venv
 env/
@@ -158,3 +159,6 @@ vicuna-*
 .DS_Store
 
 openai/
+
+# news
+CURRENT_BULLETIN.md

.pre-commit-config.yaml

@@ -1,39 +1,32 @@
 repos:
-  - repo: https://github.com/sourcery-ai/sourcery
-    rev: v1.1.0 # Get the latest tag from https://github.com/sourcery-ai/sourcery/tags
-    hooks:
-      - id: sourcery
-
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v0.9.2
     hooks:
       - id: check-added-large-files
-        args: [ '--maxkb=500' ]
+        args: ['--maxkb=500']
       - id: check-byte-order-marker
       - id: check-case-conflict
       - id: check-merge-conflict
       - id: check-symlinks
       - id: debug-statements
-
-  - repo: local
+
+  - repo: https://github.com/pycqa/isort
+    rev: 5.12.0
     hooks:
       - id: isort
-        name: isort-local
-        entry: isort
-        language: python
-        types: [ python ]
-        exclude: .+/(dist|.venv|venv|build)/.+
-        pass_filenames: true
+        language_version: python3.10
+
+  - repo: https://github.com/psf/black
+    rev: 23.3.0
+    hooks:
       - id: black
-        name: black-local
-        entry: black
-        language: python
-        types: [ python ]
-        exclude: .+/(dist|.venv|venv|build)/.+
-        pass_filenames: true
+        language_version: python3.10
+
+  - repo: local
+    hooks:
       - id: pytest-check
         name: pytest-check
         entry: pytest --cov=autogpt --without-integration --without-slow-integration
         language: system
         pass_filenames: false
-        always_run: true
+        always_run: true

BULLETIN.md

@@ -0,0 +1,2 @@
+Welcome to Auto-GPT! We'll keep you informed of the latest news and features by printing messages here.
+If you don't wish to see this message, you can run Auto-GPT with the --skip-news flag

CONTRIBUTING.md

@@ -20,6 +20,12 @@ This document provides guidelines and best practices to help you contribute effe
 
 By participating in this project, you agree to abide by our [Code of Conduct](CODE_OF_CONDUCT.md). Please read it to understand the expectations we have for everyone who contributes to this project.
 
+## 📢 A Quick Word
+Right now we will not be accepting any Contributions that add non-essential commands to Auto-GPT.
+
+However, you absolutely can still add these commands to Auto-GPT in the form of plugins. Please check out this [template](https://github.com/Significant-Gravitas/Auto-GPT-Plugin-Template).
+> ⚠️ Plugin support is expected to ship within the week. You can follow PR #757 for more updates!
+
 ## Getting Started
 
 To start contributing, follow these steps:

Dockerfile

@@ -5,6 +5,16 @@ FROM python:3.11-slim
 RUN apt-get -y update
 RUN apt-get -y install git chromium-driver
 
+# Install Xvfb and other dependencies for headless browser testing
+RUN apt-get update \
+    && apt-get install -y wget gnupg2 libgtk-3-0 libdbus-glib-1-2 dbus-x11 xvfb ca-certificates
+
+# Install Firefox / Chromium
+RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
+    && echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list \
+    && apt-get update \
+    && apt-get install -y chromium firefox-esr
+
 # Set environment variables
 ENV PIP_NO_CACHE_DIR=yes \
     PYTHONUNBUFFERED=1 \
@@ -17,8 +27,9 @@ RUN chown appuser:appuser /home/appuser
 USER appuser
 
 # Copy the requirements.txt file and install the requirements
-COPY --chown=appuser:appuser requirements-docker.txt .
-RUN pip install --no-cache-dir --user -r requirements-docker.txt
+COPY --chown=appuser:appuser requirements.txt .
+RUN sed -i '/Items below this point will not be included in the Docker Image/,$d' requirements.txt && \
+	pip install --no-cache-dir --user -r requirements.txt
 
 # Copy the application files
 COPY --chown=appuser:appuser autogpt/ ./autogpt