🔀 [Merge] merge master

.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:
 

.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: |

.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

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: