fyodorov-llm-agents 0.4.15__py3-none-any.whl → 0.4.17__py3-none-any.whl

fyodorov_llm_agents/agents/agent_service.py

@@ -72,15 +72,27 @@ class Agent(AgentModel):
             raise e
 
     @staticmethod
-    async def get_all_in_db(limit: int = 10, created_at_lt: datetime = datetime.now()) -> [dict]:
+    async def get_all_in_db(limit: int = 10, created_at_lt: datetime = datetime.now(), user_id: str = None) -> list[AgentModel]:
         try:
-            result = supabase.from_('agents') \
-                .select("*") \
-                .limit(limit) \
-                .lt('created_at', created_at_lt) \
-                .order('created_at', desc=True) \
-                .execute()
-            agents = result.data
+            supabase = get_supabase()
+            if user_id:
+                result = supabase.from_('agents') \
+                    .select("*") \
+                    .eq('user_id', user_id) \
+                    .limit(limit) \
+                    .lt('created_at', created_at_lt) \
+                    .order('created_at', desc=True) \
+                    .execute()
+            else:
+                result = supabase.from_('agents') \
+                    .select("*") \
+                    .limit(limit) \
+                    .lt('created_at', created_at_lt) \
+                    .order('created_at', desc=True) \
+                    .execute()
+            if not result.data:
+                return []
+            agents = [AgentModel(**agent) for agent in result.data]
             print(f"Fetched agents: {agents}")
             return agents
         except Exception as e:

fyodorov_llm_agents/instances/instance_service.py

@@ -149,14 +149,26 @@ class Instance(InstanceModel):
             raise e
 
     @staticmethod
-    def get_all_in_db(limit: int = 10, created_at_lt: datetime = datetime.now()) -> [InstanceModel]:
+    def get_all_in_db(limit: int = 10, created_at_lt: datetime = datetime.now(), user_id: str = None) -> list[InstanceModel]:
         try:
-            result = supabase.from_('instances') \
-                .select("*") \
-                .limit(limit) \
-                .lt('created_at', created_at_lt) \
-                .order('created_at', desc=True) \
-                .execute()
+            supabase = get_supabase()
+            if user_id:
+                result = supabase.from_('instances') \
+                    .select("*") \
+                    .eq('user_id', user_id) \
+                    .limit(limit) \
+                    .lt('created_at', created_at_lt) \
+                    .order('created_at', desc=True) \
+                    .execute()
+            else:
+                result = supabase.from_('instances') \
+                    .select("*") \
+                    .limit(limit) \
+                    .lt('created_at', created_at_lt) \
+                    .order('created_at', desc=True) \
+                    .execute()
+            if not result.data:
+                return []
             instance_models = [InstanceModel(**{k: str(v) if not isinstance(v, list) else v for k, v in instance.items()}) for instance in result.data]
             return instance_models
         except Exception as e:

fyodorov_llm_agents/models/llm_service.py

@@ -78,17 +78,28 @@ class LLM(LLMModel):
             raise e
 
     @staticmethod
-    async def get_models(limit: int = 10, created_at_lt: datetime = datetime.now()) -> [dict]:
+    async def get_models(limit: int = 10, created_at_lt: datetime = datetime.now(), user_id: str = None) -> list[LLMModel]:
         try:
-            result = supabase.table('models') \
-                        .select('*') \
-                        .order('created_at', desc=True) \
-                        .limit(limit) \
-                        .lt('created_at', created_at_lt) \
-                        .execute()
-            data = result.data
-            print('Fetched models', data)
-            return data
+            if user_id:
+                result = supabase.table('models') \
+                            .select('*') \
+                            .eq('user_id', user_id) \
+                            .order('created_at', desc=True) \
+                            .limit(limit) \
+                            .lt('created_at', created_at_lt) \
+                            .execute()
+                data = result.data
+            else:
+                result = supabase.table('models') \
+                            .select('*') \
+                            .order('created_at', desc=True) \
+                            .limit(limit) \
+                            .lt('created_at', created_at_lt) \
+                            .execute()
+                data = result.data
+            models = [LLMModel(**model) for model in data]
+            print('Fetched models', models)
+            return models
         except Exception as e:
             print('Error fetching models', str(e))
             raise e

fyodorov_llm_agents/providers/provider_service.py

@@ -122,17 +122,28 @@ class Provider(ProviderModel):
             return provider
 
     @staticmethod
-    async def get_providers(limit: int = 10, created_at_lt: datetime = datetime.now()) -> [dict]:
+    async def get_providers(limit: int = 10, created_at_lt: datetime = datetime.now(), user_id: str = None) -> list[dict]:
         try:
-            result = supabase.table('providers') \
-                        .select('*') \
-                        .order('created_at', desc=True) \
-                        .limit(limit) \
-                        .lt('created_at', created_at_lt) \
-                        .execute()
-            data = result.data
-            print('Fetched providers', data)
-            return data
+            if user_id:
+                result = supabase.table('providers') \
+                            .select('*') \
+                            .eq('user_id', user_id) \
+                            .order('created_at', desc=True) \
+                            .limit(limit) \
+                            .lt('created_at', created_at_lt) \
+                            .execute()
+                data = result.data
+            else:
+                result = supabase.table('providers') \
+                            .select('*') \
+                            .order('created_at', desc=True) \
+                            .limit(limit) \
+                            .lt('created_at', created_at_lt) \
+                            .execute()
+                data = result.data
+            providers = [ProviderModel(**provider) for provider in data]
+            print('Fetched providers', providers)
+            return providers
         except Exception as e:
             print('Error fetching providers', str(e))
             raise e

fyodorov_llm_agents/tools/mcp_tool_service.py

@@ -5,7 +5,7 @@ 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 = await MCPTool.get_by_name_and_user_id(access_token, tool.handle, user_id)
         if tool_w_id:
@@ -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,17 +99,26 @@ 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, limit: int = 10, created_at_lt: datetime = datetime.now(), user_id: str = None) -> list[ToolModel]:
         try:
             supabase = get_supabase(access_token)
             print('getting tools from db for user', user_id)
             tools = []
-            result = supabase.from_('mcp_tools') \
-                .select("*") \
-                .limit(limit) \
-                .lt('created_at', created_at_lt) \
-                .order('created_at', desc=True) \
-                .execute()
+            if user_id:
+                result = supabase.from_('mcp_tools') \
+                    .select("*") \
+                    .eq('user_id', user_id) \
+                    .limit(limit) \
+                    .lt('created_at', created_at_lt) \
+                    .order('created_at', desc=True) \
+                    .execute()
+            else:
+                result = supabase.from_('mcp_tools') \
+                    .select("*") \
+                    .limit(limit) \
+                    .lt('created_at', created_at_lt) \
+                    .order('created_at', desc=True) \
+                    .execute()
             for tool in result.data:
                 tool["id"] = str(tool["id"])
                 tool["user_id"] = str(tool["user_id"])
@@ -114,7 +126,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.15.dist-info → fyodorov_llm_agents-0.4.17.dist-info}/METADATA

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

@@ -0,0 +1,16 @@
+fyodorov_llm_agents/agents/agent_model.py,sha256=UN8KJvPWsoiatBM3Pw0X8bt0G0pGJeEf4vOTMBITnKU,6839
+fyodorov_llm_agents/agents/agent_service.py,sha256=qm3oGtgrbTV3LfmVYTIrZDs4GwmghdRAxxb3gkrS2i4,6553
+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=MNUJTKQnt62GiRpyBmGWJSht96ERchEVBlRamnAQv3s,8967
+fyodorov_llm_agents/models/llm_model.py,sha256=aQtXtB7kRpnVdbPu-nmTGAaflbtKz3DPkgcckf1srsg,1645
+fyodorov_llm_agents/models/llm_service.py,sha256=L_YxZIotlPea0ymUfYXY24rdnCuZdOZEMTDrh8J_BAM,4562
+fyodorov_llm_agents/providers/provider_model.py,sha256=OyCK6WMRhyElsp88gILg0wso-OPHI7f55gEeypsJ7O0,957
+fyodorov_llm_agents/providers/provider_service.py,sha256=-TUItGF8vD6Ndp6SbWVTH6IcavO04k8UsiYXHkHAlZQ,6438
+fyodorov_llm_agents/tools/mcp_tool_model.py,sha256=nGdPmqSkA7hqDUTPbNCZAHNSVJCgVOs5dzJfPntLidI,5110
+fyodorov_llm_agents/tools/mcp_tool_service.py,sha256=nOWeCXFP8t7pbFL4Co70c7ukEEl-TQbb1pnPHlG5Tac,7677
+fyodorov_llm_agents/tools/tool.py,sha256=HyOk0X_3XE23sa8J-8UZx657tJ0sxwZWMbA4OPxXU6E,7940
+fyodorov_llm_agents-0.4.17.dist-info/METADATA,sha256=9oSARobZSeTyth0gf0yriLdc4nNmM81CEyFhW7p8MUU,551
+fyodorov_llm_agents-0.4.17.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+fyodorov_llm_agents-0.4.17.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
+fyodorov_llm_agents-0.4.17.dist-info/RECORD,,

fyodorov_llm_agents-0.4.15.dist-info/RECORD

@@ -1,16 +0,0 @@
-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=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=RDFGx_qUibIm-j7GJZf4OZ_CRJAK7-V04JnTWiWshQg,6978
-fyodorov_llm_agents/tools/tool.py,sha256=HyOk0X_3XE23sa8J-8UZx657tJ0sxwZWMbA4OPxXU6E,7940
-fyodorov_llm_agents-0.4.15.dist-info/METADATA,sha256=Dgm22EVQsBabbiWMyuCrj7fI1ZF9xM7ydIFEpCCLsxQ,551
-fyodorov_llm_agents-0.4.15.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-fyodorov_llm_agents-0.4.15.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
-fyodorov_llm_agents-0.4.15.dist-info/RECORD,,