solana-agent 29.1.5__tar.gz → 29.2.0__tar.gz

{solana_agent-29.1.5 → solana_agent-29.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: solana-agent
-Version: 29.1.5
+Version: 29.2.0
 Summary: AI Agents for Solana
 License: MIT
 Keywords: solana,solana ai,solana agent,ai,ai agent,ai agents
@@ -14,19 +14,19 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
-Requires-Dist: instructor (==1.8.2)
+Requires-Dist: instructor (==1.8.3)
 Requires-Dist: llama-index-core (==0.12.37)
 Requires-Dist: llama-index-embeddings-openai (==0.3.1)
-Requires-Dist: logfire (==3.16.0)
-Requires-Dist: openai (==1.79.0)
+Requires-Dist: logfire (==3.16.1)
+Requires-Dist: openai (==1.82.0)
 Requires-Dist: pillow (==11.2.1)
-Requires-Dist: pinecone (==6.0.2)
+Requires-Dist: pinecone (==7.0.1)
 Requires-Dist: pydantic (>=2)
 Requires-Dist: pymongo (==4.13.0)
 Requires-Dist: pypdf (==5.5.0)
 Requires-Dist: rich (>=13,<14.0)
 Requires-Dist: scrubadub (==2.0.1)
-Requires-Dist: typer (==0.15.4)
+Requires-Dist: typer (==0.16.0)
 Requires-Dist: zep-cloud (==2.12.3)
 Project-URL: Documentation, https://docs.solana-agent.com
 Project-URL: Homepage, https://solana-agent.com
@@ -116,7 +116,7 @@ Build your AI agents in three lines of code!
 
 **OpenAI**
 * [gpt-4.1](https://platform.openai.com/docs/models/gpt-4.1) (agent - can be overridden)
-* [gpt-4.1-nano](https://platform.openai.com/docs/models/gpt-4.1-nano) (router)
+* [gpt-4.1-nano](https://platform.openai.com/docs/models/gpt-4.1-nano) (router - can be overridden)
 * [text-embedding-3-large](https://platform.openai.com/docs/models/text-embedding-3-large) (embedding)
 * [tts-1](https://platform.openai.com/docs/models/tts-1) (audio TTS)
 * [gpt-4o-mini-transcribe](https://platform.openai.com/docs/models/gpt-4o-mini-transcribe) (audio transcription)
@@ -125,12 +125,16 @@ Build your AI agents in three lines of code!
 
 **Grok**
 * [grok-3-fast](https://x.ai/api#pricing) (agent - optional)
+* [grok-3-mini-fast](https://x.ai/api#pricing) (router - optional)
 * [grok-2-image](https://x.ai/api#pricing) (image generation - optional)
 
 **Gemini**
-* [gemini-2.5-flash-preview-04-17](https://ai.google.dev/gemini-api/docs/models#gemini-2.5-flash-preview) (agent - optional)
+* [gemini-2.5-flash-preview-04-17](https://ai.google.dev/gemini-api/docs/models#gemini-2.5-flash-preview) (agent & router - optional)
 * [imagen-3.0-generate-002](https://ai.google.dev/gemini-api/docs/models#imagen-3) (image generation - optional)
 
+**Ollama**
+* [gemma:4b-it-qat](https://ollama.com/library/gemma3) - (agent & router - optional)
+
 ## Installation
 
 You can install Solana Agent using pip:
@@ -434,8 +438,6 @@ config = {
 
 ### Grok
 
-`grok-3-fast` can be used instead of `gpt-4.1` for the agent model
-
 ```python
 config = {
     "grok": {
@@ -446,8 +448,6 @@ config = {
 
 ### Gemini
 
-`gemini-2.5-pro-preview-03-25` can be used instead of `gpt-4.1` for the agent model
-
 ```python
 config = {
     "gemini": {
@@ -456,6 +456,16 @@ config = {
 }
 ```
 
+### Ollama
+
+```python
+config = {
+    "ollama": {
+        "api_key": "use-this-key-1010"
+    },
+}
+```
+
 ### Knowledge Base
 
 The Knowledge Base (KB) is meant to store text values and/or PDFs (extracts text) - can handle very large PDFs.

{solana_agent-29.1.5 → solana_agent-29.2.0}/README.md

@@ -81,7 +81,7 @@ Build your AI agents in three lines of code!
 
 **OpenAI**
 * [gpt-4.1](https://platform.openai.com/docs/models/gpt-4.1) (agent - can be overridden)
-* [gpt-4.1-nano](https://platform.openai.com/docs/models/gpt-4.1-nano) (router)
+* [gpt-4.1-nano](https://platform.openai.com/docs/models/gpt-4.1-nano) (router - can be overridden)
 * [text-embedding-3-large](https://platform.openai.com/docs/models/text-embedding-3-large) (embedding)
 * [tts-1](https://platform.openai.com/docs/models/tts-1) (audio TTS)
 * [gpt-4o-mini-transcribe](https://platform.openai.com/docs/models/gpt-4o-mini-transcribe) (audio transcription)
@@ -90,12 +90,16 @@ Build your AI agents in three lines of code!
 
 **Grok**
 * [grok-3-fast](https://x.ai/api#pricing) (agent - optional)
+* [grok-3-mini-fast](https://x.ai/api#pricing) (router - optional)
 * [grok-2-image](https://x.ai/api#pricing) (image generation - optional)
 
 **Gemini**
-* [gemini-2.5-flash-preview-04-17](https://ai.google.dev/gemini-api/docs/models#gemini-2.5-flash-preview) (agent - optional)
+* [gemini-2.5-flash-preview-04-17](https://ai.google.dev/gemini-api/docs/models#gemini-2.5-flash-preview) (agent & router - optional)
 * [imagen-3.0-generate-002](https://ai.google.dev/gemini-api/docs/models#imagen-3) (image generation - optional)
 
+**Ollama**
+* [gemma:4b-it-qat](https://ollama.com/library/gemma3) - (agent & router - optional)
+
 ## Installation
 
 You can install Solana Agent using pip:
@@ -399,8 +403,6 @@ config = {
 
 ### Grok
 
-`grok-3-fast` can be used instead of `gpt-4.1` for the agent model
-
 ```python
 config = {
     "grok": {
@@ -411,8 +413,6 @@ config = {
 
 ### Gemini
 
-`gemini-2.5-pro-preview-03-25` can be used instead of `gpt-4.1` for the agent model
-
 ```python
 config = {
     "gemini": {
@@ -421,6 +421,16 @@ config = {
 }
 ```
 
+### Ollama
+
+```python
+config = {
+    "ollama": {
+        "api_key": "use-this-key-1010"
+    },
+}
+```
+
 ### Knowledge Base
 
 The Knowledge Base (KB) is meant to store text values and/or PDFs (extracts text) - can handle very large PDFs.

{solana_agent-29.1.5 → solana_agent-29.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "solana-agent"
-version = "29.1.5"
+version = "29.2.0"
 description = "AI Agents for Solana"
 authors = ["Bevan Hunt <bevan@bevanhunt.com>"]
 license = "MIT"
@@ -24,25 +24,25 @@ python_paths = [".", "tests"]
 
 [tool.poetry.dependencies]
 python = ">=3.12,<4.0"
-openai = "1.79.0"
+openai = "1.82.0"
 pydantic = ">=2"
 pymongo = "4.13.0"
 zep-cloud = "2.12.3"
-instructor = "1.8.2"
-pinecone = "6.0.2"
+instructor = "1.8.3"
+pinecone = "7.0.1"
 llama-index-core = "0.12.37"
 llama-index-embeddings-openai = "0.3.1"
 pypdf = "5.5.0"
 scrubadub = "2.0.1"
-logfire = "3.16.0"
-typer = "0.15.4"
+logfire = "3.16.1"
+typer = "0.16.0"
 rich = ">=13,<14.0"
 pillow = "11.2.1"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.3.5"
 pytest-cov = "^6.1.1"
-pytest-asyncio = "^0.26.0"
+pytest-asyncio = "^1.0.0"
 pytest-mock = "^3.14.0"
 pytest-github-actions-annotate-failures = "^0.3.0"
 sphinx = "^8.2.3"

{solana_agent-29.1.5 → solana_agent-29.2.0}/solana_agent/factories/agent_factory.py

@@ -168,6 +168,12 @@ class SolanaAgentFactory:
             output_guardrails=output_guardrails,
         )
 
+        # Create routing service
+        routing_service = RoutingService(
+            llm_provider=llm_adapter,
+            agent_service=agent_service,
+        )
+
         if "gemini" in config and "api_key" in config["gemini"]:
             # Create primary services
             agent_service = AgentService(
@@ -180,6 +186,15 @@ class SolanaAgentFactory:
                 output_guardrails=output_guardrails,
             )  # pragma: no cover
 
+            # Create routing service
+            routing_service = RoutingService(
+                llm_provider=llm_adapter,
+                agent_service=agent_service,
+                api_key=config["gemini"]["api_key"],
+                base_url="https://generativelanguage.googleapis.com/v1beta/openai/",
+                model="gemini-2.5-flash-preview-05-20",
+            )  # pragma: no cover
+
         elif "grok" in config and "api_key" in config["grok"]:
             # Create primary services
             agent_service = AgentService(
@@ -192,11 +207,35 @@ class SolanaAgentFactory:
                 output_guardrails=output_guardrails,
             )  # pragma: no cover
 
-        # Create routing service
-        routing_service = RoutingService(
-            llm_provider=llm_adapter,
-            agent_service=agent_service,
-        )
+            # Create routing service
+            routing_service = RoutingService(
+                llm_provider=llm_adapter,
+                agent_service=agent_service,
+                api_key=config["gemini"]["api_key"],
+                base_url="https://api.x.ai/v1",
+                model="grok-3-mini-fast",
+            )  # pragma: no cover
+
+        elif "ollama" in config and "api_key" in config["ollama"]:
+            # Create primary services
+            agent_service = AgentService(
+                llm_provider=llm_adapter,
+                business_mission=business_mission,
+                config=config,
+                api_key=config["ollama"]["api_key"],
+                base_url="http://localhost:11434/v1",
+                model="gemma3:4b-it-qat",
+                output_guardrails=output_guardrails,
+            )  # pragma: no cover
+
+            # Create routing service
+            routing_service = RoutingService(
+                llm_provider=llm_adapter,
+                agent_service=agent_service,
+                api_key=config["ollama"]["api_key"],
+                base_url="http://localhost:11434/v1",
+                model="gemma3:4b-it-qat",
+            )  # pragma: no cover
 
         # Debug the agent service tool registry
         logger.debug(  # Use logger.debug

{solana_agent-29.1.5 → solana_agent-29.2.0}/solana_agent/services/agent.py

@@ -773,13 +773,14 @@ class AgentService(AgentServiceInterface):
 
     def _get_tool_usage_prompt(self, agent_name: str) -> str:
         """Generate marker-based instructions for tool usage."""
-        tools = self.get_agent_tools(agent_name)
-        if not tools:
+        # Only include tools actually assigned to this agent
+        agent_tools = self.tool_registry.get_agent_tools(agent_name)
+        if not agent_tools:
             return ""
 
         # Simplify tool representation for the prompt
         simplified_tools = []
-        for tool in tools:
+        for tool in agent_tools:
             simplified_tool = {
                 "name": tool.get("name"),
                 "description": tool.get("description"),