rename error_handling.py to error_handler.py (#1287)

superagi/agent/agent_iteration_step_handler.py

@@ -11,7 +11,7 @@
 from superagi.agent.tool_builder import ToolBuilder
 from superagi.apm.event_handler import EventHandler
 from superagi.config.config import get_config
-from superagi.helper.error_handling import ErrorHandling
+from superagi.helper.error_handler import ErrorHandler
 from superagi.helper.token_counter import TokenCounter
 from superagi.lib.logger import logger
 from superagi.models.agent import Agent
@@ -75,7 +75,7 @@ def execute_step(self):
         response = self.llm.chat_completion(messages, TokenCounter(session=self.session, organisation_id=organisation.id).token_limit(self.llm.get_model()) - current_tokens)
 
         if 'error' in response and response['message'] is not None:
-            ErrorHandling.handle_openai_errors(self.session, self.agent_id, self.agent_execution_id, response['message'])
+            ErrorHandler.handle_openai_errors(self.session, self.agent_id, self.agent_execution_id, response['message'])
 
         if 'content' not in response or response['content'] is None:
             raise RuntimeError(f"Failed to get response from llm")

superagi/agent/agent_message_builder.py

@@ -3,7 +3,7 @@
 from sqlalchemy import asc
 
 from superagi.config.config import get_config
-from superagi.helper.error_handling import ErrorHandling
+from superagi.helper.error_handler import ErrorHandler
 from superagi.helper.prompt_reader import PromptReader
 from superagi.helper.token_counter import TokenCounter
 from superagi.models.agent_execution import AgentExecution
@@ -124,7 +124,7 @@ def _build_ltm_summary(self, past_messages, output_token_limit) -> str:
         ltm_summary = self.llm.chat_completion(msgs)
 
         if 'error' in ltm_summary and ltm_summary['message'] is not None:
-            ErrorHandling.handle_openai_errors(self.session, self.agent_id, self.agent_execution_id, ltm_summary['message'])
+            ErrorHandler.handle_openai_errors(self.session, self.agent_id, self.agent_execution_id, ltm_summary['message'])
 
         execution = AgentExecution(id=self.agent_execution_id)
         agent_execution_configs = {"ltm_summary": ltm_summary["content"]}

superagi/agent/agent_tool_step_handler.py

@@ -7,7 +7,7 @@
 from superagi.agent.output_parser import AgentSchemaToolOutputParser
 from superagi.agent.queue_step_handler import QueueStepHandler
 from superagi.agent.tool_builder import ToolBuilder
-from superagi.helper.error_handling import ErrorHandling
+from superagi.helper.error_handler import ErrorHandler
 from superagi.helper.prompt_reader import PromptReader
 from superagi.helper.token_counter import TokenCounter
 from superagi.lib.logger import logger
@@ -108,7 +108,7 @@ def _process_input_instruction(self, agent_config, agent_execution_config, step_
         response = self.llm.chat_completion(messages, TokenCounter(session=self.session, organisation_id=self.organisation.id).token_limit(self.llm.get_model()) - current_tokens)
 
         if 'error' in response and response['message'] is not None:
-            ErrorHandling.handle_openai_errors(self.session, self.agent_id, self.agent_execution_id, response['message'])
+            ErrorHandler.handle_openai_errors(self.session, self.agent_id, self.agent_execution_id, response['message'])
         # ModelsHelper(session=self.session, organisation_id=organisation.id).create_call_log(execution.name,agent_config['agent_id'],response['response'].usage.total_tokens,json.loads(response['content'])['tool']['name'],agent_config['model'])
         if 'content' not in response or response['content'] is None:
             raise RuntimeError(f"Failed to get response from llm")
@@ -143,7 +143,7 @@ def _process_output_instruction(self, final_response: str, step_tool: AgentWorkf
                                             TokenCounter(session=self.session, organisation_id=self.organisation.id).token_limit(self.llm.get_model()) - current_tokens)
 
         if 'error' in response and response['message'] is not None:
-            ErrorHandling.handle_openai_errors(self.session, self.agent_id, self.agent_execution_id, response['message'])
+            ErrorHandler.handle_openai_errors(self.session, self.agent_id, self.agent_execution_id, response['message'])
 
         if 'content' not in response or response['content'] is None:
             raise RuntimeError(f"ToolWorkflowStepHandler: Failed to get output response from llm")

superagi/agent/queue_step_handler.py

@@ -4,7 +4,7 @@
 
 from superagi.agent.agent_message_builder import AgentLlmMessageBuilder
 from superagi.agent.task_queue import TaskQueue
-from superagi.helper.error_handling import ErrorHandling
+from superagi.helper.error_handler import ErrorHandler
 from superagi.helper.json_cleaner import JsonCleaner
 from superagi.helper.prompt_reader import PromptReader
 from superagi.helper.token_counter import TokenCounter
@@ -93,7 +93,7 @@ def _process_input_instruction(self, step_tool):
         response = self.llm.chat_completion(messages, TokenCounter(session=self.session, organisation_id=self.organisation.id).token_limit(self.llm.get_model()) - current_tokens)
 
         if 'error' in response and response['message'] is not None:
-            ErrorHandling.handle_openai_errors(self.session, self.agent_id, self.agent_execution_id, response['message'])
+            ErrorHandler.handle_openai_errors(self.session, self.agent_id, self.agent_execution_id, response['message'])
 
         if 'content' not in response or response['content'] is None:
             raise RuntimeError(f"Failed to get response from llm")

superagi/helper/error_handling.py → superagi/helper/error_handler.py

@@ -1,7 +1,7 @@
 from superagi.models.agent_execution import AgentExecution
 from superagi.models.agent_execution_feed import AgentExecutionFeed
 
-class ErrorHandling:
+class ErrorHandler:
 
     def handle_openai_errors(session, agent_id, agent_execution_id, error_message):
         execution = session.query(AgentExecution).filter(AgentExecution.id == agent_execution_id).first()

superagi/tools/code/improve_code.py

@@ -4,7 +4,7 @@
 from pydantic import BaseModel, Field
 
 from superagi.agent.agent_prompt_builder import AgentPromptBuilder
-from superagi.helper.error_handling import ErrorHandling
+from superagi.helper.error_handler import ErrorHandler
 from superagi.helper.prompt_reader import PromptReader
 from superagi.helper.token_counter import TokenCounter
 from superagi.lib.logger import logger
@@ -77,7 +77,7 @@ def _execute(self) -> str:
                 result = self.llm.chat_completion([{'role': 'system', 'content': prompt}])
 
                 if result is not None and 'error' in result and result['message'] is not None:
-                   ErrorHandling.handle_openai_errors(self.toolkit_config.session, self.agent_id, self.agent_execution_id, result['message'])
+                   ErrorHandler.handle_openai_errors(self.toolkit_config.session, self.agent_id, self.agent_execution_id, result['message'])
 
                 # Extract the response first
                 response = result.get('response')

superagi/tools/code/write_code.py

@@ -4,7 +4,7 @@
 from pydantic import BaseModel, Field
 
 from superagi.agent.agent_prompt_builder import AgentPromptBuilder
-from superagi.helper.error_handling import ErrorHandling
+from superagi.helper.error_handler import ErrorHandler
 from superagi.helper.prompt_reader import PromptReader
 from superagi.helper.token_counter import TokenCounter
 from superagi.lib.logger import logger
@@ -81,7 +81,7 @@ def _execute(self, code_description: str) -> str:
         result = self.llm.chat_completion(messages, max_tokens=(token_limit - total_tokens - 100))
 
         if 'error' in result and result['message'] is not None:
-            ErrorHandling.handle_openai_errors(self.toolkit_config.session, self.agent_id, self.agent_execution_id, result['message'])
+            ErrorHandler.handle_openai_errors(self.toolkit_config.session, self.agent_id, self.agent_execution_id, result['message'])
 
         # Get all filenames and corresponding code blocks
         regex = r"(\S+?)\n```\S*\n(.+?)```"

superagi/tools/code/write_spec.py

@@ -3,7 +3,7 @@
 from pydantic import BaseModel, Field
 
 from superagi.agent.agent_prompt_builder import AgentPromptBuilder
-from superagi.helper.error_handling import ErrorHandling
+from superagi.helper.error_handler import ErrorHandler
 from superagi.helper.prompt_reader import PromptReader
 from superagi.helper.token_counter import TokenCounter
 from superagi.lib.logger import logger
@@ -75,7 +75,7 @@ def _execute(self, task_description: str, spec_file_name: str) -> str:
         result = self.llm.chat_completion(messages, max_tokens=(token_limit - total_tokens - 100))
 
         if 'error' in result and result['message'] is not None:
-            ErrorHandling.handle_openai_errors(self.toolkit_config.session, self.agent_id, self.agent_execution_id, result['message'])
+            ErrorHandler.handle_openai_errors(self.toolkit_config.session, self.agent_id, self.agent_execution_id, result['message'])
 
         # Save the specification to a file
         write_result = self.resource_manager.write_file(spec_file_name, result["content"])

superagi/tools/code/write_test.py

@@ -4,7 +4,7 @@
 from pydantic import BaseModel, Field
 
 from superagi.agent.agent_prompt_builder import AgentPromptBuilder
-from superagi.helper.error_handling import ErrorHandling
+from superagi.helper.error_handler import ErrorHandler
 from superagi.helper.prompt_reader import PromptReader
 from superagi.helper.token_counter import TokenCounter
 from superagi.lib.logger import logger
@@ -92,7 +92,7 @@ def _execute(self, test_description: str, test_file_name: str) -> str:
         result = self.llm.chat_completion(messages, max_tokens=(token_limit - total_tokens - 100))
 
         if 'error' in result and result['message'] is not None:
-            ErrorHandling.handle_openai_errors(self.toolkit_config.session, self.agent_id, self.agent_execution_id, result['message'])
+            ErrorHandler.handle_openai_errors(self.toolkit_config.session, self.agent_id, self.agent_execution_id, result['message'])
 
         regex = r"(\S+?)\n```\S*\n(.+?)```"
         matches = re.finditer(regex, result["content"], re.DOTALL)

superagi/tools/duck_duck_go/duck_duck_go_search.py

@@ -2,7 +2,7 @@
 import requests
 from typing import Type, Optional,Union
 import time
-from superagi.helper.error_handling import ErrorHandling
+from superagi.helper.error_handler import ErrorHandler
 from superagi.lib.logger import logger
 from pydantic import BaseModel, Field
 from duckduckgo_search import DDGS
@@ -176,5 +176,5 @@ def summarise_result(self, query, snippets):
         result = self.llm.chat_completion(messages, max_tokens=self.max_token_limit)
 
         if 'error' in result and result['message'] is not None:
-            ErrorHandling.handle_openai_errors(self.toolkit_config.session, self.agent_id, self.agent_execution_id, result['message'])
+            ErrorHandler.handle_openai_errors(self.toolkit_config.session, self.agent_id, self.agent_execution_id, result['message'])
         return result["content"]

superagi/tools/github/review_pull_request.py

@@ -2,7 +2,7 @@
 from typing import Type, Optional
 
 from pydantic import BaseModel, Field
-from superagi.helper.error_handling import ErrorHandling
+from superagi.helper.error_handler import ErrorHandler
 
 from superagi.helper.github_helper import GithubHelper
 from superagi.helper.json_cleaner import JsonCleaner
@@ -92,7 +92,7 @@ def run_code_review(self, github_helper, content, latest_commit_id, organisation
         result = self.llm.chat_completion(messages, max_tokens=(token_limit - total_tokens - 100))
 
         if 'error' in result and result['message'] is not None:
-            ErrorHandling.handle_openai_errors(self.toolkit_config.session, self.agent_id, self.agent_execution_id, result['message'])
+            ErrorHandler.handle_openai_errors(self.toolkit_config.session, self.agent_id, self.agent_execution_id, result['message'])
         response = result["content"]
         if response.startswith("```") and response.endswith("```"):
             response = "```".join(response.split("```")[1:-1])

superagi/tools/google_search/google_search.py

@@ -2,7 +2,7 @@
 from typing import Type, Optional
 
 from pydantic import BaseModel, Field
-from superagi.helper.error_handling import ErrorHandling
+from superagi.helper.error_handler import ErrorHandler
 
 from superagi.helper.google_search import GoogleSearchWrap
 from superagi.helper.token_counter import TokenCounter
@@ -94,5 +94,5 @@ def summarise_result(self, query, snippets):
         result = self.llm.chat_completion(messages, max_tokens=self.max_token_limit)
 
         if 'error' in result and result['message'] is not None:
-            ErrorHandling.handle_openai_errors(self.toolkit_config.session, self.agent_id, self.agent_execution_id, result['message'])
+            ErrorHandler.handle_openai_errors(self.toolkit_config.session, self.agent_id, self.agent_execution_id, result['message'])
         return result["content"]

superagi/tools/google_serp_search/google_serp_search.py

@@ -1,7 +1,7 @@
 from typing import Type, Optional, Any
 from pydantic import BaseModel, Field
 import aiohttp
-from superagi.helper.error_handling import ErrorHandling
+from superagi.helper.error_handler import ErrorHandler
 from superagi.helper.google_serp import GoogleSerpApiWrap
 from superagi.llms.base_llm import BaseLlm
 from superagi.models.agent_execution import AgentExecution
@@ -73,5 +73,5 @@ def summarise_result(self, query, snippets):
         result = self.llm.chat_completion(messages, max_tokens=self.max_token_limit)
 
         if 'error' in result and result['message'] is not None:
-            ErrorHandling.handle_openai_errors(self.toolkit_config.session, self.agent_id, self.agent_execution_id, result['message'])
+            ErrorHandler.handle_openai_errors(self.toolkit_config.session, self.agent_id, self.agent_execution_id, result['message'])
         return result["content"]

superagi/tools/instagram_tool/instagram.py

@@ -3,7 +3,7 @@
 import boto3
 import os
 from superagi.config.config import get_config
-from superagi.helper.error_handling import ErrorHandling
+from superagi.helper.error_handler import ErrorHandler
 from superagi.helper.resource_helper import ResourceHelper
 from typing import Type, Optional
 from pydantic import BaseModel, Field
@@ -117,7 +117,7 @@ def create_caption(self, photo_description: str) -> str:
         messages = [{"role": "system", "content": caption_prompt}]
         result = self.llm.chat_completion(messages, max_tokens=self.max_token_limit)
         if 'error' in result and result['message'] is not None:
-            ErrorHandling.handle_openai_errors(self.toolkit_config.session, self.agent_id, self.agent_execution_id, result['message'])
+            ErrorHandler.handle_openai_errors(self.toolkit_config.session, self.agent_id, self.agent_execution_id, result['message'])
         caption=result["content"]
 
         encoded_caption=urllib. parse. quote(caption)     

superagi/tools/searx/searx.py

@@ -1,6 +1,6 @@
 from typing import Type, Optional
 from pydantic import BaseModel, Field
-from superagi.helper.error_handling import ErrorHandling
+from superagi.helper.error_handler import ErrorHandler
 from superagi.llms.base_llm import BaseLlm
 from superagi.models.agent_execution import AgentExecution
 from superagi.models.agent_execution_feed import AgentExecutionFeed
@@ -74,5 +74,5 @@ def summarise_result(self, query, snippets):
         result = self.llm.chat_completion(messages, max_tokens=self.max_token_limit)
 
         if 'error' in result and result['message'] is not None:
-            ErrorHandling.handle_openai_errors(self.toolkit_config.session, self.agent_id, self.agent_execution_id, result['message'])
+            ErrorHandler.handle_openai_errors(self.toolkit_config.session, self.agent_id, self.agent_execution_id, result['message'])
         return result["content"]

superagi/tools/thinking/tools.py

@@ -3,7 +3,7 @@
 from pydantic import BaseModel, Field
 
 from superagi.agent.agent_prompt_builder import AgentPromptBuilder
-from superagi.helper.error_handling import ErrorHandling
+from superagi.helper.error_handler import ErrorHandler
 from superagi.helper.prompt_reader import PromptReader
 from superagi.lib.logger import logger
 from superagi.llms.base_llm import BaseLlm
@@ -68,7 +68,7 @@ def _execute(self, task_description: str):
             result = self.llm.chat_completion(messages, max_tokens=self.max_token_limit)
 
             if 'error' in result and result['message'] is not None:
-                ErrorHandling.handle_openai_errors(self.toolkit_config.session, self.agent_id, self.agent_execution_id, result['message'])
+                ErrorHandler.handle_openai_errors(self.toolkit_config.session, self.agent_id, self.agent_execution_id, result['message'])
             return result["content"]
         except Exception as e:
             logger.error(e)

tests/unit_tests/helper/test_error_handling.py

@@ -2,7 +2,7 @@
 from unittest.mock import Mock, patch
 from superagi.models.agent_execution import AgentExecution
 from superagi.models.agent_execution_feed import AgentExecutionFeed
-from superagi.helper.error_handling import ErrorHandling  
+from superagi.helper.error_handler import ErrorHandler
 
 def test_handle_error():
     session = Mock()
@@ -14,6 +14,6 @@ def test_handle_error():
     mock_query.filter().first.return_value = AgentExecution(id=agent_execution_id)
     session.query.return_value = mock_query
 
-    ErrorHandling.handle_openai_errors(session, agent_id, agent_execution_id, error_message)
+    ErrorHandler.handle_openai_errors(session, agent_id, agent_execution_id, error_message)
 
     session.query.assert_called_once_with(AgentExecution)