solana-agent 2.1.3__py3-none-any.whl → 3.0.1__py3-none-any.whl

solana_agent/ai.py

@@ -9,6 +9,7 @@ from pydantic import BaseModel
 from pymongo import MongoClient
 from openai import OpenAI
 import inspect
+import pytz
 import requests
 from zep_cloud.client import AsyncZep as AsyncZepCloud
 from zep_cloud.client import Zep as ZepCloud
@@ -69,7 +70,9 @@ class AI:
         pinecone_embed_model: Literal["llama-text-embed-v2"] = "llama-text-embed-v2",
         gemini_api_key: str = None,
         openai_base_url: str = None,
-        openai_model: str = "gpt-4o-mini",
+        main_model: str = "gpt-4o-mini",
+        tool_formatting_model: str = "gpt-4o-mini",
+        tool_formatting_instructions: str = None,
     ):
         """Initialize a new AI assistant instance.
 
@@ -86,8 +89,9 @@ class AI:
             pinecone_embed_model (Literal["llama-text-embed-v2"], optional): Pinecone embedding model. Defaults to "llama-text-embed-v2"
             gemini_api_key (str, optional): API key for Gemini search. Defaults to None
             openai_base_url (str, optional): Base URL for OpenAI API. Defaults to None
-            openai_model (str, optional): OpenAI model to use. Defaults to "gpt-4o-mini"
-
+            main_model (str, optional): Main OpenAI model for conversation. Defaults to "gpt-4o-mini"
+            tool_formatting_model (str, optional): OpenAI model for tool formatting. Defaults to "gpt-4o-mini"
+            tool_formatting_instructions (str, optional): Instructions for tool formatting
         Example:
             ```python
             ai = AI(
@@ -104,9 +108,12 @@ class AI:
             - Optional integrations for Perplexity, Pinecone, Gemini, and Grok
             - You must create the Pinecone index in the dashboard before using it
         """
-        self._client = OpenAI(api_key=openai_api_key, base_url=openai_base_url) if openai_base_url else OpenAI(
-            api_key=openai_api_key)
-        memory_instructions = """
+        self._client = (
+            OpenAI(api_key=openai_api_key, base_url=openai_base_url)
+            if openai_base_url
+            else OpenAI(api_key=openai_api_key)
+        )
+        self._memory_instructions = """
             You are a highly intelligent, context-aware conversational AI. When a user sends a query or statement, you should not only process the current input but also retrieve and integrate relevant context from their previous interactions. Use the memory data to:
             - Infer nuances in the user's intent.
             - Recall previous topics, preferences, or facts that might be relevant.
@@ -114,8 +121,13 @@ class AI:
             - Clarify ambiguous queries by relating them to known user history.
 
             Always be concise and ensure that your response maintains coherence across the conversation while respecting the user's context and previous data.
+            You always take the Tool Result over the Memory Context in terms of priority.
         """
-        self._instructions = instructions + " " + memory_instructions
+        self._instructions = instructions
+        self._tool_formatting_instructions = (
+            tool_formatting_instructions + " " +
+            self._memory_instructions if tool_formatting_instructions else self._memory_instructions
+        )
         self._database: MongoDatabase = database
         self._accumulated_value_queue = asyncio.Queue()
         if zep_api_key and not zep_base_url:
@@ -140,7 +152,8 @@ class AI:
                 self._pinecone_index_name) if self._pinecone else None
         )
         self._openai_base_url = openai_base_url
-        self._openai_model = openai_model
+        self._main_model = main_model
+        self._tool_formatting_model = tool_formatting_model
         self._tools = []
 
     async def __aenter__(self):
@@ -431,16 +444,19 @@ class AI:
         self.kb.delete(ids=[id], namespace=user_id)
         self._database.kb.delete_one({"reference": id})
 
-    def check_time(self) -> str:
+    def check_time(self, timezone: str) -> str:
         """Get current UTC time formatted as a string via Cloudflare's NTP service.
 
+        Args:
+            timezone (str): Timezone to convert the time to (e.g., "America/New_York")
+
         Returns:
-            str: Current UTC time in format 'YYYY-MM-DD HH:MM:SS UTC'
+            str: Current time in the requested timezone in format 'YYYY-MM-DD HH:MM:SS'
 
         Example:
             ```python
-            time = ai.check_time()
-            # Returns: "2025-02-26 15:30:45 UTC"
+            time = ai.check_time("America/New_York")
+            # Returns: "The current time in America/New_York is 2025-02-26 10:30:45"
             ```
 
         Note:
@@ -448,14 +464,24 @@ class AI:
             Fetches time over NTP from Cloudflare's time server (time.cloudflare.com).
         """
         try:
+            # Request time from Cloudflare's NTP server
             client = ntplib.NTPClient()
-            # Request time from Cloudflare's NTP server.
             response = client.request("time.cloudflare.com", version=3)
-            dt = datetime.datetime.fromtimestamp(
-                response.tx_time, datetime.timezone.utc)
-            # convert time based on location
-            the_time = dt.strftime("%Y-%m-%d %H:%M:%S UTC")
-            return f"The current time is {the_time}"
+
+            # Get UTC time from NTP response
+            utc_dt = datetime.datetime.fromtimestamp(
+                response.tx_time, datetime.timezone.utc
+            )
+
+            # Convert to requested timezone
+            try:
+                tz = pytz.timezone(timezone)
+                local_dt = utc_dt.astimezone(tz)
+                formatted_time = local_dt.strftime("%Y-%m-%d %H:%M:%S")
+                return f"The current time in {timezone} is {formatted_time}"
+            except pytz.exceptions.UnknownTimeZoneError:
+                return f"Error: Unknown timezone '{timezone}'. Please use a valid timezone like 'America/New_York'."
+
         except Exception as e:
             return f"Error getting the current time: {e}"
 
@@ -721,18 +747,6 @@ class AI:
         except Exception:
             pass
 
-    async def delete_assistant_thread(self, user_id: str):
-        """Delete stored conversation thread for a user on OpenAI.
-
-        Example:
-            ```python
-            await ai.delete_assistant_thread("user123")
-            # Deletes the assistant conversation thread for a user
-            ```
-        """
-        thread_id = self._database.get_thread_id(user_id)
-        await self._client.beta.threads.delete(thread_id=thread_id)
-
     async def delete_memory(self, user_id: str):
         """Delete memory for a specific user from Zep memory.
 
@@ -789,13 +803,13 @@ class AI:
 
         async def stream_processor():
             memory = self.get_memory_context(user_id)
+            regular_content = ""  # Add this to accumulate regular content
             response = self._client.chat.completions.create(
-                model=self._openai_model,
+                model=self._main_model,
                 messages=[
                     {
                         "role": "system",
-                        "content": self._instructions + f" Memory: {memory}",
-
+                        "content": self._instructions,
                     },
                     {
                         "role": "user",
@@ -806,6 +820,7 @@ class AI:
                 stream=True,
             )
             for chunk in response:
+                result = ""
                 delta = chunk.choices[0].delta
 
                 # Process tool call deltas (if any)
@@ -816,11 +831,13 @@ class AI:
                             # Initialize a new tool call record
                             final_tool_calls[index] = {
                                 "name": tool_call.function.name,
-                                "arguments": tool_call.function.arguments or ""
+                                "arguments": tool_call.function.arguments or "",
                             }
                         elif tool_call.function.arguments:
                             # Append additional arguments if provided in subsequent chunks
-                            final_tool_calls[index]["arguments"] += tool_call.function.arguments
+                            final_tool_calls[index]["arguments"] += (
+                                tool_call.function.arguments
+                            )
 
                             try:
                                 args = json.loads(
@@ -830,15 +847,11 @@ class AI:
                                 # Execute the tool call (synchronously; adjust if async is needed)
                                 result = func(**args)
                                 response = self._client.chat.completions.create(
-                                    model=self._openai_model,
+                                    model=self._tool_formatting_model,
                                     messages=[
                                         {
                                             "role": "system",
-                                            "content": self._instructions,
-                                        },
-                                        {
-                                            "role": "user",
-                                            "content": result,
+                                            "content": f"Rules: {self._tool_formatting_instructions}, Tool Result: {result}, Memory Context: {memory}",
                                         },
                                     ],
                                     stream=True,
@@ -847,7 +860,9 @@ class AI:
                                     delta = chunk.choices[0].delta
 
                                     if delta.content is not None:
-                                        await self._accumulated_value_queue.put(delta.content)
+                                        await self._accumulated_value_queue.put(
+                                            delta.content
+                                        )
                                 # Remove the cached tool call info so it doesn't block future calls
                                 del final_tool_calls[index]
                             except json.JSONDecodeError:
@@ -856,7 +871,29 @@ class AI:
 
                 # Process regular response content
                 if delta.content is not None:
-                    await self._accumulated_value_queue.put(delta.content)
+                    regular_content += delta.content  # Accumulate instead of directly sending
+
+            # After processing all chunks from the first response
+            if regular_content:  # Only if we have regular content
+                # Format the regular content with memory context, similar to tool results
+                response = self._client.chat.completions.create(
+                    model=self._tool_formatting_model,
+                    messages=[
+                        {
+                            "role": "system",
+                            "content": f"Rules: {self._memory_instructions}, Regular Content: {regular_content}, Memory Context: {memory}",
+                        },
+                        {
+                            "role": "user",
+                            "content": user_text,
+                        }
+                    ],
+                    stream=True,
+                )
+                for chunk in response:
+                    delta = chunk.choices[0].delta
+                    if delta.content is not None:
+                        await self._accumulated_value_queue.put(delta.content)
 
         # Start the stream processor as a background task
         asyncio.create_task(stream_processor())
@@ -864,7 +901,9 @@ class AI:
         # Yield values from the queue as they become available.
         while True:
             try:
-                value = await asyncio.wait_for(self._accumulated_value_queue.get(), timeout=0.1)
+                value = await asyncio.wait_for(
+                    self._accumulated_value_queue.get(), timeout=0.1
+                )
                 if value is not None:
                     final_response += value
                     yield value
@@ -959,7 +998,7 @@ class AI:
                     },
                     {
                         "role": "user",
-                        "content":  transcript,
+                        "content": transcript,
                     },
                 ],
                 tools=self._tools,
@@ -976,11 +1015,13 @@ class AI:
                             # Initialize a new tool call record
                             final_tool_calls[index] = {
                                 "name": tool_call.function.name,
-                                "arguments": tool_call.function.arguments or ""
+                                "arguments": tool_call.function.arguments or "",
                             }
                         elif tool_call.function.arguments:
                             # Append additional arguments if provided in subsequent chunks
-                            final_tool_calls[index]["arguments"] += tool_call.function.arguments
+                            final_tool_calls[index]["arguments"] += (
+                                tool_call.function.arguments
+                            )
 
                             try:
                                 args = json.loads(
@@ -990,15 +1031,11 @@ class AI:
                                 # Execute the tool call (synchronously; adjust if async is needed)
                                 result = func(**args)
                                 response = self._client.chat.completions.create(
-                                    model=self._openai_model,
+                                    model=self._tool_formatting_model,
                                     messages=[
                                         {
                                             "role": "system",
-                                            "content": self._instructions,
-                                        },
-                                        {
-                                            "role": "user",
-                                            "content": result,
+                                            "content": f" Rules: {self._tool_formatting_instructions}, Result: {result}",
                                         },
                                     ],
                                     stream=True,
@@ -1007,7 +1044,9 @@ class AI:
                                     delta = chunk.choices[0].delta
 
                                     if delta.content is not None:
-                                        await self._accumulated_value_queue.put(delta.content)
+                                        await self._accumulated_value_queue.put(
+                                            delta.content
+                                        )
                                 # Remove the cached tool call info so it doesn't block future calls
                                 del final_tool_calls[index]
                             except json.JSONDecodeError:
@@ -1024,7 +1063,9 @@ class AI:
         # Yield values from the queue as they become available.
         while True:
             try:
-                value = await asyncio.wait_for(self._accumulated_value_queue.get(), timeout=0.1)
+                value = await asyncio.wait_for(
+                    self._accumulated_value_queue.get(), timeout=0.1
+                )
                 if value is not None:
                     final_response += value
                     yield value

{solana_agent-2.1.3.dist-info → solana_agent-3.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: solana-agent
-Version: 2.1.3
+Version: 3.0.1
 Summary: Build self-learning AI Agents
 License: MIT
 Keywords: ai,openai,ai agents

solana_agent-3.0.1.dist-info/RECORD

@@ -0,0 +1,6 @@
+solana_agent/__init__.py,sha256=zpfnWqANd3OHGWm7NCF5Y6m01BWG4NkNk8SK9Ex48nA,18
+solana_agent/ai.py,sha256=TXXd--Iuqe0jwJb83BUCITbnmy7wbvSnmQK6okGsBBs,46417
+solana_agent-3.0.1.dist-info/LICENSE,sha256=BnSRc-NSFuyF2s496l_4EyrwAP6YimvxWcjPiJ0J7g4,1057
+solana_agent-3.0.1.dist-info/METADATA,sha256=nhxvZe2DJYk7KeYsQNx79O1E2Dt4mtBFkQvL9Di4Neo,4808
+solana_agent-3.0.1.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+solana_agent-3.0.1.dist-info/RECORD,,

solana_agent-2.1.3.dist-info/RECORD

@@ -1,6 +0,0 @@
-solana_agent/__init__.py,sha256=zpfnWqANd3OHGWm7NCF5Y6m01BWG4NkNk8SK9Ex48nA,18
-solana_agent/ai.py,sha256=IlhPK4xSR5xCTL69xudcgYz0fbPSY6i0H7dI77pqKsU,44343
-solana_agent-2.1.3.dist-info/LICENSE,sha256=BnSRc-NSFuyF2s496l_4EyrwAP6YimvxWcjPiJ0J7g4,1057
-solana_agent-2.1.3.dist-info/METADATA,sha256=Y2HjYIvBwmb3Tf3wxZ-bYMKBpUeCFXTIC4_DnsLZAnI,4808
-solana_agent-2.1.3.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-solana_agent-2.1.3.dist-info/RECORD,,