From d1ea6cf002fb9b7747221666ba5593108cd48984 Mon Sep 17 00:00:00 2001
From: Drikus Roor <drikusroor@gmail.com>
Date: Wed, 12 Apr 2023 23:05:14 +0200
Subject: [PATCH] lint: Fix all E302 linting errors

---
 scripts/agent_manager.py          |  1 +
 scripts/ai_config.py              |  1 +
 scripts/browse.py                 | 16 ++++++++++++++++
 scripts/call_ai_function.py       |  2 ++
 scripts/chat.py                   |  1 +
 scripts/commands.py               |  3 +++
 scripts/data.py                   |  1 +
 scripts/file_operations.py        |  1 +
 scripts/image_gen.py              |  1 +
 scripts/llm_utils.py              |  1 +
 scripts/logger.py                 |  1 +
 scripts/main.py                   |  4 ++++
 scripts/memory/__init__.py        |  2 ++
 scripts/speak.py                  |  4 ++++
 scripts/token_counter.py          |  2 ++
 tests/integration/memory_tests.py |  1 +
 tests/local_cache_test.py         |  2 ++
 tests/test_config.py              |  1 +
 tests/test_json_parser.py         |  1 +
 tests/unit/json_tests.py          |  1 +
 20 files changed, 47 insertions(+)

diff --git a/scripts/agent_manager.py b/scripts/agent_manager.py
index a0e5f16482..191ab838a3 100644
--- a/scripts/agent_manager.py
+++ b/scripts/agent_manager.py
@@ -6,6 +6,7 @@ agents = {}  # key, (task, full_message_history, model)
 # Create new GPT agent
 # TODO: Centralise use of create_chat_completion() to globally enforce token limit
 
+
 def create_agent(task, prompt, model):
     """Create a new agent and return its key"""
     global next_key
diff --git a/scripts/ai_config.py b/scripts/ai_config.py
index bd373944fc..ee4b1fda23 100644
--- a/scripts/ai_config.py
+++ b/scripts/ai_config.py
@@ -2,6 +2,7 @@ import yaml
 import data
 import os
 
+
 class AIConfig:
     """
     A class object that contains the configuration information for the AI
diff --git a/scripts/browse.py b/scripts/browse.py
index 9e93c55a33..a5b167c928 100644
--- a/scripts/browse.py
+++ b/scripts/browse.py
@@ -21,12 +21,28 @@ def sanitize_url(url):
     return urljoin(url, urlparse(url).path)
 
 
+# Function to make a request with a specified timeout and handle exceptions
+def make_request(url, timeout=10):
+    try:
+        response = requests.get(url, headers=cfg.user_agent_header, timeout=timeout)
+        response.raise_for_status()
+        return response
+    except requests.exceptions.RequestException as e:
+        return "Error: " + str(e)
+
+
 # Define and check for local file address prefixes
 def check_local_file_access(url):
     local_prefixes = ['file:///', 'file://localhost', 'http://localhost', 'https://localhost']
     return any(url.startswith(prefix) for prefix in local_prefixes)
 
 
+def scrape_text(url):
+    """Scrape text from a webpage"""
+    # Basic check if the URL is valid
+    if not url.startswith('http'):
+        return "Error: Invalid URL"
+
 def get_response(url, headers=cfg.user_agent_header, timeout=10):
     try:
         # Restrict access to local files
diff --git a/scripts/call_ai_function.py b/scripts/call_ai_function.py
index f823865869..6f1d6ceee8 100644
--- a/scripts/call_ai_function.py
+++ b/scripts/call_ai_function.py
@@ -3,6 +3,8 @@ from config import Config
 cfg = Config()
 
 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/chat.py b/scripts/chat.py
index e16cee3837..2b7c34b5c4 100644
--- a/scripts/chat.py
+++ b/scripts/chat.py
@@ -9,6 +9,7 @@ import logging
 
 cfg = Config()
 
+
 def create_chat_message(role, content):
     """
     Create a chat message with the given role and content.
diff --git a/scripts/commands.py b/scripts/commands.py
index 3966e86ab8..fe6f6c30e9 100644
--- a/scripts/commands.py
+++ b/scripts/commands.py
@@ -24,6 +24,7 @@ def is_valid_int(value):
     except ValueError:
         return False
 
+
 def get_command(response):
     """Parse the response and return the command name and arguments"""
     try:
@@ -135,6 +136,7 @@ def google_search(query, num_results=8):
 
     return json.dumps(search_results, ensure_ascii=False, indent=4)
 
+
 def google_official_search(query, num_results=8):
     """Return the results of a google search using the official Google API"""
     from googleapiclient.discovery import build
@@ -171,6 +173,7 @@ def google_official_search(query, num_results=8):
     # Return the list of search result URLs
     return search_results_links
 
+
 def browse_website(url, question):
     """Browse a website and return the summary and links"""
     summary = get_text_summary(url, question)
diff --git a/scripts/data.py b/scripts/data.py
index f80c2875d8..088fd51ce1 100644
--- a/scripts/data.py
+++ b/scripts/data.py
@@ -1,6 +1,7 @@
 import os
 from pathlib import Path
 
+
 def load_prompt():
     """Load the prompt from data/prompt.txt"""
     try:
diff --git a/scripts/file_operations.py b/scripts/file_operations.py
index 7b48c13487..2999bc24f1 100644
--- a/scripts/file_operations.py
+++ b/scripts/file_operations.py
@@ -65,6 +65,7 @@ def delete_file(filename):
     except Exception as e:
         return "Error: " + str(e)
 
+
 def search_files(directory):
     found_files = []
 
diff --git a/scripts/image_gen.py b/scripts/image_gen.py
index 4481696ffa..6c27df3f35 100644
--- a/scripts/image_gen.py
+++ b/scripts/image_gen.py
@@ -11,6 +11,7 @@ cfg = Config()
 
 working_directory = "auto_gpt_workspace"
 
+
 def generate_image(prompt):
 
     filename = str(uuid.uuid4()) + ".jpg"
diff --git a/scripts/llm_utils.py b/scripts/llm_utils.py
index 35cc5ce040..16739dddf0 100644
--- a/scripts/llm_utils.py
+++ b/scripts/llm_utils.py
@@ -4,6 +4,7 @@ cfg = Config()
 
 openai.api_key = cfg.openai_api_key
 
+
 # Overly simple abstraction until we create something better
 def create_chat_completion(messages, model=None, temperature=cfg.temperature, max_tokens=None)->str:
     """Create a chat completion using the OpenAI API"""
diff --git a/scripts/logger.py b/scripts/logger.py
index 85dde81331..42a4387851 100644
--- a/scripts/logger.py
+++ b/scripts/logger.py
@@ -151,6 +151,7 @@ class TypingConsoleHandler(logging.StreamHandler):
         except Exception:
             self.handleError(record)
 
+
 class ConsoleHandler(logging.StreamHandler):
     def emit(self, record):
         msg = self.format(record)
diff --git a/scripts/main.py b/scripts/main.py
index 81f560b216..4a89e8e127 100644
--- a/scripts/main.py
+++ b/scripts/main.py
@@ -20,6 +20,7 @@ import logging
 
 cfg = Config()
 
+
 def check_openai_api_key():
     """Check if the OpenAI API key is set in config.py or as an environment variable."""
     if not cfg.openai_api_key:
@@ -30,6 +31,7 @@ def check_openai_api_key():
         print("You can get your key from https://beta.openai.com/account/api-keys")
         exit(1)
 
+
 def attempt_to_fix_json_by_finding_outermost_brackets(json_string):
     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.")
@@ -58,6 +60,7 @@ def attempt_to_fix_json_by_finding_outermost_brackets(json_string):
 
     return json_string
 
+
 def print_assistant_thoughts(assistant_reply):
     """Prints the assistant's thoughts to the console"""
     global ai_name
@@ -262,6 +265,7 @@ def prompt_user():
     config = AIConfig(ai_name, ai_role, ai_goals)
     return config
 
+
 def parse_arguments():
     """Parses the arguments passed to the script"""
     global cfg
diff --git a/scripts/memory/__init__.py b/scripts/memory/__init__.py
index a07f9fd88d..7eee1b3da1 100644
--- a/scripts/memory/__init__.py
+++ b/scripts/memory/__init__.py
@@ -18,6 +18,7 @@ except ImportError:
     print("Pinecone not installed. Skipping import.")
     PineconeMemory = None
 
+
 def get_memory(cfg, init=False):
     memory = None
     if cfg.memory_backend == "pinecone":
@@ -41,6 +42,7 @@ def get_memory(cfg, init=False):
             memory.clear()
     return memory
 
+
 def get_supported_memory_backends():
     return supported_memory
 
diff --git a/scripts/speak.py b/scripts/speak.py
index 64054e3c58..7a17873c5e 100644
--- a/scripts/speak.py
+++ b/scripts/speak.py
@@ -31,6 +31,7 @@ tts_headers = {
 mutex_lock = Lock() # Ensure only one sound is played at a time
 queue_semaphore = Semaphore(1) # The amount of sounds to queue before blocking the main thread
 
+
 def eleven_labs_speech(text, voice_index=0):
     """Speak text using elevenlabs.io's API"""
     tts_url = "https://api.elevenlabs.io/v1/text-to-speech/{voice_id}".format(
@@ -51,6 +52,7 @@ def eleven_labs_speech(text, voice_index=0):
         print("Response content:", response.content)
         return False
 
+
 def gtts_speech(text):
     tts = gtts.gTTS(text)
     with mutex_lock:
@@ -58,6 +60,7 @@ def gtts_speech(text):
         playsound("speech.mp3", True)
         os.remove("speech.mp3")
 
+
 def macos_tts_speech(text, voice_index=0):
     if voice_index == 0:
         os.system(f'say "{text}"')
@@ -67,6 +70,7 @@ def macos_tts_speech(text, voice_index=0):
         else:
             os.system(f'say -v Samantha "{text}"')
 
+
 def say_text(text, voice_index=0):
 
     def speak():
diff --git a/scripts/token_counter.py b/scripts/token_counter.py
index 635d328638..8aecf1681b 100644
--- a/scripts/token_counter.py
+++ b/scripts/token_counter.py
@@ -1,6 +1,7 @@
 import tiktoken
 from typing import List, Dict
 
+
 def count_message_tokens(messages : List[Dict[str, str]], model : str = "gpt-3.5-turbo-0301") -> int:
     """
     Returns the number of tokens used by a list of messages.
@@ -41,6 +42,7 @@ def count_message_tokens(messages : List[Dict[str, str]], model : str = "gpt-3.5
     num_tokens += 3  # every reply is primed with <|start|>assistant<|message|>
     return num_tokens
 
+
 def count_string_tokens(string: str, model_name: str) -> int:
     """
     Returns the number of tokens in a text string.
diff --git a/tests/integration/memory_tests.py b/tests/integration/memory_tests.py
index 5f1611be96..d0c3096280 100644
--- a/tests/integration/memory_tests.py
+++ b/tests/integration/memory_tests.py
@@ -8,6 +8,7 @@ sys.path.append(str(Path(__file__).resolve().parent.parent.parent / 'scripts'))
 from config import Config
 from memory.local import LocalCache
 
+
 class TestLocalCache(unittest.TestCase):
 
     def random_string(self, length):
diff --git a/tests/local_cache_test.py b/tests/local_cache_test.py
index d1f1ef0843..0352624ea2 100644
--- a/tests/local_cache_test.py
+++ b/tests/local_cache_test.py
@@ -4,6 +4,7 @@ import sys
 sys.path.append(os.path.abspath('../scripts'))
 from memory.local import LocalCache
 
+
 def MockConfig():
     return type('MockConfig', (object,), {
         'debug_mode': False,
@@ -12,6 +13,7 @@ def MockConfig():
         'memory_index': 'auto-gpt',
     })
 
+
 class TestLocalCache(unittest.TestCase):
 
     def setUp(self):
diff --git a/tests/test_config.py b/tests/test_config.py
index c1310b7098..ba8381e1e7 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -1,6 +1,7 @@
 import unittest
 from scripts.config import Config
 
+
 class TestConfig(unittest.TestCase):
 
     def test_singleton(self):
diff --git a/tests/test_json_parser.py b/tests/test_json_parser.py
index 0f2c6488c6..438e047b44 100644
--- a/tests/test_json_parser.py
+++ b/tests/test_json_parser.py
@@ -3,6 +3,7 @@ import tests.context
 
 from scripts.json_parser import fix_and_parse_json
 
+
 class TestParseJson(unittest.TestCase):
     def test_valid_json(self):
         # Test that a valid JSON string is parsed correctly
diff --git a/tests/unit/json_tests.py b/tests/unit/json_tests.py
index 3320ad5e9a..4f3267217a 100644
--- a/tests/unit/json_tests.py
+++ b/tests/unit/json_tests.py
@@ -5,6 +5,7 @@ import sys
 sys.path.append(os.path.abspath('../scripts'))
 from json_parser import fix_and_parse_json
 
+
 class TestParseJson(unittest.TestCase):
     def test_valid_json(self):
         # Test that a valid JSON string is parsed correctly