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

solana_agent/adapters/openai_adapter.py

@@ -410,6 +410,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,
     ) -> T:  # pragma: no cover
         """Generate structured output using Pydantic model parsing with Instructor."""
 
@@ -431,13 +433,18 @@ class OpenAIAdapter(LLMProvider):
 
             patched_client = instructor.from_openai(client, mode=Mode.TOOLS_STRICT)
 
-            # Use instructor's structured generation with function calling
-            response = await patched_client.chat.completions.create(
-                model=current_parse_model,  # Use the determined model
-                messages=messages,
-                response_model=model_class,
-                max_retries=2,  # Automatically retry on validation errors
-            )
+            create_args = {
+                "model": current_parse_model,
+                "messages": messages,
+                "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
+
+            response = await patched_client.chat.completions.create(**create_args)
             return response
         except Exception as e:
             logger.warning(

solana_agent/client/solana_agent.py

@@ -7,7 +7,9 @@ the agent system without dealing with internal implementation details.
 
 import json
 import importlib.util
-from typing import AsyncGenerator, Dict, Any, List, Literal, Optional, Union
+from typing import AsyncGenerator, Dict, Any, List, Literal, Optional, Type, Union
+
+from pydantic import BaseModel
 
 from solana_agent.factories.agent_factory import SolanaAgentFactory
 from solana_agent.interfaces.client.client import SolanaAgent as SolanaAgentInterface
@@ -69,7 +71,8 @@ class SolanaAgent(SolanaAgentInterface):
         ] = "mp4",
         router: Optional[RoutingInterface] = None,
         images: Optional[List[Union[str, bytes]]] = None,
-    ) -> AsyncGenerator[Union[str, bytes], None]:  # pragma: no cover
+        output_model: Optional[Type[BaseModel]] = None,
+    ) -> AsyncGenerator[Union[str, bytes, BaseModel], None]:  # pragma: no cover
         """Process a user message (text or audio) and optional images, returning the response stream.
 
         Args:
@@ -83,6 +86,7 @@ class SolanaAgent(SolanaAgentInterface):
             audio_input_format: Audio input format
             router: Optional routing service for processing
             images: Optional list of image URLs (str) or image bytes.
+            output_model: Optional Pydantic model for structured output
 
         Returns:
             Async generator yielding response chunks (text strings or audio bytes)
@@ -98,6 +102,7 @@ class SolanaAgent(SolanaAgentInterface):
             audio_input_format=audio_input_format,
             prompt=prompt,
             router=router,
+            output_model=output_model,
         ):
             yield chunk
 

solana_agent/interfaces/client/client.py

@@ -1,5 +1,7 @@
 from abc import ABC, abstractmethod
-from typing import AsyncGenerator, Dict, Any, List, Literal, Optional, Union
+from typing import AsyncGenerator, Dict, Any, List, Literal, Optional, Type, Union
+
+from pydantic import BaseModel
 from solana_agent.interfaces.plugins.plugins import Tool
 from solana_agent.interfaces.services.routing import RoutingService as RoutingInterface
 
@@ -35,7 +37,8 @@ class SolanaAgent(ABC):
         ] = "mp4",
         router: Optional[RoutingInterface] = None,
         images: Optional[List[Union[str, bytes]]] = None,
-    ) -> AsyncGenerator[Union[str, bytes], None]:
+        output_model: Optional[Type[BaseModel]] = None,
+    ) -> AsyncGenerator[Union[str, bytes, BaseModel], None]:
         """Process a user message and return the response stream."""
         pass
 

solana_agent/interfaces/providers/llm.py

@@ -43,6 +43,8 @@ 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,
     ) -> T:
         """Generate structured output using a specific model class."""
         pass

solana_agent/interfaces/services/agent.py

@@ -1,5 +1,7 @@
 from abc import ABC, abstractmethod
-from typing import Any, AsyncGenerator, Dict, List, Literal, Optional, Union
+from typing import Any, AsyncGenerator, Dict, List, Literal, Optional, Type, Union
+
+from pydantic import BaseModel
 
 from solana_agent.domains.agent import AIAgent
 
@@ -45,7 +47,8 @@ class AgentService(ABC):
         ] = "aac",
         prompt: Optional[str] = None,
         images: Optional[List[Union[str, bytes]]] = None,
-    ) -> AsyncGenerator[Union[str, bytes], None]:
+        output_model: Optional[Type[BaseModel]] = None,
+    ) -> AsyncGenerator[Union[str, bytes, BaseModel], None]:
         """Generate a response from an agent."""
         pass
 

solana_agent/interfaces/services/query.py

@@ -1,5 +1,7 @@
 from abc import ABC, abstractmethod
-from typing import Any, AsyncGenerator, Dict, List, Literal, Optional, Union
+from typing import Any, AsyncGenerator, Dict, List, Literal, Optional, Type, Union
+
+from pydantic import BaseModel
 
 from solana_agent.interfaces.services.routing import RoutingService as RoutingInterface
 
@@ -35,7 +37,8 @@ class QueryService(ABC):
         prompt: Optional[str] = None,
         router: Optional[RoutingInterface] = None,
         images: Optional[List[Union[str, bytes]]] = None,
-    ) -> AsyncGenerator[Union[str, bytes], None]:
+        output_model: Optional[Type[BaseModel]] = None,
+    ) -> AsyncGenerator[Union[str, bytes, BaseModel], None]:
         """Process the user request and generate a response."""
         pass
 

solana_agent/services/agent.py

@@ -10,7 +10,9 @@ from datetime import datetime
 import json
 import logging  # Add logging
 import re
-from typing import AsyncGenerator, Dict, List, Literal, Optional, Any, Union
+from typing import AsyncGenerator, Dict, List, Literal, Optional, Any, Type, Union
+
+from pydantic import BaseModel
 
 from solana_agent.interfaces.services.agent import AgentService as AgentServiceInterface
 from solana_agent.interfaces.providers.llm import LLMProvider
@@ -229,8 +231,9 @@ class AgentService(AgentServiceInterface):
             "mp3", "opus", "aac", "flac", "wav", "pcm"
         ] = "aac",
         prompt: Optional[str] = None,
-    ) -> AsyncGenerator[Union[str, bytes], None]:  # pragma: no cover
-        """Generate a response using OpenAI function calling (tools API) via generate_text."""
+        output_model: Optional[Type[BaseModel]] = None,
+    ) -> AsyncGenerator[Union[str, bytes, BaseModel], None]:  # pragma: no cover
+        """Generate a response using OpenAI function calling (tools API) or structured output."""
 
         agent = next((a for a in self.agents if a.name == agent_name), None)
         if not agent:
@@ -252,9 +255,7 @@ class AgentService(AgentServiceInterface):
         system_prompt = self.get_agent_system_prompt(agent_name)
         user_content = str(query)
         if images:
-            user_content += (
-                "\n\n[Images attached]"  # Optionally, handle images as needed
-            )
+            user_content += "\n\n[Images attached]"
 
         # Compose the prompt for generate_text
         full_prompt = ""
@@ -266,18 +267,33 @@ class AgentService(AgentServiceInterface):
         full_prompt += f"USER IDENTIFIER: {user_id}"
 
         # Get OpenAI function schemas for this agent's tools
-        functions = []
-        for tool in self.get_agent_tools(agent_name):
-            functions.append(
-                {
-                    "name": tool["name"],
-                    "description": tool.get("description", ""),
-                    "parameters": tool.get("parameters", {}),
-                }
-            )
+        functions = [
+            {
+                "name": tool["name"],
+                "description": tool.get("description", ""),
+                "parameters": tool.get("parameters", {}),
+            }
+            for tool in self.get_agent_tools(agent_name)
+        ]
 
-        response_text = ""
         try:
+            if output_model is not None:
+                # --- Structured output with tool support ---
+                model_instance = await self.llm_provider.parse_structured_output(
+                    prompt=full_prompt,
+                    system_prompt=system_prompt,
+                    model_class=output_model,
+                    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,
+                )
+                yield model_instance
+                return
+
+            # --- Streaming text/audio with tool support (as before) ---
+            response_text = ""
             while True:
                 response = await self.llm_provider.generate_text(
                     prompt=full_prompt,
@@ -298,9 +314,7 @@ class AgentService(AgentServiceInterface):
                     break
 
                 choice = response.choices[0]
-                message = getattr(
-                    choice, "message", choice
-                )  # Support both OpenAI and instructor
+                message = getattr(choice, "message", choice)
 
                 # If the model wants to call a function/tool
                 if hasattr(message, "function_call") and message.function_call:
@@ -316,7 +330,6 @@ class AgentService(AgentServiceInterface):
                     )
 
                     # Add the tool result to the prompt for the next round
-                    # (You may want to format this differently for your use case)
                     full_prompt += (
                         f"\n\nTool '{function_name}' was called with arguments {arguments}.\n"
                         f"Result: {tool_result}\n"
@@ -381,6 +394,7 @@ class AgentService(AgentServiceInterface):
 
         if not text:
             return ""
+        text = text.replace("’", "'").replace("‘", "'")
         text = re.sub(r"\[([^\]]+)\]\([^\)]+\)", r"\1", text)
         text = re.sub(r"`([^`]+)`", r"\1", text)
         text = re.sub(r"(\*\*|__)(.*?)\1", r"\2", text)
@@ -411,9 +425,7 @@ class AgentService(AgentServiceInterface):
             flags=re.UNICODE,
         )
         text = emoji_pattern.sub(r" ", text)
-        text = re.sub(
-            r"[^\w\s\.\,\;\:\?\!\'\"\-\(\)]", " ", text
-        )  # Keep basic punctuation
+        text = re.sub(r"[^\w\s\.\,\;\:\?\!\'\"\-\(\)]", " ", text)
         text = re.sub(r"\s+", " ", text)
         return text.strip()
 

solana_agent/services/query.py

@@ -7,7 +7,9 @@ clean separation of concerns.
 """
 
 import logging
-from typing import Any, AsyncGenerator, Dict, List, Literal, Optional, Union
+from typing import Any, AsyncGenerator, Dict, List, Literal, Optional, Type, Union
+
+from pydantic import BaseModel
 
 # Interface imports
 from solana_agent.interfaces.services.query import QueryService as QueryServiceInterface
@@ -86,7 +88,8 @@ class QueryService(QueryServiceInterface):
         ] = "mp4",
         prompt: Optional[str] = None,
         router: Optional[RoutingServiceInterface] = None,
-    ) -> AsyncGenerator[Union[str, bytes], None]:  # pragma: no cover
+        output_model: Optional[Type[BaseModel]] = None,
+    ) -> AsyncGenerator[Union[str, bytes, BaseModel], None]:  # pragma: no cover
         """Process the user request with appropriate agent and apply input guardrails.
 
         Args:
@@ -100,6 +103,7 @@ class QueryService(QueryServiceInterface):
             audio_input_format: Audio input format
             prompt: Optional prompt for the agent
             router: Optional routing service for processing
+            output_model: Optional Pydantic model for structured output
 
         Yields:
             Response chunks (text strings or audio bytes)
@@ -267,9 +271,11 @@ class QueryService(QueryServiceInterface):
                     memory_context=combined_context,
                     output_format="text",
                     prompt=prompt,
+                    output_model=output_model,
                 ):
                     yield chunk
-                    full_text_response += chunk
+                    if output_model is None:
+                        full_text_response += chunk
 
                 # Store conversation using processed user_text
                 # Note: Storing images in history is not directly supported by current memory provider interface

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: solana-agent
-Version: 29.2.3
+Version: 29.3.0
 Summary: AI Agents for Solana
 License: MIT
 Keywords: solana,solana ai,solana agent,ai,ai agent,ai agents
@@ -15,12 +15,12 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Requires-Dist: instructor (==1.8.3)
-Requires-Dist: llama-index-core (==0.12.37)
+Requires-Dist: llama-index-core (==0.12.39)
 Requires-Dist: llama-index-embeddings-openai (==0.3.1)
 Requires-Dist: logfire (==3.16.1)
-Requires-Dist: openai (==1.82.0)
+Requires-Dist: openai (==1.82.1)
 Requires-Dist: pillow (==11.2.1)
-Requires-Dist: pinecone (==7.0.1)
+Requires-Dist: pinecone (==7.0.2)
 Requires-Dist: pydantic (>=2)
 Requires-Dist: pymongo (==4.13.0)
 Requires-Dist: pypdf (==5.5.0)
@@ -64,6 +64,7 @@ Build your AI agents in three lines of code!
 * Extensible Tooling
 * Automatic Tool Workflows
 * Autonomous Operation
+* Structured Outputs
 * Knowledge Base
 * MCP Support
 * Guardrails
@@ -95,6 +96,7 @@ Build your AI agents in three lines of code!
 * Input and output guardrails for content filtering, safety, and data sanitization
 * Generate custom images based on text prompts with storage on S3 compatible services
 * Automatic sequential tool workflows allowing agents to chain multiple tools
+* Deterministically return structured outputs
 * Combine with event-driven systems to create autonomous agents
 
 ## Stack
@@ -341,6 +343,38 @@ async for response in solana_agent.process("user123", "What is in this image? De
     print(response, end="")
 ```
 
+### Structured Outputs
+
+```python
+from solana_agent import SolanaAgent
+
+config = {
+    "openai": {
+        "api_key": "your-openai-api-key",
+    },
+    "agents": [
+        {
+            "name": "researcher",
+            "instructions": "You are a research expert.",
+            "specialization": "Researcher",
+        }
+    ],
+}
+
+solana_agent = SolanaAgent(config=config)
+
+class ResearchProposal(BaseModel):
+    title: str
+    abstract: str
+    key_points: list[str]
+
+full_response = None
+async for response in solana_agent.process("user123", "Research the life of Ben Franklin - the founding Father.", output_model=ResearchProposal):
+    full_response = response
+
+print(full_response.model_dump())
+```
+
 ### Command Line Interface (CLI)
 
 Solana Agent includes a command-line interface (CLI) for text-based chat using a configuration file.
@@ -575,6 +609,8 @@ async for response in solana_agent.process("user123", "Summarize the annual repo
 
 Guardrails allow you to process and potentially modify user input before it reaches the agent (Input Guardrails) and agent output before it's sent back to the user (Output Guardrails). This is useful for implementing safety checks, content moderation, data sanitization, or custom transformations.
 
+Guardrails don't work with structured outputs.
+
 Solana Agent provides a built-in PII scrubber based on [scrubadub](https://github.com/LeapBeyond/scrubadub).
 
 ```python
@@ -615,6 +651,8 @@ config = {
 
 #### Example Custom Guardrails
 
+Guardrails don't work with structured outputs.
+
 ```python
 from solana_agent import InputGuardrail, OutputGuardrail
 import logging

{solana_agent-29.2.3.dist-info → solana_agent-29.3.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
 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=nKfJzgtxNfQWLp6vcu-2Z8zBbvpYgTOEil7nPH7QIlU,23340
+solana_agent/adapters/openai_adapter.py,sha256=2-YvMbrBdrHCkMt1qJPD6B926vgfEdkHqnbu3exUe9c,23584
 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
-solana_agent/client/solana_agent.py,sha256=z_8i_dDJOV5JcZvvRNsRulCd40RvIUuE_f231fRXBDo,8975
+solana_agent/client/solana_agent.py,sha256=ZNBRpougMi8xjkFQffSyrkJCnbRe7C2rKOjJfhQN5ug,9191
 solana_agent/domains/__init__.py,sha256=HiC94wVPRy-QDJSSRywCRrhrFfTBeHjfi5z-QfZv46U,168
 solana_agent/domains/agent.py,sha256=3Q1wg4eIul0CPpaYBOjEthKTfcdhf1SAiWc2R-IMGO8,2561
 solana_agent/domains/routing.py,sha256=1yR4IswGcmREGgbOOI6TKCfuM7gYGOhQjLkBqnZ-rNo,582
@@ -13,16 +13,16 @@ solana_agent/factories/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 solana_agent/factories/agent_factory.py,sha256=P8d-wGdWhksu79jngwTtL4jOeMjeo3OfiUJhwPWVh7U,15897
 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=hFYe04lFGbp4BDlUMOnYQrp_SQXFPcktGOwsi0F87vU,3140
+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=IBtvl_p2Dd9pzuA6ub6DZRn50Td8f-XMtcc1M4V3gvA,2872
+solana_agent/interfaces/providers/llm.py,sha256=Si1xvybHKC6bhjTYjGQi5K9PO9WA7Te29oqs24jxRlY,2998
 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=MgLudTwzCzzzSR6PsVTB-w5rhGDHB5B81TGjo2z3G-A,2152
+solana_agent/interfaces/services/agent.py,sha256=A-Hmgelr3g_qaNB0PEPMFHxB5nSCBK0WJ5hauJtIcmI,2257
 solana_agent/interfaces/services/knowledge_base.py,sha256=Mu8lCGFXPmI_IW5LRGti7octLoWZIg4k5PmGwPfe7LQ,1479
-solana_agent/interfaces/services/query.py,sha256=eLMMwc8hwHHjxFxlvVvkZfoQi8cSgQycWJbYAVphl9E,1632
+solana_agent/interfaces/services/query.py,sha256=Co-pThoT4Zz8jhwKt5fV3LH9MaE_lSyEwNFxsMnTU9Y,1737
 solana_agent/interfaces/services/routing.py,sha256=Qbn3-DQGVSQKaegHDekSFmn_XCklA0H2f0XUx9-o3wA,367
 solana_agent/plugins/__init__.py,sha256=coZdgJKq1ExOaj6qB810i3rEhbjdVlrkN76ozt_Ojgo,193
 solana_agent/plugins/manager.py,sha256=mO_dKSVJ8GToD3wZflMcpKDEBXRoaaMRtY267HENCI0,5542
@@ -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=q5cYzY6Jp5HFtYgJtrqTBWp5Z2n3dXdpQ5YScSKfvPo,18056
+solana_agent/services/agent.py,sha256=kznv2Jhpc4DiFbB-kV3eG5FuPPgl2Hu26h5yCsxyCuw,18624
 solana_agent/services/knowledge_base.py,sha256=ZvOPrSmcNDgUzz4bJIQ4LeRl9vMZiK9hOfs71IpB7Bk,32735
-solana_agent/services/query.py,sha256=ENUfs4WSTpODMRXppDVW-Y3li9jYn8pOfQIHIPerUdQ,18498
+solana_agent/services/query.py,sha256=3v5Ym8UqL0rfOC-0MWHALAsS2jVWdpUR3A-YI9n0xyo,18771
 solana_agent/services/routing.py,sha256=C5Ku4t9TqvY7S8wlUPMTC04HCrT4Ib3E8Q8yX0lVU_s,7137
-solana_agent-29.2.3.dist-info/LICENSE,sha256=BnSRc-NSFuyF2s496l_4EyrwAP6YimvxWcjPiJ0J7g4,1057
-solana_agent-29.2.3.dist-info/METADATA,sha256=tQgYee62kteB-uJScA1UsE6GItQpJQe63AY7AR2nWJ0,28982
-solana_agent-29.2.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-solana_agent-29.2.3.dist-info/entry_points.txt,sha256=-AuT_mfqk8dlZ0pHuAjx1ouAWpTRjpqvEUa6YV3lmc0,53
-solana_agent-29.2.3.dist-info/RECORD,,
+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,,