fyodorov-llm-agents 0.2.131__py3-none-any.whl → 0.2.135__py3-none-any.whl

fyodorov_llm_agents/agents/agent.py

@@ -87,11 +87,13 @@ class Agent(BaseModel):
         else:
             print("Provider Ollama")
             model = 'ollama/'+self.model
-            if self.api_url and str(self.api_url)[-1] == '/':
-                print("Removing trailing slash")
-                self.api_url = HttpUrl(str(self.api_url)[:-1])
-            else:
-                self.api_url = HttpUrl("https://api.ollama.ai/v1")
+            if self.api_url is None:
+                self.api_url = "https://api.ollama.ai/v1"
+
+        base_url = str(self.api_url)
+        if base_url and base_url[-1] == '/':
+            print("Removing trailing slash")
+            base_url = base_url[:-1]
 
         messages: [] = [
             {"content": self.prompt, "role": "system"},
@@ -101,11 +103,11 @@ class Agent(BaseModel):
         print(f"Tools: {self.tools}")
         tools = [tool.get_function() for tool in self.tools]
         if tools and litellm.supports_function_calling(model=model):
-            print(f"calling litellm with model {model}, tools: {tools}, messages: {messages}, max_retries: 0, history: {history}, base_url: {str(self.api_url)}")
-            response = litellm.completion(model=model, messages=messages, max_retries=0, tools=tools, tool_choice="auto", base_url=str(self.api_url))
+            print(f"calling litellm with model {model}, tools: {tools}, messages: {messages}, max_retries: 0, history: {history}, base_url: {base_url}")
+            response = litellm.completion(model=model, messages=messages, max_retries=0, tools=tools, tool_choice="auto", base_url=base_url)
         else:
-            print(f"calling litellm with model {model}, messages: {messages}, max_retries: 0, history: {history}, base_url: {str(self.api_url)}")
-            response = litellm.completion(model=model, messages=messages, max_retries=0, base_url=str(self.api_url))
+            print(f"calling litellm with model {model}, messages: {messages}, max_retries: 0, history: {history}, base_url: {base_url}")
+            response = litellm.completion(model=model, messages=messages, max_retries=0, base_url=base_url)
         print(f"Response: {response}")
         tool_calls = []
         if hasattr(response, 'tool_calls'):

fyodorov_llm_agents/tools/mcp_tool.py

@@ -0,0 +1,74 @@
+from pydantic import BaseModel, EmailStr, HttpUrl, Field
+from typing import TypeVar, Optional, Dict, Any, Literal
+import re
+from datetime import datetime
+
+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_DESCRIPTION_LENGTH = 1000
+
+class MCPTool(BaseModel):
+    """
+    Pydantic model corresponding to the 'mcp_tools' table.
+    """
+    # Database columns
+    id: Optional[int] = None                          # bigserial (int8) primary key
+    created_at: Optional[datetime] = None             # timestamptz
+    updated_at: Optional[datetime] = None             # timestamptz
+
+    display_name: str = Field(..., max_length=MAX_DISPLAY_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
+    user_id: Optional[str] = None                     # uuid
+
+    public: bool = False
+    api_type: Optional[str] = None
+    api_url: Optional[str] = None                     # stored as text; could also be HttpUrl
+    auth_method: Optional[str] = None
+    auth_info: Optional[Dict[str, Any]] = None        # jsonb
+    capabilities: Optional[Dict[str, Any]] = None     # jsonb
+    health_status: Optional[str] = None
+    usage_notes: Optional[str] = None
+
+    # Example validations below. Adjust/extend to fit your needs.
+
+    def validate_model_fields(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.description:
+            self._validate_description(self.description)
+        if self.api_url:
+            self._validate_url(self.api_url)
+        if self.logo_url:
+            self._validate_url(self.logo_url)
+        # Add more validations as desired...
+        return True
+
+    @staticmethod
+    def _validate_display_name(name: str) -> None:
+        if not re.match(VALID_CHARACTERS_REGEX, name):
+            raise ValueError("display_name contains invalid characters.")
+
+    @staticmethod
+    def _validate_description(description: str) -> None:
+        if not re.match(VALID_CHARACTERS_REGEX, description):
+            raise ValueError("description contains invalid characters.")
+
+    @staticmethod
+    def _validate_url(url: str) -> None:
+        if not HttpUrl.validate(url):
+            raise ValueError("{url} is not a valid URL.")
+
+    def to_dict(self) -> dict:
+        """
+        Convert this Pydantic model to a plain dict (e.g., for inserting into Supabase).
+        """
+        return self.dict()

{fyodorov_llm_agents-0.2.131.dist-info → fyodorov_llm_agents-0.2.135.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: fyodorov_llm_agents
-Version: 0.2.131
+Version: 0.2.135
 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.135.dist-info/RECORD

@@ -0,0 +1,8 @@
+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=nyqAqVLZODJOPbcfnBr302llnmLxDMwGZ_XsyEzjT_E,2827
+fyodorov_llm_agents/tools/tool.py,sha256=HyOk0X_3XE23sa8J-8UZx657tJ0sxwZWMbA4OPxXU6E,7940
+fyodorov_llm_agents-0.2.135.dist-info/METADATA,sha256=WSgXvrCzfYq1ITztKZ2h44ed6ifLwTiws21rNlg2fZc,552
+fyodorov_llm_agents-0.2.135.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+fyodorov_llm_agents-0.2.135.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
+fyodorov_llm_agents-0.2.135.dist-info/RECORD,,

{fyodorov_llm_agents-0.2.131.dist-info → fyodorov_llm_agents-0.2.135.dist-info}/WHEEL

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

fyodorov_llm_agents-0.2.131.dist-info/RECORD

@@ -1,7 +0,0 @@
-fyodorov_llm_agents/agents/agent.py,sha256=E4ogwm8BwC6MXOmyxjuO_TDh_Y3krOu7TEKiKwzDmAQ,6599
-fyodorov_llm_agents/agents/openai.py,sha256=FA5RS7yn3JwvFA8PXju60XSYC_2oUZFNgBUzeIYtGv0,1154
-fyodorov_llm_agents/tools/tool.py,sha256=HyOk0X_3XE23sa8J-8UZx657tJ0sxwZWMbA4OPxXU6E,7940
-fyodorov_llm_agents-0.2.131.dist-info/METADATA,sha256=myvGBIKwMtR7200yg3kBzxsO4HMw6g9Yxkx2tGBWkr4,552
-fyodorov_llm_agents-0.2.131.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-fyodorov_llm_agents-0.2.131.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
-fyodorov_llm_agents-0.2.131.dist-info/RECORD,,