fyodorov-llm-agents 0.4.2__py3-none-any.whl → 0.4.3__py3-none-any.whl

fyodorov_llm_agents/agents/agent_service.py

@@ -0,0 +1,148 @@
+from datetime import datetime
+from supabase import Client
+from fyodorov_llm_agents.agents.agent_model import Agent as AgentModel
+from fyodorov_utils.config.supabase import get_supabase
+from fyodorov_llm_agents.tools.tool import Tool as ToolModel
+from fyodorov_llm_agents.models.llm_service import LLM
+
+supabase: Client = get_supabase()
+
+class Agent(AgentModel):
+    @staticmethod    
+    async def create_in_db(access_token: str, agent: AgentModel) -> str:
+        try:
+            supabase = get_supabase(access_token)
+            result = supabase.table('agents').upsert(agent.to_dict()).execute()
+            agent_id = result.data[0]['id']
+            return agent_id
+        except Exception as e:
+            print('Error creating agent', str(e))
+            raise e
+
+    @staticmethod    
+    async def create_agent_in_db(access_token: str, agent: dict, user_id: str) -> str:
+        try:
+            supabase = get_supabase(access_token)
+            agent['user_id'] = user_id
+            result = supabase.table('agents').upsert(agent).execute()
+            agent_dict = result.data[0]
+            return agent_dict
+        except Exception as e:
+            print('Error creating agent', str(e))
+            raise e
+
+    @staticmethod
+    async def update_in_db(id: str, agent: dict) -> dict:
+        if not id:
+            raise ValueError('Agent ID is required')
+        try:
+            result = supabase.table('agents').update(agent).eq('id', id).execute()
+            return result.data[0]
+        except Exception as e:
+            print('An error occurred while updating agent:', id, str(e))
+            raise
+
+    @staticmethod
+    async def delete_in_db(id: str) -> bool:
+        if not id:
+            raise ValueError('Agent ID is required')
+        try:
+            result = supabase.table('agents').delete().eq('id', id).execute()
+            return True
+        except Exception as e:
+            print('Error deleting agent', str(e))
+            raise e
+
+    @staticmethod
+    async def get_in_db(access_token: str, id: str) -> AgentModel:
+        if not id:
+            raise ValueError('Agent ID is required')
+        try:
+            supabase = get_supabase(access_token)
+            result = supabase.table('agents').select('*').eq('id', id).limit(1).execute()
+            agent_dict = result.data[0]
+            print(f"Fetched agent: {agent_dict}")
+            agent_dict["modelid"] = str(agent_dict["model_id"])
+            model = await LLM.get_model(access_token=access_token, id = agent_dict["modelid"])
+            agent_dict['model'] = model.name
+            agent = AgentModel(**agent_dict)
+            return agent
+        except Exception as e:
+            print('Error fetching agent', str(e))
+            raise e
+
+    @staticmethod
+    async def get_all_in_db(limit: int = 10, created_at_lt: datetime = datetime.now()) -> [dict]:
+        try:
+            result = supabase.from_('agents') \
+                .select("*") \
+                .limit(limit) \
+                .lt('created_at', created_at_lt) \
+                .order('created_at', desc=True) \
+                .execute()
+            agents = result.data
+            print(f"Fetched agents: {agents}")
+            return agents
+        except Exception as e:
+            print('Error fetching agents', str(e))
+            raise e
+
+    @staticmethod
+    async def save_from_dict(access_token: str, user_id: str, data):
+        agent = AgentModel.from_dict(data)
+        agent_dict = agent.to_dict()
+        model_name = data['model']
+        model = await LLM.get_model(access_token, user_id, model_name)
+        if model:
+            agent_dict['model_id'] = model.id
+        del agent_dict['model']
+        print('Saving agent', agent_dict)
+        agent = await Agent.create_agent_in_db(access_token, agent_dict, user_id)
+        return agent
+
+    @staticmethod
+    async def get_agent_tools(access_token: str, agent_id: str) -> list:
+        if not agent_id:
+            raise ValueError('Agent ID is required')
+        supabase = get_supabase(access_token)
+        result = supabase.table('agent_mcp_tools').select('*').eq('agent_id', agent_id).execute()
+        tool_ids = [item['mcp_tool_id'] for item in result.data if 'mcp_tool_id' in item]
+        result = []
+        for tool_id in tool_ids:
+            tool = supabase.table('mcp_tools').select('*').eq('id', tool_id).limit(1).execute()
+            if tool and tool.data:
+                tool_dict = tool.data[0]
+                tool_dict['id'] = str(tool_dict['id'])
+                result.append(tool_dict)
+        return result
+
+    @staticmethod
+    async def assign_agent_tools(access_token: str, agent_id: str, tool_ids: list[ToolModel]) -> list:
+        if not tool_ids:
+            raise ValueError('Agent IDs are required')
+        supabase = get_supabase(access_token)
+        result = []
+        for tool_id in tool_ids:
+            # Check if tool is valid and exists in the database
+            tool_result = supabase.table('mcp_tools').select('*').eq('id', tool_id).limit(1).execute()
+            if not tool_result.data:
+                print(f"Tool with ID {tool_id} does not exist.")
+                continue
+            supabase.table('agent_mcp_tools').insert({'mcp_tool_id': tool_id, 'agent_id': agent_id}).execute()
+            print('Inserted tool', tool_id, 'for agent', agent_id)
+            result.append(tool_id)
+        return result
+
+    @staticmethod
+    async def delete_agent_tool_connection(access_token: str, agent_id: str, tool_id: str) -> list:
+        if not agent_id:
+            raise ValueError('Agent ID is required')
+        if not tool_id:
+            raise ValueError('Tool ID is required')
+        try:
+            supabase = get_supabase(access_token)
+            result = supabase.table('agent_mcp_tools').delete().eq('agent_id', agent_id).eq('mcp_tool_id', tool_id).execute()
+            return True
+        except Exception as e:
+            print('Error deleting agent tool', str(e))
+            raise e

fyodorov_llm_agents/instances/instance_service.py

@@ -1,12 +1,13 @@
 from datetime import datetime
 from supabase import Client
 from fyodorov_utils.config.supabase import get_supabase
-from .agent import Agent
-from .providers.provider_service import Provider
 
-from fyodorov_llm_agents.agents.agent import Agent as AgentModel
+from fyodorov_llm_agents.providers.provider_service import Provider
+from fyodorov_llm_agents.agents.agent_model import Agent as AgentModel
 from fyodorov_llm_agents.models.llm_model import LLMModel
 from fyodorov_llm_agents.models.llm_service import LLM
+from fyodorov_llm_agents.agents.agent_service import Agent
+
 from .instance_model import InstanceModel
 
 supabase: Client = get_supabase()

{fyodorov_llm_agents-0.4.2.dist-info → fyodorov_llm_agents-0.4.3.dist-info}/METADATA

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

@@ -1,7 +1,8 @@
-fyodorov_llm_agents/agents/agent.py,sha256=vVBCEBpG11m4ae11Mr94rF5TJpuBluI_loQPDTw734w,5044
+fyodorov_llm_agents/agents/agent_model.py,sha256=vVBCEBpG11m4ae11Mr94rF5TJpuBluI_loQPDTw734w,5044
+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=uGZL23WAMygzmEtna15aZMjt8IjmogOJ4Du0OXOjY_A,8221
+fyodorov_llm_agents/instances/instance_service.py,sha256=8tXWimECQd0Ks5Q9j2S2wvfJd7j9CPvLG6tLmdzGqXg,8281
 fyodorov_llm_agents/models/llm_model.py,sha256=aQtXtB7kRpnVdbPu-nmTGAaflbtKz3DPkgcckf1srsg,1645
 fyodorov_llm_agents/models/llm_service.py,sha256=613PLLGiDzkCfkVbt0XDlRwTQRL06QPyr9bfsbwQtPk,3989
 fyodorov_llm_agents/providers/provider_model.py,sha256=OyCK6WMRhyElsp88gILg0wso-OPHI7f55gEeypsJ7O0,957
@@ -9,7 +10,7 @@ fyodorov_llm_agents/providers/provider_service.py,sha256=GST-NLV8aLPsvapQEvgT_qH
 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.4.2.dist-info/METADATA,sha256=E1EOPBs6rG0y8KmuG10fk5sgvF5NWJj3qyO97v7Z2zg,550
-fyodorov_llm_agents-0.4.2.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-fyodorov_llm_agents-0.4.2.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
-fyodorov_llm_agents-0.4.2.dist-info/RECORD,,
+fyodorov_llm_agents-0.4.3.dist-info/METADATA,sha256=MlHKLuddV5d6uMEBC6RPUYZ7OeW_yb6uG4jH12lJGNM,550
+fyodorov_llm_agents-0.4.3.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+fyodorov_llm_agents-0.4.3.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
+fyodorov_llm_agents-0.4.3.dist-info/RECORD,,