solana-agent 22.0.2__py3-none-any.whl → 22.0.4__py3-none-any.whl

solana_agent/services/agent.py

@@ -5,6 +5,7 @@ This service manages AI and human agents, their registration, tool assignments,
 and response generation.
 """
 import asyncio
+from copy import deepcopy
 import datetime as main_datetime
 from datetime import datetime
 import json
@@ -199,12 +200,8 @@ class AgentService(AgentServiceInterface):
             else:
                 query_text = query
 
-            # Get system prompt and add tool instructions
+            # Get system prompt
             system_prompt = self.get_agent_system_prompt(agent_name)
-            if self.tool_registry:
-                tool_usage_prompt = self._get_tool_usage_prompt(agent_name)
-                if tool_usage_prompt:
-                    system_prompt = f"{system_prompt}\n\n{tool_usage_prompt}"
 
             # Add User ID and memory context
             system_prompt += f"\n\nUser ID: {user_id}"
@@ -213,6 +210,13 @@ class AgentService(AgentServiceInterface):
             if prompt:
                 system_prompt += f"\n\nADDITIONAL PROMPT: {prompt}"
 
+            # make tool calling prompt
+            tool_calling_system_prompt = deepcopy(system_prompt)
+            if self.tool_registry:
+                tool_usage_prompt = self._get_tool_usage_prompt(agent_name)
+                if tool_usage_prompt:
+                    tool_calling_system_prompt += f"\n\nTOOL CALLING PROMPT: {tool_usage_prompt}"
+
             # Variables for tracking the response
             complete_text_response = ""
 
@@ -226,7 +230,7 @@ class AgentService(AgentServiceInterface):
             # Generate and stream response
             async for chunk in self.llm_provider.generate_text(
                 prompt=query_text,
-                system_prompt=system_prompt,
+                system_prompt=tool_calling_system_prompt,
                 internet_search=internet_search,
             ):
                 # Check if the chunk is JSON or a tool call
@@ -276,7 +280,7 @@ class AgentService(AgentServiceInterface):
                                     tool_response += processed_chunk
 
                                 # Add to our complete text record and full audio buffer
-                                tool_response = self._remove_markdown(
+                                tool_response = self._clean_for_audio(
                                     tool_response)
                                 complete_text_response += tool_response
                                 full_response_buffer += tool_response
@@ -318,8 +322,8 @@ class AgentService(AgentServiceInterface):
 
             # For audio output, now process the complete response
             if output_format == "audio" and full_response_buffer:
-                # Clean markdown before TTS
-                full_response_buffer = self._remove_markdown(
+                # Clean text before TTS
+                full_response_buffer = self._clean_for_audio(
                     full_response_buffer)
 
                 # Process the entire response with TTS
@@ -427,14 +431,14 @@ class AgentService(AgentServiceInterface):
        - Use exact tool names as shown in AVAILABLE TOOLS
     """
 
-    def _remove_markdown(self, text: str) -> str:
-        """Remove Markdown formatting and links from text.
+    def _clean_for_audio(self, text: str) -> str:
+        """Remove Markdown formatting, emojis, and non-pronounceable characters from text.
 
         Args:
-            text: Input text with potential Markdown formatting
+            text: Input text with potential Markdown formatting and special characters
 
         Returns:
-            Clean text without Markdown formatting
+            Clean text without Markdown, emojis, and special characters
         """
         import re
 
@@ -469,4 +473,34 @@ class AgentService(AgentServiceInterface):
         # Remove multiple consecutive newlines (keep just one)
         text = re.sub(r'\n{3,}', '\n\n', text)
 
+        # Remove emojis and other non-pronounceable characters
+        # Common emoji Unicode ranges
+        emoji_pattern = re.compile(
+            "["
+            "\U0001F600-\U0001F64F"  # emoticons
+            "\U0001F300-\U0001F5FF"  # symbols & pictographs
+            "\U0001F680-\U0001F6FF"  # transport & map symbols
+            "\U0001F700-\U0001F77F"  # alchemical symbols
+            "\U0001F780-\U0001F7FF"  # Geometric Shapes
+            "\U0001F800-\U0001F8FF"  # Supplemental Arrows-C
+            "\U0001F900-\U0001F9FF"  # Supplemental Symbols and Pictographs
+            "\U0001FA00-\U0001FA6F"  # Chess Symbols
+            "\U0001FA70-\U0001FAFF"  # Symbols and Pictographs Extended-A
+            "\U00002702-\U000027B0"  # Dingbats
+            "\U000024C2-\U0000257F"  # Enclosed characters
+            "\U00002600-\U000026FF"  # Miscellaneous Symbols
+            "\U00002700-\U000027BF"  # Dingbats
+            "\U0000FE00-\U0000FE0F"  # Variation Selectors
+            "\U0001F1E0-\U0001F1FF"  # Flags (iOS)
+            "]+",
+            flags=re.UNICODE
+        )
+        text = emoji_pattern.sub(r' ', text)
+
+        # Replace special characters that can cause issues with TTS
+        text = re.sub(r'[^\w\s\.\,\;\:\?\!\'\"\-\(\)]', ' ', text)
+
+        # Replace multiple spaces with a single space
+        text = re.sub(r'\s+', ' ', text)
+
         return text.strip()

{solana_agent-22.0.2.dist-info → solana_agent-22.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: solana-agent
-Version: 22.0.2
+Version: 22.0.4
 Summary: Agentic IQ
 License: MIT
 Keywords: ai,openai,ai agents,agi

{solana_agent-22.0.2.dist-info → solana_agent-22.0.4.dist-info}/RECORD

@@ -26,10 +26,10 @@ solana_agent/plugins/tools/auto_tool.py,sha256=DgES_cZ6xKSf_HJpFINpvJxrjVlk5oeqa
 solana_agent/repositories/__init__.py,sha256=fP83w83CGzXLnSdq-C5wbw9EhWTYtqE2lQTgp46-X_4,163
 solana_agent/repositories/memory.py,sha256=mrpmNSQ0D_eLebNY-cBqtecVVpIGXE7s9jCzOWEAuR4,6984
 solana_agent/services/__init__.py,sha256=ab_NXJmwYUCmCrCzuTlZ47bJZINW0Y0F5jfQ9OovidU,163
-solana_agent/services/agent.py,sha256=c7dZvuAmI0jXO2roDCbUFbWIfEn79uK5TU378PBk3rU,18472
+solana_agent/services/agent.py,sha256=bIVC4VGCv8qS5AF0nh_hfUjz8nu70Owll-VuvHJ9X48,20047
 solana_agent/services/query.py,sha256=os_LRkDIwXQuWW_zJMtm__n0Lvi-AvItdanpCs1bXv0,11362
 solana_agent/services/routing.py,sha256=PMCSG5m3uLMaHMj3dxNvNfcFZaeaDi7kMr7AEBCzwDE,6499
-solana_agent-22.0.2.dist-info/LICENSE,sha256=BnSRc-NSFuyF2s496l_4EyrwAP6YimvxWcjPiJ0J7g4,1057
-solana_agent-22.0.2.dist-info/METADATA,sha256=D9zc-pg5gP9tm0MTaSKIMuA0zW1z4OfPIFYgINjb0yg,14882
-solana_agent-22.0.2.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-solana_agent-22.0.2.dist-info/RECORD,,
+solana_agent-22.0.4.dist-info/LICENSE,sha256=BnSRc-NSFuyF2s496l_4EyrwAP6YimvxWcjPiJ0J7g4,1057
+solana_agent-22.0.4.dist-info/METADATA,sha256=1Ek0Si7v2t-LuLMC0YUnoKF8sxATs728NhjPoDT4OMc,14882
+solana_agent-22.0.4.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+solana_agent-22.0.4.dist-info/RECORD,,