solana-agent 21.1.0__tar.gz → 22.0.1__tar.gz

{solana_agent-21.1.0 → solana_agent-22.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: solana-agent
-Version: 21.1.0
+Version: 22.0.1
 Summary: Agentic IQ
 License: MIT
 Keywords: ai,openai,ai agents,agi
@@ -18,7 +18,6 @@ Requires-Dist: openai (>=1.70.0,<2.0.0)
 Requires-Dist: pydantic (>=2.11.2,<3.0.0)
 Requires-Dist: pymongo (>=4.11.3,<5.0.0)
 Requires-Dist: zep-cloud (>=2.9.0,<3.0.0)
-Requires-Dist: zep-python (>=2.0.2,<3.0.0)
 Project-URL: Documentation, https://docs.solana-agent.com
 Project-URL: Repository, https://github.com/truemagic-coder/solana-agent
 Description-Content-Type: text/markdown
@@ -50,7 +49,6 @@ Build your AI business in three lines of code!
 * Extensible Tooling
 * Simple Business Definition
 * Tested & Secure
-* Support for MCP Servers
 * Built in Python
 * Deployed by [CometHeart](https://cometheart.com) & [WalletBubbles](https://walletbubbles.com)
 
@@ -67,14 +65,13 @@ Build your AI business in three lines of code!
 * Powerful tool integration using standard Python packages and/or inline tools
 * Assigned tools are utilized by agents automatically and effectively
 * Simple business definition using JSON
-* Ability to access any MCP server via URL
 
 ## Stack
 
 * [Python](https://python.org) - Programming Language
 * [OpenAI](https://openai.com) - LLMs
 * [MongoDB](https://mongodb.com) - Conversational History (optional)
-* [Zep](https://getzep.com) - Conversational Memory (optional)
+* [Zep Cloud](https://getzep.com) - Conversational Memory (optional)
 
 ## Installation
 
@@ -240,19 +237,26 @@ config = {
 ```python
 config = {
     "zep": {
-        "api_key": "your-zep-api-key",
-        "base_url": "your-zep-base-url", # not applicable if using Zep Cloud
+        "api_key": "your-zep-cloud-api-key",
     },
 }
 ```
 
-## Plugins
+### Disable Internet Searching
 
-Plugins like Solana Agent Kit (sakit) integrate automatically with Solana Agent.
+```python
+async for response in solana_agent.process("user123", "Write me a poem.", internet_search=False):
+    print(response, end="")
+```
+
+## Tools
+
+Tools can be used from plugins like Solana Agent Kit (sakit) or via custom inline tools. Tools available via plugins integrate automatically with Solana Agent.
+
+### Plugin Usage Example
 
 `pip install sakit`
 
-### MCP
 ```python
 from solana_agent import SolanaAgent
 
@@ -261,20 +265,18 @@ config = {
         "api_key": "your-openai-api-key",
     },
     "tools": {
-        "mcp": {
-            "server_urls": [
-                "http://mcp-server1.com/mcp",
-                "http://mcp-server2.com/mcp",
-                "http://mcp-server3.com/mcp"
-            ]
-        }
+        "search_internet": {
+            "api_key": "your-perplexity-key", # Required
+            "citations": True, # Optional, defaults to True
+            "model": "sonar"  # Optional, defaults to "sonar"
+        },
     },
     "agents": [
         {
             "name": "research_specialist",
             "instructions": "You are an expert researcher who synthesizes complex information clearly.",
             "specialization": "Research and knowledge synthesis",
-            "tools": ["mcp"],
+            "tools": ["search_internet"],
         },
         {
             "name": "customer_support",
@@ -286,15 +288,11 @@ config = {
 
 solana_agent = SolanaAgent(config=config)
 
-async for response in solana_agent.process("user123", "What are the latest AI developments?"):
+async for response in solana_agent.process("user123", "What are the latest AI developments?", internet_search=False):
     print(response, end="")
 ```
 
-To create a plugin like Solana Agent Kit - read the [code](https://github.com/truemagic-coder/solana-agent-kit)
-
-## Advanced
-
-### Custom Inline Tools
+### Custom Inline Tool Example
 
 ```python
 from solana_agent import SolanaAgent
@@ -374,9 +372,11 @@ async for response in solana_agent.process("user123", "What are the latest AI de
     print(response, end="")
 ```
 
-### Custom Prompt Injection at Runtime
+## Training your Agents
+
+Many use-cases for Solana Agent require training your agents on your company data.
 
-Useful for Knowledge Base answers and FAQs
+This can be accomplished via runtime prompt injection. Integrations that work well with this method are KBs like Pinecone and FAQs.
 
 ```python
 from solana_agent import SolanaAgent
@@ -401,11 +401,13 @@ config = {
 
 solana_agent = SolanaAgent(config=config)
 
-async for response in solana_agent.process("user123", "What are the latest AI developments?", "Always end your sentences with eh?"):
+async for response in solana_agent.process("user123", "What are the latest AI developments?", "This is my FAQ"):
     print(response, end="")
 ```
 
-### Custom Routing
+## Custom Routing
+
+In advanced cases like implementing a ticketing system on-top of Solana Agent - you can use your own router.
 
 ```python
 from solana_agent import SolanaAgent

{solana_agent-21.1.0 → solana_agent-22.0.1}/README.md

@@ -25,7 +25,6 @@ Build your AI business in three lines of code!
 * Extensible Tooling
 * Simple Business Definition
 * Tested & Secure
-* Support for MCP Servers
 * Built in Python
 * Deployed by [CometHeart](https://cometheart.com) & [WalletBubbles](https://walletbubbles.com)
 
@@ -42,14 +41,13 @@ Build your AI business in three lines of code!
 * Powerful tool integration using standard Python packages and/or inline tools
 * Assigned tools are utilized by agents automatically and effectively
 * Simple business definition using JSON
-* Ability to access any MCP server via URL
 
 ## Stack
 
 * [Python](https://python.org) - Programming Language
 * [OpenAI](https://openai.com) - LLMs
 * [MongoDB](https://mongodb.com) - Conversational History (optional)
-* [Zep](https://getzep.com) - Conversational Memory (optional)
+* [Zep Cloud](https://getzep.com) - Conversational Memory (optional)
 
 ## Installation
 
@@ -215,19 +213,26 @@ config = {
 ```python
 config = {
     "zep": {
-        "api_key": "your-zep-api-key",
-        "base_url": "your-zep-base-url", # not applicable if using Zep Cloud
+        "api_key": "your-zep-cloud-api-key",
     },
 }
 ```
 
-## Plugins
+### Disable Internet Searching
 
-Plugins like Solana Agent Kit (sakit) integrate automatically with Solana Agent.
+```python
+async for response in solana_agent.process("user123", "Write me a poem.", internet_search=False):
+    print(response, end="")
+```
+
+## Tools
+
+Tools can be used from plugins like Solana Agent Kit (sakit) or via custom inline tools. Tools available via plugins integrate automatically with Solana Agent.
+
+### Plugin Usage Example
 
 `pip install sakit`
 
-### MCP
 ```python
 from solana_agent import SolanaAgent
 
@@ -236,20 +241,18 @@ config = {
         "api_key": "your-openai-api-key",
     },
     "tools": {
-        "mcp": {
-            "server_urls": [
-                "http://mcp-server1.com/mcp",
-                "http://mcp-server2.com/mcp",
-                "http://mcp-server3.com/mcp"
-            ]
-        }
+        "search_internet": {
+            "api_key": "your-perplexity-key", # Required
+            "citations": True, # Optional, defaults to True
+            "model": "sonar"  # Optional, defaults to "sonar"
+        },
     },
     "agents": [
         {
             "name": "research_specialist",
             "instructions": "You are an expert researcher who synthesizes complex information clearly.",
             "specialization": "Research and knowledge synthesis",
-            "tools": ["mcp"],
+            "tools": ["search_internet"],
         },
         {
             "name": "customer_support",
@@ -261,15 +264,11 @@ config = {
 
 solana_agent = SolanaAgent(config=config)
 
-async for response in solana_agent.process("user123", "What are the latest AI developments?"):
+async for response in solana_agent.process("user123", "What are the latest AI developments?", internet_search=False):
     print(response, end="")
 ```
 
-To create a plugin like Solana Agent Kit - read the [code](https://github.com/truemagic-coder/solana-agent-kit)
-
-## Advanced
-
-### Custom Inline Tools
+### Custom Inline Tool Example
 
 ```python
 from solana_agent import SolanaAgent
@@ -349,9 +348,11 @@ async for response in solana_agent.process("user123", "What are the latest AI de
     print(response, end="")
 ```
 
-### Custom Prompt Injection at Runtime
+## Training your Agents
+
+Many use-cases for Solana Agent require training your agents on your company data.
 
-Useful for Knowledge Base answers and FAQs
+This can be accomplished via runtime prompt injection. Integrations that work well with this method are KBs like Pinecone and FAQs.
 
 ```python
 from solana_agent import SolanaAgent
@@ -376,11 +377,13 @@ config = {
 
 solana_agent = SolanaAgent(config=config)
 
-async for response in solana_agent.process("user123", "What are the latest AI developments?", "Always end your sentences with eh?"):
+async for response in solana_agent.process("user123", "What are the latest AI developments?", "This is my FAQ"):
     print(response, end="")
 ```
 
-### Custom Routing
+## Custom Routing
+
+In advanced cases like implementing a ticketing system on-top of Solana Agent - you can use your own router.
 
 ```python
 from solana_agent import SolanaAgent

{solana_agent-21.1.0 → solana_agent-22.0.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "solana-agent"
-version = "21.1.0"
+version = "22.0.1"
 description = "Agentic IQ"
 authors = ["Bevan Hunt <bevan@bevanhunt.com>"]
 license = "MIT"
@@ -27,7 +27,6 @@ openai = "^1.70.0"
 pydantic = "^2.11.2"
 pymongo = "^4.11.3"
 zep-cloud = "^2.9.0"
-zep-python = "^2.0.2"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.3.5"

{solana_agent-21.1.0 → solana_agent-22.0.1}/solana_agent/adapters/llm_adapter.py

@@ -20,7 +20,7 @@ class OpenAIAdapter(LLMProvider):
         self.client = OpenAI(api_key=api_key)
         self.parse_model = "gpt-4o-mini"
         self.text_model = "gpt-4o-mini"
-        self.search_model = "gpt-4o-mini-search-preview"
+        self.internet_search_model = "gpt-4o-mini-search-preview"
         self.transcription_model = "gpt-4o-mini-transcribe"
         self.tts_model = "tts-1"
 
@@ -106,7 +106,7 @@ class OpenAIAdapter(LLMProvider):
         self,
         prompt: str,
         system_prompt: str = "",
-        search: bool = False,
+        internet_search: bool = False,
     ) -> AsyncGenerator[str, None]:  # pragma: no cover
         """Generate text from OpenAI models."""
         messages = []
@@ -117,8 +117,8 @@ class OpenAIAdapter(LLMProvider):
         messages.append({"role": "user", "content": prompt})
 
         model = self.text_model
-        if search:
-            model = self.search_model
+        if internet_search:
+            model = self.internet_search_model
 
         # Prepare request parameters
         request_params = {

{solana_agent-21.1.0 → solana_agent-22.0.1}/solana_agent/client/solana_agent.py

@@ -56,7 +56,7 @@ class SolanaAgent(SolanaAgentInterface):
             "flac", "mp3", "mp4", "mpeg", "mpga", "m4a", "ogg", "wav", "webm"
         ] = "mp4",
         router: Optional[RoutingInterface] = None,
-        use_openai_search: bool = True,
+        internet_search: bool = True,
     ) -> AsyncGenerator[Union[str, bytes], None]:  # pragma: no cover
         """Process a user message and return the response stream.
 
@@ -70,7 +70,7 @@ class SolanaAgent(SolanaAgentInterface):
             audio_output_format: Audio output format
             audio_input_format: Audio input format
             router: Optional routing service for processing
-            use_openai_search: Flag to use OpenAI search
+            internet_search: Flag to use OpenAI Internet search
 
         Returns:
             Async generator yielding response chunks (text strings or audio bytes)
@@ -85,7 +85,7 @@ class SolanaAgent(SolanaAgentInterface):
             audio_input_format=audio_input_format,
             prompt=prompt,
             router=router,
-            use_openai_search=use_openai_search,
+            internet_search=internet_search,
         ):
             yield chunk
 

{solana_agent-21.1.0 → solana_agent-22.0.1}/solana_agent/factories/agent_factory.py

@@ -74,17 +74,16 @@ class SolanaAgentFactory:
             if "api_key" not in config["zep"]:
                 raise ValueError("Zep API key is required.")
             memory_provider = MemoryRepository(
-                db_adapter, config["zep"].get("api_key"), config["zep"].get("base_url"))
+                mongo_adapter=db_adapter, zep_api_key=config["zep"].get("api_key"))
 
         if "mongo" in config and not "zep" in config:
-            memory_provider = MemoryRepository(db_adapter)
+            memory_provider = MemoryRepository(mongo_adapter=db_adapter)
 
         if "zep" in config and not "mongo" in config:
             if "api_key" not in config["zep"]:
                 raise ValueError("Zep API key is required.")
             memory_provider = MemoryRepository(
-                zep_api_key=config["zep"].get("api_key"),
-                zep_base_url=config["zep"].get("base_url")
+                zep_api_key=config["zep"].get("api_key")
             )
 
         # Create primary services

{solana_agent-21.1.0 → solana_agent-22.0.1}/solana_agent/interfaces/client/client.py

@@ -24,7 +24,7 @@ class SolanaAgent(ABC):
             "flac", "mp3", "mp4", "mpeg", "mpga", "m4a", "ogg", "wav", "webm"
         ] = "mp4",
         router: Optional[RoutingInterface] = None,
-        use_openai_search: bool = True,
+        internet_search: bool = True,
     ) -> AsyncGenerator[Union[str, bytes], None]:
         """Process a user message and return the response stream."""
         pass

{solana_agent-21.1.0 → solana_agent-22.0.1}/solana_agent/interfaces/providers/llm.py

@@ -15,7 +15,7 @@ class LLMProvider(ABC):
         self,
         prompt: str,
         system_prompt: str = "",
-        search: bool = False,
+        internet_search: bool = False,
     ) -> AsyncGenerator[str, None]:
         """Generate text from the language model."""
         pass

{solana_agent-21.1.0 → solana_agent-22.0.1}/solana_agent/interfaces/services/agent.py

@@ -34,7 +34,7 @@ class AgentService(ABC):
             "flac", "mp3", "mp4", "mpeg", "mpga", "m4a", "ogg", "wav", "webm"
         ] = "mp4",
         prompt: Optional[str] = None,
-        use_openai_search: bool = True,
+        internet_search: bool = True,
     ) -> AsyncGenerator[Union[str, bytes], None]:
         """Generate a response from an agent."""
         pass

{solana_agent-21.1.0 → solana_agent-22.0.1}/solana_agent/interfaces/services/query.py

@@ -20,7 +20,7 @@ class QueryService(ABC):
             "flac", "mp3", "mp4", "mpeg", "mpga", "m4a", "ogg", "wav", "webm"
         ] = "mp4",
         prompt: Optional[str] = None,
-        use_openai_search: bool = True,
+        internet_search: bool = True,
     ) -> AsyncGenerator[Union[str, bytes], None]:
         """Process the user request and generate a response."""
         pass

{solana_agent-21.1.0 → solana_agent-22.0.1}/solana_agent/repositories/memory.py

@@ -1,7 +1,7 @@
+from copy import deepcopy
 from typing import List, Dict, Any, Optional, Tuple
 from datetime import datetime, timezone
 from zep_cloud.client import AsyncZep as AsyncZepCloud
-from zep_python.client import AsyncZep
 from zep_cloud.types import Message
 from solana_agent.interfaces.providers.memory import MemoryProvider
 from solana_agent.adapters.mongodb_adapter import MongoDBAdapter
@@ -14,7 +14,6 @@ class MemoryRepository(MemoryProvider):
         self,
         mongo_adapter: Optional[MongoDBAdapter] = None,
         zep_api_key: Optional[str] = None,
-        zep_base_url: Optional[str] = None
     ):
         """Initialize the combined memory provider."""
         if not mongo_adapter:
@@ -33,13 +32,10 @@ class MemoryRepository(MemoryProvider):
             except Exception as e:
                 print(f"Error initializing MongoDB: {e}")
 
+        self.zep = None
         # Initialize Zep
-        if zep_api_key and not zep_base_url:
+        if zep_api_key:
             self.zep = AsyncZepCloud(api_key=zep_api_key)
-        elif zep_api_key and zep_base_url:
-            self.zep = AsyncZep(api_key=zep_api_key, base_url=zep_base_url)
-        else:
-            self.zep = None
 
     async def store(self, user_id: str, messages: List[Dict[str, Any]]) -> None:
         """Store messages in both Zep and MongoDB."""
@@ -99,9 +95,10 @@ class MemoryRepository(MemoryProvider):
         zep_messages = []
         for msg in messages:
             if "role" in msg and "content" in msg:
+                content = self._truncate(deepcopy(msg["content"]))
                 zep_msg = Message(
                     role=msg["role"],
-                    content=msg["content"],
+                    content=content,
                     role_type=msg["role"],
                 )
                 zep_messages.append(zep_msg)
@@ -196,4 +193,4 @@ class MemoryRepository(MemoryProvider):
             return text[:last_period + 1]
 
         # If no period found, truncate at limit and add ellipsis
-        return text[:limit] + "..."
+        return text[:limit-3] + "..."

{solana_agent-21.1.0 → solana_agent-22.0.1}/solana_agent/services/agent.py

@@ -176,31 +176,15 @@ class AgentService(AgentServiceInterface):
             "flac", "mp3", "mp4", "mpeg", "mpga", "m4a", "ogg", "wav", "webm"
         ] = "mp4",
         prompt: Optional[str] = None,
-        use_openai_search: bool = True,
+        internet_search: bool = True,
     ) -> AsyncGenerator[Union[str, bytes], None]:  # pragma: no cover
-        """Generate a response with support for text/audio input/output.
-
-        Args:
-            agent_name: Agent name
-            user_id: User ID
-            query: Text query or audio bytes
-            memory_context: Optional conversation context
-            output_format: Response format ("text" or "audio")
-            audio_voice: Voice to use for audio output
-            audio_instructions: Optional instructions for audio synthesis
-            audio_output_format: Audio output format
-            audio_input_format: Audio input format
-            prompt: Optional prompt for the agent
-            use_openai_search: Flag to use OpenAI search
-
-        Yields:
-            Text chunks or audio bytes depending on output_format
-        """
+        """Generate a response with support for text/audio input/output."""
         agent = next((a for a in self.agents if a.name == agent_name), None)
         if not agent:
             error_msg = f"Agent '{agent_name}' not found."
             if output_format == "audio":
-                async for chunk in self.llm_provider.tts(error_msg, instructions=audio_instructions, response_format=audio_output_format, voice=audio_voice):
+                async for chunk in self.llm_provider.tts(error_msg, instructions=audio_instructions,
+                                                         response_format=audio_output_format, voice=audio_voice):
                     yield chunk
             else:
                 yield error_msg
@@ -229,20 +213,24 @@ class AgentService(AgentServiceInterface):
             if prompt:
                 system_prompt += f"\n\nADDITIONAL PROMPT: {prompt}"
 
-            # Keep track of the complete text response
+            # Variables for tracking the response
             complete_text_response = ""
+
+            # For audio output, we'll collect everything first
+            full_response_buffer = ""
+
+            # Variables for handling JSON processing
             json_buffer = ""
             is_json = False
-            text_buffer = ""
 
             # Generate and stream response
             async for chunk in self.llm_provider.generate_text(
                 prompt=query_text,
                 system_prompt=system_prompt,
-                search=use_openai_search,
+                internet_search=internet_search,
             ):
-                # Check for JSON start
-                if chunk.strip().startswith("{") and not is_json:
+                # Check if the chunk is JSON or a tool call
+                if (chunk.strip().startswith("{") or "{\"tool_call\":" in chunk) and not is_json:
                     is_json = True
                     json_buffer = chunk
                     continue
@@ -256,107 +244,105 @@ class AgentService(AgentServiceInterface):
 
                         # Valid JSON found, handle it
                         if "tool_call" in data:
-                            # Process tool call with existing method
                             response_text = await self._handle_tool_call(
                                 agent_name=agent_name,
                                 json_chunk=json_buffer
                             )
 
-                            system_prompt = system_prompt + \
+                            # Update system prompt to prevent further tool calls
+                            tool_system_prompt = system_prompt + \
                                 "\n DO NOT make any tool calls or return JSON."
 
+                            # Create prompt with tool response
                             user_prompt = f"\n USER QUERY: {query_text} \n"
                             user_prompt += f"\n TOOL RESPONSE: {response_text} \n"
 
-                            # Collect all processed text first
-                            processed_text = ""
-                            async for processed_chunk in self.llm_provider.generate_text(
-                                prompt=user_prompt,
-                                system_prompt=system_prompt,
-                            ):
-                                processed_text += processed_chunk
-                                # For text output, yield chunks as they come
-                                if output_format == "text":
+                            # For text output, process chunks directly
+                            if output_format == "text":
+                                # Stream text response for text output
+                                async for processed_chunk in self.llm_provider.generate_text(
+                                    prompt=user_prompt,
+                                    system_prompt=tool_system_prompt,
+                                ):
+                                    complete_text_response += processed_chunk
                                     yield processed_chunk
-
-                            # Add to complete response
-                            complete_text_response += processed_text
-
-                            # For audio output, process the complete text
-                            if output_format == "audio":
-                                async for audio_chunk in self.llm_provider.tts(
-                                    text=processed_text,
-                                    voice=audio_voice,
-                                    response_format=audio_output_format
+                            else:
+                                # For audio output, collect the full tool response first
+                                tool_response = ""
+                                async for processed_chunk in self.llm_provider.generate_text(
+                                    prompt=user_prompt,
+                                    system_prompt=tool_system_prompt,
                                 ):
-                                    yield audio_chunk
+                                    tool_response += processed_chunk
+
+                                # Add to our complete text record and full audio buffer
+                                tool_response = self._remove_markdown(
+                                    tool_response)
+                                complete_text_response += tool_response
+                                full_response_buffer += tool_response
                         else:
                             # For non-tool JSON, still capture the text
                             complete_text_response += json_buffer
 
-                            if output_format == "audio":
-                                async for audio_chunk in self.llm_provider.tts(
-                                    text=json_buffer,
-                                    voice=audio_voice,
-                                    response_format=audio_output_format
-                                ):
-                                    yield audio_chunk
-                            else:
+                            if output_format == "text":
                                 yield json_buffer
+                            else:
+                                # Add to full response buffer for audio
+                                full_response_buffer += json_buffer
 
                         # Reset JSON handling
                         is_json = False
                         json_buffer = ""
 
                     except json.JSONDecodeError:
+                        # JSON not complete yet, continue collecting
                         pass
                 else:
-                    # For regular text, always add to the complete response
+                    # For regular text
                     complete_text_response += chunk
 
-                    # Handle audio buffering or direct text output
-                    if output_format == "audio":
-                        text_buffer += chunk
-                        if any(punct in chunk for punct in ".!?"):
-                            async for audio_chunk in self.llm_provider.tts(
-                                text=text_buffer,
-                                voice=audio_voice,
-                                response_format=audio_output_format
-                            ):
-                                yield audio_chunk
-                            text_buffer = ""
-                    else:
+                    if output_format == "text":
+                        # For text output, yield directly
                         yield chunk
-
-            # Handle any remaining text or incomplete JSON
-            remaining_text = ""
-            if text_buffer:
-                remaining_text += text_buffer
-            if is_json and json_buffer:
-                remaining_text += json_buffer
-
-            if remaining_text:
-                # Add remaining text to complete response
-                complete_text_response += remaining_text
-
-                if output_format == "audio":
-                    async for audio_chunk in self.llm_provider.tts(
-                        text=remaining_text,
-                        voice=audio_voice,
-                        response_format=audio_output_format
-                    ):
-                        yield audio_chunk
+                    else:
+                        # For audio output, add to the full response buffer
+                        full_response_buffer += chunk
+
+            # Handle any leftover JSON buffer
+            if json_buffer:
+                complete_text_response += json_buffer
+                if output_format == "text":
+                    yield json_buffer
                 else:
-                    yield remaining_text
-
-            # Store the complete text response for the caller to access
-            # This needs to be done in the query service using the self.last_text_response
+                    full_response_buffer += json_buffer
+
+            # 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(
+                    full_response_buffer)
+
+                # Process the entire response with TTS
+                async for audio_chunk in self.llm_provider.tts(
+                    text=full_response_buffer,
+                    voice=audio_voice,
+                    response_format=audio_output_format,
+                    instructions=audio_instructions
+                ):
+                    yield audio_chunk
+
+            # Store the complete text response
             self.last_text_response = complete_text_response
 
         except Exception as e:
             error_msg = f"I apologize, but I encountered an error: {str(e)}"
             if output_format == "audio":
-                async for chunk in self.llm_provider.tts(error_msg, voice=audio_voice, response_format=audio_output_format):
+                async for chunk in self.llm_provider.tts(
+                    error_msg,
+                    voice=audio_voice,
+                    response_format=audio_output_format,
+                    instructions=audio_instructions
+                ):
                     yield chunk
             else:
                 yield error_msg
@@ -379,15 +365,31 @@ class AgentService(AgentServiceInterface):
                 parameters = tool_data.get("parameters", {})
 
                 if tool_name:
-                    result = await self.execute_tool(
-                        agent_name, tool_name, parameters)
+                    # Execute the tool and get the result
+                    result = await self.execute_tool(agent_name, tool_name, parameters)
+
                     if result.get("status") == "success":
-                        return result.get("result", "")
+                        tool_result = result.get("result", "")
+                        return tool_result
                     else:
-                        return f"I apologize, but I encountered an issue: {result.get('message', 'Unknown error')}"
-            return json_chunk
-        except json.JSONDecodeError:
+                        error_message = f"I apologize, but I encountered an issue with the {tool_name} tool: {result.get('message', 'Unknown error')}"
+                        print(f"Tool error: {error_message}")
+                        return error_message
+                else:
+                    return "Tool name was not provided in the tool call."
+            else:
+                print(f"JSON received but no tool_call found: {json_chunk}")
+
+            # If we get here, it wasn't properly handled as a tool
+            return f"The following request was not processed as a valid tool call:\n{json_chunk}"
+        except json.JSONDecodeError as e:
+            print(f"JSON decode error in tool call: {e}")
             return json_chunk
+        except Exception as e:
+            print(f"Unexpected error in tool call handling: {str(e)}")
+            import traceback
+            print(traceback.format_exc())
+            return f"Error processing tool call: {str(e)}"
 
     def _get_tool_usage_prompt(self, agent_name: str) -> str:
         """Generate JSON-based instructions for tool usage."""
@@ -424,3 +426,47 @@ class AgentService(AgentServiceInterface):
        - No explanation text before or after
        - Use exact tool names as shown in AVAILABLE TOOLS
     """
+
+    def _remove_markdown(self, text: str) -> str:
+        """Remove Markdown formatting and links from text.
+
+        Args:
+            text: Input text with potential Markdown formatting
+
+        Returns:
+            Clean text without Markdown formatting
+        """
+        import re
+
+        if not text:
+            return ""
+
+        # Remove Markdown links - [text](url) -> text
+        text = re.sub(r'\[([^\]]+)\]\([^\)]+\)', r'\1', text)
+
+        # Remove inline code with backticks
+        text = re.sub(r'`([^`]+)`', r'\1', text)
+
+        # Remove bold formatting - **text** or __text__ -> text
+        text = re.sub(r'(\*\*|__)(.*?)\1', r'\2', text)
+
+        # Remove italic formatting - *text* or _text_ -> text
+        text = re.sub(r'(\*|_)(.*?)\1', r'\2', text)
+
+        # Remove headers - ## Header -> Header
+        text = re.sub(r'^\s*#+\s*(.*?)$', r'\1', text, flags=re.MULTILINE)
+
+        # Remove blockquotes - > Text -> Text
+        text = re.sub(r'^\s*>\s*(.*?)$', r'\1', text, flags=re.MULTILINE)
+
+        # Remove horizontal rules (---, ***, ___)
+        text = re.sub(r'^\s*[-*_]{3,}\s*$', '', text, flags=re.MULTILINE)
+
+        # Remove list markers - * Item or - Item or 1. Item -> Item
+        text = re.sub(r'^\s*[-*+]\s+(.*?)$', r'\1', text, flags=re.MULTILINE)
+        text = re.sub(r'^\s*\d+\.\s+(.*?)$', r'\1', text, flags=re.MULTILINE)
+
+        # Remove multiple consecutive newlines (keep just one)
+        text = re.sub(r'\n{3,}', '\n\n', text)
+
+        return text.strip()

{solana_agent-21.1.0 → solana_agent-22.0.1}/solana_agent/services/query.py

@@ -49,7 +49,7 @@ class QueryService(QueryServiceInterface):
         ] = "mp4",
         prompt: Optional[str] = None,
         router: Optional[RoutingServiceInterface] = None,
-        use_openai_search: bool = True,
+        internet_search: bool = True,
     ) -> AsyncGenerator[Union[str, bytes], None]:  # pragma: no cover
         """Process the user request with appropriate agent.
 
@@ -63,7 +63,7 @@ class QueryService(QueryServiceInterface):
             audio_input_format: Audio input format
             prompt: Optional prompt for the agent
             router: Optional routing service for processing
-            use_openai_search: Flag to use OpenAI search
+            internet_search: Flag to use OpenAI Internet search
 
         Yields:
             Response chunks (text strings or audio bytes)
@@ -121,7 +121,7 @@ class QueryService(QueryServiceInterface):
                     audio_output_format=audio_output_format,
                     audio_instructions=audio_instructions,
                     prompt=prompt,
-                    use_openai_search=use_openai_search,
+                    internet_search=internet_search,
                 ):
                     yield audio_chunk
 
@@ -140,7 +140,7 @@ class QueryService(QueryServiceInterface):
                     memory_context=memory_context,
                     output_format="text",
                     prompt=prompt,
-                    use_openai_search=use_openai_search,
+                    internet_search=internet_search,
                 ):
                     yield chunk
                     full_text_response += chunk