Release v0.4.1 (#4686)

Co-authored-by: Reinier van der Leer <github@pwuts.nl>
Co-authored-by: Nicholas Tindle <nick@ntindle.com>
Co-authored-by: Nicholas Tindle <nicktindle@outlook.com>
Co-authored-by: k-boikov <64261260+k-boikov@users.noreply.github.com>
Co-authored-by: merwanehamadi <merwanehamadi@gmail.com>
Co-authored-by: Merwane Hamadi <merwanehamadi@gmail.com>
Co-authored-by: Richard Beales <rich@richbeales.net>
Co-authored-by: Luke K <2609441+lc0rp@users.noreply.github.com>
Co-authored-by: Luke K (pr-0f3t) <2609441+lc0rp@users.noreply.github.com>
Co-authored-by: Erik Peterson <e@eriklp.com>
Co-authored-by: Auto-GPT-Bot <github-bot@agpt.co>
Co-authored-by: Benny van der Lans <49377421+bfalans@users.noreply.github.com>
Co-authored-by: Jan <jan-github@phobia.de>
Co-authored-by: Robin Richtsfeld <robin.richtsfeld@gmail.com>
Co-authored-by: Marc Bornträger <marc.borntraeger@gmail.com>
Co-authored-by: Stefan Ayala <stefanayala3266@gmail.com>
Co-authored-by: javableu <45064273+javableu@users.noreply.github.com>
Co-authored-by: DGdev91 <DGdev91@users.noreply.github.com>
Co-authored-by: Kinance <kinance@gmail.com>
Co-authored-by: digger yu <digger-yu@outlook.com>
Co-authored-by: David <scenaristeur@gmail.com>
Co-authored-by: gravelBridge <john.tian31@gmail.com>
Fix Python CI "update cassettes" step (#4591)
fix CI (#4596)
Fix inverted logic for deny_command (#4563)
fix current_score.json generation (#4601)
Fix duckduckgo rate limiting (#4592)
Fix debug code challenge (#4632)
Fix issues with information retrieval challenge a (#4622)
fix issues with env configuration and .env.template (#4630)
Fix prompt issue causing 'No Command' issues and challenge to fail (#4623)
Fix benchmark logs (#4653)
Fix typo in docs/setup.md (#4613)
Fix run.sh shebang (#4561)
Fix autogpt docker image not working because missing prompt_settings (#4680)
Fix execute_command coming from plugins (#4730)

tests/integration/test_execute_code.py

@@ -1,23 +1,25 @@
+import os
 import random
 import string
 import tempfile
+from typing import Callable
 
 import pytest
-from pytest_mock import MockerFixture
 
 import autogpt.commands.execute_code as sut  # system under testing
+from autogpt.agent.agent import Agent
 from autogpt.config import Config
 
 
 @pytest.fixture
-def config_allow_execute(config: Config, mocker: MockerFixture):
-    yield mocker.patch.object(config, "execute_local_commands", True)
+def random_code(random_string) -> Callable:
+    return f"print('Hello {random_string}!')"
 
 
 @pytest.fixture
-def python_test_file(config: Config, random_string):
+def python_test_file(config: Config, random_code: str) -> Callable:
     temp_file = tempfile.NamedTemporaryFile(dir=config.workspace_path, suffix=".py")
-    temp_file.write(str.encode(f"print('Hello {random_string}!')"))
+    temp_file.write(str.encode(random_code))
     temp_file.flush()
 
     yield temp_file.name
@@ -29,22 +31,98 @@ def random_string():
     return "".join(random.choice(string.ascii_lowercase) for _ in range(10))
 
 
-def test_execute_python_file(python_test_file: str, random_string: str, config):
-    result: str = sut.execute_python_file(python_test_file, config)
+def test_execute_python_file(python_test_file: str, random_string: str, agent: Agent):
+    result: str = sut.execute_python_file(python_test_file, agent=agent)
     assert result.replace("\r", "") == f"Hello {random_string}!\n"
 
 
-def test_execute_python_file_invalid(config):
+def test_execute_python_code(random_code: str, random_string: str, agent: Agent):
+    ai_name = agent.ai_name
+
+    result: str = sut.execute_python_code(random_code, "test_code", agent=agent)
+    assert result.replace("\r", "") == f"Hello {random_string}!\n"
+
+    # Check that the code is stored
+    destination = os.path.join(
+        agent.config.workspace_path, ai_name, "executed_code", "test_code.py"
+    )
+    with open(destination) as f:
+        assert f.read() == random_code
+
+
+def test_execute_python_code_overwrites_file(
+    random_code: str, random_string: str, agent: Agent
+):
+    ai_name = agent.ai_name
+    destination = os.path.join(
+        agent.config.workspace_path, ai_name, "executed_code", "test_code.py"
+    )
+    os.makedirs(os.path.dirname(destination), exist_ok=True)
+
+    with open(destination, "w+") as f:
+        f.write("This will be overwritten")
+
+    sut.execute_python_code(random_code, "test_code.py", agent=agent)
+
+    # Check that the file is updated with the new code
+    with open(destination) as f:
+        assert f.read() == random_code
+
+
+def test_execute_python_file_invalid(agent: Agent):
     assert all(
-        s in sut.execute_python_file("not_python", config).lower()
+        s in sut.execute_python_file("not_python", agent).lower()
         for s in ["error:", "invalid", ".py"]
     )
+
+
+def test_execute_python_file_not_found(agent: Agent):
     assert all(
-        s in sut.execute_python_file("notexist.py", config).lower()
-        for s in ["error:", "does not exist"]
+        s in sut.execute_python_file("notexist.py", agent).lower()
+        for s in [
+            "python: can't open file 'notexist.py'",
+            "[errno 2] no such file or directory",
+        ]
     )
 
 
-def test_execute_shell(config_allow_execute, random_string, config):
-    result = sut.execute_shell(f"echo 'Hello {random_string}!'", config)
+def test_execute_shell(random_string: str, agent: Agent):
+    result = sut.execute_shell(f"echo 'Hello {random_string}!'", agent)
     assert f"Hello {random_string}!" in result
+
+
+def test_execute_shell_local_commands_not_allowed(random_string: str, agent: Agent):
+    result = sut.execute_shell(f"echo 'Hello {random_string}!'", agent)
+    assert f"Hello {random_string}!" in result
+
+
+def test_execute_shell_denylist_should_deny(agent: Agent, random_string: str):
+    agent.config.shell_denylist = ["echo"]
+
+    result = sut.execute_shell(f"echo 'Hello {random_string}!'", agent)
+    assert "Error:" in result and "not allowed" in result
+
+
+def test_execute_shell_denylist_should_allow(agent: Agent, random_string: str):
+    agent.config.shell_denylist = ["cat"]
+
+    result = sut.execute_shell(f"echo 'Hello {random_string}!'", agent)
+    assert "Hello" in result and random_string in result
+    assert "Error" not in result
+
+
+def test_execute_shell_allowlist_should_deny(agent: Agent, random_string: str):
+    agent.config.shell_command_control = sut.ALLOWLIST_CONTROL
+    agent.config.shell_allowlist = ["cat"]
+
+    result = sut.execute_shell(f"echo 'Hello {random_string}!'", agent)
+    assert "Error:" in result and "not allowed" in result
+
+
+def test_execute_shell_allowlist_should_allow(agent: Agent, random_string: str):
+    agent.config.shell_command_control = sut.ALLOWLIST_CONTROL
+    agent.config.shell_allowlist = ["echo"]
+
+    result = sut.execute_shell(f"echo 'Hello {random_string}!'", agent)
+    assert "Hello" in result and random_string in result
+    assert "Error" not in result