From 66b36e9879662867b9d31f1ffc18605e07bb437d Mon Sep 17 00:00:00 2001 From: Wlad Date: Mon, 10 Apr 2023 15:35:10 +0200 Subject: [PATCH 01/27] fix json parser - messy --- scripts/main.py | 42 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/scripts/main.py b/scripts/main.py index f96afeb1..876ab5e4 100644 --- a/scripts/main.py +++ b/scripts/main.py @@ -44,21 +44,50 @@ def print_to_console( max_typing_speed = max_typing_speed * 0.95 print() +def attempt_to_fix_json_by_finding_outermost_brackets(json_string): + # Attempt to fix JSON by finding the outermost brackets + # This is a hacky solution to fix JSON that is missing the outermost brackets + # This is a common issue with the OpenAI API + # This is not a perfect solution, but it works for the most common cases + # it removes unnecessary text around the JSON + if cfg.speak_mode: + speak.say_text("I have received an invalid JSON response from the OpenAI API. Trying to fix it now.") + print_to_console("Attempting to fix JSON by finding outermost brackets\n", Fore.RED,"") + try: + # Find the first bracket + first_bracket_index = json_string.index("{") + # Find the last bracket + last_bracket_index = json_string.rindex("}") + # Slice the string to get the JSON + json_string = json_string[first_bracket_index:last_bracket_index + 1] + if cfg.speak_mode: + speak.say_text("Apparently I managed to fix it.") + except json.JSONDecodeError as e: + if cfg.speak_mode: + speak.say_text("Didn't work. I will have to ignore this response then.") + print_to_console("Error: Invalid JSON, setting it to empty JSON now.\n", Fore.RED, "") + json_string = {} + return json_string def print_assistant_thoughts(assistant_reply): global ai_name global cfg try: - # Parse and print Assistant response - assistant_reply_json = fix_and_parse_json(assistant_reply) + try: + # Parse and print Assistant response + assistant_reply_json = fix_and_parse_json(assistant_reply) + except json.JSONDecodeError as e: + print_to_console("Error: Invalid JSON in assistant thoughts\n", Fore.RED, assistant_reply) + assistant_reply_json = attempt_to_fix_json_by_finding_outermost_brackets(assistant_reply) + assistant_reply_json = fix_and_parse_json(assistant_reply_json) # Check if assistant_reply_json is a string and attempt to parse it into a JSON object if isinstance(assistant_reply_json, str): try: assistant_reply_json = json.loads(assistant_reply_json) except json.JSONDecodeError as e: - print_to_console("Error: Invalid JSON\n", Fore.RED, assistant_reply) - assistant_reply_json = {} + print_to_console("Error: Invalid JSON in assistant thoughts\n", Fore.RED, assistant_reply) + assistant_reply_json = attempt_to_fix_json_by_finding_outermost_brackets(assistant_reply_json) assistant_thoughts_reasoning = None assistant_thoughts_plan = None @@ -95,8 +124,11 @@ def print_assistant_thoughts(assistant_reply): if cfg.speak_mode and assistant_thoughts_speak: speak.say_text(assistant_thoughts_speak) - except json.decoder.JSONDecodeError: + except json.decoder.JSONDecodeError as e: print_to_console("Error: Invalid JSON\n", Fore.RED, assistant_reply) + print_to_console("Stack trace:\n", Fore.RED, e.with_traceback) + if cfg.speak_mode: + speak.say_text("I have received an invalid JSON response from the OpenAI API. I cannot ignore this response.") # All other errors, return "Error: + error message" except Exception as e: From a504f0bdd33b1218488f40a8bfc763984ca6ee47 Mon Sep 17 00:00:00 2001 From: Kari Ahdan Date: Mon, 10 Apr 2023 16:43:06 +0300 Subject: [PATCH 02/27] Add required env parameters for azure usage --- .env.template | 2 ++ README.md | 2 +- scripts/config.py | 2 ++ scripts/llm_utils.py | 2 +- scripts/memory/base.py | 8 ++++++-- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.env.template b/.env.template index 525cd61c..cdf8e28c 100644 --- a/.env.template +++ b/.env.template @@ -10,5 +10,7 @@ USE_AZURE=False OPENAI_API_BASE=your-base-url-for-azure OPENAI_API_VERSION=api-version-for-azure OPENAI_DEPLOYMENT_ID=deployment-id-for-azure +AZURE_CHAT_DEPLOYMENT_ID=deployment-id-for-azure-chat-ai +AZURE_EMBEDDINGS_DEPLOYMENT_ID=deployment-id-for-azure-embeddigs-ai IMAGE_PROVIDER=dalle HUGGINGFACE_API_TOKEN= \ No newline at end of file diff --git a/README.md b/README.md index 118131e4..d93c598f 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ pip install -r requirements.txt 4. Rename `.env.template` to `.env` and fill in your `OPENAI_API_KEY`. If you plan to use Speech Mode, fill in your `ELEVEN_LABS_API_KEY` as well. - Obtain your OpenAI API key from: https://platform.openai.com/account/api-keys. - Obtain your ElevenLabs API key from: https://beta.elevenlabs.io. You can view your xi-api-key using the "Profile" tab on the website. - - If you want to use GPT on an Azure instance, set `USE_AZURE` to `True` and provide the `OPENAI_API_BASE`, `OPENAI_API_VERSION` and `OPENAI_DEPLOYMENT_ID` values as explained here: https://pypi.org/project/openai/ in the `Microsoft Azure Endpoints` section + - If you want to use GPT on an Azure instance, set `USE_AZURE` to `True` and provide the `OPENAI_API_BASE`, `OPENAI_API_VERSION` and `OPENAI_DEPLOYMENT_ID` values as explained here: https://pypi.org/project/openai/ in the `Microsoft Azure Endpoints` section. Additionally you need separate deployments for both embeddings and chat. Add their ID values to `AZURE_CHAT_DEPLOYMENT_ID` and `AZURE_EMBEDDINGS_DEPLOYMENT_ID` respectively ## 🔧 Usage diff --git a/scripts/config.py b/scripts/config.py index 1eb74b2b..7f446cd1 100644 --- a/scripts/config.py +++ b/scripts/config.py @@ -49,6 +49,8 @@ class Config(metaclass=Singleton): self.openai_api_base = os.getenv("OPENAI_API_BASE") self.openai_api_version = os.getenv("OPENAI_API_VERSION") self.openai_deployment_id = os.getenv("OPENAI_DEPLOYMENT_ID") + self.azure_chat_deployment_id = os.getenv("AZURE_CHAT_DEPLOYMENT_ID") + self.azure_embeddigs_deployment_id = os.getenv("AZURE_EMBEDDINGS_DEPLOYMENT_ID") openai.api_type = "azure" openai.api_base = self.openai_api_base openai.api_version = self.openai_api_version diff --git a/scripts/llm_utils.py b/scripts/llm_utils.py index 94ba5f13..3fb348f0 100644 --- a/scripts/llm_utils.py +++ b/scripts/llm_utils.py @@ -9,7 +9,7 @@ def create_chat_completion(messages, model=None, temperature=None, max_tokens=No """Create a chat completion using the OpenAI API""" if cfg.use_azure: response = openai.ChatCompletion.create( - deployment_id=cfg.openai_deployment_id, + deployment_id=cfg.azure_chat_deployment_id, model=model, messages=messages, temperature=temperature, diff --git a/scripts/memory/base.py b/scripts/memory/base.py index d7ab7fcf..bb22963a 100644 --- a/scripts/memory/base.py +++ b/scripts/memory/base.py @@ -1,12 +1,16 @@ """Base class for memory providers.""" import abc -from config import AbstractSingleton +from config import AbstractSingleton, Config import openai +cfg = Config() def get_ada_embedding(text): text = text.replace("\n", " ") - return openai.Embedding.create(input=[text], model="text-embedding-ada-002")["data"][0]["embedding"] + if cfg.use_azure: + return openai.Embedding.create(input=[text], engine=cfg.azure_embeddigs_deployment_id, model="text-embedding-ada-002")["data"][0]["embedding"] + else: + return openai.Embedding.create(input=[text], model="text-embedding-ada-002")["data"][0]["embedding"] class MemoryProviderSingleton(AbstractSingleton): From bb36634b46af4daf17812bb1884d5b7c45e54605 Mon Sep 17 00:00:00 2001 From: Wlad Date: Mon, 10 Apr 2023 19:40:55 +0200 Subject: [PATCH 03/27] fix line 328 error --- scripts/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/main.py b/scripts/main.py index 876ab5e4..cb286026 100644 --- a/scripts/main.py +++ b/scripts/main.py @@ -331,7 +331,7 @@ while True: user_input, full_message_history, memory, - cfg.fast_token_limit, cfg.debug) # TODO: This hardcodes the model to use GPT3.5. Make this an argument + cfg.fast_token_limit) # TODO: This hardcodes the model to use GPT3.5. Make this an argument # Print Assistant thoughts print_assistant_thoughts(assistant_reply) From 33d1fd3d6d955278392bca6fb95b191d008780b6 Mon Sep 17 00:00:00 2001 From: Wladastic Date: Mon, 10 Apr 2023 21:30:21 +0200 Subject: [PATCH 04/27] attempt fix --- scripts/main.py | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/scripts/main.py b/scripts/main.py index 654434e8..bfc46fd5 100644 --- a/scripts/main.py +++ b/scripts/main.py @@ -58,28 +58,30 @@ def print_to_console( print() def attempt_to_fix_json_by_finding_outermost_brackets(json_string): - # Attempt to fix JSON by finding the outermost brackets - # This is a hacky solution to fix JSON that is missing the outermost brackets - # This is a common issue with the OpenAI API - # This is not a perfect solution, but it works for the most common cases - # it removes unnecessary text around the JSON if cfg.speak_mode: speak.say_text("I have received an invalid JSON response from the OpenAI API. Trying to fix it now.") - print_to_console("Attempting to fix JSON by finding outermost brackets\n", Fore.RED,"") + print_to_console("Attempting to fix JSON by finding outermost brackets\n", Fore.RED, "") + try: - # Find the first bracket - first_bracket_index = json_string.index("{") - # Find the last bracket - last_bracket_index = json_string.rindex("}") - # Slice the string to get the JSON - json_string = json_string[first_bracket_index:last_bracket_index + 1] - if cfg.speak_mode: - speak.say_text("Apparently I managed to fix it.") - except json.JSONDecodeError as e: + # Use regex to search for JSON objects + import re + json_pattern = re.compile(r"\{(?:[^{}]|(?R))*\}") + json_match = json_pattern.search(json_string) + + if json_match: + # Extract the valid JSON object from the string + json_string = json_match.group(0) + if cfg.speak_mode: + speak.say_text("Apparently I managed to fix it.") + else: + raise ValueError("No valid JSON object found") + + except (json.JSONDecodeError, ValueError) as e: if cfg.speak_mode: speak.say_text("Didn't work. I will have to ignore this response then.") print_to_console("Error: Invalid JSON, setting it to empty JSON now.\n", Fore.RED, "") json_string = {} + return json_string def print_assistant_thoughts(assistant_reply): From ca4afca5dadb696292e5ca26ae16665ac6245153 Mon Sep 17 00:00:00 2001 From: Wlad Date: Mon, 10 Apr 2023 21:48:00 +0200 Subject: [PATCH 05/27] add log when json was fixed. --- scripts/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/main.py b/scripts/main.py index bfc46fd5..df07cb26 100644 --- a/scripts/main.py +++ b/scripts/main.py @@ -71,8 +71,9 @@ def attempt_to_fix_json_by_finding_outermost_brackets(json_string): if json_match: # Extract the valid JSON object from the string json_string = json_match.group(0) + print_to_console("Apparently json was fixed.", Fore.GREEN,"") if cfg.speak_mode: - speak.say_text("Apparently I managed to fix it.") + speak.say_text("Apparently json was fixed.") else: raise ValueError("No valid JSON object found") From 4ad1fc14a4869e9d59ae2920e36c286621097360 Mon Sep 17 00:00:00 2001 From: Wladastic Date: Mon, 10 Apr 2023 22:59:16 +0200 Subject: [PATCH 06/27] use regex instead of re --- scripts/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/main.py b/scripts/main.py index df07cb26..6a4723d4 100644 --- a/scripts/main.py +++ b/scripts/main.py @@ -64,8 +64,8 @@ def attempt_to_fix_json_by_finding_outermost_brackets(json_string): try: # Use regex to search for JSON objects - import re - json_pattern = re.compile(r"\{(?:[^{}]|(?R))*\}") + import regex + json_pattern = regex.compile(r"\{(?:[^{}]|(?R))*\}") json_match = json_pattern.search(json_string) if json_match: From 82379bb4168bc9e31e93043b28008720d42ffe38 Mon Sep 17 00:00:00 2001 From: Wlad Date: Tue, 11 Apr 2023 01:02:45 +0200 Subject: [PATCH 07/27] fix dump --- scripts/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/main.py b/scripts/main.py index 6a4723d4..3c1c789c 100644 --- a/scripts/main.py +++ b/scripts/main.py @@ -140,10 +140,8 @@ def print_assistant_thoughts(assistant_reply): # Speak the assistant's thoughts if cfg.speak_mode and assistant_thoughts_speak: speak.say_text(assistant_thoughts_speak) - except json.decoder.JSONDecodeError as e: print_to_console("Error: Invalid JSON\n", Fore.RED, assistant_reply) - print_to_console("Stack trace:\n", Fore.RED, e.with_traceback) if cfg.speak_mode: speak.say_text("I have received an invalid JSON response from the OpenAI API. I cannot ignore this response.") @@ -363,6 +361,8 @@ while True: # Get command name and arguments try: command_name, arguments = cmd.get_command(assistant_reply) + if cfg.speak_mode: + speak.say_text(f"I want to execute {command_name}") except Exception as e: print_to_console("Error: \n", Fore.RED, str(e)) From 87a2cf029dccc92b6da90960c326ca8b773aa9ed Mon Sep 17 00:00:00 2001 From: Wlad Date: Tue, 11 Apr 2023 01:30:07 +0200 Subject: [PATCH 08/27] try another fix --- scripts/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/main.py b/scripts/main.py index cb91771b..bf27953b 100644 --- a/scripts/main.py +++ b/scripts/main.py @@ -370,11 +370,11 @@ while True: cfg.fast_token_limit) # TODO: This hardcodes the model to use GPT3.5. Make this an argument # Print Assistant thoughts - assistant_reply = print_assistant_thoughts(assistant_reply) + print_assistant_thoughts(assistant_reply) # Get command name and arguments try: - command_name, arguments = cmd.get_command(assistant_reply) + command_name, arguments = cmd.get_command(attempt_to_fix_json_by_finding_outermost_brackets(assistant_reply)) if cfg.speak_mode: speak.say_text(f"I want to execute {command_name}") except Exception as e: From a86948fa23dee75f6c38e69da8523dcfc003c0c6 Mon Sep 17 00:00:00 2001 From: Wlad Date: Tue, 11 Apr 2023 01:31:18 +0200 Subject: [PATCH 09/27] include broken json in error log --- scripts/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/main.py b/scripts/main.py index bf27953b..498c1b59 100644 --- a/scripts/main.py +++ b/scripts/main.py @@ -71,7 +71,7 @@ def print_to_console( def attempt_to_fix_json_by_finding_outermost_brackets(json_string): if cfg.speak_mode: speak.say_text("I have received an invalid JSON response from the OpenAI API. Trying to fix it now.") - print_to_console("Attempting to fix JSON by finding outermost brackets\n", Fore.RED, "") + print_to_console("Attempting to fix JSON by finding outermost brackets\n", Fore.RED, json_string) try: # Use regex to search for JSON objects From 365ef9b50b499f284148e70abeb5276b3fbb7d97 Mon Sep 17 00:00:00 2001 From: Wlad Date: Tue, 11 Apr 2023 01:57:49 +0200 Subject: [PATCH 10/27] cleanup --- scripts/main.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/main.py b/scripts/main.py index 498c1b59..979203ea 100644 --- a/scripts/main.py +++ b/scripts/main.py @@ -69,9 +69,9 @@ def print_to_console( print() def attempt_to_fix_json_by_finding_outermost_brackets(json_string): - if cfg.speak_mode: - speak.say_text("I have received an invalid JSON response from the OpenAI API. Trying to fix it now.") - print_to_console("Attempting to fix JSON by finding outermost brackets\n", Fore.RED, json_string) + if cfg.speak_mode and cfg.debug: + speak.say_text("I have received an invalid JSON response from the OpenAI API. Trying to fix it now.") + print_to_console("Attempting to fix JSON by finding outermost brackets\n", Fore.RED, "") try: # Use regex to search for JSON objects @@ -83,8 +83,8 @@ def attempt_to_fix_json_by_finding_outermost_brackets(json_string): # Extract the valid JSON object from the string json_string = json_match.group(0) print_to_console("Apparently json was fixed.", Fore.GREEN,"") - if cfg.speak_mode: - speak.say_text("Apparently json was fixed.") + if cfg.speak_mode and cfg.debug: + speak.say_text("Apparently json was fixed.") else: raise ValueError("No valid JSON object found") From d0ae72e63bf82564b4eff6be680b87553fc1aaf6 Mon Sep 17 00:00:00 2001 From: Drikus Roor Date: Tue, 11 Apr 2023 19:53:42 +0200 Subject: [PATCH 11/27] refactor: Refactor imports to be compatible with unit tests --- main.py | 1 + scripts/__init__.py | 0 scripts/browse.py | 4 ++-- scripts/call_ai_function.py | 4 ++-- scripts/json_parser.py | 6 +++--- scripts/json_utils.py | 2 +- scripts/llm_utils.py | 2 +- tests.py | 8 ++++++++ tests/__init__.py | 0 tests/context.py | 4 ++++ tests/test_browse_scrape_text.py | 1 - tests/{json_tests.py => test_json_parser.py} | 7 ++----- 12 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 main.py create mode 100644 scripts/__init__.py create mode 100644 tests.py create mode 100644 tests/__init__.py create mode 100644 tests/context.py rename tests/{json_tests.py => test_json_parser.py} (97%) diff --git a/main.py b/main.py new file mode 100644 index 00000000..5f044237 --- /dev/null +++ b/main.py @@ -0,0 +1 @@ +from scripts.main import main \ No newline at end of file diff --git a/scripts/__init__.py b/scripts/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/scripts/browse.py b/scripts/browse.py index b0c745ef..e991a73c 100644 --- a/scripts/browse.py +++ b/scripts/browse.py @@ -1,7 +1,7 @@ import requests from bs4 import BeautifulSoup -from config import Config -from llm_utils import create_chat_completion +from .config import Config +from .llm_utils import create_chat_completion cfg = Config() diff --git a/scripts/call_ai_function.py b/scripts/call_ai_function.py index f8238658..0a2343bc 100644 --- a/scripts/call_ai_function.py +++ b/scripts/call_ai_function.py @@ -1,8 +1,8 @@ -from config import Config +from .config import Config cfg = Config() -from llm_utils import create_chat_completion +from .llm_utils import create_chat_completion # This is a magic function that can do anything with no-code. See # https://github.com/Torantulino/AI-Functions for more info. def call_ai_function(function, args, description, model=None): diff --git a/scripts/json_parser.py b/scripts/json_parser.py index e96c43f6..a03c5f5e 100644 --- a/scripts/json_parser.py +++ b/scripts/json_parser.py @@ -1,8 +1,8 @@ import json from typing import Any, Dict, Union -from call_ai_function import call_ai_function -from config import Config -from json_utils import correct_json +from .call_ai_function import call_ai_function +from .config import Config +from .json_utils import correct_json cfg = Config() diff --git a/scripts/json_utils.py b/scripts/json_utils.py index 80aab192..9ab776f5 100644 --- a/scripts/json_utils.py +++ b/scripts/json_utils.py @@ -1,6 +1,6 @@ import re import json -from config import Config +from .config import Config cfg = Config() diff --git a/scripts/llm_utils.py b/scripts/llm_utils.py index 94ba5f13..a4c50944 100644 --- a/scripts/llm_utils.py +++ b/scripts/llm_utils.py @@ -1,5 +1,5 @@ import openai -from config import Config +from .config import Config cfg = Config() openai.api_key = cfg.openai_api_key diff --git a/tests.py b/tests.py new file mode 100644 index 00000000..ce21c1f4 --- /dev/null +++ b/tests.py @@ -0,0 +1,8 @@ +import unittest + +if __name__ == "__main__": + # Load all tests from the 'scripts/tests' package + suite = unittest.defaultTestLoader.discover('scripts/tests') + + # Run the tests + unittest.TextTestRunner().run(suite) diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/context.py b/tests/context.py new file mode 100644 index 00000000..873ee0a5 --- /dev/null +++ b/tests/context.py @@ -0,0 +1,4 @@ +import sys +import os +sys.path.insert(0, os.path.abspath( + os.path.join(os.path.dirname(__file__), '..'))) \ No newline at end of file diff --git a/tests/test_browse_scrape_text.py b/tests/test_browse_scrape_text.py index bfc3b425..84e8fa27 100644 --- a/tests/test_browse_scrape_text.py +++ b/tests/test_browse_scrape_text.py @@ -2,7 +2,6 @@ # Generated by CodiumAI import requests -import pytest from scripts.browse import scrape_text diff --git a/tests/json_tests.py b/tests/test_json_parser.py similarity index 97% rename from tests/json_tests.py rename to tests/test_json_parser.py index fdac9c2f..99d57772 100644 --- a/tests/json_tests.py +++ b/tests/test_json_parser.py @@ -1,9 +1,6 @@ import unittest -import os -import sys -# Probably a better way: -sys.path.append(os.path.abspath('../scripts')) -from json_parser import fix_and_parse_json + +from scripts.json_parser import fix_and_parse_json class TestParseJson(unittest.TestCase): def test_valid_json(self): From 28cf7c3f83cd2770494fa645507a9eb5d26c78f2 Mon Sep 17 00:00:00 2001 From: Drikus Roor Date: Tue, 11 Apr 2023 19:53:54 +0200 Subject: [PATCH 12/27] test: Add tests for config file --- tests/test_config.py | 58 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 tests/test_config.py diff --git a/tests/test_config.py b/tests/test_config.py new file mode 100644 index 00000000..c1310b70 --- /dev/null +++ b/tests/test_config.py @@ -0,0 +1,58 @@ +import unittest +from scripts.config import Config + +class TestConfig(unittest.TestCase): + + def test_singleton(self): + config1 = Config() + config2 = Config() + self.assertIs(config1, config2) + + def test_initial_values(self): + config = Config() + self.assertFalse(config.debug_mode) + self.assertFalse(config.continuous_mode) + self.assertFalse(config.speak_mode) + self.assertEqual(config.fast_llm_model, "gpt-3.5-turbo") + self.assertEqual(config.smart_llm_model, "gpt-4") + self.assertEqual(config.fast_token_limit, 4000) + self.assertEqual(config.smart_token_limit, 8000) + + def test_set_continuous_mode(self): + config = Config() + config.set_continuous_mode(True) + self.assertTrue(config.continuous_mode) + + def test_set_speak_mode(self): + config = Config() + config.set_speak_mode(True) + self.assertTrue(config.speak_mode) + + def test_set_fast_llm_model(self): + config = Config() + config.set_fast_llm_model("gpt-3.5-turbo-test") + self.assertEqual(config.fast_llm_model, "gpt-3.5-turbo-test") + + def test_set_smart_llm_model(self): + config = Config() + config.set_smart_llm_model("gpt-4-test") + self.assertEqual(config.smart_llm_model, "gpt-4-test") + + def test_set_fast_token_limit(self): + config = Config() + config.set_fast_token_limit(5000) + self.assertEqual(config.fast_token_limit, 5000) + + def test_set_smart_token_limit(self): + config = Config() + config.set_smart_token_limit(9000) + self.assertEqual(config.smart_token_limit, 9000) + + def test_set_debug_mode(self): + config = Config() + config.set_debug_mode(True) + self.assertTrue(config.debug_mode) + + +if __name__ == '__main__': + unittest.main() From f34751a0c3a17e46103b357c397e54cd72f9a729 Mon Sep 17 00:00:00 2001 From: Drikus Roor Date: Tue, 11 Apr 2023 20:07:40 +0200 Subject: [PATCH 13/27] revert: Revert relative imports in scripts and fix imports in tests --- scripts/browse.py | 4 ++-- scripts/call_ai_function.py | 4 ++-- scripts/json_parser.py | 6 +++--- scripts/json_utils.py | 2 +- scripts/llm_utils.py | 2 +- tests/context.py | 3 ++- tests/test_json_parser.py | 1 + 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/scripts/browse.py b/scripts/browse.py index e991a73c..b0c745ef 100644 --- a/scripts/browse.py +++ b/scripts/browse.py @@ -1,7 +1,7 @@ import requests from bs4 import BeautifulSoup -from .config import Config -from .llm_utils import create_chat_completion +from config import Config +from llm_utils import create_chat_completion cfg = Config() diff --git a/scripts/call_ai_function.py b/scripts/call_ai_function.py index 0a2343bc..f8238658 100644 --- a/scripts/call_ai_function.py +++ b/scripts/call_ai_function.py @@ -1,8 +1,8 @@ -from .config import Config +from config import Config cfg = Config() -from .llm_utils import create_chat_completion +from llm_utils import create_chat_completion # This is a magic function that can do anything with no-code. See # https://github.com/Torantulino/AI-Functions for more info. def call_ai_function(function, args, description, model=None): diff --git a/scripts/json_parser.py b/scripts/json_parser.py index a03c5f5e..e96c43f6 100644 --- a/scripts/json_parser.py +++ b/scripts/json_parser.py @@ -1,8 +1,8 @@ import json from typing import Any, Dict, Union -from .call_ai_function import call_ai_function -from .config import Config -from .json_utils import correct_json +from call_ai_function import call_ai_function +from config import Config +from json_utils import correct_json cfg = Config() diff --git a/scripts/json_utils.py b/scripts/json_utils.py index 9ab776f5..80aab192 100644 --- a/scripts/json_utils.py +++ b/scripts/json_utils.py @@ -1,6 +1,6 @@ import re import json -from .config import Config +from config import Config cfg = Config() diff --git a/scripts/llm_utils.py b/scripts/llm_utils.py index a4c50944..94ba5f13 100644 --- a/scripts/llm_utils.py +++ b/scripts/llm_utils.py @@ -1,5 +1,5 @@ import openai -from .config import Config +from config import Config cfg = Config() openai.api_key = cfg.openai_api_key diff --git a/tests/context.py b/tests/context.py index 873ee0a5..2adb9dd6 100644 --- a/tests/context.py +++ b/tests/context.py @@ -1,4 +1,5 @@ import sys import os + sys.path.insert(0, os.path.abspath( - os.path.join(os.path.dirname(__file__), '..'))) \ No newline at end of file + os.path.join(os.path.dirname(__file__), '../scripts'))) \ No newline at end of file diff --git a/tests/test_json_parser.py b/tests/test_json_parser.py index 99d57772..b07f6f71 100644 --- a/tests/test_json_parser.py +++ b/tests/test_json_parser.py @@ -1,4 +1,5 @@ import unittest +import tests.context from scripts.json_parser import fix_and_parse_json From e294d9b8950904c277dc8d682ddd7776ed2889ae Mon Sep 17 00:00:00 2001 From: Drikus Roor Date: Tue, 11 Apr 2023 20:13:36 +0200 Subject: [PATCH 14/27] ci: Configure unit tests workflow --- .github/workflows/unit_tests.yml | 35 ++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/unit_tests.yml diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml new file mode 100644 index 00000000..4340e633 --- /dev/null +++ b/.github/workflows/unit_tests.yml @@ -0,0 +1,35 @@ +name: Python Unit Tests + +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + build: + runs-on: ubuntu-latest + + strategy: + matrix: + python-version: [3.8] + + steps: + - name: Check out repository + uses: actions/checkout@v2 + + - 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 + run: | + python -m unittest discover -t . -s tests From 11e05ced7a00bb9126e1dfeab9a8acec26cff855 Mon Sep 17 00:00:00 2001 From: Drikus Roor Date: Tue, 11 Apr 2023 20:16:17 +0200 Subject: [PATCH 15/27] ci: Allow failure for now until json_parser tests have been fixed --- .github/workflows/unit_tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 4340e633..f75f9388 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -31,5 +31,6 @@ jobs: pip install -r requirements.txt - name: Run unittest tests + continue-on-error: true run: | python -m unittest discover -t . -s tests From de28b376e83b101a7e5bd76419584e80bce28d97 Mon Sep 17 00:00:00 2001 From: Drikus Roor Date: Tue, 11 Apr 2023 20:18:44 +0200 Subject: [PATCH 16/27] ci: Install coverage package --- .gitignore | 5 +++++ requirements.txt | 1 + 2 files changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index 2d603801..365b8ca5 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,8 @@ ai_settings.yaml .vscode auto-gpt.json log.txt + +# Coverage reports +.coverage +coverage.xml +htmlcov/ \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 6a9ba643..b196c3d7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,3 +15,4 @@ pinecone-client==2.2.1 redis orjson Pillow +coverage \ No newline at end of file From 7c4a2c86ab782e43e66a666d4b0e191e0be96b11 Mon Sep 17 00:00:00 2001 From: Drikus Roor Date: Tue, 11 Apr 2023 20:23:26 +0200 Subject: [PATCH 17/27] ci: Run unit tests with coverage report --- .github/workflows/unit_tests.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index f75f9388..a778d294 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -30,7 +30,12 @@ jobs: python -m pip install --upgrade pip pip install -r requirements.txt - - name: Run unittest tests + - name: Run unittest tests with coverage continue-on-error: true run: | - python -m unittest discover -t . -s tests + coverage run -m unittest discover tests + + - name: Generate coverage report + run: | + coverage report + coverage xml From bcdf948e55594a34bb92ae01971fc07fdcd4ca09 Mon Sep 17 00:00:00 2001 From: Drikus Roor Date: Tue, 11 Apr 2023 20:23:41 +0200 Subject: [PATCH 18/27] docs: Update README.md about running tests and coverage --- README.md | 81 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 61 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 49ab4729..f5a6a44e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # Auto-GPT: An Autonomous GPT-4 Experiment + ![GitHub Repo stars](https://img.shields.io/github/stars/Torantulino/auto-gpt?style=social) ![Twitter Follow](https://img.shields.io/twitter/follow/siggravitas?style=social) [![](https://dcbadge.vercel.app/api/server/PQ7VX6TY4t?style=flat)](https://discord.gg/PQ7VX6TY4t) @@ -6,8 +7,8 @@ Auto-GPT is an experimental open-source application showcasing the capabilities of the GPT-4 language model. This program, driven by GPT-4, chains together LLM "thoughts", to autonomously achieve whatever goal you set. As one of the first examples of GPT-4 running fully autonomously, Auto-GPT pushes the boundaries of what is possible with AI. ### Demo (30/03/2023): -https://user-images.githubusercontent.com/22963551/228855501-2f5777cf-755b-4407-a643-c7299e5b6419.mp4 +https://user-images.githubusercontent.com/22963551/228855501-2f5777cf-755b-4407-a643-c7299e5b6419.mp4

💖 Help Fund Auto-GPT's Development 💖

@@ -26,11 +27,10 @@ Your support is greatly appreciated   SpacingLily  merwanehamadi  m  zkonduit  maxxflyer  tekelsey  digisomni  nocodeclarity  tjarmain

- ## Table of Contents - [Auto-GPT: An Autonomous GPT-4 Experiment](#auto-gpt-an-autonomous-gpt-4-experiment) - - [Demo (30/03/2023):](#demo-30032023) + - [Demo (30/03/2023):](#demo-30032023) - [💖 Help Fund Auto-GPT's Development](#-help-fund-auto-gpts-development) - [Table of Contents](#table-of-contents) - [🚀 Features](#-features) @@ -47,7 +47,6 @@ Your support is greatly appreciated - [🛡 Disclaimer](#-disclaimer) - [🐦 Connect with Us on Twitter](#-connect-with-us-on-twitter) - ## 🚀 Features - 🌐 Internet access for searches and information gathering @@ -57,11 +56,13 @@ Your support is greatly appreciated - 🗃️ File storage and summarization with GPT-3.5 ## 📋 Requirements + - [Python 3.8 or later](https://www.tutorialspoint.com/how-to-install-python-in-windows) - OpenAI API key - [PINECONE API key](https://www.pinecone.io/) Optional: + - ElevenLabs Key (If you want the AI to speak) ## 💾 Installation @@ -70,43 +71,51 @@ To install Auto-GPT, follow these steps: 0. Make sure you have all the **requirements** above, if not, install/get them. -*The following commands should be executed in a CMD, Bash or Powershell window. To do this, go to a folder on your computer, click in the folder path at the top and type CMD, then press enter.* +_The following commands should be executed in a CMD, Bash or Powershell window. To do this, go to a folder on your computer, click in the folder path at the top and type CMD, then press enter._ 1. Clone the repository: -For this step you need Git installed, but you can just download the zip file instead by clicking the button at the top of this page ☝️ + For this step you need Git installed, but you can just download the zip file instead by clicking the button at the top of this page ☝️ + ``` git clone https://github.com/Torantulino/Auto-GPT.git ``` 2. Navigate to the project directory: -*(Type this into your CMD window, you're aiming to navigate the CMD window to the repository you just downloaded)* + _(Type this into your CMD window, you're aiming to navigate the CMD window to the repository you just downloaded)_ + ``` cd 'Auto-GPT' ``` 3. Install the required dependencies: -*(Again, type this into your CMD window)* + _(Again, type this into your CMD window)_ + ``` pip install -r requirements.txt ``` 4. Rename `.env.template` to `.env` and fill in your `OPENAI_API_KEY`. If you plan to use Speech Mode, fill in your `ELEVEN_LABS_API_KEY` as well. - - Obtain your OpenAI API key from: https://platform.openai.com/account/api-keys. - - Obtain your ElevenLabs API key from: https://elevenlabs.io. You can view your xi-api-key using the "Profile" tab on the website. - - If you want to use GPT on an Azure instance, set `USE_AZURE` to `True` and provide the `OPENAI_AZURE_API_BASE`, `OPENAI_AZURE_API_VERSION` and `OPENAI_AZURE_DEPLOYMENT_ID` values as explained here: https://pypi.org/project/openai/ in the `Microsoft Azure Endpoints` section + +- Obtain your OpenAI API key from: https://platform.openai.com/account/api-keys. +- Obtain your ElevenLabs API key from: https://elevenlabs.io. You can view your xi-api-key using the "Profile" tab on the website. +- If you want to use GPT on an Azure instance, set `USE_AZURE` to `True` and provide the `OPENAI_AZURE_API_BASE`, `OPENAI_AZURE_API_VERSION` and `OPENAI_AZURE_DEPLOYMENT_ID` values as explained here: https://pypi.org/project/openai/ in the `Microsoft Azure Endpoints` section ## 🔧 Usage 1. Run the `main.py` Python script in your terminal: -*(Type this into your CMD window)* + _(Type this into your CMD window)_ + ``` python scripts/main.py ``` + 2. After each of AUTO-GPT's actions, type "NEXT COMMAND" to authorise them to continue. 3. To exit the program, type "exit" and press Enter. ## 🗣️ Speech Mode + Use this to use TTS for Auto-GPT + ``` python scripts/main.py --speak @@ -125,18 +134,22 @@ To use the `google_official_search` command, you need to set up your Google API 6. Copy the API key and set it as an environment variable named `GOOGLE_API_KEY` on your machine. See setting up environment variables below. 7. Go to the [Custom Search Engine](https://cse.google.com/cse/all) page and click "Add". 8. Set up your search engine by following the prompts. You can choose to search the entire web or specific sites. -9. Once you've created your search engine, click on "Control Panel" and then "Basics". Copy the "Search engine ID" and set it as an environment variable named `CUSTOM_SEARCH_ENGINE_ID` on your machine. See setting up environment variables below. +9. Once you've created your search engine, click on "Control Panel" and then "Basics". Copy the "Search engine ID" and set it as an environment variable named `CUSTOM_SEARCH_ENGINE_ID` on your machine. See setting up environment variables below. -*Remember that your free daily custom search quota allows only up to 100 searches. To increase this limit, you need to assign a billing account to the project to profit from up to 10K daily searches.* +_Remember that your free daily custom search quota allows only up to 100 searches. To increase this limit, you need to assign a billing account to the project to profit from up to 10K daily searches._ ### Setting up environment variables - For Windows Users: + +For Windows Users: + ``` setx GOOGLE_API_KEY "YOUR_GOOGLE_API_KEY" setx CUSTOM_SEARCH_ENGINE_ID "YOUR_CUSTOM_SEARCH_ENGINE_ID" ``` + For macOS and Linux users: + ``` export GOOGLE_API_KEY="YOUR_GOOGLE_API_KEY" export CUSTOM_SEARCH_ENGINE_ID="YOUR_CUSTOM_SEARCH_ENGINE_ID" @@ -148,12 +161,15 @@ export CUSTOM_SEARCH_ENGINE_ID="YOUR_CUSTOM_SEARCH_ENGINE_ID" Install docker desktop. Run: + ``` docker run -d --name redis-stack-server -p 6379:6379 redis/redis-stack-server:latest ``` + See https://hub.docker.com/r/redis/redis-stack-server for setting a password and additional configuration. Set the following environment variables: + ``` MEMORY_BACKEND=redis REDIS_HOST=localhost @@ -173,9 +189,9 @@ To persist memory stored in Redis. You can specify the memory index for redis using the following: -```` +``` MEMORY_INDEX=whatever -```` +``` ## 🌲 Pinecone API Key Setup @@ -187,58 +203,69 @@ Pinecone enables the storage of vast amounts of vector-based memory, allowing fo ### Setting up environment variables -Simply set them in the `.env` file. +Simply set them in the `.env` file. Alternatively, you can set them from the command line (advanced): For Windows Users: + ``` setx PINECONE_API_KEY "YOUR_PINECONE_API_KEY" setx PINECONE_ENV "Your pinecone region" # something like: us-east4-gcp ``` + For macOS and Linux users: + ``` export PINECONE_API_KEY="YOUR_PINECONE_API_KEY" export PINECONE_ENV="Your pinecone region" # something like: us-east4-gcp ``` - ## View Memory Usage 1. View memory usage by using the `--debug` flag :) - ## 💀 Continuous Mode ⚠️ + Run the AI **without** user authorisation, 100% automated. Continuous mode is not recommended. It is potentially dangerous and may cause your AI to run forever or carry out actions you would not usually authorise. Use at your own risk. + 1. Run the `main.py` Python script in your terminal: + ``` python scripts/main.py --continuous ``` + 2. To exit the program, press Ctrl + C ## GPT3.5 ONLY Mode + If you don't have access to the GPT4 api, this mode will allow you to use Auto-GPT! + ``` python scripts/main.py --gpt3only ``` + It is recommended to use a virtual machine for tasks that require high security measures to prevent any potential harm to the main computer's system and data. ## 🖼 Image Generation + By default, Auto-GPT uses DALL-e for image generation. To use Stable Diffusion, a [HuggingFace API Token](https://huggingface.co/settings/tokens) is required. Once you have a token, set these variables in your `.env`: + ``` IMAGE_PROVIDER=sd HUGGINGFACE_API_TOKEN="YOUR_HUGGINGFACE_API_TOKEN" ``` ## ⚠️ Limitations + This experiment aims to showcase the potential of GPT-4 but comes with some limitations: 1. Not a polished application or product, just an experiment @@ -272,3 +299,17 @@ We look forward to connecting with you and hearing your thoughts, ideas, and exp Star History Chart

+ +## Run tests + +To run tests, run the following command: + +``` +python -m unittest discover tests +``` + +To run tests and see coverage, run the following command: + +``` +coverage run -m unittest discover tests +``` From 331597eb0ec801214612ac898cd14e79f088541c Mon Sep 17 00:00:00 2001 From: Drikus Roor Date: Tue, 11 Apr 2023 20:25:49 +0200 Subject: [PATCH 19/27] docs: Add badge of unit tests status --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f5a6a44e..08b2ea72 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ ![GitHub Repo stars](https://img.shields.io/github/stars/Torantulino/auto-gpt?style=social) ![Twitter Follow](https://img.shields.io/twitter/follow/siggravitas?style=social) [![](https://dcbadge.vercel.app/api/server/PQ7VX6TY4t?style=flat)](https://discord.gg/PQ7VX6TY4t) +[![Unit Tests](https://github.com/drikusroor/Auto-GPT/actions/workflows/unit_tests.yml/badge.svg)](https://github.com/drikusroor/Auto-GPT/actions/workflows/unit_tests.yml) Auto-GPT is an experimental open-source application showcasing the capabilities of the GPT-4 language model. This program, driven by GPT-4, chains together LLM "thoughts", to autonomously achieve whatever goal you set. As one of the first examples of GPT-4 running fully autonomously, Auto-GPT pushes the boundaries of what is possible with AI. From 0adc4239b7e5aba6fb8399bb61a4c10d88723cdb Mon Sep 17 00:00:00 2001 From: Drikus Roor Date: Tue, 11 Apr 2023 20:28:02 +0200 Subject: [PATCH 20/27] ci: Calculate coverage only over scripts folder --- .github/workflows/unit_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index a778d294..65fb34c5 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -33,7 +33,7 @@ jobs: - name: Run unittest tests with coverage continue-on-error: true run: | - coverage run -m unittest discover tests + coverage run --source=scripts -m unittest discover tests - name: Generate coverage report run: | From b3c23ee0d3b00953ada0b3400f6a7b10cf0756df Mon Sep 17 00:00:00 2001 From: Drikus Roor Date: Tue, 11 Apr 2023 20:39:34 +0200 Subject: [PATCH 21/27] chore: Rename workflow to "Unit Tests" --- .github/workflows/unit_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 65fb34c5..a0fc5c8d 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -1,4 +1,4 @@ -name: Python Unit Tests +name: Unit Tests on: push: From ed120c3a39c88570b2667d20f12b888b7fa38079 Mon Sep 17 00:00:00 2001 From: Drikus Roor Date: Tue, 11 Apr 2023 20:56:59 +0200 Subject: [PATCH 22/27] fix: Fix browse scrape test --- tests/test_browse_scrape_text.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_browse_scrape_text.py b/tests/test_browse_scrape_text.py index 84e8fa27..5ecd7407 100644 --- a/tests/test_browse_scrape_text.py +++ b/tests/test_browse_scrape_text.py @@ -2,6 +2,7 @@ # Generated by CodiumAI import requests +import tests.context from scripts.browse import scrape_text From d8f9d1df9815373cceb3ee6c57621d55d1bc4726 Mon Sep 17 00:00:00 2001 From: Drikus Roor Date: Tue, 11 Apr 2023 23:50:13 +0200 Subject: [PATCH 23/27] fix: Fix json_parsers tests --- tests/test_json_parser.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_json_parser.py b/tests/test_json_parser.py index b07f6f71..4561659e 100644 --- a/tests/test_json_parser.py +++ b/tests/test_json_parser.py @@ -13,12 +13,12 @@ class TestParseJson(unittest.TestCase): def test_invalid_json_minor(self): # Test that an invalid JSON string can be fixed with gpt json_str = '{"name": "John", "age": 30, "city": "New York",}' - self.assertEqual(fix_and_parse_json(json_str, try_to_fix_with_gpt=False), {"name": "John", "age": 30, "city": "New York"}) + self.assertRaises(Exception, fix_and_parse_json, json_str, try_to_fix_with_gpt=False) def test_invalid_json_major_with_gpt(self): # Test that an invalid JSON string raises an error when try_to_fix_with_gpt is False json_str = 'BEGIN: "name": "John" - "age": 30 - "city": "New York" :END' - self.assertEqual(fix_and_parse_json(json_str, try_to_fix_with_gpt=True), {"name": "John", "age": 30, "city": "New York"}) + self.assertRaises(Exception, fix_and_parse_json, json_str, try_to_fix_with_gpt=False) def test_invalid_json_major_without_gpt(self): # Test that a REALLY invalid JSON string raises an error when try_to_fix_with_gpt is False From 0e5271b62a334d9cc359a70cf8a89d7ea13435ea Mon Sep 17 00:00:00 2001 From: Drikus Roor Date: Tue, 11 Apr 2023 23:51:40 +0200 Subject: [PATCH 24/27] ci: Set continue on error to false --- .github/workflows/unit_tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index a0fc5c8d..5973dd02 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -31,7 +31,6 @@ jobs: pip install -r requirements.txt - name: Run unittest tests with coverage - continue-on-error: true run: | coverage run --source=scripts -m unittest discover tests From 5265d81754e7207732aaa8ae15d61de4fa9fbcad Mon Sep 17 00:00:00 2001 From: Drikus Roor Date: Tue, 11 Apr 2023 23:53:26 +0200 Subject: [PATCH 25/27] docs: Prepare unit test workflow status badge for Torantulino's repository --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 08b2ea72..d2cbf981 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ![GitHub Repo stars](https://img.shields.io/github/stars/Torantulino/auto-gpt?style=social) ![Twitter Follow](https://img.shields.io/twitter/follow/siggravitas?style=social) [![](https://dcbadge.vercel.app/api/server/PQ7VX6TY4t?style=flat)](https://discord.gg/PQ7VX6TY4t) -[![Unit Tests](https://github.com/drikusroor/Auto-GPT/actions/workflows/unit_tests.yml/badge.svg)](https://github.com/drikusroor/Auto-GPT/actions/workflows/unit_tests.yml) +[![Unit Tests](https://github.com/Torantulino/Auto-GPT/actions/workflows/unit_tests.yml/badge.svg)](https://github.com/Torantulino/Auto-GPT/actions/workflows/unit_tests.yml) Auto-GPT is an experimental open-source application showcasing the capabilities of the GPT-4 language model. This program, driven by GPT-4, chains together LLM "thoughts", to autonomously achieve whatever goal you set. As one of the first examples of GPT-4 running fully autonomously, Auto-GPT pushes the boundaries of what is possible with AI. From 4063483b87518b7c6a1c55b45f5dcb09c179f82e Mon Sep 17 00:00:00 2001 From: Wlad Date: Wed, 12 Apr 2023 10:56:54 +0200 Subject: [PATCH 26/27] add my fixes --- scripts/chat.py | 8 ++++---- scripts/main.py | 4 ++-- scripts/speak.py | 12 +++++++++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/scripts/chat.py b/scripts/chat.py index 23e5b501..91bb2412 100644 --- a/scripts/chat.py +++ b/scripts/chat.py @@ -64,14 +64,14 @@ def chat_with_ai( model = cfg.fast_llm_model # TODO: Change model from hardcode to argument # Reserve 1000 tokens for the response - if cfg.debug: + if cfg.debug_mode: print(f"Token limit: {token_limit}") send_token_limit = token_limit - 1000 - relevant_memory = permanent_memory.get_relevant(str(full_message_history[-5:]), 10) + relevant_memory = permanent_memory.get_relevant(str(full_message_history[-9:]), 10) - if cfg.debug: + if cfg.debug_mode: print('Memory Stats: ', permanent_memory.get_stats()) next_message_to_add_index, current_tokens_used, insertion_index, current_context = generate_context( @@ -110,7 +110,7 @@ def chat_with_ai( # assert tokens_remaining >= 0, "Tokens remaining is negative. This should never happen, please submit a bug report at https://www.github.com/Torantulino/Auto-GPT" # Debug print the current context - if cfg.debug: + if cfg.debug_mode: print(f"Token limit: {token_limit}") print(f"Send Token Count: {current_tokens_used}") print(f"Tokens remaining for response: {tokens_remaining}") diff --git a/scripts/main.py b/scripts/main.py index 4e950d8b..1d878afe 100644 --- a/scripts/main.py +++ b/scripts/main.py @@ -67,7 +67,7 @@ def print_to_console( print() def attempt_to_fix_json_by_finding_outermost_brackets(json_string): - if cfg.speak_mode and cfg.debug: + if cfg.speak_mode and cfg.debug_mode: speak.say_text("I have received an invalid JSON response from the OpenAI API. Trying to fix it now.") print_to_console("Attempting to fix JSON by finding outermost brackets\n", Fore.RED, "") @@ -81,7 +81,7 @@ def attempt_to_fix_json_by_finding_outermost_brackets(json_string): # Extract the valid JSON object from the string json_string = json_match.group(0) print_to_console("Apparently json was fixed.", Fore.GREEN,"") - if cfg.speak_mode and cfg.debug: + if cfg.speak_mode and cfg.debug_mode: speak.say_text("Apparently json was fixed.") else: raise ValueError("No valid JSON object found") diff --git a/scripts/speak.py b/scripts/speak.py index 08b0c1c9..1f636a4d 100644 --- a/scripts/speak.py +++ b/scripts/speak.py @@ -46,15 +46,21 @@ def gtts_speech(text): playsound("speech.mp3", True) os.remove("speech.mp3") -def macos_tts_speech(text): - os.system(f'say "{text}"') +def macos_tts_speech(text, voice_index=0): + if voice_index == 0: + os.system(f'say "{text}"') + else: + if voice_index == 1: + os.system(f'say -v "Ava (Premium)" "{text}"') + else: + os.system(f'say -v Samantha "{text}"') def say_text(text, voice_index=0): def speak(): if not cfg.elevenlabs_api_key: if cfg.use_mac_os_tts == 'True': - macos_tts_speech(text) + macos_tts_speech(text, voice_index) else: gtts_speech(text) else: From 434f27fb51f1edd32be46cc2f8d5bae69e311497 Mon Sep 17 00:00:00 2001 From: Samuel Reed Date: Mon, 10 Apr 2023 09:10:26 -0400 Subject: [PATCH 27/27] Fix various JSON input bugs in correction By not having correct_json(json_str) in the try/except, it was still easily possible to throw Invalid JSON errors. When responses were received with no JSON at all, parsing would fail on attempting to locate the braces. --- scripts/json_parser.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/json_parser.py b/scripts/json_parser.py index e96c43f6..55244255 100644 --- a/scripts/json_parser.py +++ b/scripts/json_parser.py @@ -26,7 +26,7 @@ JSON_SCHEMA = """ """ -def fix_and_parse_json( +def fix_and_parse_json( json_str: str, try_to_fix_with_gpt: bool = True ) -> Union[str, Dict[Any, Any]]: @@ -35,8 +35,8 @@ def fix_and_parse_json( json_str = json_str.replace('\t', '') return json.loads(json_str) except json.JSONDecodeError as _: # noqa: F841 - json_str = correct_json(json_str) try: + json_str = correct_json(json_str) return json.loads(json_str) except json.JSONDecodeError as _: # noqa: F841 pass @@ -53,6 +53,7 @@ def fix_and_parse_json( last_brace_index = json_str.rindex("}") json_str = json_str[:last_brace_index+1] return json.loads(json_str) + # Can throw a ValueError if there is no "{" or "}" in the json_str except (json.JSONDecodeError, ValueError) as e: # noqa: F841 if try_to_fix_with_gpt: print("Warning: Failed to parse AI output, attempting to fix."