Merge pull request MervinPraison#526 from MervinPraison/claude/issue-394-20250528_143330

fix: Support OPENAI_BASE_URL and MODEL_NAME for Ollama integration

Author: MervinPraison

docs/models/ollama.mdx

@@ -10,8 +10,41 @@ icon: "terminal"
 
 <AccordionGroup>
   <Accordion title="Ollama Integration" defaultOpen>
+    **Standard OpenAI SDK Environment Variables (Recommended):**
     ```bash
     export OPENAI_BASE_URL=http://localhost:11434/v1
+    export MODEL_NAME=deepseek-r1:14b
+    export OPENAI_API_KEY=NA
+    ```
+    
+    **Alternative Environment Variable Patterns:**
+    ```bash
+    # Community recommended pattern
+    export OLLAMA_API_BASE=http://localhost:11434
+    export MODEL_NAME=gemma3:4b
+    export OPENAI_API_KEY=fake-key
+    
+    # Legacy pattern (still supported)
+    export OPENAI_API_BASE=http://localhost:11434/v1
+    export OPENAI_MODEL_NAME=llama2
+    export OPENAI_API_KEY=not-needed
+    ```
+    
+    **Usage with praisonai --init:**
+    ```bash
+    # Make sure Ollama is running
+    ollama serve
+    
+    # Pull your desired model
+    ollama pull deepseek-r1:14b
+    
+    # Set environment variables
+    export OPENAI_BASE_URL=http://localhost:11434/v1
+    export MODEL_NAME=deepseek-r1:14b
+    export OPENAI_API_KEY=NA
+    
+    # Initialize agents
+    praisonai --init "Create a story about AI"
     ```
   </Accordion>
 </AccordionGroup>

src/praisonai/praisonai/auto.py

@@ -91,10 +91,22 @@ def __init__(self, topic="Movie Story writing about AI", agent_file="test.yaml",
     pip install "praisonai[{framework}]"
 """)
 
+        # Support multiple environment variable patterns for better compatibility
+        # Priority order: MODEL_NAME > OPENAI_MODEL_NAME for model selection
+        model_name = os.environ.get("MODEL_NAME") or os.environ.get("OPENAI_MODEL_NAME", "gpt-4o")
+        
+        # Priority order for base_url: OPENAI_BASE_URL > OPENAI_API_BASE > OLLAMA_API_BASE
+        # OPENAI_BASE_URL is the standard OpenAI SDK environment variable
+        base_url = (
+            os.environ.get("OPENAI_BASE_URL") or 
+            os.environ.get("OPENAI_API_BASE") or
+            os.environ.get("OLLAMA_API_BASE", "https://api.openai.com/v1")
+        )
+        
         self.config_list = config_list or [
             {
-                'model': os.environ.get("OPENAI_MODEL_NAME", "gpt-4o"),
-                'base_url': os.environ.get("OPENAI_API_BASE", "https://api.openai.com/v1"),
+                'model': model_name,
+                'base_url': base_url,
                 'api_key': os.environ.get("OPENAI_API_KEY")
             }
         ]

src/praisonai/praisonai/cli.py

@@ -114,11 +114,23 @@ def __init__(self, agent_file="agents.yaml", framework="", auto=False, init=Fals
         """
         self.agent_yaml = agent_yaml
         # Create config_list with AutoGen compatibility
+        # Support multiple environment variable patterns for better compatibility
+        # Priority order: MODEL_NAME > OPENAI_MODEL_NAME for model selection
+        model_name = os.environ.get("MODEL_NAME") or os.environ.get("OPENAI_MODEL_NAME", "gpt-4o")
+        
+        # Priority order for base_url: OPENAI_BASE_URL > OPENAI_API_BASE > OLLAMA_API_BASE
+        # OPENAI_BASE_URL is the standard OpenAI SDK environment variable
+        base_url = (
+            os.environ.get("OPENAI_BASE_URL") or 
+            os.environ.get("OPENAI_API_BASE") or
+            os.environ.get("OLLAMA_API_BASE", "https://api.openai.com/v1")
+        )
+        
         api_key = os.environ.get("OPENAI_API_KEY")
         self.config_list = [
             {
-                'model': os.environ.get("OPENAI_MODEL_NAME", "gpt-4o"),
-                'base_url': os.environ.get("OPENAI_API_BASE", "https://api.openai.com/v1"),
+                'model': model_name,
+                'base_url': base_url,
                 'api_key': api_key,
                 'api_type': 'openai'        # AutoGen expects this field
             }