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

fyodorov_llm_agents/agents/agent_model.py

@@ -72,7 +72,7 @@ class Agent(BaseModel):
         #     'rag': self.rag,
         # }
 
-    def call_with_fn_calling(self, input: str = "", history = [], user_id: str = "") -> dict:
+    async def call_with_fn_calling(self, input: str = "", history = [], user_id: str = "") -> dict:
         litellm.set_verbose = True
         model = self.model
         # Set environmental variable
@@ -101,7 +101,7 @@ class Agent(BaseModel):
         mcp_tools = []
         for tool in self.tools:
             try:
-                tool_instance = ToolService.get_by_name_and_user_id(tool, user_id)
+                tool_instance = await 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}")

fyodorov_llm_agents/instances/instance_service.py

@@ -28,10 +28,10 @@ class Instance(InstanceModel):
         agent.api_url = provider.api_url
         for index, tool in enumerate(agent.tools):
             if isinstance(tool, str):
-                agent.tools[index] = ToolService.get_by_name_and_user_id(access_token, tool, user_id)
+                agent.tools[index] = await ToolService.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]}")
                 agent.prompt += f"\n\n{agent.tools[index].handle}: {agent.tools[index].description}\n\n"
-        res = agent.call_with_fn_calling(input=input, history=self.chat_history, user_id=user_id)
+        res = await 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/tools/mcp_tool_service.py

@@ -5,27 +5,31 @@ from .mcp_tool_model import MCPTool as ToolModel
 class MCPTool():
 
     @staticmethod
-    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) -> str:
         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)
         if tool_w_id:
             print(f"Tool with handle {tool.handle} already exists, updating it.")
-            return MCPTool.update_in_db(access_token, tool_w_id.id, tool)
+            return await MCPTool.update_in_db(access_token, tool_w_id.id, tool)
         else:
             print(f"Tool with handle {tool.handle} does not exist, creating it.")
-            return MCPTool.create_in_db(access_token, tool, user_id)
+            return await MCPTool.create_in_db(access_token, tool, user_id)
 
     @staticmethod    
-    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) -> str:
         try:
             supabase = get_supabase(access_token)
             tool_dict = tool.to_dict()
             tool_dict['user_id'] = user_id
-            del tool_dict['id']
-            del tool_dict['created_at']
-            del tool_dict['updated_at']
+            if 'id' in tool_dict:
+                del tool_dict['id']
+            if 'created_at' in tool_dict:
+                del tool_dict['created_at']
+            if 'updated_at' in tool_dict:
+                del tool_dict['updated_at']
             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
         except Exception as e:
@@ -33,7 +37,7 @@ class MCPTool():
             raise e
 
     @staticmethod
-    def update_in_db(access_token: str, id: str, tool: ToolModel) -> dict:
+    async def update_in_db(access_token: str, id: str, tool: ToolModel) -> dict:
         if not id:
             raise ValueError('Tool ID is required')
         try:
@@ -47,7 +51,7 @@ class MCPTool():
             raise
 
     @staticmethod
-    def delete_in_db(access_token: str, id: str) -> bool:
+    async def delete_in_db(access_token: str, id: str) -> bool:
         if not id:
             raise ValueError('Tool ID is required')
         try:
@@ -60,7 +64,7 @@ class MCPTool():
             raise e
 
     @staticmethod
-    def get_in_db(access_token: str, id: str) -> ToolModel:
+    async def get_in_db(access_token: str, id: str) -> ToolModel:
         if not id:
             raise ValueError('Tool ID is required')
         try:
@@ -74,7 +78,7 @@ class MCPTool():
             raise e
 
     @staticmethod
-    def get_by_name_and_user_id(access_token: str, handle: str, user_id: str) -> ToolModel:
+    async 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('handle', handle).limit(1).execute()
@@ -92,7 +96,7 @@ class MCPTool():
             raise e
 
     @staticmethod
-    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[dict]:
         try:
             supabase = get_supabase(access_token)
             print('getting tools from db for user', user_id)
@@ -118,7 +122,7 @@ class MCPTool():
             raise e
 
     @staticmethod
-    def get_tool_agents(access_token: str, id: str) -> list[int]:
+    async def get_tool_agents(access_token: str, id: str) -> list[int]:
         if not id:
             raise ValueError('Tool ID is required')
         try:
@@ -131,7 +135,7 @@ class MCPTool():
             raise
 
     @staticmethod
-    def set_tool_agents(access_token: str, id: str, agent_ids: list[int]) -> list[int]:
+    async def set_tool_agents(access_token: str, id: str, agent_ids: list[int]) -> list[int]:
         if not id:
             raise ValueError('Tool ID is required')
         try:

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

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

@@ -1,16 +1,16 @@
-fyodorov_llm_agents/agents/agent_model.py,sha256=LxoQ8ZrGt_xYbcAjFTZC4ff8zvzsWq9MstTmroFBTdE,6827
+fyodorov_llm_agents/agents/agent_model.py,sha256=UN8KJvPWsoiatBM3Pw0X8bt0G0pGJeEf4vOTMBITnKU,6839
 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=jNZ4jHCdBpHwhHeIGaOeEOFDi9tu1BnRsNF3vg-2Pn0,8456
+fyodorov_llm_agents/instances/instance_service.py,sha256=QolwEosIH5MEVNdAcmPa4pB3cuDyygvOdNFIERRLquc,8468
 fyodorov_llm_agents/models/llm_model.py,sha256=aQtXtB7kRpnVdbPu-nmTGAaflbtKz3DPkgcckf1srsg,1645
 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=nGdPmqSkA7hqDUTPbNCZAHNSVJCgVOs5dzJfPntLidI,5110
-fyodorov_llm_agents/tools/mcp_tool_service.py,sha256=rjsC1LBvIFZh3RsK1EESdPA9G7HrmQPkHnXBewSc_uY,6728
+fyodorov_llm_agents/tools/mcp_tool_service.py,sha256=XFm6mVy3QHmJhquPapZb7qo_bhftBTrtXURe7alBRQY,6972
 fyodorov_llm_agents/tools/tool.py,sha256=HyOk0X_3XE23sa8J-8UZx657tJ0sxwZWMbA4OPxXU6E,7940
-fyodorov_llm_agents-0.4.11.dist-info/METADATA,sha256=cHHHwrJAnpNRewvDZsLB42x7szTj0vWXQ6uy8QuVPqo,551
-fyodorov_llm_agents-0.4.11.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-fyodorov_llm_agents-0.4.11.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
-fyodorov_llm_agents-0.4.11.dist-info/RECORD,,
+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,,