fyodorov-llm-agents 0.3.6__py3-none-any.whl → 0.3.8__py3-none-any.whl

fyodorov_llm_agents/agents/agent.py

@@ -72,50 +72,12 @@ class Agent(BaseModel):
         #     'rag': self.rag,
         # }
 
-    def call_with_fn_calling_old(self, input: str = "", history = []) -> 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)
-        if base_url and base_url[-1] == '/':
-            print("Removing trailing slash")
-            base_url = base_url[:-1]
-
-        messages: [] = [
-            {"content": self.prompt, "role": "system"},
-            *history,
-            { "content": input, "role": "user"},
-        ]
-        print(f"Tools: {self.tools}")
-        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}")
-        answer = response.choices[0].message.content
-        print(f"Answer: {answer}")
-        return {
-            "answer": answer,
-
-        }
-    
     def call_with_fn_calling(self, input: str = "", history = []) -> 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 != '':

fyodorov_llm_agents/instances/instance.py

@@ -0,0 +1,163 @@
+from datetime import datetime
+from supabase import Client
+from fyodorov_utils.config.supabase import get_supabase
+from models.instance import InstanceModel
+from fyodorov_llm_agents.agents.agent import Agent as AgentModel
+from .agent import Agent
+from .provider import Provider
+
+from fyodorov_llm_agents.tools.mcp_tool_service import MCPTool as Tool
+from .model import LLM
+from models.model import LLMModel
+
+supabase: Client = get_supabase()
+
+JWT = "eyJhbGciOiJIUzI1NiIsImtpZCI6Im14MmVrTllBY3ZYN292LzMiLCJ0eXAiOiJKV1QifQ.eyJhdWQiOiJhdXRoZW50aWNhdGVkIiwiZXhwIjoxNzA3MzI0MTMxLCJpYXQiOjE3MDczMjA1MzEsImlzcyI6Imh0dHBzOi8vbGptd2R2ZWZrZ3l4cnVjc2dla3cuc3VwYWJhc2UuY28vYXV0aC92MSIsInN1YiI6IjljYzYzOWQ0LWUwMzItNDM3Zi1hNWVhLTUzNDljZGE0YTNmZCIsImVtYWlsIjoiZGFuaWVsQGRhbmllbHJhbnNvbS5jb20iLCJwaG9uZSI6IiIsImFwcF9tZXRhZGF0YSI6eyJwcm92aWRlciI6ImVtYWlsIiwicHJvdmlkZXJzIjpbImVtYWlsIl19LCJ1c2VyX21ldGFkYXRhIjp7Imludml0ZV9jb2RlIjoiUkFOU09NIn0sInJvbGUiOiJhdXRoZW50aWNhdGVkIiwiYWFsIjoiYWFsMSIsImFtciI6W3sibWV0aG9kIjoicGFzc3dvcmQiLCJ0aW1lc3RhbXAiOjE3MDczMjA1MzF9XSwic2Vzc2lvbl9pZCI6ImE4MTM4NmE1LTUxZTUtNDkyMS04ZjM3LWMyYWE3ODlhZDRhZiJ9.NNZA2rm1IQQ9wAhpyC8taMqregRmy8I9oZgT0P5heBg"
+
+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)
+        model: LLMModel = await LLM.get_model(access_token, user_id, id = agent.modelid)
+        print(f"Model fetched via LLM.get_model in chat_w_fn_calls: {model}")
+        provider: Provider = await Provider.get_provider_by_id(access_token, id = model.provider)
+        prompt = f"{agent.prompt}\n\n{datetime.now().strftime('%Y-%m-%d %H:%M:%S')}\n\n"
+        agent.prompt = prompt
+        agent.model = model.base_model
+        agent.api_key = provider.api_key
+        agent.api_url = provider.api_url
+        # for index, tool in enumerate(agent.tools):
+        #     if isinstance(tool, str):
+        #         agent.tools[index] = Tool.get_by_name_and_user_id(access_token, tool, user_id)
+        #         print(f"Tool fetched via Tool.get_by_name_and_user_id in chat_w_fn_calls: {agent.tools[index]}")
+        res = agent.call_with_fn_calling(input=input, history=self.chat_history)
+        self.chat_history.append({
+            "role": "user",
+            "content": input
+        })
+        self.chat_history.append({
+            "role": "assistant",
+            "content": res["answer"]
+        })
+        # Update history
+        await self.create_in_db(instance=self)
+        return res
+
+    @staticmethod
+    async def create_in_db(instance: InstanceModel) -> dict:
+        try:
+            existing_instance = Instance.get_by_title_and_agent(instance.title, instance.agent_id)
+            if existing_instance:
+                needs_update = False
+                for key, value in instance.to_dict().items():
+                    if value != existing_instance[key]:
+                        print(f"Instance {key} needs updating: {value} != {existing_instance[key]}")
+                        needs_update = True
+                        existing_instance[key] = value
+                if needs_update:
+                    print('Instance already exists, will update:', existing_instance)
+                    instance_dict = await Instance.update_in_db(existing_instance["id"], existing_instance)
+                else:
+                    print('Instance already exists and no update needed:', existing_instance)
+                    instance_dict = existing_instance
+            else:
+                print("Creating instance in DB:", instance.to_dict())
+                result = supabase.table('instances').upsert(instance.to_dict()).execute()
+                if not result or not result.data:
+                    print(f"Error creating instance in DB: {result}")
+                    raise ValueError('Error creating instance in DB')
+                print(f"Result of creating instance in DB: {result}")
+                instance_dict = result.data[0]
+            instance_dict["id"] = str(instance_dict["id"])
+            instance_dict["agent_id"] = str(instance_dict["agent_id"])
+            return instance_dict
+        except Exception as e:
+            print(f"An error occurred while creating instance: {e}")
+            if 'code' in e and e.code == '23505':
+                print('Instance already exists')
+                instance_dict = Instance.get_by_title_and_agent(instance.title, instance.agent_id)
+                return instance_dict
+            print('Error creating instance', str(e))
+            raise e
+
+    @staticmethod
+    async def update_in_db(id: str, instance: dict) -> InstanceModel:
+        if not id:
+            raise ValueError('Instance ID is required')
+        try:
+            print(f"Updating instance in DB with ID: {id}, data: {instance}")
+            result = supabase.table('instances').update(instance).eq('id', id).execute()
+            print(f"Result of update: {result}")
+            instance_dict = result.data[0]
+            instance_dict["id"] = str(instance_dict["id"])
+            return instance_dict
+        except Exception as e:
+            print('An error occurred while updating instance:', id, str(e))
+            raise
+
+    @staticmethod
+    async def delete_in_db(id: str) -> bool:
+        if not id:
+            raise ValueError('Instance ID is required')
+        try:
+            result = supabase.table('instances').delete().eq('id', id).execute()
+            print('Deleted instance', result)
+            if not result.data:
+                raise ValueError('Instance ID not found')
+            else:
+                return True
+        except Exception as e:
+            print('Error deleting instance', str(e))
+            raise e
+
+    @staticmethod
+    def get_by_title_and_agent(title: str, agent_id: str) -> dict:
+        if not title:
+            raise ValueError('Instance title is required')
+        if not agent_id:
+            raise ValueError('Agent ID is required')
+        try:
+            print(f"Fetching instance with title {title} and agent ID {agent_id}")
+            result = supabase.table('instances').select('*').eq('title', title).eq('agent_id', agent_id).limit(1).execute()
+            if not result or not result.data:
+                print(f"No instance found with the given title {title} and agent ID {agent_id}: {result}")
+                return None
+            instance_dict = result.data[0]
+            instance_dict["agent_id"] = str(instance_dict["agent_id"])
+            instance_dict["id"] = str(instance_dict["id"])
+            print(f"Fetched instance: {instance_dict}")
+            return instance_dict
+        except Exception as e:
+            print('[Instance.get_by_title_and_agent] Error fetching instance', str(e))
+            raise e
+
+    @staticmethod
+    def get_in_db(id: str) -> InstanceModel:
+        if not id:
+            raise ValueError('Instance ID is required')
+        try:
+            result = supabase.table('instances').select('*').eq('id', id).limit(1).execute()
+            instance_dict = result.data[0]
+            instance_dict["agent_id"] = str(instance_dict["agent_id"])
+            instance_dict["id"] = str(instance_dict["id"])
+            print(f"Fetched instance: {instance_dict}")
+            instance = InstanceModel(**instance_dict)
+            return instance
+        except Exception as e:
+            print('[Instance.get_in_db] Error fetching instance', str(e))
+            raise e
+
+    @staticmethod
+    def get_all_in_db(limit: int = 10, created_at_lt: datetime = datetime.now()) -> [InstanceModel]:
+        try:
+            result = supabase.from_('instances') \
+                .select("*") \
+                .limit(limit) \
+                .lt('created_at', created_at_lt) \
+                .order('created_at', desc=True) \
+                .execute()
+            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:
+            print('[Instance.get_all_in_db] Error fetching instances', str(e))
+            raise e

{fyodorov_llm_agents-0.3.6.dist-info → fyodorov_llm_agents-0.3.8.dist-info}/METADATA

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

@@ -0,0 +1,10 @@
+fyodorov_llm_agents/agents/agent.py,sha256=vVBCEBpG11m4ae11Mr94rF5TJpuBluI_loQPDTw734w,5044
+fyodorov_llm_agents/agents/openai.py,sha256=FA5RS7yn3JwvFA8PXju60XSYC_2oUZFNgBUzeIYtGv0,1154
+fyodorov_llm_agents/instances/instance.py,sha256=edPOcn6qIB6Gnbr5d2_4HBaCk3sa8XYxfJPSHrcDLHE,8218
+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.3.8.dist-info/METADATA,sha256=u-fvGhE1XF17eJcWQQNNbYSKq8sL1BV1yV9VFyMb878,550
+fyodorov_llm_agents-0.3.8.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+fyodorov_llm_agents-0.3.8.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
+fyodorov_llm_agents-0.3.8.dist-info/RECORD,,

fyodorov_llm_agents-0.3.6.dist-info/RECORD

@@ -1,9 +0,0 @@
-fyodorov_llm_agents/agents/agent.py,sha256=EM4uq94_S3ZYH6aLT7iYu-FeIfc6VpkiuxXgQhp1lug,6560
-fyodorov_llm_agents/agents/openai.py,sha256=FA5RS7yn3JwvFA8PXju60XSYC_2oUZFNgBUzeIYtGv0,1154
-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.3.6.dist-info/METADATA,sha256=3dd7l6yvr2CzMVTwFvDrZFcgnBTZw8PlEiJt3gmfosg,550
-fyodorov_llm_agents-0.3.6.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-fyodorov_llm_agents-0.3.6.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
-fyodorov_llm_agents-0.3.6.dist-info/RECORD,,