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

fyodorov_llm_agents/agents/agent_service.py

@@ -171,32 +171,30 @@ class Agent(AgentModel):
     async def call_with_fn_calling(self, input: str = "", history = [], user_id: str = "") -> dict:
         print('call_with_fn_calling')
         litellm.set_verbose = True
-        model = self.model
         # Set environmental variable
+        print(f"[call_with_fn_calling] self.model: {self.model}")
         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}")
+            self.provider = await Provider.get_provider_by_id(self.model.provider_id)
+            print(f"Provider fetched via Provider.get_provider_by_id in call_with_fn_calling: {self.provider}")
         else:
             print(f"Model ID not set on Agent {self.id}, using assumptions")
-        if provider:
-            self.api_key = provider.api_key
-            self.api_url = provider.api_url
-            if provider.name == "gemini":
-                model = 'gemini/'+self.model
+        if self.provider:
+            self.api_key = self.provider.api_key
+            self.api_url = self.provider.api_url
+            if self.provider.name == "gemini":
+                model = 'gemini/'+self.model.name
                 os.environ["GEMINI_API_KEY"] = self.api_key
         elif self.api_key.startswith('sk-'):
-            model = 'openai/'+self.model
+            model = 'openai/'+self.model.name
             os.environ["OPENAI_API_KEY"] = self.api_key
             self.api_url = "https://api.openai.com/v1"
         elif self.api_key and self.api_key != '':
-            model = 'mistral/'+self.model
+            model = 'mistral/'+self.model.name
             os.environ["MISTRAL_API_KEY"] = self.api_key
             self.api_url = "https://api.mistral.ai/v1"
         else:
             print("Provider Ollama")
-            model = 'ollama/'+self.model
+            model = 'ollama/'+self.model.name
             if self.api_url is None:
                 self.api_url = "https://api.ollama.ai/v1"
 

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

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

@@ -1,6 +1,6 @@
 fyodorov_llm_agents/base_model.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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/agent_service.py,sha256=JU2z3pTnTjvfNYJZn_UfJlAJFCQ0dioHBAV_wsXKMho,10640
 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=XUHznbUhSwDrxs1R9w5zKe15hzEbw2YhNvgDCSWw07M,8764
@@ -11,7 +11,7 @@ fyodorov_llm_agents/providers/provider_service.py,sha256=i_xKqC-fuL33Jsdo9h0jtjH
 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.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,,
+fyodorov_llm_agents-0.4.56.dist-info/METADATA,sha256=eym1t50VslAgFrVF_o4vRSXp9WGayaaORkcBVejkn-A,551
+fyodorov_llm_agents-0.4.56.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+fyodorov_llm_agents-0.4.56.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
+fyodorov_llm_agents-0.4.56.dist-info/RECORD,,