Building AI agents, atomically
feat: Add CalculatorToolConfig and ContentScrapingToolConfig classes
KennyVaneetvelde85d23e7ab141
diff --git a/atomic_agents/lib/tools/calculator_tool.py b/atomic_agents/lib/tools/calculator_tool.pyindex b241a05..38edb73 100644--- a/atomic_agents/lib/tools/calculator_tool.py+++ b/atomic_agents/lib/tools/calculator_tool.py@@ -4,7 +4,7 @@ from pydantic import BaseModel, Fieldfrom sympy import sympifyimport instructor-from atomic_agents.lib.tools.base import BaseTool+from atomic_agents.lib.tools.base import BaseTool, BaseToolConfig################# INPUT SCHEMA #@@ -26,9 +26,12 @@ class CalculatorToolSchema(BaseModel):class CalculatorToolOutputSchema(BaseModel):result: str = Field(..., description="Result of the calculation.")-################-# TOOL LOGIC #-################+##############+# TOOL LOGIC #+##############+class CalculatorToolConfig(BaseToolConfig):+ pass+class CalculatorTool(BaseTool):"""Tool for performing calculations based on the provided mathematical expression.@@ -40,15 +43,14 @@ class CalculatorTool(BaseTool):input_schema = CalculatorToolSchemaoutput_schema = CalculatorToolOutputSchema- def __init__(self, **kwargs):+ def __init__(self, config: CalculatorToolConfig = CalculatorToolConfig()):"""Initializes the CalculatorTool.-+Args:- *args: Variable length argument list.- **kwargs: Arbitrary keyword arguments.+ config (CalculatorToolConfig): Configuration for the tool."""- super().__init__(**kwargs)+ super().__init__(config)def run(self, params: CalculatorToolSchema) -> CalculatorToolOutputSchema:"""@@ -77,21 +79,4 @@ class CalculatorTool(BaseTool):# EXAMPLE USAGE ##################if __name__ == "__main__":-- # Initialize the client outside- client = instructor.from_openai(- openai.OpenAI(- api_key=os.getenv("OPENAI_API_KEY"),- base_url=os.getenv("OPENAI_BASE_URL")- )- )-- # Extract structured data from natural language- result = client.chat.completions.create(- model="gpt-3.5-turbo",- response_model=CalculatorTool.input_schema,- messages=[{"role": "user", "content": "Calculate 2 + 2"}],- )-- # Print the result- print(CalculatorTool(tool_description_override="derp").run(result))\ No newline at end of file+ print(CalculatorTool().run(CalculatorToolSchema(expression="2 + 2")))\ No newline at end of filediff --git a/atomic_agents/lib/tools/content_scraping_tool.py b/atomic_agents/lib/tools/content_scraping_tool.pyindex 644f26e..5ded932 100644--- a/atomic_agents/lib/tools/content_scraping_tool.py+++ b/atomic_agents/lib/tools/content_scraping_tool.py@@ -6,7 +6,7 @@ import openaiimport instructorimport requests-from atomic_agents.lib.tools.base import BaseTool+from atomic_agents.lib.tools.base import BaseTool, BaseToolConfigfrom atomic_agents.lib.utils.scraping.url_to_markdown import UrlToMarkdownConverterfrom atomic_agents.lib.utils.scraping.pdf_to_markdown import PdfToMarkdownConverter@@ -37,6 +37,9 @@ class ContentScrapingToolOutputSchema(BaseModel):############### TOOL LOGIC ###############+class ContentScrapingToolConfig(BaseToolConfig):+ pass+class ContentScrapingTool(BaseTool):"""Tool for scraping web pages or PDFs and converting content to markdown.@@ -48,15 +51,14 @@ class ContentScrapingTool(BaseTool):input_schema = ContentScrapingToolSchemaoutput_schema = ContentScrapingToolOutputSchema- def __init__(self, **kwargs):+ def __init__(self, config: ContentScrapingToolConfig = ContentScrapingToolConfig()):"""Initializes the ContentScrapingTool.Args:- *args: Variable length argument list.- **kwargs: Arbitrary keyword arguments.+ config (ContentScrapingToolConfig): Configuration for the tool."""- super().__init__(**kwargs)+ super().__init__(config)def run(self, params: ContentScrapingToolSchema) -> ContentScrapingToolOutputSchema:"""