fyodorov-llm-agents 0.2.139__py3-none-any.whl → 0.2.140__py3-none-any.whl

fyodorov_llm_agents/agents/agent.py

@@ -8,17 +8,20 @@ import yaml
 from pydantic import BaseModel, HttpUrl
 from openai import OpenAI as oai
 import litellm
-from fyodorov_llm_agents.tools.tool import Tool
+from fyodorov_llm_agents.tools.mcp_tool import MCPTool as Tool
 
 MAX_NAME_LENGTH = 80
 MAX_DESCRIPTION_LENGTH = 280
 VALID_CHARACTERS_REGEX = r'^[a-zA-Z0-9\s.,!?:;\'"-_]+$'
 
 class Agent(BaseModel):
+    id: Optional[int] = None
+    created_at: Optional[datetime] = None
     api_key: str | None = None
     api_url: HttpUrl | None = None
-    tools: [Tool] = []
-    rag: [] = []
+    tools: list[Tool] = []
+    rag: list[dict] = []
+    chat_history: list[dict] = []
     model: str | None = None
     modelid: str | None = None
     name: str = "My Agent"
@@ -63,15 +66,16 @@ class Agent(BaseModel):
         return prompt
 
     def to_dict(self) -> dict:
-        return {
-            'model': self.model,
-            'name': self.name,
-            'description': self.description,
-            'prompt': self.prompt,
-            'prompt_size': self.prompt_size,
-            'tools': self.tools,
-            'rag': self.rag,
-        }
+        return self.dict(exclude_none=True)
+        # return {
+        #     'model': self.model,
+        #     'name': self.name,
+        #     'description': self.description,
+        #     'prompt': self.prompt,
+        #     'prompt_size': self.prompt_size,
+        #     'tools': self.tools,
+        #     'rag': self.rag,
+        # }
 
     def call_with_fn_calling(self, input: str = "", history = []) -> dict:
         litellm.set_verbose = True

fyodorov_llm_agents/tools/mcp_tool.py

@@ -2,12 +2,13 @@ from pydantic import BaseModel, HttpUrl, Field
 from typing import Optional, Dict, Any, Literal
 import re
 from datetime import datetime
+import yaml
 
 APIUrlTypes = Literal['openapi']
 
 # Example regex for validating textual fields; adjust as needed
 VALID_CHARACTERS_REGEX = r'^[a-zA-Z0-9\s.,!?:;\'"\-_]+$'
-MAX_DISPLAY_NAME_LENGTH = 80
+MAX_NAME_LENGTH = 80
 MAX_DESCRIPTION_LENGTH = 1000
 
 class MCPTool(BaseModel):
@@ -19,7 +20,7 @@ class MCPTool(BaseModel):
     created_at: Optional[datetime] = None             # timestamptz
     updated_at: Optional[datetime] = None             # timestamptz
 
-    display_name: Optional[str] = Field(..., max_length=MAX_DISPLAY_NAME_LENGTH)
+    name: Optional[str] = Field(..., max_length=MAX_NAME_LENGTH)
     handle: Optional[str] = None
     description: Optional[str] = Field(None, max_length=MAX_DESCRIPTION_LENGTH)
     logo_url: Optional[str] = None                    # stored as text; could be a URL
@@ -36,13 +37,13 @@ class MCPTool(BaseModel):
 
     # Example validations below. Adjust/extend to fit your needs.
 
-    def validate_model_fields(self) -> bool:
+    def validate(self) -> bool:
         """
         Run custom validations on the model fields.
         Returns True if all validations pass, otherwise raises ValueError.
         """
-        if self.display_name:
-            self._validate_display_name(self.display_name)
+        if self.name:
+            self._validate_name(self.name)
         if self.description:
             self._validate_description(self.description)
         if self.api_url:
@@ -53,9 +54,9 @@ class MCPTool(BaseModel):
         return True
 
     @staticmethod
-    def _validate_display_name(name: str) -> None:
+    def _validate_name(name: str) -> None:
         if not re.match(VALID_CHARACTERS_REGEX, name):
-            raise ValueError("display_name contains invalid characters.")
+            raise ValueError("name contains invalid characters.")
 
     @staticmethod
     def _validate_description(description: str) -> None:
@@ -67,6 +68,18 @@ class MCPTool(BaseModel):
         if not HttpUrl.validate(url):
             raise ValueError("{url} is not a valid URL.")
 
+    @staticmethod
+    def from_yaml(yaml_str: str):
+        """Instantiate Tool from YAML."""
+        if not yaml_str:
+            raise ValueError('YAML string is required')
+        tool_dict = yaml.safe_load(yaml_str)
+        if not isinstance(tool_dict, dict):
+            raise ValueError('YAML string must represent a dictionary')
+        tool = MCPTool(**tool_dict)
+        tool.validate()
+        return tool
+
     def to_dict(self) -> dict:
         """
         Convert this Pydantic model to a plain dict (e.g., for inserting into Supabase).

{fyodorov_llm_agents-0.2.139.dist-info → fyodorov_llm_agents-0.2.140.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fyodorov_llm_agents
-Version: 0.2.139
+Version: 0.2.140
 Summary: LLM agents for the Fyodorov AI suite
 Author-email: Daniel Ransom <02masseur.alibis@icloud.com>
 Project-URL: Homepage, https://github.com/FyodorovAI/fyodorov-llm-agents

fyodorov_llm_agents-0.2.140.dist-info/RECORD

@@ -0,0 +1,8 @@
+fyodorov_llm_agents/agents/agent.py,sha256=jC-xHJFcCKcCpgF4oL0tWEIwg4fYPf5E0TQnUP2NL6w,6758
+fyodorov_llm_agents/agents/openai.py,sha256=FA5RS7yn3JwvFA8PXju60XSYC_2oUZFNgBUzeIYtGv0,1154
+fyodorov_llm_agents/tools/mcp_tool.py,sha256=QRKtja2tYcmcNYFL-1bXfYLo0w7FPSmBCJCgTDmiUYE,3197
+fyodorov_llm_agents/tools/tool.py,sha256=HyOk0X_3XE23sa8J-8UZx657tJ0sxwZWMbA4OPxXU6E,7940
+fyodorov_llm_agents-0.2.140.dist-info/METADATA,sha256=Rc_5DnBA3HjdhquMqh8zE3JQogrUhDp5LUQZwIoa4rM,552
+fyodorov_llm_agents-0.2.140.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
+fyodorov_llm_agents-0.2.140.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
+fyodorov_llm_agents-0.2.140.dist-info/RECORD,,

{fyodorov_llm_agents-0.2.139.dist-info → fyodorov_llm_agents-0.2.140.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (78.1.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

fyodorov_llm_agents-0.2.139.dist-info/RECORD

@@ -1,8 +0,0 @@
-fyodorov_llm_agents/agents/agent.py,sha256=W1VkCeKAN7PYabUFlrchmad91P4NFcuqr1rRquwH1hI,6564
-fyodorov_llm_agents/agents/openai.py,sha256=FA5RS7yn3JwvFA8PXju60XSYC_2oUZFNgBUzeIYtGv0,1154
-fyodorov_llm_agents/tools/mcp_tool.py,sha256=arRXqaldrJAv9w3mkzZU_lYKOWFYN0LjHF_8yyID7OU,2845
-fyodorov_llm_agents/tools/tool.py,sha256=HyOk0X_3XE23sa8J-8UZx657tJ0sxwZWMbA4OPxXU6E,7940
-fyodorov_llm_agents-0.2.139.dist-info/METADATA,sha256=PjwZ4jRUpuRWMftCG3RZeyIyIfeuBd3i4zGlsedPbdg,552
-fyodorov_llm_agents-0.2.139.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-fyodorov_llm_agents-0.2.139.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
-fyodorov_llm_agents-0.2.139.dist-info/RECORD,,