solana-agent 27.5.0__py3-none-any.whl → 28.1.0__py3-none-any.whl

solana_agent/adapters/openai_adapter.py

@@ -10,12 +10,13 @@ from openai import AsyncOpenAI
 from pydantic import BaseModel
 import instructor
 from instructor import Mode
+import logfire
 
 from solana_agent.interfaces.providers.llm import LLMProvider
 
 T = TypeVar("T", bound=BaseModel)
 
-DEFAULT_CHAT_MODEL = "gpt-4.1-mini"
+DEFAULT_CHAT_MODEL = "gpt-4.1"
 DEFAULT_PARSE_MODEL = "gpt-4.1-nano"
 DEFAULT_EMBEDDING_MODEL = "text-embedding-3-large"
 DEFAULT_EMBEDDING_DIMENSIONS = 3072
@@ -26,8 +27,21 @@ DEFAULT_TTS_MODEL = "tts-1"
 class OpenAIAdapter(LLMProvider):
     """OpenAI implementation of LLMProvider with web search capabilities."""
 
-    def __init__(self, api_key: str):
+    def __init__(self, api_key: str, logfire_api_key: Optional[str] = None):
         self.client = AsyncOpenAI(api_key=api_key)
+
+        self.logfire = False
+        if logfire_api_key:
+            try:
+                logfire.configure(token=logfire_api_key)
+                self.logfire = True
+                print("Logfire configured successfully.")  # Optional: confirmation log
+            except Exception as e:
+                print(
+                    f"Failed to configure Logfire: {e}"
+                )  # Log error if configuration fails
+                self.logfire = False  # Ensure logfire is False if config fails
+
         self.parse_model = DEFAULT_PARSE_MODEL
         self.text_model = DEFAULT_CHAT_MODEL
         self.transcription_model = DEFAULT_TRANSCRIPTION_MODEL
@@ -65,6 +79,7 @@ class OpenAIAdapter(LLMProvider):
             Audio bytes as they become available
         """
         try:
+            logfire.instrument_openai(self.client)
             async with self.client.audio.speech.with_streaming_response.create(
                 model=self.tts_model,
                 voice=voice,
@@ -106,6 +121,7 @@ class OpenAIAdapter(LLMProvider):
             Transcript text chunks as they become available
         """
         try:
+            logfire.instrument_openai(self.client)
             async with self.client.audio.transcriptions.with_streaming_response.create(
                 model=self.transcription_model,
                 file=(f"file.{input_format}", audio_bytes),
@@ -129,45 +145,44 @@ class OpenAIAdapter(LLMProvider):
         api_key: Optional[str] = None,
         base_url: Optional[str] = None,
         model: Optional[str] = None,
-    ) -> AsyncGenerator[str, None]:  # pragma: no cover
-        """Generate text from OpenAI models."""
+    ) -> str:  # pragma: no cover
+        """Generate text from OpenAI models as a single string."""
         messages = []
-
         if system_prompt:
             messages.append({"role": "system", "content": system_prompt})
-
         messages.append({"role": "user", "content": prompt})
 
-        # Prepare request parameters
+        # Prepare request parameters - stream is always False now
         request_params = {
             "messages": messages,
-            "stream": True,
-            "model": self.text_model,
+            "stream": False,  # Hardcoded to False
+            "model": model or self.text_model,
         }
 
+        # Determine client based on provided api_key/base_url
         if api_key and base_url:
             client = AsyncOpenAI(api_key=api_key, base_url=base_url)
         else:
             client = self.client
 
-        if model:
-            request_params["model"] = model
+        if self.logfire:
+            logfire.instrument_openai(client)
 
         try:
+            # Make the non-streaming API call
             response = await client.chat.completions.create(**request_params)
 
-            async for chunk in response:
-                if chunk.choices:
-                    if chunk.choices[0].delta.content:
-                        text = chunk.choices[0].delta.content
-                        yield text
+            # Handle non-streaming response
+            if response.choices and response.choices[0].message.content:
+                full_text = response.choices[0].message.content
+                return full_text  # Return the complete string
+            else:
+                print("Received non-streaming response with no content.")
+                return ""  # Return empty string if no content
 
         except Exception as e:
-            print(f"Error in generate_text: {str(e)}")
-            import traceback
-
-            print(traceback.format_exc())
-            yield f"I apologize, but I encountered an error: {str(e)}"
+            # Log the error and return an error message string
+            print(f"Error in generate_text: {e}")
 
     async def parse_structured_output(
         self,
@@ -190,6 +205,9 @@ class OpenAIAdapter(LLMProvider):
             else:
                 client = self.client
 
+            if self.logfire:
+                logfire.instrument_openai(client)
+
             if model:
                 self.parse_model = model
 
@@ -233,6 +251,9 @@ class OpenAIAdapter(LLMProvider):
                     else:
                         client = self.client
 
+                    if self.logfire:
+                        logfire.instrument_openai(client)
+
                     if model:
                         self.parse_model = model
 
@@ -292,6 +313,9 @@ class OpenAIAdapter(LLMProvider):
             # Replace newlines with spaces as recommended by OpenAI
             text = text.replace("\n", " ")
 
+            if self.logfire:
+                logfire.instrument_openai(self.client)
+
             response = await self.client.embeddings.create(
                 input=[text], model=embedding_model, dimensions=embedding_dimensions
             )

solana_agent/factories/agent_factory.py

@@ -78,6 +78,10 @@ class SolanaAgentFactory:
         # Create adapters
 
         if "mongo" in config:
+            if "connection_string" not in config["mongo"]:
+                raise ValueError("MongoDB connection string is required.")
+            if "database" not in config["mongo"]:
+                raise ValueError("MongoDB database name is required.")
             db_adapter = MongoDBAdapter(
                 connection_string=config["mongo"]["connection_string"],
                 database_name=config["mongo"]["database"],
@@ -85,9 +89,21 @@ class SolanaAgentFactory:
         else:
             db_adapter = None
 
-        llm_adapter = OpenAIAdapter(
-            api_key=config["openai"]["api_key"],
-        )
+        if "logfire" in config:
+            if "api_key" not in config["logfire"]:
+                raise ValueError("Pydantic Logfire API key is required.")
+            if "openai" not in config or "api_key" not in config["openai"]:
+                raise ValueError("OpenAI API key is required.")
+            llm_adapter = OpenAIAdapter(
+                api_key=config["openai"]["api_key"],
+                logfire_api_key=config["logfire"].get("api_key"),
+            )
+        else:
+            if "openai" not in config or "api_key" not in config["openai"]:
+                raise ValueError("OpenAI API key is required.")
+            llm_adapter = OpenAIAdapter(
+                api_key=config["openai"].get("api_key"),
+            )
 
         # Create business mission if specified in config
         business_mission = None
@@ -130,90 +146,19 @@ class SolanaAgentFactory:
             f"Loaded {len(input_guardrails)} input guardrails and {len(output_guardrails)} output guardrails."
         )
 
-        if (
-            "gemini" in config
-            and "api_key" in config["gemini"]
-            and "grok" not 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.5-flash-preview-04-17",
-                output_guardrails=output_guardrails,
-            )
-
-            # 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-04-17",
-            )
-
-        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",
-                output_guardrails=output_guardrails,
-            )
-            # 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-04-17",
-            )
-
-        elif (
-            "grok" in config and "api_key" in config["grok"] and "gemini" not 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",
-                output_guardrails=output_guardrails,
-            )
-
-            # 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,
-                output_guardrails=output_guardrails,
-            )
+        # Create primary services
+        agent_service = AgentService(
+            llm_provider=llm_adapter,
+            business_mission=business_mission,
+            config=config,
+            output_guardrails=output_guardrails,
+        )
 
-            # 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,
+        )
 
         # Debug the agent service tool registry
         print(

solana_agent/interfaces/providers/llm.py

@@ -25,7 +25,7 @@ class LLMProvider(ABC):
         api_key: Optional[str] = None,
         base_url: Optional[str] = None,
         model: Optional[str] = None,
-    ) -> AsyncGenerator[str, None]:
+    ) -> str:
         """Generate text from the language model."""
         pass