fyodorov-llm-agents 0.3.2__py3-none-any.whl → 0.3.4__py3-none-any.whl

fyodorov_llm_agents/agents/agent.py

@@ -1,10 +1,9 @@
 import os
 import re
-import json
 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
@@ -135,38 +134,11 @@ class Agent(BaseModel):
             { "content": input, "role": "user"},
         ]
         print(f"Tools: {self.tools}")
-        tools = [ToolService.get_by_name_and_user_id(tool, self.user_id) 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: {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: {base_url}")
-            response = litellm.completion(model=model, messages=messages, max_retries=0, base_url=base_url)
+        # 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"Response: {response}")
         answer = response.choices[0].message
-        if hasattr(response, 'tool_calls') and response.tool_calls:
-            for tool_call in response.tool_calls:
-                print(f"Calling function {tool_call.function.name}")
-                function_args = json.loads(tool_call.function.arguments)
-                tool = tools.get(tool_call.function.name)
-                ToolService.get
-                function_response =  self.call_api(
-                    url=function_args["url"],
-                    method=function_args["method"],
-                    body=function_args["body"],
-                )
-                messages.append(
-                    {
-                        "tool_call_id": tool_call.id,
-                        "role": "tool",
-                        "name": function_name,
-                        "content": function_response,
-                    }
-                )  # extend conversation with function response
-            response = litellm.completion(
-                model=model,
-                messages=messages,
-            )
         print(f"Answer: {answer}")
         return {
             "answer": answer,

fyodorov_llm_agents/tools/mcp_tool_service.py

@@ -62,10 +62,10 @@ class MCPTool():
             raise e
 
     @staticmethod
-    def get_by_user_and_name_in_db(access_token: str, user_id: str, name: str) -> ToolModel:
+    def get_by_name_and_user_id(access_token: str, handle: str, user_id: str) -> ToolModel:
         try:
             supabase = get_supabase(access_token)
-            result = supabase.table('mcp_tools').select('*').eq('user_id', user_id).eq('name', name).limit(1).execute()
+            result = supabase.table('mcp_tools').select('*').eq('user_id', user_id).eq('handle', handle).limit(1).execute()
             tool_dict = result.data[0]
             tool = ToolModel(**tool_dict)
             return tool

{fyodorov_llm_agents-0.3.2.dist-info → fyodorov_llm_agents-0.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fyodorov_llm_agents
-Version: 0.3.2
+Version: 0.3.4
 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.3.4.dist-info/RECORD

@@ -0,0 +1,9 @@
+fyodorov_llm_agents/agents/agent.py,sha256=YAtd7Z4SKmO9pYkDzjfH26HhD2fL40U1aJeRVBVmO0g,6511
+fyodorov_llm_agents/agents/openai.py,sha256=FA5RS7yn3JwvFA8PXju60XSYC_2oUZFNgBUzeIYtGv0,1154
+fyodorov_llm_agents/tools/mcp_tool_model.py,sha256=i7oFZReVGZsHN2K8T7mCAGF4t92wMMIR9mCkRHUgKsI,4413
+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.3.4.dist-info/METADATA,sha256=YAqKqTsnk5ckVSerLgni7dXmX-PwjxbVpmBnQjFc-bE,550
+fyodorov_llm_agents-0.3.4.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+fyodorov_llm_agents-0.3.4.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
+fyodorov_llm_agents-0.3.4.dist-info/RECORD,,

fyodorov_llm_agents-0.3.2.dist-info/RECORD

@@ -1,9 +0,0 @@
-fyodorov_llm_agents/agents/agent.py,sha256=NbjiyydsrNUdEQYZ_rR1YpAZ-oqRZqxKEwStWxOkxpE,8010
-fyodorov_llm_agents/agents/openai.py,sha256=FA5RS7yn3JwvFA8PXju60XSYC_2oUZFNgBUzeIYtGv0,1154
-fyodorov_llm_agents/tools/mcp_tool_model.py,sha256=i7oFZReVGZsHN2K8T7mCAGF4t92wMMIR9mCkRHUgKsI,4413
-fyodorov_llm_agents/tools/mcp_tool_service.py,sha256=vfWrPOofi_n5k7Hs7bTpVyeLdDuZIWHF6tvK2CxdNjs,5539
-fyodorov_llm_agents/tools/tool.py,sha256=HyOk0X_3XE23sa8J-8UZx657tJ0sxwZWMbA4OPxXU6E,7940
-fyodorov_llm_agents-0.3.2.dist-info/METADATA,sha256=Wq826B6fu874n8I6T8JKlAlWODBqzmPa8zJ-YDMWw4A,550
-fyodorov_llm_agents-0.3.2.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-fyodorov_llm_agents-0.3.2.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
-fyodorov_llm_agents-0.3.2.dist-info/RECORD,,