fyodorov-llm-agents 0.4.13__py3-none-any.whl → 0.4.16__py3-none-any.whl

fyodorov_llm_agents/tools/mcp_tool_service.py

@@ -5,9 +5,9 @@ from .mcp_tool_model import MCPTool as ToolModel
 class MCPTool():
 
     @staticmethod
-    async def create_or_update_in_db(access_token: str, tool: ToolModel, user_id: str) -> str:
+    async def create_or_update_in_db(access_token: str, tool: ToolModel, user_id: str) -> ToolModel:
         print(f"Creating or updating tool with handle {tool.handle} for user {user_id}")
-        tool_w_id = MCPTool.get_by_name_and_user_id(access_token, tool.handle, user_id)
+        tool_w_id = await MCPTool.get_by_name_and_user_id(access_token, tool.handle, user_id)
         if tool_w_id:
             print(f"Tool with handle {tool.handle} already exists, updating it.")
             return await MCPTool.update_in_db(access_token, tool_w_id.id, tool)
@@ -16,7 +16,7 @@ class MCPTool():
             return await MCPTool.create_in_db(access_token, tool, user_id)
 
     @staticmethod    
-    async def create_in_db(access_token: str, tool: ToolModel, user_id: str) -> str:
+    async def create_in_db(access_token: str, tool: ToolModel, user_id: str) -> ToolModel:
         try:
             supabase = get_supabase(access_token)
             tool_dict = tool.to_dict()
@@ -30,14 +30,15 @@ class MCPTool():
             print('creating tool in db', tool_dict)
             result = supabase.table('mcp_tools').insert(tool_dict).execute()
             print('created tool in db', result)
-            tool_id = result.data[0]['id']
-            return tool_id
+            tool_dict = result.data[0]
+            tool = ToolModel(**tool_dict)
+            return tool
         except Exception as e:
             print('Error creating tool', str(e))
             raise e
 
     @staticmethod
-    async def update_in_db(access_token: str, id: str, tool: ToolModel) -> dict:
+    async def update_in_db(access_token: str, id: str, tool: ToolModel) -> ToolModel:
         if not id:
             raise ValueError('Tool ID is required')
         try:
@@ -45,7 +46,9 @@ class MCPTool():
             tool_dict = tool.to_dict()
             print('updating tool in db', tool_dict)
             result = supabase.table('mcp_tools').update(tool_dict).eq('id', id).execute()
-            return result.data[0]
+            tool_dict = result.data[0]
+            tool = ToolModel(**tool_dict)
+            return tool
         except Exception as e:
             print('An error occurred while updating tool:', id, str(e))
             raise
@@ -96,7 +99,7 @@ class MCPTool():
             raise e
 
     @staticmethod
-    async def get_all_in_db(access_token: str, user_id: str = None, limit: int = 10, created_at_lt: datetime = datetime.now()) -> list[dict]:
+    async def get_all_in_db(access_token: str, user_id: str = None, limit: int = 10, created_at_lt: datetime = datetime.now()) -> list[ToolModel]:
         try:
             supabase = get_supabase(access_token)
             print('getting tools from db for user', user_id)
@@ -114,7 +117,11 @@ class MCPTool():
                 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)):
                     print('tool is public or belongs to user', tool)
-                    tools.append(tool)
+                    tool_model = ToolModel(**tool)
+                    if tool_model.validate():
+                        tools.append(tool_model)
+                    else:
+                        print(f"Invalid tool data: {tool}")
             print('got tools from db', len(tools))
             return tools
         except Exception as e:

{fyodorov_llm_agents-0.4.13.dist-info → fyodorov_llm_agents-0.4.16.dist-info}/METADATA

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

@@ -8,9 +8,9 @@ fyodorov_llm_agents/models/llm_service.py,sha256=35bS0RFXJhJUSjge-v4u5cftn_MT-Cm
 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=nGdPmqSkA7hqDUTPbNCZAHNSVJCgVOs5dzJfPntLidI,5110
-fyodorov_llm_agents/tools/mcp_tool_service.py,sha256=XFm6mVy3QHmJhquPapZb7qo_bhftBTrtXURe7alBRQY,6972
+fyodorov_llm_agents/tools/mcp_tool_service.py,sha256=NzZOmOQLH-V4m5Znifxy7hI038MLTT22rj2hkZSK1to,7299
 fyodorov_llm_agents/tools/tool.py,sha256=HyOk0X_3XE23sa8J-8UZx657tJ0sxwZWMbA4OPxXU6E,7940
-fyodorov_llm_agents-0.4.13.dist-info/METADATA,sha256=MnLvh8NTB-zhvRe2Wdlm0GiECOZr21v1rN24cj_9Og4,551
-fyodorov_llm_agents-0.4.13.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-fyodorov_llm_agents-0.4.13.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
-fyodorov_llm_agents-0.4.13.dist-info/RECORD,,
+fyodorov_llm_agents-0.4.16.dist-info/METADATA,sha256=vp1qXDwpzpKkvOxjNYPxnGXvNWvX7tEii4gwhRUAaL0,551
+fyodorov_llm_agents-0.4.16.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+fyodorov_llm_agents-0.4.16.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
+fyodorov_llm_agents-0.4.16.dist-info/RECORD,,