fyodorov-llm-agents 0.4.41__py3-none-any.whl → 0.4.43__py3-none-any.whl

fyodorov_llm_agents/agents/agent_model.py

@@ -1,8 +1,6 @@
-import os
 import re
 from pydantic import BaseModel, HttpUrl
 from typing import Optional
-import litellm
 from fyodorov_llm_agents.tools.mcp_tool_service import MCPTool as ToolService
 from datetime import datetime
 
@@ -23,6 +21,7 @@ class Agent(BaseModel):
     description: str = "My Agent Description"
     prompt: str = "My Prompt"
     prompt_size: int = 10000
+    public: bool | None = False
 
     class Config:
         arbitrary_types_allowed = True
@@ -81,89 +80,6 @@ class Agent(BaseModel):
         # }
 
 
-    async def call_with_fn_calling(self, input: str = "", history = [], user_id: str = "") -> dict:
-        litellm.set_verbose = True
-        model = self.model
-        # Set environmental variable
-        if self.api_key.startswith('sk-'):
-            model = 'openai/'+self.model
-            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
-            os.environ["MISTRAL_API_KEY"] = self.api_key
-            self.api_url = "https://api.mistral.ai/v1"
-        else:
-            print("Provider Ollama")
-            model = 'ollama/'+self.model
-            if self.api_url is None:
-                self.api_url = "https://api.ollama.ai/v1"
-
-        base_url = str(self.api_url.rstrip('/'))
-        messages: list[dict] = [
-            {"content": self.prompt, "role": "system"},
-            *history,
-            { "content": input, "role": "user"},
-        ]
-        # tools
-        print(f"Tools: {self.tools}")
-        mcp_tools = []
-        for tool in self.tools:
-            try:
-                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}")
-        
-        tool_schemas = [tool.get_function() for tool in mcp_tools]
-        print(f"Tool schemas: {tool_schemas}")
-        if tool_schemas:
-            print(f"calling litellm with model {model}, messages: {messages}, max_retries: 0, history: {history}, base_url: {base_url}, tools: {tool_schemas}")
-            response = litellm.completion(model=model, messages=messages, max_retries=0, base_url=base_url)
-        else:     
-            print(f"calling litellm with model {model}, messages: {messages}, max_retries: 0, history: {history}, base_url: {base_url}")
-            response = litellm.completion(model=model, messages=messages, max_retries=0, base_url=base_url)
-        print(f"Response: {response}")
-
-        message = response.choices[0].message
-
-        if hasattr(message, "tool_calls") and message.tool_calls:
-            tool_call = message.tool_calls[0]
-            fn_name = tool_call.function.name
-            args = tool_call.function.arguments
-
-            mcp_tool = mcp_tools.get(fn_name)
-            if not mcp_tool:
-                raise ValueError(f"Tool '{fn_name}' not found in loaded MCP tools")
-
-            tool_output = mcp_tool.call(args)
-
-            messages.append({
-                "role": "assistant",
-                "content": None,
-                "tool_calls": [tool_call],
-            })
-            messages.append({
-                "role": "tool",
-                "tool_call_id": tool_call.id,
-                "content": tool_output,
-            })
-
-            followup = litellm.completion(
-                model=model,
-                messages=messages,
-                max_retries=0,
-                base_url=base_url,
-            )
-            return {"answer": followup.choices[0].message.content}
-        
-        answer = message.content
-        print(f"Answer: {answer}")
-        return {
-            "answer": answer,
-
-        }
-
     @staticmethod
     def call_api(url: str = "", method: str = "GET", body: dict = {}) -> dict:
         if not url:

fyodorov_llm_agents/agents/agent_service.py

@@ -1,9 +1,12 @@
 from datetime import datetime
+import os
 from supabase import Client
-from fyodorov_llm_agents.agents.agent_model import Agent as AgentModel
+import litellm
 from fyodorov_utils.config.supabase import get_supabase
+from fyodorov_llm_agents.agents.agent_model import Agent as AgentModel
 from fyodorov_llm_agents.tools.tool import Tool as ToolModel
 from fyodorov_llm_agents.models.llm_service import LLM
+from fyodorov_llm_agents.providers.provider_service import Provider
 
 supabase: Client = get_supabase()
 
@@ -86,6 +89,7 @@ class Agent(AgentModel):
             else:
                 result = supabase.from_('agents') \
                     .select("*") \
+                    .eq('public', True) \
                     .limit(limit) \
                     .lt('created_at', created_at_lt) \
                     .order('created_at', desc=True) \
@@ -158,3 +162,98 @@ class Agent(AgentModel):
         except Exception as e:
             print('Error deleting agent tool', str(e))
             raise e
+
+    async def call_with_fn_calling(self, input: str = "", history = [], user_id: str = "") -> dict:
+        litellm.set_verbose = True
+        model = self.model
+        # Set environmental variable
+        if self.model_id:
+            model_instance = await LLM.get_model(self.access_token, user_id, id = self.model_id)
+            model = model_instance.base_model
+            provider = await Provider.get_provider_by_id(model.provider_id)
+        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
+                os.environ["GEMINI_API_KEY"] = self.api_key
+        elif self.api_key.startswith('sk-'):
+            model = 'openai/'+self.model
+            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
+            os.environ["MISTRAL_API_KEY"] = self.api_key
+            self.api_url = "https://api.mistral.ai/v1"
+        else:
+            print("Provider Ollama")
+            model = 'ollama/'+self.model
+            if self.api_url is None:
+                self.api_url = "https://api.ollama.ai/v1"
+
+        base_url = str(self.api_url.rstrip('/'))
+        messages: list[dict] = [
+            {"content": self.prompt, "role": "system"},
+            *history,
+            { "content": input, "role": "user"},
+        ]
+        # tools
+        print(f"Tools: {self.tools}")
+        mcp_tools = []
+        for tool in self.tools:
+            try:
+                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}")
+        
+        tool_schemas = [tool.get_function() for tool in mcp_tools]
+        print(f"Tool schemas: {tool_schemas}")
+        if tool_schemas:
+            print(f"calling litellm with model {model}, messages: {messages}, max_retries: 0, history: {history}, base_url: {base_url}, tools: {tool_schemas}")
+            response = litellm.completion(model=model, messages=messages, max_retries=0, base_url=base_url)
+        else:     
+            print(f"calling litellm with model {model}, messages: {messages}, max_retries: 0, history: {history}, base_url: {base_url}")
+            response = litellm.completion(model=model, messages=messages, max_retries=0, base_url=base_url)
+        print(f"Response: {response}")
+
+        message = response.choices[0].message
+
+        if hasattr(message, "tool_calls") and message.tool_calls:
+            tool_call = message.tool_calls[0]
+            fn_name = tool_call.function.name
+            args = tool_call.function.arguments
+
+            mcp_tool = mcp_tools.get(fn_name)
+            if not mcp_tool:
+                raise ValueError(f"Tool '{fn_name}' not found in loaded MCP tools")
+
+            tool_output = mcp_tool.call(args)
+
+            messages.append({
+                "role": "assistant",
+                "content": None,
+                "tool_calls": [tool_call],
+            })
+            messages.append({
+                "role": "tool",
+                "tool_call_id": tool_call.id,
+                "content": tool_output,
+            })
+
+            followup = litellm.completion(
+                model=model,
+                messages=messages,
+                max_retries=0,
+                base_url=base_url,
+            )
+            return {"answer": followup.choices[0].message.content}
+        
+        answer = message.content
+        print(f"Answer: {answer}")
+        return {
+            "answer": answer,
+
+        }

{fyodorov_llm_agents-0.4.41.dist-info → fyodorov_llm_agents-0.4.43.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fyodorov_llm_agents
-Version: 0.4.41
+Version: 0.4.43
 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.41.dist-info → fyodorov_llm_agents-0.4.43.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=EA3SiUSUGn1kBmUE4wgwds3CI-ghYSoR8N0J0oCUCpk,7052
-fyodorov_llm_agents/agents/agent_service.py,sha256=qm3oGtgrbTV3LfmVYTIrZDs4GwmghdRAxxb3gkrS2i4,6553
+fyodorov_llm_agents/agents/agent_model.py,sha256=OpsnLenPfro_nTvp_oatey8BPsb5kGX1K-ctdGkGqwU,3805
+fyodorov_llm_agents/agents/agent_service.py,sha256=C2Md4igdoJSCPvS52uPxaWqeBWPma8avAT1enl7AkpM,10535
 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=Vonsz4wQZA-KOkS-q1Hd8DH0obBj7O19Xzovdv0stNY,8857
@@ -11,7 +11,7 @@ fyodorov_llm_agents/providers/provider_service.py,sha256=2DiInqVnaxL5iG6cPX5uxQq
 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.41.dist-info/METADATA,sha256=q6BQq9B1ZzJxIqdfdG6PZ3ELTopLaMT32UydyStY6eg,551
-fyodorov_llm_agents-0.4.41.dist-info/WHEEL,sha256=GHB6lJx2juba1wDgXDNlMTyM13ckjBMKf-OnwgKOCtA,91
-fyodorov_llm_agents-0.4.41.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
-fyodorov_llm_agents-0.4.41.dist-info/RECORD,,
+fyodorov_llm_agents-0.4.43.dist-info/METADATA,sha256=IUCwzifSf6WuFCyadsy62lwUqE54u8rg1KunaCMn28A,551
+fyodorov_llm_agents-0.4.43.dist-info/WHEEL,sha256=GHB6lJx2juba1wDgXDNlMTyM13ckjBMKf-OnwgKOCtA,91
+fyodorov_llm_agents-0.4.43.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
+fyodorov_llm_agents-0.4.43.dist-info/RECORD,,