Merge branch 'master' of https://github.com/Significant-Gravitas/Auto…

…-GPT into pr/1477

.devcontainer/Dockerfile

@@ -1,10 +1,10 @@
-# [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
+# [Choice] Python version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.10, 3-bullseye, 3.10-bullseye, 3-buster, 3.10-buster
 ARG VARIANT=3-bullseye
-FROM --platform=linux/amd64 python:3.8
+FROM --platform=linux/amd64 python:3.10
 
 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 
+    && 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.
@@ -25,4 +25,4 @@ 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
+# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1

.env.template

@@ -3,6 +3,8 @@
 ################################################################################
 # EXECUTE_LOCAL_COMMANDS - Allow local command execution (Example: False)
 EXECUTE_LOCAL_COMMANDS=False
+# RESTRICT_TO_WORKSPACE - Restrict file operations to workspace ./auto_gpt_workspace (Default: True)
+RESTRICT_TO_WORKSPACE=True
 # BROWSE_CHUNK_MAX_LENGTH - When browsing website, define the length of chunk stored in memory
 BROWSE_CHUNK_MAX_LENGTH=8192
 # USER_AGENT - Define the user-agent used by the requests library to browse website (string)

.github/workflows/benchmark.yml

@@ -9,11 +9,11 @@ jobs:
     environment: benchmark
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: ['3.10', '3.11']
 
     steps:
     - name: Check out repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2

.github/workflows/ci.yml

@@ -2,48 +2,64 @@ name: Python CI
 
 on:
   push:
-    branches:
-      - master
+    branches: [master]
   pull_request:
-    branches:
-      - '**'
-  pull_request_target:
-    branches:
-      - '**'
+    branches: [master]
+
+concurrency:
+  group: ${{ format('ci-{0}', format('pr-{0}', github.event.pull_request.number) || github.sha) }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
-  build:
+  lint:
     runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        python-version: [3.8]
+    env:
+      min-python-version: '3.10'
 
     steps:
     - name: Check out repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
-    - name: Set up Python ${{ matrix.python-version }}
+    - name: Set up Python ${{ env.min-python-version }}
       uses: actions/setup-python@v2
       with:
-        python-version: ${{ matrix.python-version }}
+        python-version: ${{ env.min-python-version }}
 
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt
 
     - name: Lint with flake8
-      continue-on-error: false
       run: flake8
 
     - name: Check black formatting
-      continue-on-error: false
       run: black . --check
+      if: success() || failure()
 
     - name: Check isort formatting
-      continue-on-error: false
       run: isort . --check
+      if: success() || failure()
+
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.10', '3.11']
+
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v3
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
 
     - name: Run unittest tests with coverage
       run: |
@@ -53,3 +69,4 @@ jobs:
       run: |
         coverage report
         coverage xml
+      if: success() || failure()

.sourcery.yaml

@@ -30,7 +30,7 @@ rule_settings:
   - refactoring
   - suggestion
   - comment
-  python_version: '3.9' # A string specifying the lowest Python version your project supports. Sourcery will not suggest refactorings requiring a higher Python version.
+  python_version: '3.10' # A string specifying the lowest Python version your project supports. Sourcery will not suggest refactorings requiring a higher Python version.
 
 # rules:  # A list of custom rules Sourcery will include in its analysis.
 # - id: no-print-statements
@@ -68,4 +68,4 @@ rule_settings:
 # proxy:
 #   url:
 #   ssl_certs_file:
-#   no_ssl_verify: false
+#   no_ssl_verify: false

Dockerfile

@@ -1,5 +1,5 @@
 # Use an official Python base image from the Docker Hub
-FROM python:3.11-slim
+FROM python:3.10-slim
 
 # Install git
 RUN apt-get -y update

autogpt/app.py

@@ -3,8 +3,8 @@
 from typing import Dict, List, NoReturn, Union
 
 from autogpt.agent.agent_manager import AgentManager
+from autogpt.commands.analyze_code import analyze_code
 from autogpt.commands.audio_text import read_audio_from_file
-from autogpt.commands.evaluate_code import evaluate_code
 from autogpt.commands.execute_code import (
     execute_python_file,
     execute_shell,
@@ -181,8 +181,8 @@ def execute_command(command_name: str, arguments):
         # TODO: Change these to take in a file rather than pasted code, if
         # non-file is given, return instructions "Input should be a python
         # filepath, write your code to file and try again"
-        elif command_name == "evaluate_code":
-            return evaluate_code(arguments["code"])
+        elif command_name == "analyze_code":
+            return analyze_code(arguments["code"])
         elif command_name == "improve_code":
             return improve_code(arguments["suggestions"], arguments["code"])
         elif command_name == "write_tests":

autogpt/commands/evaluate_code.py → autogpt/commands/analyze_code.py

@@ -4,7 +4,7 @@
 from autogpt.llm_utils import call_ai_function
 
 
-def evaluate_code(code: str) -> list[str]:
+def analyze_code(code: str) -> list[str]:
     """
     A function that takes in a string and returns a response from create chat
       completion api call.

autogpt/commands/execute_code.py

@@ -84,6 +84,12 @@ def execute_python_file(file: str) -> str:
 
         return logs
 
+    except docker.errors.DockerException as e:
+        print(
+            "Could not run the script in a container. If you haven't already, please install Docker https://docs.docker.com/get-docker/"
+        )
+        return f"Error: {str(e)}"
+
     except Exception as e:
         return f"Error: {str(e)}"
 

autogpt/commands/file_operations.py

@@ -3,8 +3,7 @@
 
 import os
 import os.path
-from pathlib import Path
-from typing import Generator, List
+from typing import Generator
 
 import requests
 from colorama import Back, Fore

autogpt/config/config.py

@@ -39,6 +39,9 @@ def __init__(self) -> None:
         self.execute_local_commands = (
             os.getenv("EXECUTE_LOCAL_COMMANDS", "False") == "True"
         )
+        self.restrict_to_workspace = (
+            os.getenv("RESTRICT_TO_WORKSPACE", "True") == "True"
+        )
 
         if self.use_azure:
             self.load_azure_config()

autogpt/prompt.py

@@ -73,7 +73,7 @@ def get_prompt() -> str:
         ("Append to file", "append_to_file", {"file": "<file>", "text": "<text>"}),
         ("Delete file", "delete_file", {"file": "<file>"}),
         ("Search Files", "search_files", {"directory": "<directory>"}),
-        ("Evaluate Code", "evaluate_code", {"code": "<full_code_string>"}),
+        ("Analyze Code", "analyze_code", {"code": "<full_code_string>"}),
         (
             "Get Improved Code",
             "improve_code",

autogpt/workspace.py

@@ -3,6 +3,10 @@
 import os
 from pathlib import Path
 
+from autogpt.config import Config
+
+CFG = Config()
+
 # Set a dedicated folder for file I/O
 WORKSPACE_PATH = Path(os.getcwd()) / "auto_gpt_workspace"
 
@@ -35,9 +39,9 @@ def safe_path_join(base: Path, *paths: str | Path) -> Path:
     """
     joined_path = base.joinpath(*paths).resolve()
 
-    if not joined_path.is_relative_to(base):
+    if CFG.restrict_to_workspace and not joined_path.is_relative_to(base):
         raise ValueError(
-            f"Attempted to access path '{joined_path}' outside of working directory '{base}'."
+            f"Attempted to access path '{joined_path}' outside of workspace '{base}'."
         )
 
     return joined_path