praisonaiagents 0.0.116__py3-none-any.whl → 0.0.117__py3-none-any.whl

praisonaiagents/agent/agent.py

@@ -354,8 +354,10 @@ class Agent:
         # Check for model name in environment variable if not provided
         self._using_custom_llm = False
         
-        # Initialize OpenAI client for direct API calls
-        self._openai_client = get_openai_client(api_key=api_key, base_url=base_url)
+        # Store OpenAI client parameters for lazy initialization
+        self._openai_api_key = api_key
+        self._openai_base_url = base_url
+        self.__openai_client = None
 
         # If base_url is provided, always create a custom LLM instance
         if base_url:
@@ -488,6 +490,42 @@ Your Goal: {self.goal}
                 for source in knowledge:
                     self._process_knowledge(source)
 
+    @property
+    def _openai_client(self):
+        """Lazily initialize OpenAI client only when needed."""
+        if self.__openai_client is None:
+            try:
+                self.__openai_client = get_openai_client(
+                    api_key=self._openai_api_key, 
+                    base_url=self._openai_base_url
+                )
+            except ValueError as e:
+                # If we're using a custom LLM, we might not need the OpenAI client
+                # Return None and let the calling code handle it
+                if self._using_custom_llm:
+                    return None
+                else:
+                    raise e
+        return self.__openai_client
+
+    @property
+    def llm_model(self):
+        """Unified property to get the LLM model regardless of configuration type.
+        
+        Returns:
+            The LLM model/instance being used by this agent.
+            - For standard models: returns the model string (e.g., "gpt-4o")
+            - For custom LLM instances: returns the LLM instance object
+            - For provider models: returns the LLM instance object
+        """
+        if hasattr(self, 'llm_instance') and self.llm_instance:
+            return self.llm_instance
+        elif hasattr(self, 'llm') and self.llm:
+            return self.llm
+        else:
+            # Default fallback
+            return "gpt-4o"
+
     def _process_knowledge(self, knowledge_item):
         """Process and store knowledge from a file path, URL, or string."""
         try:
@@ -694,14 +732,39 @@ Your Role: {self.role}\n
 Your Goal: {self.goal}
             """
         
-        # Use openai_client's build_messages method
-        messages, original_prompt = self._openai_client.build_messages(
-            prompt=prompt,
-            system_prompt=system_prompt,
-            chat_history=self.chat_history,
-            output_json=output_json,
-            output_pydantic=output_pydantic
-        )
+        # Use openai_client's build_messages method if available
+        if self._openai_client is not None:
+            messages, original_prompt = self._openai_client.build_messages(
+                prompt=prompt,
+                system_prompt=system_prompt,
+                chat_history=self.chat_history,
+                output_json=output_json,
+                output_pydantic=output_pydantic
+            )
+        else:
+            # Fallback implementation for when OpenAI client is not available
+            messages = []
+            
+            # Add system message if provided
+            if system_prompt:
+                messages.append({"role": "system", "content": system_prompt})
+            
+            # Add chat history
+            messages.extend(self.chat_history)
+            
+            # Add user prompt
+            if isinstance(prompt, list):
+                messages.extend(prompt)
+                original_prompt = prompt
+            else:
+                messages.append({"role": "user", "content": str(prompt)})
+                original_prompt = str(prompt)
+            
+            # Add JSON format instruction if needed
+            if output_json or output_pydantic:
+                model = output_pydantic or output_json
+                json_instruction = f"\nPlease respond with valid JSON matching this schema: {model.model_json_schema()}"
+                messages[-1]["content"] += json_instruction
         
         return messages, original_prompt
 
@@ -943,6 +1006,9 @@ Your Goal: {self.goal}
 
     def _process_stream_response(self, messages, temperature, start_time, formatted_tools=None, reasoning_steps=False):
         """Process streaming response and return final response"""
+        if self._openai_client is None:
+            raise ValueError("OpenAI client is not initialized. Please provide OPENAI_API_KEY or use a custom LLM provider.")
+        
         return self._openai_client.process_stream_response(
             messages=messages,
             model=self.llm,
@@ -1009,6 +1075,9 @@ Your Goal: {self.goal}
                 
                 # Note: openai_client expects tools in various formats and will format them internally
                 # But since we already have formatted_tools, we can pass them directly
+                if self._openai_client is None:
+                    raise ValueError("OpenAI client is not initialized. Please provide OPENAI_API_KEY or use a custom LLM provider.")
+                
                 final_response = self._openai_client.chat_completion_with_tools(
                     messages=messages,
                     model=self.llm,
@@ -1202,6 +1271,17 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                     messages.append({"role": "user", "content": reflection_prompt})
 
                     try:
+                        # Check if OpenAI client is available
+                        if self._openai_client is None:
+                            # For custom LLMs, self-reflection with structured output is not supported
+                            if self.verbose:
+                                display_self_reflection(f"Agent {self.name}: Self-reflection with structured output is not supported for custom LLM providers. Skipping reflection.", console=self.console)
+                            # Return the original response without reflection
+                            self.chat_history.append({"role": "user", "content": prompt})
+                            self.chat_history.append({"role": "assistant", "content": response_text})
+                            display_interaction(prompt, response_text, markdown=self.markdown, generation_time=time.time() - start_time, console=self.console)
+                            return response_text
+                        
                         reflection_response = self._openai_client.sync_client.beta.chat.completions.parse(
                             model=self.reflect_llm if self.reflect_llm else self.llm,
                             messages=messages,
@@ -1388,6 +1468,12 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
 
                     # Use the new _format_tools_for_completion helper method
                     formatted_tools = self._format_tools_for_completion(tools)
+                    
+                    # Check if OpenAI client is available
+                    if self._openai_client is None:
+                        error_msg = "OpenAI client is not initialized. Please provide OPENAI_API_KEY or use a custom LLM provider."
+                        display_error(error_msg)
+                        return None
 
                     # Make the API call based on the type of request
                     if tools:
@@ -1442,6 +1528,19 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                                 ]
                                 
                                 try:
+                                    # Check if OpenAI client is available for self-reflection
+                                    if self._openai_client is None:
+                                        # For custom LLMs, self-reflection with structured output is not supported
+                                        if self.verbose:
+                                            display_self_reflection(f"Agent {self.name}: Self-reflection with structured output is not supported for custom LLM providers. Skipping reflection.", console=self.console)
+                                        # Return the original response without reflection
+                                        self.chat_history.append({"role": "user", "content": original_prompt})
+                                        self.chat_history.append({"role": "assistant", "content": response_text})
+                                        if logging.getLogger().getEffectiveLevel() == logging.DEBUG:
+                                            total_time = time.time() - start_time
+                                            logging.debug(f"Agent.achat completed in {total_time:.2f} seconds")
+                                        return response_text
+                                    
                                     reflection_response = await self._openai_client.async_client.beta.chat.completions.parse(
                                         model=self.reflect_llm if self.reflect_llm else self.llm,
                                         messages=reflection_messages,

praisonaiagents/agents/agents.py

@@ -7,7 +7,7 @@ from pydantic import BaseModel
 from rich.text import Text
 from rich.panel import Panel
 from rich.console import Console
-from ..main import display_error, TaskOutput, error_logs, client
+from ..main import display_error, TaskOutput, error_logs
 from ..agent.agent import Agent
 from ..task.task import Task
 from ..process.process import Process, LoopItems

praisonaiagents/agents/autoagents.py

@@ -12,7 +12,8 @@ from typing import List, Any, Optional, Dict, Tuple
 import logging
 import os
 from pydantic import BaseModel, ConfigDict
-from ..main import display_instruction, display_tool_call, display_interaction, client
+from ..main import display_instruction, display_tool_call, display_interaction
+from ..llm import get_openai_client
 
 # Define Pydantic models for structured output
 class TaskConfig(BaseModel):
@@ -237,6 +238,17 @@ Return the configuration in a structured JSON format matching the AutoAgentsConf
 """
         
         try:
+            # Get OpenAI client
+            try:
+                client = get_openai_client()
+            except ValueError as e:
+                # AutoAgents requires OpenAI for structured output generation
+                raise ValueError(
+                    "AutoAgents requires OpenAI API for automatic agent generation. "
+                    "Please set OPENAI_API_KEY environment variable or use PraisonAIAgents class directly "
+                    "with manually configured agents for non-OpenAI providers."
+                ) from e
+                
             response = client.beta.chat.completions.parse(
                 model=self.llm,
                 response_format=AutoAgentsConfig,

praisonaiagents/main.py

@@ -3,7 +3,6 @@ import time
 import json
 import logging
 from typing import List, Optional, Dict, Any, Union, Literal, Type
-from openai import OpenAI
 from pydantic import BaseModel, ConfigDict
 from rich import print
 from rich.console import Console
@@ -377,24 +376,6 @@ class ReflectionOutput(BaseModel):
     reflection: str
     satisfactory: Literal["yes", "no"]
 
-# Constants
-LOCAL_SERVER_API_KEY_PLACEHOLDER = "not-needed"
-
-# Initialize OpenAI client with proper API key handling
-api_key = os.environ.get("OPENAI_API_KEY")
-base_url = os.environ.get("OPENAI_API_BASE") or os.environ.get("OPENAI_BASE_URL")
-
-# For local servers like LM Studio, allow minimal API key
-if base_url and not api_key:
-    api_key = LOCAL_SERVER_API_KEY_PLACEHOLDER
-elif not api_key:
-    raise ValueError(
-        "OPENAI_API_KEY environment variable is required for the default OpenAI service. "
-        "If you are targeting a local server (e.g., LM Studio), ensure OPENAI_API_BASE is set "
-        f"(e.g., 'http://localhost:1234/v1') and you can use a placeholder API key by setting OPENAI_API_KEY='{LOCAL_SERVER_API_KEY_PLACEHOLDER}'"
-    )
-
-client = OpenAI(api_key=api_key, base_url=base_url)
 
 class TaskOutput(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True)

praisonaiagents/process/process.py

@@ -5,10 +5,10 @@ from typing import Dict, Optional, List, Any, AsyncGenerator
 from pydantic import BaseModel, ConfigDict
 from ..agent.agent import Agent
 from ..task.task import Task
-from ..main import display_error, client
+from ..main import display_error
 import csv
 import os
-from openai import AsyncOpenAI
+from openai import AsyncOpenAI, OpenAI
 
 class LoopItems(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True)
@@ -140,6 +140,8 @@ class Process:
 
     def _get_manager_instructions_with_fallback(self, manager_task, manager_prompt, ManagerInstructions):
         """Sync version of getting manager instructions with fallback"""
+        # Create OpenAI client
+        client = OpenAI()
         try:
             # First try structured output (OpenAI compatible)
             logging.info("Attempting structured output...")

{praisonaiagents-0.0.116.dist-info → praisonaiagents-0.0.117.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: praisonaiagents
-Version: 0.0.116
+Version: 0.0.117
 Summary: Praison AI agents for completing complex tasks with Self Reflection Agents
 Author: Mervin Praison
 Requires-Python: >=3.10

{praisonaiagents-0.0.116.dist-info → praisonaiagents-0.0.117.dist-info}/RECORD

@@ -1,14 +1,14 @@
 praisonaiagents/__init__.py,sha256=TezvgadS1p5FGnIRAUVOB_6Jzb3Of7ZtzjtyeCqRsmM,3017
 praisonaiagents/approval.py,sha256=UJ4OhfihpFGR5CAaMphqpSvqdZCHi5w2MGw1MByZ1FQ,9813
-praisonaiagents/main.py,sha256=_-XE7_Y7ChvtLQMivfNFrrnAhv4wSSDhH9WJMWlkS0w,16315
+praisonaiagents/main.py,sha256=bamnEu5PaekloGi52VqAFclm-HzjEVeKtWF0Zpdmfzs,15479
 praisonaiagents/session.py,sha256=d-CZPYikOHb0q-H9f_IWKJsypnQfz1YKeLLkyxs6oDo,15532
 praisonaiagents/agent/__init__.py,sha256=IhIDtAkfJ99cxbttwou52coih_AejS2-jpazsX6LbDY,350
-praisonaiagents/agent/agent.py,sha256=yyFRlmbN9EvV9Oc95tfzOb-W0Dnwl9cC6hZTH4bq5k0,103177
+praisonaiagents/agent/agent.py,sha256=oZaMJJXoWOWJVOFSLmnoBEpF9rb54pnvSqZHgiOhzAw,108660
 praisonaiagents/agent/handoff.py,sha256=Saq0chqfvC6Zf5UbXvmctybbehqnotrXn72JsS-76Q0,13099
 praisonaiagents/agent/image_agent.py,sha256=-5MXG594HVwSpFMcidt16YBp7udtik-Cp7eXlzLE1fY,8696
 praisonaiagents/agents/__init__.py,sha256=_1d6Pqyk9EoBSo7E68sKyd1jDRlN1vxvVIRpoMc0Jcw,168
-praisonaiagents/agents/agents.py,sha256=C_yDdJB4XUuwKA9DrysAtAj3zSYT0IKtfCT4Pxo0oyI,63309
-praisonaiagents/agents/autoagents.py,sha256=Lc_b9mO2MeefBrsHkHoqFxEr5iRGrYuzDhslyybXwdw,13649
+praisonaiagents/agents/agents.py,sha256=WnptTEMSDMAM30Ka6rOAu6rBD-ZLev3qphb1a3BbP1g,63301
+praisonaiagents/agents/autoagents.py,sha256=njkcv7wgDjrUd5auLL3rMc7qv20Kfo40zdn49UxWR9k,14235
 praisonaiagents/guardrails/__init__.py,sha256=HA8zhp-KRHTxo0194MUwXOUJjPyjOu7E3d7xUIKYVVY,310
 praisonaiagents/guardrails/guardrail_result.py,sha256=2K1WIYRyT_s1H6vBGa-7HEHzXCFIyZXZVY4f0hnQyWc,1352
 praisonaiagents/guardrails/llm_guardrail.py,sha256=MTTqmYDdZX-18QN9T17T5P_6H2qnV8GVgymJufW1WuM,3277
@@ -24,7 +24,7 @@ praisonaiagents/mcp/mcp_sse.py,sha256=z8TMFhW9xuLQ7QnpOa3n1-nSHt0-Bf27qso0u4qxYS
 praisonaiagents/memory/__init__.py,sha256=aEFdhgtTqDdMhc_JCWM-f4XI9cZIj7Wz5g_MUa-0amg,397
 praisonaiagents/memory/memory.py,sha256=D5BmQTktv6VOJ49yW2m1MjjCJ5UDSX1Qo46_443ymKo,44276
 praisonaiagents/process/__init__.py,sha256=lkYbL7Hn5a0ldvJtkdH23vfIIZLIcanK-65C0MwaorY,52
-praisonaiagents/process/process.py,sha256=gxhMXG3s4CzaREyuwE5zxCMx2Wp_b_Wd53tDfkj8Qk8,66567
+praisonaiagents/process/process.py,sha256=NTc9rbelIdEA-S1Nwd79OVeKA7mmoZWXhD5r8S91LNs,66624
 praisonaiagents/task/__init__.py,sha256=VL5hXVmyGjINb34AalxpBMl-YW9m5EDcRkMTKkSSl7c,80
 praisonaiagents/task/task.py,sha256=imqJ8wzZzVyUSym2EyF2tC-vAsV1UdfI_P3YM5mqAiw,20786
 praisonaiagents/telemetry/__init__.py,sha256=5iAOrj_N_cKMmh2ltWGYs3PfOYt_jcwUoElW8fTAIsc,3062
@@ -53,7 +53,7 @@ praisonaiagents/tools/xml_tools.py,sha256=iYTMBEk5l3L3ryQ1fkUnNVYK-Nnua2Kx2S0dxN
 praisonaiagents/tools/yaml_tools.py,sha256=uogAZrhXV9O7xvspAtcTfpKSQYL2nlOTvCQXN94-G9A,14215
 praisonaiagents/tools/yfinance_tools.py,sha256=s2PBj_1v7oQnOobo2fDbQBACEHl61ftG4beG6Z979ZE,8529
 praisonaiagents/tools/train/data/generatecot.py,sha256=H6bNh-E2hqL5MW6kX3hqZ05g9ETKN2-kudSjiuU_SD8,19403
-praisonaiagents-0.0.116.dist-info/METADATA,sha256=5V4etTHb1-_EmiMICrUBgF4byjyNhrdC8Ona3pW8aPs,1669
-praisonaiagents-0.0.116.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-praisonaiagents-0.0.116.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
-praisonaiagents-0.0.116.dist-info/RECORD,,
+praisonaiagents-0.0.117.dist-info/METADATA,sha256=mgOfLNqTgXkHQ-hP91BvEx1g-ZaDLGJCswHO2zM2N9U,1669
+praisonaiagents-0.0.117.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+praisonaiagents-0.0.117.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
+praisonaiagents-0.0.117.dist-info/RECORD,,