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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: solana-agent
-Version: 29.1.5
+Version: 29.2.1
 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
@@ -41,9 +41,7 @@ Description-Content-Type: text/markdown
 [![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT)
 [![codecov](https://img.shields.io/codecov/c/github/truemagic-coder/solana-agent/main.svg)](https://codecov.io/gh/truemagic-coder/solana-agent)
 [![Build Status](https://img.shields.io/github/actions/workflow/status/truemagic-coder/solana-agent/ci.yml?branch=main)](https://github.com/truemagic-coder/solana-agent/actions/workflows/ci.yml)
-[![Lines of Code](https://tokei.rs/b1/github/truemagic-coder/solana-agent?type=python&category=code&style=flat)](https://github.com/truemagic-coder/solana-agent)
 [![Ruff Style](https://img.shields.io/badge/style-ruff-41B5BE)](https://github.com/astral-sh/ruff)
-[![Libraries.io dependency status for GitHub repo](https://img.shields.io/librariesio/github/truemagic-coder/solana-agent)](https://libraries.io/pypi/solana-agent)
 
 ![Solana Agent Logo](https://dl.walletbubbles.com/solana-agent-logo.png?width=200)
 
@@ -116,7 +114,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 +123,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 +436,6 @@ config = {
 
 ### Grok
 
-`grok-3-fast` can be used instead of `gpt-4.1` for the agent model
-
 ```python
 config = {
     "grok": {
@@ -446,8 +446,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 +454,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.1}/README.md

@@ -6,9 +6,7 @@
 [![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT)
 [![codecov](https://img.shields.io/codecov/c/github/truemagic-coder/solana-agent/main.svg)](https://codecov.io/gh/truemagic-coder/solana-agent)
 [![Build Status](https://img.shields.io/github/actions/workflow/status/truemagic-coder/solana-agent/ci.yml?branch=main)](https://github.com/truemagic-coder/solana-agent/actions/workflows/ci.yml)
-[![Lines of Code](https://tokei.rs/b1/github/truemagic-coder/solana-agent?type=python&category=code&style=flat)](https://github.com/truemagic-coder/solana-agent)
 [![Ruff Style](https://img.shields.io/badge/style-ruff-41B5BE)](https://github.com/astral-sh/ruff)
-[![Libraries.io dependency status for GitHub repo](https://img.shields.io/librariesio/github/truemagic-coder/solana-agent)](https://libraries.io/pypi/solana-agent)
 
 ![Solana Agent Logo](https://dl.walletbubbles.com/solana-agent-logo.png?width=200)
 
@@ -81,7 +79,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 +88,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 +401,6 @@ config = {
 
 ### Grok
 
-`grok-3-fast` can be used instead of `gpt-4.1` for the agent model
-
 ```python
 config = {
     "grok": {
@@ -411,8 +411,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 +419,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.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "solana-agent"
-version = "29.1.5"
+version = "29.2.1"
 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.1}/solana_agent/adapters/openai_adapter.py

@@ -163,8 +163,10 @@ class OpenAIAdapter(LLMProvider):
         api_key: Optional[str] = None,
         base_url: Optional[str] = None,
         model: Optional[str] = None,
-    ) -> str:  # pragma: no cover
-        """Generate text from OpenAI models as a single string (no images)."""
+        functions: Optional[List[Dict[str, Any]]] = None,
+        function_call: Optional[Union[str, Dict[str, Any]]] = None,
+    ) -> Any:  # pragma: no cover
+        """Generate text or function call from OpenAI models."""
         messages = []
         if system_prompt:
             messages.append({"role": "system", "content": system_prompt})
@@ -174,6 +176,10 @@ class OpenAIAdapter(LLMProvider):
             "messages": messages,
             "model": model or self.text_model,
         }
+        if functions:
+            request_params["functions"] = functions
+        if function_call:
+            request_params["function_call"] = function_call
 
         if api_key and base_url:
             client = AsyncOpenAI(api_key=api_key, base_url=base_url)
@@ -185,17 +191,13 @@ class OpenAIAdapter(LLMProvider):
 
         try:
             response = await client.chat.completions.create(**request_params)
-            if response.choices and response.choices[0].message.content:
-                return response.choices[0].message.content
-            else:
-                logger.warning("Received non-streaming response with no content.")
-                return ""
-        except OpenAIError as e:  # Catch specific OpenAI errors
+            return response
+        except OpenAIError as e:
             logger.error(f"OpenAI API error during text generation: {e}")
-            return f"I apologize, but I encountered an API error: {e}"
+            return None
         except Exception as e:
             logger.exception(f"Error in generate_text: {e}")
-            return f"I apologize, but I encountered an unexpected error: {e}"
+            return None
 
     def _calculate_gpt41_image_cost(self, width: int, height: int, model: str) -> int:
         """Calculates the token cost for an image with GPT-4.1 models."""

{solana_agent-29.1.5 → solana_agent-29.2.1}/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.1}/solana_agent/interfaces/providers/llm.py

@@ -1,6 +1,8 @@
 from abc import ABC, abstractmethod
 from typing import (
+    Any,
     AsyncGenerator,
+    Dict,
     List,
     Literal,
     Optional,
@@ -26,7 +28,9 @@ class LLMProvider(ABC):
         api_key: Optional[str] = None,
         base_url: Optional[str] = None,
         model: Optional[str] = None,
-    ) -> str:
+        functions: Optional[List[Dict[str, Any]]] = None,
+        function_call: Optional[Union[str, Dict[str, Any]]] = None,
+    ) -> Any:
         """Generate text from the language model."""
         pass