praisonaiagents 0.0.108__py3-none-any.whl → 0.0.109__py3-none-any.whl

praisonaiagents/agent/agent.py

@@ -373,7 +373,9 @@ class Agent:
         user_id: Optional[str] = None,
         reasoning_steps: bool = False,
         guardrail: Optional[Union[Callable[['TaskOutput'], Tuple[bool, Any]], str]] = None,
-        max_guardrail_retries: int = 3
+        max_guardrail_retries: int = 3,
+        base_url: Optional[str] = None,
+        api_key: Optional[str] = None
     ):
         """Initialize an Agent instance.
 
@@ -457,6 +459,10 @@ class Agent:
                 description string for LLM-based validation. Defaults to None.
             max_guardrail_retries (int, optional): Maximum number of retry attempts when guardrail
                 validation fails before giving up. Defaults to 3.
+            base_url (Optional[str], optional): Base URL for custom LLM endpoints (e.g., Ollama).
+                If provided, automatically creates a custom LLM instance. Defaults to None.
+            api_key (Optional[str], optional): API key for LLM provider. If not provided,
+                falls back to environment variables. Defaults to None.
 
         Raises:
             ValueError: If all of name, role, goal, backstory, and instructions are None.
@@ -503,10 +509,40 @@ class Agent:
         # Check for model name in environment variable if not provided
         self._using_custom_llm = False
 
+        # If base_url is provided, always create a custom LLM instance
+        if base_url:
+            try:
+                from ..llm.llm import LLM
+                # Handle different llm parameter types with base_url
+                if isinstance(llm, dict):
+                    # Merge base_url and api_key into the dict
+                    llm_config = llm.copy()
+                    llm_config['base_url'] = base_url
+                    if api_key:
+                        llm_config['api_key'] = api_key
+                    self.llm_instance = LLM(**llm_config)
+                else:
+                    # Create LLM with model string and base_url
+                    model_name = llm or os.getenv('OPENAI_MODEL_NAME', 'gpt-4o')
+                    self.llm_instance = LLM(
+                        model=model_name,
+                        base_url=base_url,
+                        api_key=api_key
+                    )
+                self._using_custom_llm = True
+            except ImportError as e:
+                raise ImportError(
+                    "LLM features requested but dependencies not installed. "
+                    "Please install with: pip install \"praisonaiagents[llm]\""
+                ) from e
         # If the user passes a dictionary (for advanced configuration)
-        if isinstance(llm, dict) and "model" in llm:
+        elif isinstance(llm, dict) and "model" in llm:
             try:
                 from ..llm.llm import LLM
+                # Add api_key if provided and not in dict
+                if api_key and 'api_key' not in llm:
+                    llm = llm.copy()
+                    llm['api_key'] = api_key
                 self.llm_instance = LLM(**llm)  # Pass all dict items as kwargs
                 self._using_custom_llm = True
             except ImportError as e:
@@ -519,7 +555,10 @@ class Agent:
             try:
                 from ..llm.llm import LLM
                 # Pass the entire string so LiteLLM can parse provider/model
-                self.llm_instance = LLM(model=llm)
+                llm_params = {'model': llm}
+                if api_key:
+                    llm_params['api_key'] = api_key
+                self.llm_instance = LLM(**llm_params)
                 self._using_custom_llm = True
                 
                 # Ensure tools are properly accessible when using custom LLM

{praisonaiagents-0.0.108.dist-info → praisonaiagents-0.0.109.dist-info}/METADATA

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

{praisonaiagents-0.0.108.dist-info → praisonaiagents-0.0.109.dist-info}/RECORD

@@ -3,7 +3,7 @@ praisonaiagents/approval.py,sha256=UJ4OhfihpFGR5CAaMphqpSvqdZCHi5w2MGw1MByZ1FQ,9
 praisonaiagents/main.py,sha256=_-XE7_Y7ChvtLQMivfNFrrnAhv4wSSDhH9WJMWlkS0w,16315
 praisonaiagents/session.py,sha256=d-CZPYikOHb0q-H9f_IWKJsypnQfz1YKeLLkyxs6oDo,15532
 praisonaiagents/agent/__init__.py,sha256=j0T19TVNbfZcClvpbZDDinQxZ0oORgsMrMqx16jZ-bA,128
-praisonaiagents/agent/agent.py,sha256=iTt9pQigjexlQA-65xfeBHsxdRzQq3yvVxZW65Usz_c,110112
+praisonaiagents/agent/agent.py,sha256=VILZRrFbUJFF_gtATMfx-fpqoBMMwyiRmvBWo9592Ds,112093
 praisonaiagents/agent/image_agent.py,sha256=-5MXG594HVwSpFMcidt16YBp7udtik-Cp7eXlzLE1fY,8696
 praisonaiagents/agents/__init__.py,sha256=_1d6Pqyk9EoBSo7E68sKyd1jDRlN1vxvVIRpoMc0Jcw,168
 praisonaiagents/agents/agents.py,sha256=C_yDdJB4XUuwKA9DrysAtAj3zSYT0IKtfCT4Pxo0oyI,63309
@@ -51,7 +51,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.108.dist-info/METADATA,sha256=kDa4kCNt9b_sAFX9JECSpWfxXhlT7YW0hn8kjezwrKs,1669
-praisonaiagents-0.0.108.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-praisonaiagents-0.0.108.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
-praisonaiagents-0.0.108.dist-info/RECORD,,
+praisonaiagents-0.0.109.dist-info/METADATA,sha256=978n4Xm55N1ZwIQYE4vtLBVqsIuCylWFOEW1bWZTa6g,1669
+praisonaiagents-0.0.109.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+praisonaiagents-0.0.109.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
+praisonaiagents-0.0.109.dist-info/RECORD,,