solana-agent 20.0.0__py3-none-any.whl → 20.1.4__py3-none-any.whl

solana_agent/client/solana_agent.py

@@ -11,6 +11,7 @@ from typing import AsyncGenerator, Dict, Any, Literal, Optional, Union
 from solana_agent.factories.agent_factory import SolanaAgentFactory
 from solana_agent.interfaces.client.client import SolanaAgent as SolanaAgentInterface
 from solana_agent.interfaces.plugins.plugins import Tool
+from solana_agent.interfaces.services.routing import RoutingService as RoutingInterface
 
 
 class SolanaAgent(SolanaAgentInterface):
@@ -54,6 +55,7 @@ class SolanaAgent(SolanaAgentInterface):
         audio_input_format: Literal[
             "flac", "mp3", "mp4", "mpeg", "mpga", "m4a", "ogg", "wav", "webm"
         ] = "mp4",
+        router: Optional[RoutingInterface] = None,
     ) -> AsyncGenerator[Union[str, bytes], None]:  # pragma: no cover
         """Process a user message and return the response stream.
 
@@ -63,9 +65,10 @@ class SolanaAgent(SolanaAgentInterface):
             prompt: Optional prompt for the agent
             output_format: Response format ("text" or "audio")
             audio_voice: Voice to use for audio output
-            audio_instructions: Optional instructions for audio synthesis
+            audio_instructions: Not used currently
             audio_output_format: Audio output format
             audio_input_format: Audio input format
+            router: Optional routing service for processing
 
         Returns:
             Async generator yielding response chunks (text strings or audio bytes)
@@ -79,6 +82,7 @@ class SolanaAgent(SolanaAgentInterface):
             audio_output_format=audio_output_format,
             audio_input_format=audio_input_format,
             prompt=prompt,
+            router=router,
         ):
             yield chunk
 

solana_agent/interfaces/services/routing.py

@@ -6,11 +6,10 @@ class RoutingService(ABC):
     """Interface for query routing services."""
 
     @abstractmethod
-    async def route_query(self, query: str) -> Tuple[str, Any]:
+    async def route_query(self, query: str) -> str:
         """Route a query to the appropriate agent.
 
         Args:
-            user_id: User ID
             query: User query
 
         Returns:

solana_agent/services/agent.py

@@ -12,7 +12,6 @@ from typing import AsyncGenerator, Dict, List, Literal, Optional, Any, Union
 
 from solana_agent.interfaces.services.agent import AgentService as AgentServiceInterface
 from solana_agent.interfaces.providers.llm import LLMProvider
-from solana_agent.interfaces.plugins.plugins import ToolRegistry as ToolRegistryInterface
 from solana_agent.plugins.manager import PluginManager
 from solana_agent.plugins.registry import ToolRegistry
 from solana_agent.domains.agent import AIAgent, BusinessMission

solana_agent/services/query.py

@@ -8,6 +8,7 @@ clean separation of concerns.
 from typing import Any, AsyncGenerator, Dict, Literal, Optional, Union
 
 from solana_agent.interfaces.services.query import QueryService as QueryServiceInterface
+from solana_agent.interfaces.services.routing import RoutingService as RoutingServiceInterface
 from solana_agent.services.agent import AgentService
 from solana_agent.services.routing import RoutingService
 from solana_agent.interfaces.providers.memory import MemoryProvider
@@ -47,6 +48,7 @@ class QueryService(QueryServiceInterface):
             "flac", "mp3", "mp4", "mpeg", "mpga", "m4a", "ogg", "wav", "webm"
         ] = "mp4",
         prompt: Optional[str] = None,
+        router: Optional[RoutingServiceInterface] = None,
     ) -> AsyncGenerator[Union[str, bytes], None]:  # pragma: no cover
         """Process the user request with appropriate agent.
 
@@ -59,6 +61,7 @@ class QueryService(QueryServiceInterface):
             audio_output_format: Audio output format
             audio_input_format: Audio input format
             prompt: Optional prompt for the agent
+            router: Optional routing service for processing
 
         Yields:
             Response chunks (text strings or audio bytes)
@@ -96,7 +99,11 @@ class QueryService(QueryServiceInterface):
                 memory_context = await self.memory_provider.retrieve(user_id)
 
             # Route query to appropriate agent
-            agent_name = await self.routing_service.route_query(user_text)
+            if router:
+                agent_name = await router.route_query(user_text)
+            else:
+                agent_name = await self.routing_service.route_query(user_text)
+
             print(f"Routed to agent: {agent_name}")
 
             # Generate response

{solana_agent-20.0.0.dist-info → solana_agent-20.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: solana-agent
-Version: 20.0.0
+Version: 20.1.4
 Summary: Agentic IQ
 License: MIT
 Keywords: ai,openai,ai agents,agi
@@ -48,6 +48,7 @@ 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)
 
@@ -56,11 +57,12 @@ Build your AI business in three lines of code!
 * Seamless text and audio streaming with real-time multi-modal processing
 * Persistent memory that preserves context across all agent interactions
 * Streamlined message history for all agent interactions
-* Intelligent query routing to agents with optimal domain expertise
+* Intelligent query routing to agents with optimal domain expertise or your own custom routing
 * Unified value system ensuring brand-aligned agent responses
 * Powerful tool integration using standard Python packages and/or inline classes
 * Assigned tools are utilized by agents automatically and effectively
 * Simple business definition using JSON
+* Ability to access any MCP server via a URL
 
 ## Stack
 
@@ -75,13 +77,13 @@ You can install Solana Agent using pip:
 
 `pip install solana-agent`
 
-## Basic Usage
+## Usage
 
-```python
-from solana_agent import SolanaAgent
+### Business Alignment Config - Optional
 
+```python
 config = {
-    "business": { # optional
+    "business": {
         "mission": "To provide users with a one-stop shop for their queries.",
         "values": {
             "Friendliness": "Users must be treated fairly, openly, and with friendliness.",
@@ -92,14 +94,37 @@ config = {
         ],
         "voice": "The voice of the brand is that of a research business."
     },
-    "mongo": { # optional
+}
+```
+
+### Conversational History Config - Optional
+
+```python
+config = {
+    "mongo": {
         "connection_string": "mongodb://localhost:27017",
         "database": "solana_agent"
     },
-    "zep": { # optional
+}
+```
+
+### Conversational Memory Config - Optional
+
+```python
+config = {
+    "zep": {
         "api_key": "your-zep-api-key",
         "base_url": "your-zep-base-url", # not applicable if using Zep Cloud
     },
+}
+```
+
+### Text/Text Streaming
+
+```python
+from solana_agent import SolanaAgent
+
+config = {
     "openai": {
         "api_key": "your-openai-api-key",
     },
@@ -123,40 +148,110 @@ async for response in solana_agent.process("user123", "What are the latest AI de
     print(response, end="")
 ```
 
-## Plugin Usage
+### Audio/Audio Streaming
 
-Plugins like Solana Agent Kit (sakit) integrate automatically with Solana Agent.
+```python
+from solana_agent import SolanaAgent
 
-`pip install sakit`
+config = {
+    "openai": {
+        "api_key": "your-openai-api-key",
+    },
+    "agents": [
+        {
+            "name": "research_specialist",
+            "instructions": "You are an expert researcher who synthesizes complex information clearly.",
+            "specialization": "Research and knowledge synthesis",
+        },
+        {
+            "name": "customer_support",
+            "instructions": "You provide friendly, helpful customer support responses.",
+            "specialization": "Customer inquiries",
+        }
+    ],
+}
+
+solana_agent = SolanaAgent(config=config)
+
+audio_content = audio_file.read()
+
+async for response in solana_agent.process("user123", audio_content, output_format="audio", audio_voice="nova", audio_input_format="webm", audio_output_format="aac"):
+    print(response, end="")
+```
+
+### Text/Audio Streaming
 
 ```python
 from solana_agent import SolanaAgent
 
 config = {
-    "business": { # optional
-        "mission": "To provide users with a one-stop shop for their queries.",
-        "values": {
-            "Friendliness": "Users must be treated fairly, openly, and with friendliness.",
-            "Ethical": "Agents must use a strong ethical framework in their interactions with users.",
-        },
-        "goals": [
-            "Empower users with great answers to their queries.",
-        ],
-        "voice": "The voice of the brand is that of a research business."
-    },
-    "openai": { # optional
+    "openai": {
         "api_key": "your-openai-api-key",
     },
-    "ollama": { # optional
-        "url": "your-ollama-url",
-    },
-    "mongo": { # optional
-        "connection_string": "mongodb://localhost:27017",
-        "database": "solana_agent"
+    "agents": [
+        {
+            "name": "research_specialist",
+            "instructions": "You are an expert researcher who synthesizes complex information clearly.",
+            "specialization": "Research and knowledge synthesis",
+        },
+        {
+            "name": "customer_support",
+            "instructions": "You provide friendly, helpful customer support responses.",
+            "specialization": "Customer inquiries",
+        }
+    ],
+}
+
+solana_agent = SolanaAgent(config=config)
+
+async for response in solana_agent.process("user123", "What is the latest news on Elon Musk?", output_format="audio", audio_voice="nova", audio_output_format="aac"):
+    print(response, end="")
+```
+
+### Audio/Text Streaming
+
+```python
+from solana_agent import SolanaAgent
+
+config = {
+    "openai": {
+        "api_key": "your-openai-api-key",
     },
-    "zep": { # optional
-        "api_key": "your-zep-api-key",
-        "base_url": "your-zep-base-url", # not applicable if using Zep Cloud
+    "agents": [
+        {
+            "name": "research_specialist",
+            "instructions": "You are an expert researcher who synthesizes complex information clearly.",
+            "specialization": "Research and knowledge synthesis",
+        },
+        {
+            "name": "customer_support",
+            "instructions": "You provide friendly, helpful customer support responses.",
+            "specialization": "Customer inquiries",
+        }
+    ],
+}
+
+solana_agent = SolanaAgent(config=config)
+
+audio_content = audio_file.read()
+
+async for response in solana_agent.process("user123", audio_content, audio_input_format="aac"):
+    print(response, end="")
+```
+
+### Plugins
+
+Plugins like Solana Agent Kit (sakit) integrate automatically with Solana Agent.
+
+`pip install sakit`
+
+#### Internet Search
+```python
+from solana_agent import SolanaAgent
+
+config = {
+    "openai": {
+        "api_key": "your-openai-api-key",
     },
     "tools": {
         "search_internet": {
@@ -186,9 +281,47 @@ async for response in solana_agent.process("user123", "What are the latest AI de
     print(response, end="")
 ```
 
+#### MCP
+```python
+from solana_agent import SolanaAgent
+
+config = {
+    "openai": {
+        "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"
+            ]
+        }
+    },
+    "agents": [
+        {
+            "name": "research_specialist",
+            "instructions": "You are an expert researcher who synthesizes complex information clearly.",
+            "specialization": "Research and knowledge synthesis",
+            "tools": ["mcp"],
+        },
+        {
+            "name": "customer_support",
+            "instructions": "You provide friendly, helpful customer support responses.",
+            "specialization": "Customer inquiries",
+        }
+    ],
+}
+
+solana_agent = SolanaAgent(config=config)
+
+async for response in solana_agent.process("user123", "What are the latest AI developments?"):
+    print(response, end="")
+```
+
 To create a plugin like Solana Agent Kit - read the [code](https://github.com/truemagic-coder/solana-agent-kit)
 
-## Custom Inline Tool Usage
+### Custom Inline Tools
 
 ```python
 from solana_agent import SolanaAgent
@@ -241,31 +374,9 @@ class TestTool(Tool):
             }
 
 config = {
-    "business": { # optional
-        "mission": "To provide users with a one-stop shop for their queries.",
-        "values": {
-            "Friendliness": "Users must be treated fairly, openly, and with friendliness.",
-            "Ethical": "Agents must use a strong ethical framework in their interactions with users.",
-        },
-        "goals": [
-            "Empower users with great answers to their queries.",
-        ],
-        "voice": "The voice of the brand is that of a research business."
-    },
-    "openai": { # optional
+    "openai": {
         "api_key": "your-openai-api-key",
     },
-    "ollama": { # optional
-        "url": "your-ollama-url",
-    },
-    "mongo": { # optional
-        "connection_string": "mongodb://localhost:27017",
-        "database": "solana_agent"
-    },
-    "zep": { # optional
-        "api_key": "your-zep-api-key",
-        "base_url": "your-zep-base-url", # not applicable if using Zep Cloud
-    },
     "agents": [
         {
             "name": "research_specialist",
@@ -290,12 +401,81 @@ async for response in solana_agent.process("user123", "What are the latest AI de
     print(response, end="")
 ```
 
+### Custom Prompt Injection at Runtime
+
+```python
+from solana_agent import SolanaAgent
+
+config = {
+    "openai": {
+        "api_key": "your-openai-api-key",
+    },
+    "agents": [
+        {
+            "name": "research_specialist",
+            "instructions": "You are an expert researcher who synthesizes complex information clearly.",
+            "specialization": "Research and knowledge synthesis",
+        },
+        {
+            "name": "customer_support",
+            "instructions": "You provide friendly, helpful customer support responses.",
+            "specialization": "Customer inquiries",
+        }
+    ],
+}
+
+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?"):
+    print(response, end="")
+```
+
+### Custom Routing
+
+```python
+from solana_agent import SolanaAgent
+from solana_agent.interfaces.services.routing import RoutingService as RoutingServiceInterface
+
+config = {
+    "openai": {
+        "api_key": "your-openai-api-key",
+    },
+    "agents": [
+        {
+            "name": "research_specialist",
+            "instructions": "You are an expert researcher who synthesizes complex information clearly.",
+            "specialization": "Research and knowledge synthesis",
+        },
+        {
+            "name": "customer_support",
+            "instructions": "You provide friendly, helpful customer support responses.",
+            "specialization": "Customer inquiries",
+        }
+    ],
+}
+
+class Router(RoutingServiceInterface)
+    def __init__(self):
+        # your router initialization - delete the following pass
+        pass
+
+    async def route_query(self, query: str) -> str:
+        # a simple example to route always to customer_support agent
+        return "customer_support"
+
+router = Router()
+
+solana_agent = SolanaAgent(config=config)
+
+async for response in solana_agent.process("user123", "What are the latest AI developments?", router=router):
+    print(response, end="")
+```
+
 ## Notes
 * Solana Agent agents can only call one tool per response.
 * Solana Agent agents choose the best tool for the job.
 * Solana Agent tools do not use OpenAI function calling.
 * Solana Agent tools are async functions.
-* Solana Agent will use OpenAI for audio and Ollama and for text if both config vars are set
 
 ## Local Setup
 

{solana_agent-20.0.0.dist-info → solana_agent-20.1.4.dist-info}/RECORD

@@ -3,7 +3,7 @@ solana_agent/adapters/__init__.py,sha256=tiEEuuy0NF3ngc_tGEcRTt71zVI58v3dYY9RvMr
 solana_agent/adapters/llm_adapter.py,sha256=3_7whVsPSJdlzBVUBlV7RBRCCo2dMXNmlACIrCoQxQ4,5426
 solana_agent/adapters/mongodb_adapter.py,sha256=qqEFbY_v1XGyFXBmwd5HSXSSHnA9wWo-Hm1vGEyIG0k,2718
 solana_agent/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-solana_agent/client/solana_agent.py,sha256=CwUQHA76QiVmp9aNZcH1BVzD7I3LffwkvxtP5yLLmew,5003
+solana_agent/client/solana_agent.py,sha256=4xXPNNcULMEIx-V-_zu2IH0tlPjQU2ZzkIqZFuxAJHY,5206
 solana_agent/domains/__init__.py,sha256=HiC94wVPRy-QDJSSRywCRrhrFfTBeHjfi5z-QfZv46U,168
 solana_agent/domains/agent.py,sha256=WTo-pEc66V6D_35cpDE-kTsw1SJM-dtylPZ7em5em7Q,2659
 solana_agent/domains/routing.py,sha256=UDlgTjUoC9xIBVYu_dnf9-KG_bBgdEXAv_UtDOrYo0w,650
@@ -17,7 +17,7 @@ solana_agent/interfaces/providers/llm.py,sha256=f58kDrvESBfIr2XoZJ-VVa8vL56qyuhk
 solana_agent/interfaces/providers/memory.py,sha256=oNOH8WZXVW8assDigIWZAWiwkxbpDiKupxA2RB6tQvQ,1010
 solana_agent/interfaces/services/agent.py,sha256=34luGrUF5FNXLhF6JXwbfOSuo_SbMOmLMywG310sMDw,2082
 solana_agent/interfaces/services/query.py,sha256=m8Uc0uXT3apSOhX3N1QjLMPk1KdJhj7HDrJjWUpDPBc,1309
-solana_agent/interfaces/services/routing.py,sha256=gohkt5f9uYDLpu4iDVDk9yj8js9P56R6QHSIDNylgwA,438
+solana_agent/interfaces/services/routing.py,sha256=UzJC-z-Q9puTWPFGEo2_CAhIxuxP5IRnze7S66NSrsI,397
 solana_agent/plugins/__init__.py,sha256=coZdgJKq1ExOaj6qB810i3rEhbjdVlrkN76ozt_Ojgo,193
 solana_agent/plugins/manager.py,sha256=Il49hXeqvu0b02pURNNp7mY8kp9_sqpi_vJIWBW5Hc0,5044
 solana_agent/plugins/registry.py,sha256=5S0DlUQKogsg1zLiRUIGMHEmGYHtOovU-S-5W1Mwo1A,3639
@@ -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=eecl1P0fr_xFSWFKIJg99q90oCS9--ihPrMLH3G2AzM,7136
 solana_agent/services/__init__.py,sha256=ab_NXJmwYUCmCrCzuTlZ47bJZINW0Y0F5jfQ9OovidU,163
-solana_agent/services/agent.py,sha256=Nx3D7HrL9YRP1qI9Yzhm8HR8AXBfavFYnujXsSLdZ4A,16540
-solana_agent/services/query.py,sha256=4MEGR_Q2THcCCjln-IcSAw7GGNqJ1q2cyEVRx69OQ7I,10746
+solana_agent/services/agent.py,sha256=MdSPIC81JNuP2hfzXNGWOnRfe7OxwYHgDVZAphVCCo8,16450
+solana_agent/services/query.py,sha256=QduAeiltFTwNDlAbC_emu544U4XGNioj-OauRGt9HSY,11070
 solana_agent/services/routing.py,sha256=PMCSG5m3uLMaHMj3dxNvNfcFZaeaDi7kMr7AEBCzwDE,6499
-solana_agent-20.0.0.dist-info/LICENSE,sha256=BnSRc-NSFuyF2s496l_4EyrwAP6YimvxWcjPiJ0J7g4,1057
-solana_agent-20.0.0.dist-info/METADATA,sha256=JQWWGntl9adbkC5gSghwYANhwM7TIOMgsEZz-BDG0Pw,10961
-solana_agent-20.0.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-solana_agent-20.0.0.dist-info/RECORD,,
+solana_agent-20.1.4.dist-info/LICENSE,sha256=BnSRc-NSFuyF2s496l_4EyrwAP6YimvxWcjPiJ0J7g4,1057
+solana_agent-20.1.4.dist-info/METADATA,sha256=fnqm3cRwxnmHdvW2-2H1Xlg5n-h10Tzyh3rKE3G7VnI,15083
+solana_agent-20.1.4.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+solana_agent-20.1.4.dist-info/RECORD,,