solana-agent 29.3.0__py3-none-any.whl → 30.0.0__py3-none-any.whl

solana_agent/adapters/openai_adapter.py

@@ -33,8 +33,8 @@ logger = logging.getLogger(__name__)
 
 T = TypeVar("T", bound=BaseModel)
 
-DEFAULT_CHAT_MODEL = "gpt-4.1"
-DEFAULT_VISION_MODEL = "gpt-4.1"
+DEFAULT_CHAT_MODEL = "gpt-4.1-nano"
+DEFAULT_VISION_MODEL = "gpt-4.1-nano"
 DEFAULT_PARSE_MODEL = "gpt-4.1-nano"
 DEFAULT_EMBEDDING_MODEL = "text-embedding-3-large"
 DEFAULT_EMBEDDING_DIMENSIONS = 3072
@@ -163,9 +163,8 @@ class OpenAIAdapter(LLMProvider):
         api_key: Optional[str] = None,
         base_url: Optional[str] = None,
         model: Optional[str] = None,
-        functions: Optional[List[Dict[str, Any]]] = None,
-        function_call: Optional[Union[str, Dict[str, Any]]] = None,
-    ) -> Any:  # pragma: no cover
+        tools: Optional[List[Dict[str, Any]]] = None,
+    ) -> str:  # pragma: no cover
         """Generate text or function call from OpenAI models."""
         messages = []
         if system_prompt:
@@ -176,10 +175,8 @@ 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 tools:
+            request_params["tools"] = tools
 
         if api_key and base_url:
             client = AsyncOpenAI(api_key=api_key, base_url=base_url)
@@ -410,8 +407,7 @@ class OpenAIAdapter(LLMProvider):
         api_key: Optional[str] = None,
         base_url: Optional[str] = None,
         model: Optional[str] = None,
-        functions: Optional[List[Dict[str, Any]]] = None,
-        function_call: Optional[Union[str, Dict[str, Any]]] = None,
+        tools: Optional[List[Dict[str, Any]]] = None,
     ) -> T:  # pragma: no cover
         """Generate structured output using Pydantic model parsing with Instructor."""
 
@@ -439,10 +435,8 @@ class OpenAIAdapter(LLMProvider):
                 "response_model": model_class,
                 "max_retries": 2,  # Automatically retry on validation errors
             }
-            if functions:
-                create_args["tools"] = functions
-            if function_call:
-                create_args["function_call"] = function_call
+            if tools:
+                create_args["tools"] = tools
 
             response = await patched_client.chat.completions.create(**create_args)
             return response

solana_agent/factories/agent_factory.py

@@ -195,27 +195,6 @@ class SolanaAgentFactory:
                 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(
-                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-fast",
-                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://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(

solana_agent/interfaces/providers/llm.py

@@ -28,8 +28,7 @@ class LLMProvider(ABC):
         api_key: Optional[str] = None,
         base_url: Optional[str] = None,
         model: Optional[str] = None,
-        functions: Optional[List[Dict[str, Any]]] = None,
-        function_call: Optional[Union[str, Dict[str, Any]]] = None,
+        tools: Optional[List[Dict[str, Any]]] = None,
     ) -> Any:
         """Generate text from the language model."""
         pass
@@ -43,8 +42,7 @@ class LLMProvider(ABC):
         api_key: Optional[str] = None,
         base_url: Optional[str] = None,
         model: Optional[str] = None,
-        functions: Optional[List[Dict[str, Any]]] = None,
-        function_call: Optional[Union[str, Dict[str, Any]]] = None,
+        tools: Optional[List[Dict[str, Any]]] = None,
     ) -> T:
         """Generate structured output using a specific model class."""
         pass
@@ -106,6 +104,7 @@ class LLMProvider(ABC):
         images: List[Union[str, bytes]],
         system_prompt: str = "",
         detail: Literal["low", "high", "auto"] = "auto",
+        tools: Optional[List[Dict[str, Any]]] = None,
     ) -> str:
         """Generate text from the language model using images."""
         pass

solana_agent/services/agent.py

@@ -267,11 +267,15 @@ class AgentService(AgentServiceInterface):
         full_prompt += f"USER IDENTIFIER: {user_id}"
 
         # Get OpenAI function schemas for this agent's tools
-        functions = [
+        tools = [
             {
-                "name": tool["name"],
-                "description": tool.get("description", ""),
-                "parameters": tool.get("parameters", {}),
+                "type": "function",
+                "function": {
+                    "name": tool["name"],
+                    "description": tool.get("description", ""),
+                    "parameters": tool.get("parameters", {}),
+                    "strict": True,
+                },
             }
             for tool in self.get_agent_tools(agent_name)
         ]
@@ -286,8 +290,7 @@ class AgentService(AgentServiceInterface):
                     api_key=self.api_key,
                     base_url=self.base_url,
                     model=self.model,
-                    functions=functions if functions else None,
-                    function_call="auto" if functions else None,
+                    tools=tools if tools else None,
                 )
                 yield model_instance
                 return
@@ -295,15 +298,25 @@ class AgentService(AgentServiceInterface):
             # --- Streaming text/audio with tool support (as before) ---
             response_text = ""
             while True:
-                response = await self.llm_provider.generate_text(
-                    prompt=full_prompt,
-                    system_prompt=system_prompt,
-                    functions=functions if functions else None,
-                    function_call="auto" if functions else None,
-                    api_key=self.api_key,
-                    base_url=self.base_url,
-                    model=self.model,
-                )
+                if not images:
+                    response = await self.llm_provider.generate_text(
+                        prompt=full_prompt,
+                        system_prompt=system_prompt,
+                        api_key=self.api_key,
+                        base_url=self.base_url,
+                        model=self.model,
+                        tools=tools if tools else None,
+                    )
+                else:
+                    response = await self.llm_provider.generate_text_with_images(
+                        prompt=full_prompt,
+                        system_prompt=system_prompt,
+                        api_key=self.api_key,
+                        base_url=self.base_url,
+                        model=self.model,
+                        tools=tools if tools else None,
+                        images=images,
+                    )
                 if (
                     not response
                     or not hasattr(response, "choices")
@@ -316,25 +329,24 @@ class AgentService(AgentServiceInterface):
                 choice = response.choices[0]
                 message = getattr(choice, "message", choice)
 
-                # If the model wants to call a function/tool
-                if hasattr(message, "function_call") and message.function_call:
-                    function_name = message.function_call.name
-                    arguments = json.loads(message.function_call.arguments)
-                    logger.info(
-                        f"Model requested tool '{function_name}' with args: {arguments}"
-                    )
-
-                    # Execute the tool (async)
-                    tool_result = await self.execute_tool(
-                        agent_name, function_name, arguments
-                    )
-
-                    # Add the tool result to the prompt for the next round
-                    full_prompt += (
-                        f"\n\nTool '{function_name}' was called with arguments {arguments}.\n"
-                        f"Result: {tool_result}\n"
-                    )
-                    continue  # Loop again, LLM will see tool result and may call another tool or finish
+                if hasattr(message, "tool_calls") and message.tool_calls:
+                    for tool_call in message.tool_calls:
+                        if tool_call.type == "function":
+                            function_name = tool_call.function.name
+                            arguments = json.loads(tool_call.function.arguments)
+                            logger.info(
+                                f"Model requested tool '{function_name}' with args: {arguments}"
+                            )
+                            # Execute the tool (async)
+                            tool_result = await self.execute_tool(
+                                agent_name, function_name, arguments
+                            )
+                            # Add the tool result to the prompt for the next round
+                            full_prompt += (
+                                f"\n\nTool '{function_name}' was called with arguments {arguments}.\n"
+                                f"Result: {tool_result}\n"
+                            )
+                    continue
 
                 # Otherwise, it's a normal message (final answer)
                 response_text = message.content

{solana_agent-29.3.0.dist-info → solana_agent-30.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: solana-agent
-Version: 29.3.0
+Version: 30.0.0
 Summary: AI Agents for Solana
 License: MIT
 Keywords: solana,solana ai,solana agent,ai,ai agent,ai agents
@@ -53,7 +53,6 @@ Build your AI agents in three lines of code!
 * Three lines of code setup
 * Simple Agent Definition
 * Fast Responses
-* Multi-Vendor Support
 * Solana Integration
 * Multi-Agent Swarm
 * Multi-Modal (Images & Audio & Text)
@@ -79,7 +78,6 @@ Build your AI agents in three lines of code!
 * Easy three lines of code setup
 * Simple agent definition using JSON
 * Fast AI responses
-* Multi-vendor support including OpenAI, Grok, and Gemini AI services
 * Solana Integration
 * MCP tool usage with first-class support for [Zapier](https://zapier.com/mcp)
 * Integrated observability and tracing via [Pydantic Logfire](https://pydantic.dev/logfire)
@@ -114,25 +112,10 @@ Build your AI agents in three lines of code!
 ### AI Models Used
 
 **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 - can be overridden)
+* [gpt-4.1-nano](https://platform.openai.com/docs/models/gpt-4.1-nano) (agent & router)
 * [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)
-* [gpt-image-1](https://platform.openai.com/docs/models/gpt-image-1) (image generation - can be overridden)
-* [gpt-4o-mini-search-preview](https://platform.openai.com/docs/models/gpt-4o-mini-search-preview) (Internet search)
-
-**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 & 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
 
@@ -467,36 +450,6 @@ config = {
 }
 ```
 
-### Grok
-
-```python
-config = {
-    "grok": {
-        "api_key": "your-grok-api-key",
-    },
-}
-```
-
-### Gemini
-
-```python
-config = {
-    "gemini": {
-        "api_key": "your-gemini-api-key",
-    },
-}
-```
-
-### 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.3.0.dist-info → solana_agent-30.0.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 solana_agent/__init__.py,sha256=g83qhMOCwcWL19V4CYbQwl0Ykpb0xn49OUh05i-pu3g,1001
 solana_agent/adapters/__init__.py,sha256=tiEEuuy0NF3ngc_tGEcRTt71zVI58v3dYY9RvMrF2Cg,204
 solana_agent/adapters/mongodb_adapter.py,sha256=Hq3S8VzfLmnPjV40z8yJXGqUamOJcX5GbOMd-1nNWO4,3175
-solana_agent/adapters/openai_adapter.py,sha256=2-YvMbrBdrHCkMt1qJPD6B926vgfEdkHqnbu3exUe9c,23584
+solana_agent/adapters/openai_adapter.py,sha256=l1KQch01LhtbKFHz76oXI1Lvz_AM2zZzCMh2qOcbzmM,23253
 solana_agent/adapters/pinecone_adapter.py,sha256=XlfOpoKHwzpaU4KZnovO2TnEYbsw-3B53ZKQDtBeDgU,23847
 solana_agent/cli.py,sha256=FGvTIQmKLp6XsQdyKtuhIIfbBtMmcCCXfigNrj4bzMc,4704
 solana_agent/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -10,14 +10,14 @@ solana_agent/domains/__init__.py,sha256=HiC94wVPRy-QDJSSRywCRrhrFfTBeHjfi5z-QfZv
 solana_agent/domains/agent.py,sha256=3Q1wg4eIul0CPpaYBOjEthKTfcdhf1SAiWc2R-IMGO8,2561
 solana_agent/domains/routing.py,sha256=1yR4IswGcmREGgbOOI6TKCfuM7gYGOhQjLkBqnZ-rNo,582
 solana_agent/factories/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-solana_agent/factories/agent_factory.py,sha256=P8d-wGdWhksu79jngwTtL4jOeMjeo3OfiUJhwPWVh7U,15897
+solana_agent/factories/agent_factory.py,sha256=IekAzqLSQe1pvtFr124JvyESoWHZeP7FKK7pVuqD85E,15058
 solana_agent/guardrails/pii.py,sha256=FCz1IC3mmkr41QFFf5NaC0fwJrVkwFsxgyOCS2POO5I,4428
 solana_agent/interfaces/__init__.py,sha256=IQs1WIM1FeKP1-kY2FEfyhol_dB-I-VAe2rD6jrVF6k,355
 solana_agent/interfaces/client/client.py,sha256=9hg35-hp_CI-WVGOXehBE1ZCKYahLmbeAvtQOYmML4o,3245
 solana_agent/interfaces/guardrails/guardrails.py,sha256=gZCQ1FrirW-mX6s7FoYrbRs6golsp-x269kk4kQiZzc,572
 solana_agent/interfaces/plugins/plugins.py,sha256=Rz52cWBLdotwf4kV-2mC79tRYlN29zHSu1z9-y1HVPk,3329
 solana_agent/interfaces/providers/data_storage.py,sha256=Y92Cq8BtC55VlsYLD7bo3ofqQabNnlg7Q4H1Q6CDsLU,1713
-solana_agent/interfaces/providers/llm.py,sha256=Si1xvybHKC6bhjTYjGQi5K9PO9WA7Te29oqs24jxRlY,2998
+solana_agent/interfaces/providers/llm.py,sha256=Naj8gTGi3GpIMFHKwQjw7EuAF_uSWwwz2-41iUYtov4,2908
 solana_agent/interfaces/providers/memory.py,sha256=h3HEOwWCiFGIuFBX49XOv1jFaQW3NGjyKPOfmQloevk,1011
 solana_agent/interfaces/providers/vector_storage.py,sha256=XPYzvoWrlDVFCS9ItBmoqCFWXXWNYY-d9I7_pvP7YYk,1561
 solana_agent/interfaces/services/agent.py,sha256=A-Hmgelr3g_qaNB0PEPMFHxB5nSCBK0WJ5hauJtIcmI,2257
@@ -32,12 +32,12 @@ solana_agent/plugins/tools/auto_tool.py,sha256=uihijtlc9CCqCIaRcwPuuN7o1SHIpWL2G
 solana_agent/repositories/__init__.py,sha256=fP83w83CGzXLnSdq-C5wbw9EhWTYtqE2lQTgp46-X_4,163
 solana_agent/repositories/memory.py,sha256=SKQJJisrERccqd4cm4ERlp5BmKHVQAp1fzp8ce4i2bw,8377
 solana_agent/services/__init__.py,sha256=iko0c2MlF8b_SA_nuBGFllr2E3g_JowOrOzGcnU9tkA,162
-solana_agent/services/agent.py,sha256=kznv2Jhpc4DiFbB-kV3eG5FuPPgl2Hu26h5yCsxyCuw,18624
+solana_agent/services/agent.py,sha256=acfauSIdDQdwuvqyDpx6VryQpL3nNfss3NlVtnI_kUg,19191
 solana_agent/services/knowledge_base.py,sha256=ZvOPrSmcNDgUzz4bJIQ4LeRl9vMZiK9hOfs71IpB7Bk,32735
 solana_agent/services/query.py,sha256=3v5Ym8UqL0rfOC-0MWHALAsS2jVWdpUR3A-YI9n0xyo,18771
 solana_agent/services/routing.py,sha256=C5Ku4t9TqvY7S8wlUPMTC04HCrT4Ib3E8Q8yX0lVU_s,7137
-solana_agent-29.3.0.dist-info/LICENSE,sha256=BnSRc-NSFuyF2s496l_4EyrwAP6YimvxWcjPiJ0J7g4,1057
-solana_agent-29.3.0.dist-info/METADATA,sha256=YYGG6n8-S23KwMjDY3Rmec7DcCHaVTv8e4lecOB9J7I,29849
-solana_agent-29.3.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-solana_agent-29.3.0.dist-info/entry_points.txt,sha256=-AuT_mfqk8dlZ0pHuAjx1ouAWpTRjpqvEUa6YV3lmc0,53
-solana_agent-29.3.0.dist-info/RECORD,,
+solana_agent-30.0.0.dist-info/LICENSE,sha256=BnSRc-NSFuyF2s496l_4EyrwAP6YimvxWcjPiJ0J7g4,1057
+solana_agent-30.0.0.dist-info/METADATA,sha256=MWvby4A_W0bi7MZS4xwQ5MBKOl3U99kcwctE1_m_sjQ,28557
+solana_agent-30.0.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+solana_agent-30.0.0.dist-info/entry_points.txt,sha256=-AuT_mfqk8dlZ0pHuAjx1ouAWpTRjpqvEUa6YV3lmc0,53
+solana_agent-30.0.0.dist-info/RECORD,,