fyodorov-llm-agents 0.0.58__py3-none-any.whl → 0.0.60__py3-none-any.whl

fyodorov_llm_agents/agents/base_agent.py

@@ -1,19 +1,35 @@
-from abc import ABC, abstractmethod
 from fyodorov_llm_agents.tools.tool import Tool
 import re
 import requests
 
-class AbstractAgent(ABC):
-    def __init__(self, api_key, tools: [Tool] = [], rag: [] = []):
+class BaseAgent():
+    def __init__(self, api_key, tools: [Tool] = [], rag: [] = [], model: str = "gpt-3.5-turbo"):
         self.api_key = api_key
         self.tools = tools
         self.rag = rag
+        self.model = model
 
-    @abstractmethod
-    def call(self) -> str:
-        pass
+    def call(self, prompt: str = "", input: str = "", temperature: float = 0.0):
+        print(f"[OpenAI] Calling OpenAI with prompt: {prompt}, input: {input}, temperature: {temperature}")
+        if temperature > 2.0 or temperature < 0.0:
+            raise ValueError("Temperature must be between 0.0 and 2.0")
 
-    def invoke(self, prompt: str = "", input: str = "", temperature: float = 0.0) -> str:
+        response = self.client.chat.completions.create(
+            messages=[
+                {"role": "system", "content": prompt},
+                {"role": "user", "content": input},
+            ],
+            temperature=temperature,
+            model=self.model,
+        )
+
+        # Process the response as needed
+        print(f"Response: {response}")
+        answer = response.choices[0].message.content
+        print(f"Answer: {answer}")
+        return str(answer)
+
+    def invoke(self, prompt: str = "", input: str = "", temperature: float = 0.0, depth: int = 0) -> str:
         res = self.call(prompt, input, temperature)
         print("llm response:", res)
         if len(self.tools) > 0:
@@ -34,6 +50,75 @@ class AbstractAgent(ABC):
                 return self.invoke(prompt, input)
         return res
 
+    def streaming_call(result_queue):
+        try:
+            # Simulate defining multiple functions that the model can choose to call
+            functions = [
+                {
+                    "name": "get_current_weather",
+                    "description": "Get the current weather for a location",
+                    "parameters": {
+                        "type": "object",
+                        "properties": {
+                            "location": {"type": "string"},
+                            "unit": {"type": "string", "enum": ["celsius", "fahrenheit"]}
+                        },
+                        "required": ["location"]
+                    }
+                },
+                {
+                    "name": "get_n_day_weather_forecast",
+                    "description": "Get a weather forecast for a number of days",
+                    "parameters": {
+                        "type": "object",
+                        "properties": {
+                            "location": {"type": "string"},
+                            "num_days": {"type": "integer"},
+                            "unit": {"type": "string", "enum": ["celsius", "fahrenheit"]}
+                        },
+                        "required": ["location", "num_days"]
+                    }
+                }
+            ]
+
+            # Example request that could potentially trigger multiple function calls
+            response = openai.ChatCompletion.create(
+                model=self.model,
+                messages=[
+                    {"role": "user", "content": "What's the weather today and the forecast for the next 4 days in San Francisco?"}
+                ],
+                functions=functions
+            )
+
+            # Process the response assuming it might include multiple tool calls
+            if 'choices' in response and response['choices']:
+                tool_calls = response['choices'][0]['message']['tool_calls']
+                if tool_calls:
+                    result_queue.put(json.dumps(tool_calls))
+                else:
+                    print("No function calls detected.")
+                    answer = response.choices[0].message.content
+                    result_queue.put(answer)
+            else:
+                result_queue.put("Invalid response format.")
+            
+            result_queue.put(None)  # Signal the end of streaming
+        except Exception as e:
+            result_queue.put(str(e))
+            result_queue.put(None)
+
+    async def invoke_async(self, prompt: str = "", input: str = "", temperature: float = 0.0, depth: int = 0):
+        result_queue = queue.Queue()
+        thread = threading.Thread(target=streaming_call, args=(result_queue,))
+        thread.start()
+
+        while True:
+            result = result_queue.get()
+            if result is None:  # End of stream
+                break
+            else:
+                yield result.encode()
+    
     def add_tool(self, tool: Tool):
         self.tools.append(tool)
 

fyodorov_llm_agents/agents/openai.py

@@ -1,9 +1,9 @@
 from openai import OpenAI as oai
-from .base_agent import AbstractAgent
+from .base_agent import BaseAgent
 
 DEFAULT_MODEL: str = "gpt-3.5-turbo"
 
-class OpenAI(AbstractAgent):
+class OpenAI(BaseAgent):
     tools: list = []
     rag: list = []
     model: str = DEFAULT_MODEL

fyodorov_llm_agents/tools/tool.py

@@ -21,6 +21,7 @@ class Tool(BaseModel):
     logo_url: HttpUrl
     contact_email: str
     legal_info_url: str
+    user_id: str = None
 
     def validate(self) -> bool:
         try:

{fyodorov_llm_agents-0.0.58.dist-info → fyodorov_llm_agents-0.0.60.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fyodorov_llm_agents
-Version: 0.0.58
+Version: 0.0.60
 Summary: Library for creating LLM-based agents with tools and RAG
 Author-email: Daniel Ransom <02masseur.alibis@icloud.com>
 Project-URL: Homepage, https://github.com/FyodorovAI/fyodorov-llm-agents

fyodorov_llm_agents-0.0.60.dist-info/RECORD

@@ -0,0 +1,12 @@
+fyodorov_llm_agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fyodorov_llm_agents/agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fyodorov_llm_agents/agents/base_agent.py,sha256=-ws8d0FA1Q8iAVvOyCuG44n04nakBSPofWYvAli52xE,9091
+fyodorov_llm_agents/agents/openai.py,sha256=yAGV3pcFcKfwHR1zuIiv1hmmWOUjDfrJloUGECciOlw,1167
+fyodorov_llm_agents/prompts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fyodorov_llm_agents/prompts/prompt.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fyodorov_llm_agents/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fyodorov_llm_agents/tools/tool.py,sha256=bGZJe9stwILc4jcYsbY7-moAwy4dG6tBXg96lGqn75o,6410
+fyodorov_llm_agents-0.0.60.dist-info/METADATA,sha256=YMCsfypGiM47OG7w12ffw3kJizUt9FApsbpl2hpc2Mc,2001
+fyodorov_llm_agents-0.0.60.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+fyodorov_llm_agents-0.0.60.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
+fyodorov_llm_agents-0.0.60.dist-info/RECORD,,

fyodorov_llm_agents-0.0.58.dist-info/RECORD

@@ -1,10 +0,0 @@
-fyodorov_llm_agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fyodorov_llm_agents/agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fyodorov_llm_agents/agents/base_agent.py,sha256=qnrUWrjmYlo6lzv05FiBjRd_GqfeiletvfWPIvsY7xk,5406
-fyodorov_llm_agents/agents/openai.py,sha256=QGnc-wC6oTpomgyHK67kAtXekjdp1jcavG1relvHdH8,1175
-fyodorov_llm_agents/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fyodorov_llm_agents/tools/tool.py,sha256=5H0yRe9S-32iT7wppxPgPRTceqhFQK0xCVYk4OtnoSk,6386
-fyodorov_llm_agents-0.0.58.dist-info/METADATA,sha256=ULyOMBY7MGp9Hm120YsO6bk-5reokRfI2_Gx8aHEhNk,2001
-fyodorov_llm_agents-0.0.58.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-fyodorov_llm_agents-0.0.58.dist-info/top_level.txt,sha256=4QOslsBp8Gh7ng25DceA7fHp4KguTIdAxwURz97gH-g,20
-fyodorov_llm_agents-0.0.58.dist-info/RECORD,,