fyodorov-llm-agents 0.4.61__py3-none-any.whl → 0.4.65__py3-none-any.whl

fyodorov_llm_agents/agents/agent_service.py

@@ -2,7 +2,10 @@ from datetime import datetime
 import os
 from supabase import Client
 import litellm
+import requests
+
 from fyodorov_utils.config.supabase import get_supabase
+from fyodorov_utils.service_discovery import get_service_url
 from fyodorov_llm_agents.agents.agent_model import Agent as AgentModel
 from fyodorov_llm_agents.tools.mcp_tool_model import MCPTool as ToolModel
 from fyodorov_llm_agents.tools.mcp_tool_service import MCPTool as ToolService
@@ -230,7 +233,10 @@ class Agent(AgentModel):
             if not mcp_tool:
                 raise ValueError(f"Tool '{fn_name}' not found in loaded MCP tools")
 
-            tool_output = mcp_tool.call(args)
+            # Forward tool call to Tsiolkovsky instead of calling locally
+            tool_output = await self._forward_tool_call_to_tsiolkovsky(
+                mcp_tool.id, args, user_session
+            )
 
             messages.append({
                 "role": "assistant",
@@ -255,5 +261,26 @@ class Agent(AgentModel):
         print(f"Answer: {answer}")
         return {
             "answer": answer,
-
-        }
+        }
+    
+    async def _forward_tool_call_to_tsiolkovsky(self, tool_id: str, args: str, user_session: str) -> str:
+        """Forward function call to Tsiolkovsky for execution"""
+        try:
+            tsiolkovsky_url = get_service_url('Tsiolkovsky')
+            
+            response = await asyncio.to_thread(
+                requests.post,
+                f"{tsiolkovsky_url}/tools/{tool_id}/call",
+                json={"args": args},
+                headers={"Authorization": f"Bearer {user_session}"},
+                timeout=30
+            )
+            
+            if response.status_code == 200:
+                result = response.json()
+                return result.get("result", "")
+            else:
+                return f"Error calling tool: {response.status_code} - {response.text}"
+                
+        except Exception as e:
+            return f"Error forwarding tool call: {str(e)}"

fyodorov_llm_agents/instances/instance_service.py

@@ -18,7 +18,7 @@ JWT = "eyJhbGciOiJIUzI1NiIsImtpZCI6Im14MmVrTllBY3ZYN292LzMiLCJ0eXAiOiJKV1QifQ.ey
 class Instance(InstanceModel):
 
     async def chat_w_fn_calls(self, input: str = "", access_token: str = JWT, user_id: str = "") -> str:
-        agent: AgentModel = await Agent.get_in_db(access_token=access_token, id = self.agent_id)
+        agent: AgentModel = await Agent.get_in_db(id = self.agent_id)
         print(f"Model fetched via LLM.get_model in chat_w_fn_calls: {agent.model}")
         agent.provider = await Provider.get_provider_by_id(id = agent.model.provider)
         agent.prompt = f"{agent.prompt}\n\n{datetime.now().strftime('%Y-%m-%d %H:%M:%S')}\n\n"

fyodorov_llm_agents/tools/mcp_tool_model.py

@@ -37,6 +37,11 @@ class MCPTool(BaseModel):
     health_status: Optional[str] = None
     usage_notes: Optional[str] = None
 
+    # Fields for launching local tools
+    launch_command: Optional[str] = None              # The command to execute (e.g., "npx", "python")
+    launch_args: Optional[list[str]] = None           # Arguments for the command (e.g., ["-y", "mcp-remote@latest"])
+    launch_working_directory: Optional[str] = None    # Working directory for the command
+
     # Example validations below. Adjust/extend to fit your needs.
 
     def validate(self) -> bool:

fyodorov_llm_agents/tools/mcp_tool_service.py

@@ -1,7 +1,12 @@
 from datetime import datetime
+import json
+from typing import Any, Optional
+
+import requests
 from fyodorov_utils.config.supabase import get_supabase
 from .mcp_tool_model import MCPTool as ToolModel
 
+
 class MCPTool():
 
     @staticmethod
@@ -125,7 +130,7 @@ class MCPTool():
                 tool["user_id"] = str(tool["user_id"])
                 tool["created_at"] = str(tool["created_at"])
                 tool["updated_at"] = str(tool["updated_at"])
-                if tool and (tool['public'] == True or (user_id and 'user_id' in tool and tool['user_id'] == user_id)):
+                if tool and (tool['public'] or (user_id and 'user_id' in tool and tool['user_id'] == user_id)):
                     print('tool is public or belongs to user', tool)
                     tool_model = ToolModel(**tool)
                     if tool_model.validate():
@@ -169,4 +174,36 @@ class MCPTool():
             return agent_ids
         except Exception as e:
             print('Error setting tool agents', str(e))
-            raise
+            raise e
+
+    @staticmethod
+    async def call_mcp_server(id: str, access_token: Optional[str] = None, args: Optional[dict[str, Any]] = None) -> str:
+        """Invoke an MCP tool via the tool's configured MCP server."""
+        if not id:
+            raise ValueError('Tool ID is required')
+        tool = await MCPTool.get_in_db(access_token, id)
+        if not tool:
+            raise ValueError('Tool not found')
+        if not tool.handle:
+            raise ValueError('Tool handle is required')
+        if not tool.api_url:
+            raise ValueError('Tool api_url is required')
+
+        url = f"{tool.api_url}:call"
+        headers = {'Content-Type': 'application/json'}
+        if access_token:
+            headers['Authorization'] = f'Bearer {access_token}'
+        if args is None:
+            args = {}
+
+        try:
+            print(f"Calling MCP server at {url} with args {args}")
+            response = requests.post(url, headers=headers, json=args, timeout=30)
+            response.raise_for_status()
+            content_type = response.headers.get('Content-Type', '')
+            if 'application/json' in content_type:
+                return json.dumps(response.json())
+            return response.text
+        except requests.RequestException as e:
+            print('Error calling MCP server', str(e))
+            raise e

{fyodorov_llm_agents-0.4.61.dist-info → fyodorov_llm_agents-0.4.65.dist-info}/METADATA

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

@@ -1,17 +1,17 @@
 fyodorov_llm_agents/base_model.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fyodorov_llm_agents/agents/agent_model.py,sha256=JNbRBWtErHnFqlP_ONd0B8Vf3o_AyigHKchsd3COZrk,3899
-fyodorov_llm_agents/agents/agent_service.py,sha256=Exu_-pA4tkC67jv63G27dvAY_oQyih12xKS7TpFrjb4,10302
+fyodorov_llm_agents/agents/agent_service.py,sha256=ufNfYYLtPoI9ZQR0AZb7fGYP3T0U7fFxQq6EDRcUpZk,11447
 fyodorov_llm_agents/agents/openai.py,sha256=FA5RS7yn3JwvFA8PXju60XSYC_2oUZFNgBUzeIYtGv0,1154
 fyodorov_llm_agents/instances/instance_model.py,sha256=swRzCXeUk2FFKzGMEjeToklBJRK7GdAJl1ZIoQALuxs,1368
-fyodorov_llm_agents/instances/instance_service.py,sha256=k5uiPB5rFyHlhDdNN8jICCIASErr5zgxnDlwXE1TLmI,8799
+fyodorov_llm_agents/instances/instance_service.py,sha256=3e9qfBGfd2RydSu8skQhA_PaRiiqWjOt0jyjUTek6a0,8772
 fyodorov_llm_agents/models/llm_model.py,sha256=9sAM2QbVp62yFxhETii1x4VhZCn3HNwut4wqA9RUABM,1918
 fyodorov_llm_agents/models/llm_service.py,sha256=t7p8pRExJr-B8MD7KleKNe8YlHZ1geDuqYzbTFo_0MM,4837
 fyodorov_llm_agents/providers/provider_model.py,sha256=7G0WSPJYGcLIFgyQF0Y-Rv4f37-TMGg7fyeZxrC3fNE,1100
 fyodorov_llm_agents/providers/provider_service.py,sha256=dbLyi4_sOfciksBgbyf_iViMud93Kzpn23D7-aYIBj8,6761
-fyodorov_llm_agents/tools/mcp_tool_model.py,sha256=aCJGW1WZoeTX5UVD8K-ljUTf0dxPLpPZphIKZTIuipM,5278
-fyodorov_llm_agents/tools/mcp_tool_service.py,sha256=ijgR74pLcH9Bk-b-yAo9I8ZcXHJcrZOrgoWYGljxGhA,7697
+fyodorov_llm_agents/tools/mcp_tool_model.py,sha256=pMQ8VMYMUn8l80UVj4WefdzlGZxSrTrZOP-R2cPAGUs,5629
+fyodorov_llm_agents/tools/mcp_tool_service.py,sha256=dl6svc6ncqpAAQRTP8PM_xGH8EVnoENbvjzi7froT2Y,9089
 fyodorov_llm_agents/tools/tool.py,sha256=HyOk0X_3XE23sa8J-8UZx657tJ0sxwZWMbA4OPxXU6E,7940
-fyodorov_llm_agents-0.4.61.dist-info/METADATA,sha256=4u-ZOLhE7aqZ9FEUbGwNhgFdzpIJujc91qwOULs_Cj8,551
-fyodorov_llm_agents-0.4.61.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-fyodorov_llm_agents-0.4.61.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
-fyodorov_llm_agents-0.4.61.dist-info/RECORD,,
+fyodorov_llm_agents-0.4.65.dist-info/METADATA,sha256=7vw4WbLBBPNFM5SDMMw890iZhlLQ918eFoe9ztEhvxI,551
+fyodorov_llm_agents-0.4.65.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fyodorov_llm_agents-0.4.65.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
+fyodorov_llm_agents-0.4.65.dist-info/RECORD,,

{fyodorov_llm_agents-0.4.61.dist-info → fyodorov_llm_agents-0.4.65.dist-info}/WHEEL

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