fyodorov-llm-agents 0.4.52__py3-none-any.whl → 0.4.54__py3-none-any.whl

fyodorov_llm_agents/agents/agent_model.py

@@ -1,4 +1,6 @@
 import re
+import requests
+import yaml
 from pydantic import BaseModel, HttpUrl
 from typing import Optional
 from fyodorov_llm_agents.models.llm_model import LLMModel

fyodorov_llm_agents/agents/agent_service.py

@@ -71,10 +71,9 @@ class Agent(AgentModel):
             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(id = agent_dict["modelid"])
-            agent_dict['model'] = model.name
+            model = await LLM.get_model(id = agent_dict["model_id"])
             agent = AgentModel(**agent_dict)
+            agent.model = model
             return agent
         except Exception as e:
             print('Error fetching agent', str(e))
@@ -174,8 +173,8 @@ class Agent(AgentModel):
         litellm.set_verbose = True
         model = self.model
         # Set environmental variable
-        if self.model_id:
-            model_instance = await LLM.get_model(user_id, id = self.model_id)
+        if self.model and self.model.id:
+            model_instance = await LLM.get_model(user_id, id = self.model.id)
             model = model_instance.base_model
             provider = await Provider.get_provider_by_id(model_instance.provider_id)
             print(f"Provider fetched via Provider.get_provider_by_id in call_with_fn_calling: {provider}")

fyodorov_llm_agents/instances/instance_service.py

@@ -19,9 +19,8 @@ class Instance(InstanceModel):
 
     async def chat_w_fn_calls(self, input: str = "", access_token: str = JWT, user_id: str = "") -> str:
         agent: AgentModel = await Agent.get_in_db(access_token=access_token, id = self.agent_id)
-        agent.model = await LLM.get_model(user_id, id = agent.model_id)
-        print(f"Model fetched via LLM.get_model in chat_w_fn_calls: {model}")
-        agent.provider = await Provider.get_provider_by_id(id = model.provider)
+        print(f"Model fetched via LLM.get_model in chat_w_fn_calls: {agent.model}")
+        agent.provider = await Provider.get_provider_by_id(id = agent.model.provider)
         agent.prompt = f"{agent.prompt}\n\n{datetime.now().strftime('%Y-%m-%d %H:%M:%S')}\n\n"
         print(f"Iterating over agent tools in chat_w_fn_calls: {agent.tools}")
         for index, tool in enumerate(agent.tools):

fyodorov_llm_agents/models/llm_service.py

@@ -54,12 +54,12 @@ class LLM(LLMModel):
             raise e
 
     @staticmethod
-    async def get_model(user_id: str = None, name: str = None, id: str = None) -> LLMModel:
+    async def get_model(user_id: str = None, name: str = None, id: int = None) -> LLMModel:
         try:
             supabase = get_supabase()
             if id:
                 print(f"Getting model with id: {id}")
-                result = supabase.table('models').select('*').eq('id', id).execute()
+                result = supabase.table('models').select('*').eq('id', str(id)).execute()
             elif user_id and name:
                 print(f"Getting model with name: {name} and user_id: {user_id}")
                 result = supabase.table('models').select('*').eq('user_id', user_id).eq('name', name).execute()

{fyodorov_llm_agents-0.4.52.dist-info → fyodorov_llm_agents-0.4.54.dist-info}/METADATA

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

@@ -1,17 +1,17 @@
 fyodorov_llm_agents/base_model.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fyodorov_llm_agents/agents/agent_model.py,sha256=N0rU6Dhidr7ZVsOsithrZUtOnHTjMtIyRB0LajEPzbs,3871
-fyodorov_llm_agents/agents/agent_service.py,sha256=NdSbJXznW21-vPdI1sQUYvNR7GafuGBvRYRMWwbBE3E,10740
+fyodorov_llm_agents/agents/agent_model.py,sha256=JNbRBWtErHnFqlP_ONd0B8Vf3o_AyigHKchsd3COZrk,3899
+fyodorov_llm_agents/agents/agent_service.py,sha256=Roz3a3PVwhIRJ1F2doojdxGLl8qEINJThvCUeuKNH0g,10679
 fyodorov_llm_agents/agents/openai.py,sha256=FA5RS7yn3JwvFA8PXju60XSYC_2oUZFNgBUzeIYtGv0,1154
 fyodorov_llm_agents/instances/instance_model.py,sha256=swRzCXeUk2FFKzGMEjeToklBJRK7GdAJl1ZIoQALuxs,1368
-fyodorov_llm_agents/instances/instance_service.py,sha256=Z4kKmUxz--YqSyctC495XlP9qAQUwNZmn6bNVV-JRhY,8824
+fyodorov_llm_agents/instances/instance_service.py,sha256=XUHznbUhSwDrxs1R9w5zKe15hzEbw2YhNvgDCSWw07M,8764
 fyodorov_llm_agents/models/llm_model.py,sha256=9sAM2QbVp62yFxhETii1x4VhZCn3HNwut4wqA9RUABM,1918
-fyodorov_llm_agents/models/llm_service.py,sha256=invzXJLv5K1LsFZ2hMD1IRWoXi26_-44vYxyTWQeuhw,4832
+fyodorov_llm_agents/models/llm_service.py,sha256=t7p8pRExJr-B8MD7KleKNe8YlHZ1geDuqYzbTFo_0MM,4837
 fyodorov_llm_agents/providers/provider_model.py,sha256=7G0WSPJYGcLIFgyQF0Y-Rv4f37-TMGg7fyeZxrC3fNE,1100
 fyodorov_llm_agents/providers/provider_service.py,sha256=i_xKqC-fuL33Jsdo9h0jtjHSDx330DTppELxwDNaPpE,6730
 fyodorov_llm_agents/tools/mcp_tool_model.py,sha256=aCJGW1WZoeTX5UVD8K-ljUTf0dxPLpPZphIKZTIuipM,5278
 fyodorov_llm_agents/tools/mcp_tool_service.py,sha256=ijgR74pLcH9Bk-b-yAo9I8ZcXHJcrZOrgoWYGljxGhA,7697
 fyodorov_llm_agents/tools/tool.py,sha256=HyOk0X_3XE23sa8J-8UZx657tJ0sxwZWMbA4OPxXU6E,7940
-fyodorov_llm_agents-0.4.52.dist-info/METADATA,sha256=JQPqfmJpp28jgIQAFc4so5sagWypMjhqE3cYY4Mr6Kk,551
-fyodorov_llm_agents-0.4.52.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-fyodorov_llm_agents-0.4.52.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
-fyodorov_llm_agents-0.4.52.dist-info/RECORD,,
+fyodorov_llm_agents-0.4.54.dist-info/METADATA,sha256=AUh7TYCr9rw7iQLz1KF9KBZuto35e101F35oghT9dqc,551
+fyodorov_llm_agents-0.4.54.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+fyodorov_llm_agents-0.4.54.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
+fyodorov_llm_agents-0.4.54.dist-info/RECORD,,