solana-agent 17.0.2__py3-none-any.whl → 17.0.4__py3-none-any.whl

solana_agent/services/agent.py

@@ -39,6 +39,7 @@ class AgentService(AgentServiceInterface):
         self.agent_repository = agent_repository
         self.organization_mission = organization_mission
         self.config = config or {}
+        self.last_text_response = ""
 
         # Initialize tool registry with concrete implementation
         if tool_registry:
@@ -247,6 +248,8 @@ class AgentService(AgentServiceInterface):
             if memory_context:
                 system_prompt += f"\n\nMemory Context: {memory_context}"
 
+            # Keep track of the complete text response
+            complete_text_response = ""
             json_buffer = ""
             is_json = False
             text_buffer = ""
@@ -277,6 +280,9 @@ class AgentService(AgentServiceInterface):
                                 json_chunk=json_buffer
                             )
 
+                            # Add to complete text response
+                            complete_text_response += response_text
+
                             # Output response based on format
                             if output_format == "audio":
                                 async for audio_chunk in self.llm_provider.tts(
@@ -288,7 +294,9 @@ class AgentService(AgentServiceInterface):
                             else:
                                 yield response_text
                         else:
-                            # Not a tool call, return as normal text
+                            # For non-tool JSON, still capture the text
+                            complete_text_response += json_buffer
+
                             if output_format == "audio":
                                 async for audio_chunk in self.llm_provider.tts(
                                     text=json_buffer,
@@ -304,10 +312,12 @@ class AgentService(AgentServiceInterface):
                         json_buffer = ""
 
                     except json.JSONDecodeError:
-                        # Incomplete JSON, continue collecting
                         pass
                 else:
-                    # Regular text processing
+                    # For regular text, always add to the complete response
+                    complete_text_response += chunk
+
+                    # Handle audio buffering or direct text output
                     if output_format == "audio":
                         text_buffer += chunk
                         if any(punct in chunk for punct in ".!?"):
@@ -326,18 +336,25 @@ class AgentService(AgentServiceInterface):
             if text_buffer:
                 remaining_text += text_buffer
             if is_json and json_buffer:
-                # If we have incomplete JSON at the end, yield it as text
                 remaining_text += json_buffer
 
-            if remaining_text and output_format == "audio":
-                async for audio_chunk in self.llm_provider.tts(
-                    text=remaining_text,
-                    voice=audio_voice,
-                    response_format=audio_output_format
-                ):
-                    yield audio_chunk
-            elif remaining_text:
-                yield remaining_text
+            if remaining_text:
+                # Add remaining text to complete response
+                complete_text_response += remaining_text
+
+                if output_format == "audio":
+                    async for audio_chunk in self.llm_provider.tts(
+                        text=remaining_text,
+                        voice=audio_voice,
+                        response_format=audio_output_format
+                    ):
+                        yield audio_chunk
+                else:
+                    yield remaining_text
+
+            # Store the complete text response for the caller to access
+            # This needs to be done in the query service using the self.last_text_response
+            self.last_text_response = complete_text_response
 
         except Exception as e:
             error_msg = f"I apologize, but I encountered an error: {str(e)}"

solana_agent/services/query.py

@@ -52,11 +52,8 @@ class QueryService(QueryServiceInterface):
         Args:
             user_id: User ID
             query: Text query or audio bytes
-            output_format: Response format ("text" or "audio")
-            audio_voice: Voice to use for audio output
-            audio_instructions: Optional instructions for audio synthesis
-            audio_output_format: Audio output format
-            audio_input_format: Audio input format
+            output_format: Response format ("text" or "audio") 
+            voice: Voice to use for audio output
 
         Yields:
             Response chunks (text strings or audio bytes)
@@ -74,7 +71,11 @@ class QueryService(QueryServiceInterface):
             if user_text.strip().lower() in ["test", "hello", "hi", "hey", "ping"]:
                 response = "Hello! How can I help you today?"
                 if output_format == "audio":
-                    async for chunk in self.agent_service.llm_provider.tts(response, instructions=audio_instructions, response_format=audio_output_format, voice=audio_voice):
+                    async for chunk in self.agent_service.llm_provider.tts(
+                        text=response,
+                        voice=audio_voice,
+                        response_format=audio_output_format
+                    ):
                         yield chunk
                 else:
                     yield response
@@ -91,25 +92,17 @@ class QueryService(QueryServiceInterface):
 
             # Route query to appropriate agent
             agent_name = await self.routing_service.route_query(user_text)
+            print(f"Routed to agent: {agent_name}")
 
-            # Generate response using agent service
-            full_response = ""
-            async for chunk in self.agent_service.generate_response(
-                agent_name=agent_name,
-                user_id=user_id,
-                query=user_text,
-                memory_context=memory_context,
-                output_format=output_format,
-                audio_voice=audio_voice,
-                audio_output_format=audio_output_format,
-            ):
-                yield chunk
-                if output_format == "text":
-                    full_response += chunk
-
-            # For audio responses, get transcription for storage
+            # For audio mode, we need to carefully handle the response to make sure
+            # tool calls are properly executed and formatted for audio
             if output_format == "audio":
-                # Re-generate response in text format for storage
+                # Use the agent service to generate the response
+                text_response = ""
+
+                # First, get complete text response
+                # Note: This is a separate call from the audio generation
+                temp_response = ""
                 async for chunk in self.agent_service.generate_response(
                     agent_name=agent_name,
                     user_id=user_id,
@@ -117,16 +110,61 @@ class QueryService(QueryServiceInterface):
                     memory_context=memory_context,
                     output_format="text"
                 ):
-                    full_response += chunk
+                    temp_response += chunk
 
-            # Store conversation and extract insights
-            if self.memory_provider:
-                await self._store_conversation(user_id, user_text, full_response)
+                # Store the complete text for memory
+                text_response = temp_response
+
+                # Now generate audio from same request
+                async for audio_chunk in self.agent_service.generate_response(
+                    agent_name=agent_name,
+                    user_id=user_id,
+                    query=user_text,
+                    memory_context=memory_context,
+                    output_format="audio",
+                    audio_voice=audio_voice,
+                    audio_input_format=audio_input_format,
+                    audio_output_format=audio_output_format,
+                    audio_instructions=audio_instructions
+                ):
+                    yield audio_chunk
+
+                # Store conversation in memory
+                if self.memory_provider and text_response:
+                    await self._store_conversation(
+                        user_id=user_id,
+                        user_message=user_text,
+                        assistant_message=text_response
+                    )
+            else:
+                # For text mode, we can collect the response and store it directly
+                full_text_response = ""
+                async for chunk in self.agent_service.generate_response(
+                    agent_name=agent_name,
+                    user_id=user_id,
+                    query=user_text,
+                    memory_context=memory_context,
+                    output_format="text"
+                ):
+                    yield chunk
+                    full_text_response += chunk
+
+                # Store conversation in memory
+                if self.memory_provider and full_text_response:
+                    await self._store_conversation(
+                        user_id=user_id,
+                        user_message=user_text,
+                        assistant_message=full_text_response
+                    )
 
         except Exception as e:
             error_msg = f"I apologize for the technical difficulty. {str(e)}"
             if output_format == "audio":
-                async for chunk in self.agent_service.llm_provider.tts(error_msg, instructions=audio_instructions, response_format=audio_output_format, voice=audio_voice):
+                async for chunk in self.agent_service.llm_provider.tts(
+                    text=error_msg,
+                    voice=audio_voice,
+                    response_format=audio_output_format
+                ):
                     yield chunk
             else:
                 yield error_msg
@@ -242,25 +280,26 @@ class QueryService(QueryServiceInterface):
             }
 
     async def _store_conversation(
-        self, user_id: str, user_text: str, response_text: str
+        self, user_id: str, user_message: str, assistant_message: str
     ) -> None:
         """Store conversation history in memory provider.
 
         Args:
             user_id: User ID
-            user_text: User message
-            response_text: Assistant response
+            user_message: User message
+            assistant_message: Assistant message
         """
         if self.memory_provider:
             try:
                 # Truncate excessively long responses
-                truncated_response = self._truncate(response_text)
+                truncated_assistant_message = self._truncate(assistant_message)
+                truncated_user_message = self._truncate(user_message)
 
                 await self.memory_provider.store(
                     user_id,
                     [
-                        {"role": "user", "content": user_text},
-                        {"role": "assistant", "content": truncated_response},
+                        {"role": "user", "content": truncated_user_message},
+                        {"role": "assistant", "content": truncated_assistant_message},
                     ],
                 )
             except Exception as e:

{solana_agent-17.0.2.dist-info → solana_agent-17.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: solana-agent
-Version: 17.0.2
+Version: 17.0.4
 Summary: The Future of Work
 License: MIT
 Keywords: ai,openai,ai agents,agi
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
-Requires-Dist: openai (>=1.68.0,<2.0.0)
+Requires-Dist: openai (>=1.68.1,<2.0.0)
 Requires-Dist: pydantic (>=2.10.6,<3.0.0)
 Requires-Dist: pymongo (>=4.11.3,<5.0.0)
 Requires-Dist: zep-cloud (>=2.7.0,<3.0.0)

{solana_agent-17.0.2.dist-info → solana_agent-17.0.4.dist-info}/RECORD

@@ -28,10 +28,10 @@ solana_agent/repositories/__init__.py,sha256=fP83w83CGzXLnSdq-C5wbw9EhWTYtqE2lQT
 solana_agent/repositories/agent.py,sha256=e1rnsQiigkKwJNLKro86a3b6TBiky3GMfmCRc5b_jPw,3187
 solana_agent/repositories/memory.py,sha256=GABGwaz00thjviHewLvb18NeKE8dkBROxy_stsiiWrE,4722
 solana_agent/services/__init__.py,sha256=ab_NXJmwYUCmCrCzuTlZ47bJZINW0Y0F5jfQ9OovidU,163
-solana_agent/services/agent.py,sha256=8pRl3_9SDtv3sN9TH91SqxARRALu_QDXkM2eD3fcUM0,16282
-solana_agent/services/query.py,sha256=N0RMcQm7o4B0MGrbFFrZ_Ar5z9r-UUDgn1xzgoxQtqg,10758
+solana_agent/services/agent.py,sha256=j0aI_BGaY5Nhkb9ga0r4BqI3qMKu5TOc4QPQsU3NHyQ,17000
+solana_agent/services/query.py,sha256=_RHcT7LDvaVhgie96--l7N4ktEtL6UDtgk1_2t25PtQ,12305
 solana_agent/services/routing.py,sha256=TPJ2Pas4acE93QzMEV6ZP670OtTNrVEPa76fz6urEV4,4996
-solana_agent-17.0.2.dist-info/LICENSE,sha256=BnSRc-NSFuyF2s496l_4EyrwAP6YimvxWcjPiJ0J7g4,1057
-solana_agent-17.0.2.dist-info/METADATA,sha256=8uenEIcctj_hWi4_sle2mOJxoUsQSGi1RmYwQhqrgNs,4888
-solana_agent-17.0.2.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-solana_agent-17.0.2.dist-info/RECORD,,
+solana_agent-17.0.4.dist-info/LICENSE,sha256=BnSRc-NSFuyF2s496l_4EyrwAP6YimvxWcjPiJ0J7g4,1057
+solana_agent-17.0.4.dist-info/METADATA,sha256=_QLt1zJUJQ-wBy6qYBycjZ6w8bxvcpdwYrxbr2vZWZk,4888
+solana_agent-17.0.4.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+solana_agent-17.0.4.dist-info/RECORD,,