Merge pull request #710 from MervinPraison/claude/issue-103-20250628_214929

fix: add comprehensive Windows support with minimal changes

Author: MervinPraison

src/praisonai-agents/praisonaiagents/mcp/mcp.py

@@ -7,6 +7,7 @@
 import logging
 import os
 import re
+import platform
 from typing import Any, List, Optional, Callable, Iterable, Union
 from functools import wraps, partial
 
@@ -199,7 +200,13 @@ def __init__(self, command_or_string=None, args=None, *, command=None, timeout=6
         # Handle the single string format for stdio client
         if isinstance(command_or_string, str) and args is None:
             # Split the string into command and args using shell-like parsing
-            parts = shlex.split(command_or_string)
+            if platform.system() == 'Windows':
+                # Use shlex with posix=False for Windows to handle quotes and paths with spaces
+                parts = shlex.split(command_or_string, posix=False)
+                # Remove quotes from parts if present (Windows shlex keeps them)
+                parts = [part.strip('"') for part in parts]
+            else:
+                parts = shlex.split(command_or_string)
             if not parts:
                 raise ValueError("Empty command string")
 
@@ -217,11 +224,17 @@ def __init__(self, command_or_string=None, args=None, *, command=None, timeout=6
         env = kwargs.get('env', {})
         if not env:
             env = os.environ.copy()
-        env.update({
-            'PYTHONIOENCODING': 'utf-8',
-            'LC_ALL': 'C.UTF-8',
-            'LANG': 'C.UTF-8'
-        })
+        
+        # Always set Python encoding
+        env['PYTHONIOENCODING'] = 'utf-8'
+        
+        # Only set locale variables on Unix systems
+        if platform.system() != 'Windows':
+            env.update({
+                'LC_ALL': 'C.UTF-8',
+                'LANG': 'C.UTF-8'
+            })
+        
         kwargs['env'] = env
 
         self.server_params = StdioServerParameters(
@@ -236,7 +249,14 @@ def __init__(self, command_or_string=None, args=None, *, command=None, timeout=6
             print(f"Warning: MCP initialization timed out after {self.timeout} seconds")
 
         # Automatically detect if this is an NPX command
-        self.is_npx = cmd == 'npx' or (isinstance(cmd, str) and os.path.basename(cmd) == 'npx')
+        base_cmd = os.path.basename(cmd) if isinstance(cmd, str) else cmd
+        # Check for npx with or without Windows extensions
+        npx_variants = ['npx', 'npx.cmd', 'npx.exe']
+        if platform.system() == 'Windows' and isinstance(base_cmd, str):
+            # Case-insensitive comparison on Windows
+            self.is_npx = base_cmd.lower() in [v.lower() for v in npx_variants]
+        else:
+            self.is_npx = base_cmd in npx_variants
 
         # For NPX-based MCP servers, use a different approach
         if self.is_npx:

src/praisonai-agents/praisonaiagents/tools/shell_tools.py

@@ -12,6 +12,8 @@
 import logging
 import os
 import time
+import platform
+import psutil
 from typing import Dict, List, Optional, Union
 from ..approval import require_approval
 
@@ -58,7 +60,12 @@ def execute_command(
         try:
             # Split command if not using shell
             if not shell:
-                command = shlex.split(command)
+                # Use shlex.split with appropriate posix flag
+                if platform.system() == 'Windows':
+                    # Use shlex with posix=False for Windows to handle quotes properly
+                    command = shlex.split(command, posix=False)
+                else:
+                    command = shlex.split(command)
 
             # Set up process environment
             process_env = os.environ.copy()
@@ -201,7 +208,9 @@ def get_system_info(self) -> Dict[str, Union[float, int, str, Dict]]:
         try:
             cpu_percent = psutil.cpu_percent(interval=1)
             memory = psutil.virtual_memory()
-            disk = psutil.disk_usage('/')
+            # Use appropriate root path for the OS
+            root_path = os.path.abspath(os.sep)
+            disk = psutil.disk_usage(root_path)
 
             return {
                 'cpu': {
@@ -223,7 +232,7 @@ def get_system_info(self) -> Dict[str, Union[float, int, str, Dict]]:
                     'percent': disk.percent
                 },
                 'boot_time': psutil.boot_time(),
-                'platform': os.uname().sysname
+                'platform': platform.system()
             }
         except Exception as e:
             error_msg = f"Error getting system info: {str(e)}"
@@ -246,7 +255,11 @@ def get_system_info(self) -> Dict[str, Union[float, int, str, Dict]]:
     # 1. Execute command
     print("1. Command Execution")
     print("------------------------------")
-    result = execute_command("ls -la")
+    # Cross-platform directory listing
+    if platform.system() == 'Windows':
+        result = execute_command("dir")
+    else:
+        result = execute_command("ls -la")
     print(f"Success: {result['success']}")
     print(f"Output:\n{result['stdout']}")
     if result['stderr']:

src/praisonai/praisonai/deploy.py

@@ -1,5 +1,6 @@
 import subprocess
 import os
+import platform
 from dotenv import load_dotenv
 
 class CloudDeployer:
@@ -116,20 +117,66 @@ def run_commands(self):
         self.create_api_file()
         self.create_dockerfile()
         """Runs a sequence of shell commands for deployment, continues on error."""
+        
+        # Get project ID upfront for Windows compatibility
+        try:
+            result = subprocess.run(['gcloud', 'config', 'get-value', 'project'], 
+                                  capture_output=True, text=True, check=True)
+            project_id = result.stdout.strip()
+        except subprocess.CalledProcessError:
+            print("ERROR: Failed to get GCP project ID. Ensure gcloud is configured.")
+            return
+        
+        # Get environment variables
+        openai_model = os.environ.get('OPENAI_MODEL_NAME', 'gpt-4o')
+        openai_key = os.environ.get('OPENAI_API_KEY', 'Enter your API key')
+        openai_base = os.environ.get('OPENAI_API_BASE', 'https://api.openai.com/v1')
+        
+        # Build commands with actual values
         commands = [
-            "yes | gcloud auth configure-docker us-central1-docker.pkg.dev",
-            "gcloud artifacts repositories create praisonai-repository --repository-format=docker --location=us-central1",
-            "docker build --platform linux/amd64 -t gcr.io/$(gcloud config get-value project)/praisonai-app:latest .",
-            "docker tag gcr.io/$(gcloud config get-value project)/praisonai-app:latest us-central1-docker.pkg.dev/$(gcloud config get-value project)/praisonai-repository/praisonai-app:latest",
-            "docker push us-central1-docker.pkg.dev/$(gcloud config get-value project)/praisonai-repository/praisonai-app:latest",
-            "gcloud run deploy praisonai-service --image us-central1-docker.pkg.dev/$(gcloud config get-value project)/praisonai-repository/praisonai-app:latest --platform managed --region us-central1 --allow-unauthenticated --set-env-vars OPENAI_MODEL_NAME=${OPENAI_MODEL_NAME},OPENAI_API_KEY=${OPENAI_API_KEY},OPENAI_API_BASE=${OPENAI_API_BASE}"
+            ['gcloud', 'auth', 'configure-docker', 'us-central1-docker.pkg.dev'],
+            ['gcloud', 'artifacts', 'repositories', 'create', 'praisonai-repository', 
+             '--repository-format=docker', '--location=us-central1'],
+            ['docker', 'build', '--platform', 'linux/amd64', '-t', 
+             f'gcr.io/{project_id}/praisonai-app:latest', '.'],
+            ['docker', 'tag', f'gcr.io/{project_id}/praisonai-app:latest',
+             f'us-central1-docker.pkg.dev/{project_id}/praisonai-repository/praisonai-app:latest'],
+            ['docker', 'push', 
+             f'us-central1-docker.pkg.dev/{project_id}/praisonai-repository/praisonai-app:latest'],
+            ['gcloud', 'run', 'deploy', 'praisonai-service', 
+             '--image', f'us-central1-docker.pkg.dev/{project_id}/praisonai-repository/praisonai-app:latest',
+             '--platform', 'managed', '--region', 'us-central1', '--allow-unauthenticated',
+             '--set-env-vars', f'OPENAI_MODEL_NAME={openai_model},OPENAI_API_KEY={openai_key},OPENAI_API_BASE={openai_base}']
         ]
-
-        for cmd in commands:
+        
+        # Run commands with appropriate handling for each platform
+        for i, cmd in enumerate(commands):
             try:
-                subprocess.run(cmd, shell=True, check=True)
+                if i == 0:  # First command (gcloud auth configure-docker)
+                    if platform.system() != 'Windows':
+                        # On Unix, pipe 'yes' to auto-confirm
+                        proc = subprocess.Popen(cmd, stdin=subprocess.PIPE)
+                        proc.communicate(input=b'Y\n')
+                        if proc.returncode != 0:
+                            raise subprocess.CalledProcessError(proc.returncode, cmd)
+                    else:
+                        # On Windows, try with --quiet flag to avoid prompts
+                        cmd_with_quiet = cmd + ['--quiet']
+                        try:
+                            subprocess.run(cmd_with_quiet, check=True)
+                        except subprocess.CalledProcessError:
+                            # If --quiet fails, try without it
+                            print("Note: You may need to manually confirm the authentication prompt")
+                            subprocess.run(cmd, check=True)
+                else:
+                    # Run other commands normally
+                    subprocess.run(cmd, check=True)
             except subprocess.CalledProcessError as e:
-                print(f"ERROR: Command '{e.cmd}' failed with exit status {e.returncode}")
+                print(f"ERROR: Command failed with exit status {e.returncode}")
+                # Commands 2 (build) and 4 (push) and 5 (deploy) are critical
+                if i in [2, 4, 5]:
+                    print("Critical command failed. Aborting deployment.")
+                    return
                 print(f"Continuing with the next command...")
 
 # Usage