Merge branch 'development' into DianaStrauss-main

pyproject.toml

@@ -34,6 +34,7 @@ dependencies = [
 	'python-dotenv == 1.0.1',
 	'pypsexec == 0.3.0',
 	'openai == 1.28.0',
+	'spacy'
 ]
 
 [project.urls]

src/hackingBuddyGPT/usecases/web_api_testing/prompt_engineer.py

@@ -1,7 +1,4 @@
-import pydantic_core
-from hackingBuddyGPT.capabilities.capability import capabilities_to_action_model
 import spacy
-import time
 from instructor.retry import InstructorRetryException
 
 

src/hackingBuddyGPT/usecases/web_api_testing/simple_openapi_documentation.py

@@ -1,4 +1,4 @@
-from dataclasses import dataclass, field
+from dataclasses import field
 from typing import List, Any, Union, Dict
 
 import pydantic_core
@@ -8,19 +8,18 @@
 from hackingBuddyGPT.capabilities import Capability
 from hackingBuddyGPT.capabilities.http_request import HTTPRequest
 from hackingBuddyGPT.capabilities.record_note import RecordNote
-from hackingBuddyGPT.usecases.common_patterns import RoundBasedUseCase
+from hackingBuddyGPT.usecases.agents import Agent
 from hackingBuddyGPT.usecases.web_api_testing.utils.documentation_handler import DocumentationHandler
 from hackingBuddyGPT.usecases.web_api_testing.utils.llm_handler import LLMHandler
 from hackingBuddyGPT.usecases.web_api_testing.prompt_engineer import PromptEngineer, PromptStrategy
 from hackingBuddyGPT.usecases.web_api_testing.utils.response_handler import ResponseHandler
 from hackingBuddyGPT.utils import tool_message
 from hackingBuddyGPT.utils.configurable import parameter
 from hackingBuddyGPT.utils.openai.openai_lib import OpenAILib
-from hackingBuddyGPT.usecases.base import use_case
+from hackingBuddyGPT.usecases.base import AutonomousAgentUseCase, use_case
 Prompt = List[Union[ChatCompletionMessage, ChatCompletionMessageParam]]
 Context = Any
 
-
 class SimpleWebAPIDocumentation(Agent):
     llm: OpenAILib
     host: str = parameter(desc="The host to test", default="https://jsonplaceholder.typicode.com")
@@ -88,12 +87,12 @@ def _handle_response(self, completion, response):
         message = completion.choices[0].message
         tool_call_id = message.tool_calls[0].id
         command = pydantic_core.to_json(response).decode()
-        self.console.print(Panel(command, title="assistant"))
+        self._log.console.print(Panel(command, title="assistant"))
         self._prompt_history.append(message)
 
         with self._log.console.status("[bold green]Executing that command..."):
             result = response.execute()
-            self.console.print(Panel(result[:30], title="tool"))
+            self._log.console.print(Panel(result[:30], title="tool"))
             result_str = self.response_handler.parse_http_status_line(result)
             self._prompt_history.append(tool_message(result_str, tool_call_id))
             invalid_flags = ["recorded","Not a valid HTTP method", "404" ,"Client Error: Not Found"]
@@ -109,3 +108,7 @@ def _handle_response(self, completion, response):
     def has_no_numbers(self, path):
         return not any(char.isdigit() for char in path)
 
+
+@use_case("Minimal implementation of a web API testing use case")
+class SimpleWebAPIDocumentationUseCase(AutonomousAgentUseCase[SimpleWebAPIDocumentation]):
+    pass

src/hackingBuddyGPT/usecases/web_api_testing/simple_web_api_testing.py

@@ -9,21 +9,18 @@
 from hackingBuddyGPT.capabilities.http_request import HTTPRequest
 from hackingBuddyGPT.capabilities.record_note import RecordNote
 from hackingBuddyGPT.capabilities.submit_http_method import SubmitHTTPMethod
-from hackingBuddyGPT.usecases.common_patterns import RoundBasedUseCase
 from hackingBuddyGPT.usecases.web_api_testing.utils.llm_handler import LLMHandler
 from hackingBuddyGPT.usecases.web_api_testing.prompt_engineer import PromptEngineer, PromptStrategy
 from hackingBuddyGPT.usecases.web_api_testing.utils.response_handler import ResponseHandler
 from hackingBuddyGPT.utils import tool_message
 from hackingBuddyGPT.utils.configurable import parameter
 from hackingBuddyGPT.utils.openai.openai_lib import OpenAILib
-from hackingBuddyGPT.usecases.base import use_case
+from hackingBuddyGPT.usecases.base import AutonomousAgentUseCase, use_case
 
 Prompt = List[Union[ChatCompletionMessage, ChatCompletionMessageParam]]
 Context = Any
 
-@use_case("simple_web_api_testing", "Minimal implementation of a web API testing use case")
-@dataclass
-class SimpleWebAPITesting(RoundBasedUseCase):
+class SimpleWebAPITesting(Agent):
     llm: OpenAILib
     host: str = parameter(desc="The host to test", default="https://jsonplaceholder.typicode.com")
     http_method_description: str = parameter(
@@ -127,10 +124,14 @@ def _handle_response(self, completion, response):
         self.console.print(Panel(command, title="assistant"))
         self._prompt_history.append(message)
 
-        with self._log.console.status("[bold green]Executing that command..."):
+        with self.console.status("[bold green]Executing that command..."):
             result = response.execute()
             self.console.print(Panel(result[:30], title="tool"))
             result_str = self.response_handler.parse_http_status_line(result)
             self._prompt_history.append(tool_message(result_str, tool_call_id))
 
         return self._all_http_methods_found
+
+@use_case("Minimal implementation of a web API testing use case")
+class SimpleWebAPITestingUseCase(AutonomousAgentUseCase[SimpleWebAPITesting]):
+    pass