solana-agent 27.0.0__tar.gz → 27.2.0__tar.gz

{solana_agent-27.0.0 → solana_agent-27.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: solana-agent
-Version: 27.0.0
+Version: 27.2.0
 Summary: Agentic IQ
 License: MIT
 Keywords: ai,openai,ai agents,agi
@@ -15,10 +15,10 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Requires-Dist: instructor (>=1.7.9,<2.0.0)
-Requires-Dist: openai (>=1.72.0,<2.0.0)
+Requires-Dist: openai (>=1.74.0,<2.0.0)
 Requires-Dist: pydantic (>=2.11.3,<3.0.0)
 Requires-Dist: pymongo (>=4.12.0,<5.0.0)
-Requires-Dist: zep-cloud (>=2.10.0,<3.0.0)
+Requires-Dist: zep-cloud (>=2.10.1,<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
@@ -76,16 +76,18 @@ Build your AI business in three lines of code!
 ### Tech
 
 * [Python](https://python.org) - Programming Language
-* [OpenAI](https://openai.com) - LLM Provider
+* [OpenAI](https://openai.com), [Google](https://ai.google.dev), [xAI](https://x.ai) - LLM Providers
 * [MongoDB](https://mongodb.com) - Conversational History (optional)
 * [Zep Cloud](https://getzep.com) - Conversational Memory (optional)
 
 ### LLMs
 
-* [gpt-4o-mini](https://platform.openai.com/docs/models/gpt-4o-mini)
-* [tts-1](https://platform.openai.com/docs/models/tts-1)
-* [gpt-4o-mini-transcribe](https://platform.openai.com/docs/models/gpt-4o-mini-transcribe)
-
+* [gpt-4.1-mini](https://platform.openai.com/docs/models/gpt-4.1-mini) (agent)
+* [gpt-4.1-nano](https://platform.openai.com/docs/models/gpt-4.1-nano) (router)
+* [gemini-2.0-flash](https://ai.google.dev/gemini-api/docs/models#gemini-2.0-flash) (optional)
+* [grok-3-mini-fast-beta](https://docs.x.ai/docs/models#models-and-pricing) (optional)
+* [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)
 
 ## Installation
 
@@ -301,6 +303,30 @@ config = {
 }
 ```
 
+### Gemini
+
+This allows Gemini to replace OpenAI for agent and router.
+
+```python
+config = {
+    "gemini": {
+        "api_key": "your-gemini-api-key",
+    },
+}
+```
+
+### Grok
+
+This allows Grok to replace OpenAI (or Gemini) for agent.
+
+```python
+config = {
+    "grok": {
+        "api_key": "your-grok-api-key",
+    },
+}
+```
+
 ## Tools
 
 Tools can be used from plugins like Solana Agent Kit (sakit) or via inline tools. Tools available via plugins integrate automatically with Solana Agent.

{solana_agent-27.0.0 → solana_agent-27.2.0}/README.md

@@ -51,16 +51,18 @@ Build your AI business in three lines of code!
 ### Tech
 
 * [Python](https://python.org) - Programming Language
-* [OpenAI](https://openai.com) - LLM Provider
+* [OpenAI](https://openai.com), [Google](https://ai.google.dev), [xAI](https://x.ai) - LLM Providers
 * [MongoDB](https://mongodb.com) - Conversational History (optional)
 * [Zep Cloud](https://getzep.com) - Conversational Memory (optional)
 
 ### LLMs
 
-* [gpt-4o-mini](https://platform.openai.com/docs/models/gpt-4o-mini)
-* [tts-1](https://platform.openai.com/docs/models/tts-1)
-* [gpt-4o-mini-transcribe](https://platform.openai.com/docs/models/gpt-4o-mini-transcribe)
-
+* [gpt-4.1-mini](https://platform.openai.com/docs/models/gpt-4.1-mini) (agent)
+* [gpt-4.1-nano](https://platform.openai.com/docs/models/gpt-4.1-nano) (router)
+* [gemini-2.0-flash](https://ai.google.dev/gemini-api/docs/models#gemini-2.0-flash) (optional)
+* [grok-3-mini-fast-beta](https://docs.x.ai/docs/models#models-and-pricing) (optional)
+* [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)
 
 ## Installation
 
@@ -276,6 +278,30 @@ config = {
 }
 ```
 
+### Gemini
+
+This allows Gemini to replace OpenAI for agent and router.
+
+```python
+config = {
+    "gemini": {
+        "api_key": "your-gemini-api-key",
+    },
+}
+```
+
+### Grok
+
+This allows Grok to replace OpenAI (or Gemini) for agent.
+
+```python
+config = {
+    "grok": {
+        "api_key": "your-grok-api-key",
+    },
+}
+```
+
 ## Tools
 
 Tools can be used from plugins like Solana Agent Kit (sakit) or via inline tools. Tools available via plugins integrate automatically with Solana Agent.

{solana_agent-27.0.0 → solana_agent-27.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "solana-agent"
-version = "27.0.0"
+version = "27.2.0"
 description = "Agentic IQ"
 authors = ["Bevan Hunt <bevan@bevanhunt.com>"]
 license = "MIT"
@@ -23,10 +23,10 @@ python_paths = [".", "tests"]
 
 [tool.poetry.dependencies]
 python = ">=3.12,<4.0"
-openai = "^1.72.0"
+openai = "^1.74.0"
 pydantic = "^2.11.3"
 pymongo = "^4.12.0"
-zep-cloud = "^2.10.0"
+zep-cloud = "^2.10.1"
 instructor = "^1.7.9"
 
 [tool.poetry.group.dev.dependencies]

solana_agent-27.0.0/solana_agent/adapters/llm_adapter.py → solana_agent-27.2.0/solana_agent/adapters/openai_adapter.py

@@ -20,8 +20,8 @@ class OpenAIAdapter(LLMProvider):
 
     def __init__(self, api_key: str):
         self.client = AsyncOpenAI(api_key=api_key)
-        self.parse_model = "gpt-4o-mini"
-        self.text_model = "gpt-4o-mini"
+        self.parse_model = "gpt-4.1-nano"
+        self.text_model = "gpt-4.1-mini"
         self.transcription_model = "gpt-4o-mini-transcribe"
         self.tts_model = "tts-1"
 
@@ -170,7 +170,6 @@ class OpenAIAdapter(LLMProvider):
             if model:
                 self.parse_model = model
 
-            # Create a patched client with TOOLS_STRICT mode
             patched_client = instructor.from_openai(
                 client, mode=Mode.TOOLS_STRICT)
 
@@ -187,9 +186,17 @@ class OpenAIAdapter(LLMProvider):
                 f"Error with instructor parsing (TOOLS_STRICT mode): {e}")
 
             try:
+                if api_key and base_url:
+                    client = AsyncOpenAI(api_key=api_key, base_url=base_url)
+                else:
+                    client = self.client
+
+                if model:
+                    self.parse_model = model
+
                 # First fallback: Try regular JSON mode
                 patched_client = instructor.from_openai(
-                    self.client, mode=Mode.JSON)
+                    client, mode=Mode.JSON)
                 response = await patched_client.chat.completions.create(
                     model=self.parse_model,
                     messages=messages,
@@ -201,6 +208,15 @@ class OpenAIAdapter(LLMProvider):
                 print(f"JSON mode fallback also failed: {json_error}")
 
                 try:
+                    if api_key and base_url:
+                        client = AsyncOpenAI(
+                            api_key=api_key, base_url=base_url)
+                    else:
+                        client = self.client
+
+                    if model:
+                        self.parse_model = model
+
                     # Final fallback: Manual extraction with a detailed prompt
                     fallback_system_prompt = f"""
                     {system_prompt}
@@ -212,7 +228,7 @@ class OpenAIAdapter(LLMProvider):
                     """
 
                     # Regular completion without instructor
-                    completion = await self.client.chat.completions.create(
+                    completion = await client.chat.completions.create(
                         model=self.parse_model,
                         messages=[
                             {"role": "system", "content": fallback_system_prompt},

{solana_agent-27.0.0 → solana_agent-27.2.0}/solana_agent/factories/agent_factory.py

@@ -15,7 +15,7 @@ from solana_agent.services.routing import RoutingService
 from solana_agent.repositories.memory import MemoryRepository
 
 # Adapter imports
-from solana_agent.adapters.llm_adapter import OpenAIAdapter
+from solana_agent.adapters.openai_adapter import OpenAIAdapter
 from solana_agent.adapters.mongodb_adapter import MongoDBAdapter
 
 # Domain and plugin imports
@@ -86,18 +86,75 @@ class SolanaAgentFactory:
                 zep_api_key=config["zep"].get("api_key")
             )
 
-        # Create primary services
-        agent_service = AgentService(
-            llm_provider=llm_adapter,
-            business_mission=business_mission,
-            config=config,
-        )
+        if "gemini" in config and "api_key" in config["gemini"] and not "grok" in config:
+            # Create primary services
+            agent_service = AgentService(
+                llm_provider=llm_adapter,
+                business_mission=business_mission,
+                config=config,
+                api_key=config["gemini"]["api_key"],
+                base_url="https://generativelanguage.googleapis.com/v1beta/openai/",
+                model="gemini-2.0-flash",
+            )
 
-        # 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://generativelanguage.googleapis.com/v1beta/openai/",
+                model="gemini-2.0-flash",
+            )
+
+        elif "gemini" in config and "api_key" in config["gemini"] and "grok" in config and "api_key" in config["grok"]:
+            # Create primary services
+            agent_service = AgentService(
+                llm_provider=llm_adapter,
+                business_mission=business_mission,
+                config=config,
+                api_key=config["grok"]["api_key"],
+                base_url="https://api.x.ai/v1",
+                model="grok-3-mini-fast-beta",
+            )
+            # 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.0-flash",
+            )
+
+        elif "grok" in config and "api_key" in config["grok"] and not "gemini" in config:
+            # Create primary services
+            agent_service = AgentService(
+                llm_provider=llm_adapter,
+                business_mission=business_mission,
+                config=config,
+                api_key=config["grok"]["api_key"],
+                base_url="https://api.x.ai/v1",
+                model="grok-3-mini-fast-beta",
+            )
+
+            # Create routing service
+            routing_service = RoutingService(
+                llm_provider=llm_adapter,
+                agent_service=agent_service,
+            )
+
+        else:
+            # Create primary services
+            agent_service = AgentService(
+                llm_provider=llm_adapter,
+                business_mission=business_mission,
+                config=config,
+            )
+
+            # Create routing service
+            routing_service = RoutingService(
+                llm_provider=llm_adapter,
+                agent_service=agent_service,
+            )
 
         # Debug the agent service tool registry
         print(