fyodorov-llm-agents 0.4.5__py3-none-any.whl → 0.4.7__py3-none-any.whl

fyodorov_llm_agents/agents/agent_model.py

@@ -3,7 +3,7 @@ import re
 from pydantic import BaseModel, HttpUrl
 from typing import Optional
 import litellm
-# from fyodorov_llm_agents.tools.mcp_tool_service import MCPTool as ToolService
+from fyodorov_llm_agents.tools.mcp_tool_service import MCPTool as ToolService
 from datetime import datetime
 
 MAX_NAME_LENGTH = 80
@@ -72,7 +72,7 @@ class Agent(BaseModel):
         #     'rag': self.rag,
         # }
 
-    def call_with_fn_calling(self, input: str = "", history = []) -> dict:
+    def call_with_fn_calling(self, input: str = "", history = [], user_id: str = "") -> dict:
         litellm.set_verbose = True
         model = self.model
         # Set environmental variable
@@ -96,12 +96,59 @@ class Agent(BaseModel):
             *history,
             { "content": input, "role": "user"},
         ]
-        print(f"Tools: {self.tools}")
         # tools
-        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"Tools: {self.tools}")
+        mcp_tools = []
+        for tool in self.tools:
+            try:
+                tool_instance = ToolService.get_by_name_and_user_id(tool, user_id)
+                mcp_tools.append(tool_instance)
+            except Exception as e:
+                print(f"Error fetching tool {tool}: {e}")
+        
+        tool_schemas = [tool.get_function() for tool in mcp_tools]
+        print(f"Tool schemas: {tool_schemas}")
+        if tool_schemas:
+            print(f"calling litellm with model {model}, messages: {messages}, max_retries: 0, history: {history}, base_url: {base_url}, tools: {tool_schemas}")
+            response = litellm.completion(model=model, messages=messages, max_retries=0, base_url=base_url)
+        else:     
+            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}")
-        answer = response.choices[0].message.content
+
+        message = response.choices[0].message
+
+        if hasattr(message, "tool_calls") and message.tool_calls:
+            tool_call = message.tool_calls[0]
+            fn_name = tool_call.function.name
+            args = tool_call.function.arguments
+
+            mcp_tool = mcp_tools.get(fn_name)
+            if not mcp_tool:
+                raise ValueError(f"Tool '{fn_name}' not found in loaded MCP tools")
+
+            tool_output = mcp_tool.call(args)
+
+            messages.append({
+                "role": "assistant",
+                "content": None,
+                "tool_calls": [tool_call],
+            })
+            messages.append({
+                "role": "tool",
+                "tool_call_id": tool_call.id,
+                "content": tool_output,
+            })
+
+            followup = litellm.completion(
+                model=model,
+                messages=messages,
+                max_retries=0,
+                base_url=base_url,
+            )
+            return {"answer": followup.choices[0].message.content}
+        
+        answer = message.content
         print(f"Answer: {answer}")
         return {
             "answer": answer,

fyodorov_llm_agents/instances/instance_service.py

@@ -30,7 +30,7 @@ class Instance(InstanceModel):
         #     if isinstance(tool, str):
         #         agent.tools[index] = Tool.get_by_name_and_user_id(access_token, tool, user_id)
         #         print(f"Tool fetched via Tool.get_by_name_and_user_id in chat_w_fn_calls: {agent.tools[index]}")
-        res = agent.call_with_fn_calling(input=input, history=self.chat_history)
+        res = agent.call_with_fn_calling(input=input, history=self.chat_history, user_id=user_id)
         self.chat_history.append({
             "role": "user",
             "content": input

fyodorov_llm_agents/models/llm_service.py

@@ -1,8 +1,8 @@
 from datetime import datetime
-from .llm_model import LLMModel
-from .provider import Provider
 from supabase import Client
 from fyodorov_utils.config.supabase import get_supabase
+from fyodorov_llm_agents.providers.provider_service import Provider
+from fyodorov_llm_agents.models.llm_model import LLMModel
 
 supabase: Client = get_supabase()
 

fyodorov_llm_agents/tools/mcp_tool_model.py

@@ -73,6 +73,21 @@ class MCPTool(BaseModel):
         tool.validate()
         return tool
 
+    def get_function(self) -> dict:
+        """
+        Convert this MCP tool into a function definition usable by LLMs (OpenAI-style).
+        """
+        if not self.capabilities or "functions" not in self.capabilities:
+            raise ValueError(f"Tool '{self.name}' is missing `capabilities.functions`")
+
+        # For now: return the first declared capability
+        func = self.capabilities["functions"][0]
+        return {
+            "name": func["name"],
+            "description": func.get("description", "No description provided."),
+            "parameters": func.get("parameters", {}),
+        }
+
     def call(self, args: dict) -> str:
         if not self.api_url:
             raise ValueError("MCP tool is missing an `api_url`")

{fyodorov_llm_agents-0.4.5.dist-info → fyodorov_llm_agents-0.4.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fyodorov_llm_agents
-Version: 0.4.5
+Version: 0.4.7
 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.4.5.dist-info → fyodorov_llm_agents-0.4.7.dist-info}/RECORD

@@ -1,16 +1,16 @@
-fyodorov_llm_agents/agents/agent_model.py,sha256=vVBCEBpG11m4ae11Mr94rF5TJpuBluI_loQPDTw734w,5044
+fyodorov_llm_agents/agents/agent_model.py,sha256=LxoQ8ZrGt_xYbcAjFTZC4ff8zvzsWq9MstTmroFBTdE,6827
 fyodorov_llm_agents/agents/agent_service.py,sha256=-55RDait3eZGFfYWGNLGoa06WMcdiBnkzpa7BnWW10Q,6016
 fyodorov_llm_agents/agents/openai.py,sha256=FA5RS7yn3JwvFA8PXju60XSYC_2oUZFNgBUzeIYtGv0,1154
 fyodorov_llm_agents/instances/instance_model.py,sha256=PQaoVSH9H4qp_wcLvyT_QgvNtwf9oehOxZaGI6mv1bA,1206
-fyodorov_llm_agents/instances/instance_service.py,sha256=8tXWimECQd0Ks5Q9j2S2wvfJd7j9CPvLG6tLmdzGqXg,8281
+fyodorov_llm_agents/instances/instance_service.py,sha256=oytsWHR2-OUiALwPN6wSkHadoEiUJVU3_gwvi8Y_ghM,8298
 fyodorov_llm_agents/models/llm_model.py,sha256=aQtXtB7kRpnVdbPu-nmTGAaflbtKz3DPkgcckf1srsg,1645
-fyodorov_llm_agents/models/llm_service.py,sha256=ifSyznv9MY2kyRALClM-epdCQ9abMgsoDanS8TN0Nng,3945
+fyodorov_llm_agents/models/llm_service.py,sha256=35bS0RFXJhJUSjge-v4u5cftn_MT-CmcDuWnC2kCnJo,4008
 fyodorov_llm_agents/providers/provider_model.py,sha256=OyCK6WMRhyElsp88gILg0wso-OPHI7f55gEeypsJ7O0,957
 fyodorov_llm_agents/providers/provider_service.py,sha256=GST-NLV8aLPsvapQEvgT_qHGYu7IpS5Xsut60XFmD-g,5865
-fyodorov_llm_agents/tools/mcp_tool_model.py,sha256=i7oFZReVGZsHN2K8T7mCAGF4t92wMMIR9mCkRHUgKsI,4413
+fyodorov_llm_agents/tools/mcp_tool_model.py,sha256=LuQE-mu5zKmiMmWOOKETAVkjwGsHSbcDbB57piEAACU,5025
 fyodorov_llm_agents/tools/mcp_tool_service.py,sha256=9tDvSdKpEAOKKU5MHImUqTOc6MZyk1hEjs3GpzgQUsk,5542
 fyodorov_llm_agents/tools/tool.py,sha256=HyOk0X_3XE23sa8J-8UZx657tJ0sxwZWMbA4OPxXU6E,7940
-fyodorov_llm_agents-0.4.5.dist-info/METADATA,sha256=41-LenOznx7t3sFfTACSBQ9Mi12jPYIXeT1dedOnUa4,550
-fyodorov_llm_agents-0.4.5.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-fyodorov_llm_agents-0.4.5.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
-fyodorov_llm_agents-0.4.5.dist-info/RECORD,,
+fyodorov_llm_agents-0.4.7.dist-info/METADATA,sha256=d724yOM7r0XyfRw0QZZAyEcUbuRu1N-ww6td4ZMjxH8,550
+fyodorov_llm_agents-0.4.7.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+fyodorov_llm_agents-0.4.7.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
+fyodorov_llm_agents-0.4.7.dist-info/RECORD,,