PraisonAI 2.2.35__tar.gz → 2.2.37__tar.gz

{praisonai-2.2.35 → praisonai-2.2.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: PraisonAI
-Version: 2.2.35
+Version: 2.2.37
 Summary: PraisonAI is an AI Agents Framework with Self Reflection. PraisonAI application combines PraisonAI Agents, AutoGen, and CrewAI into a low-code solution for building and managing multi-agent LLM systems, focusing on simplicity, customisation, and efficient human-agent collaboration.
 Author: Mervin Praison
 Requires-Python: >=3.10
@@ -64,7 +64,7 @@ Requires-Dist: playwright (>=1.47.0) ; extra == "code"
 Requires-Dist: plotly (>=5.24.0) ; extra == "realtime"
 Requires-Dist: praisonai-tools (>=0.0.15) ; extra == "autogen"
 Requires-Dist: praisonai-tools (>=0.0.15) ; extra == "crewai"
-Requires-Dist: praisonaiagents (>=0.0.108)
+Requires-Dist: praisonaiagents (>=0.0.110)
 Requires-Dist: pyautogen (>=0.2.19) ; extra == "autogen"
 Requires-Dist: pydantic (<=2.10.1) ; extra == "chat"
 Requires-Dist: pydantic (<=2.10.1) ; extra == "code"

{praisonai-2.2.35 → praisonai-2.2.37}/praisonai/cli.py

@@ -170,6 +170,25 @@ class PraisonAI:
             pass
         return None
 
+    def read_file_if_provided(self, file_path):
+        """
+        Read content from a file if the file path is provided.
+        Returns the file content or None if file cannot be read.
+        """
+        if not file_path:
+            return None
+        
+        try:
+            with open(file_path, 'r', encoding='utf-8') as f:
+                file_content = f.read().strip()
+                return file_content if file_content else None
+        except FileNotFoundError:
+            print(f"[red]ERROR: File not found: {file_path}[/red]")
+            sys.exit(1)
+        except Exception as e:
+            print(f"[red]ERROR: Failed to read file: {e}[/red]")
+            sys.exit(1)
+
     def main(self):
         """
         The main function of the PraisonAI object. It parses the command-line arguments,
@@ -189,15 +208,24 @@ class PraisonAI:
 
         # Check for piped input from stdin
         stdin_input = self.read_stdin_if_available()
+        
+        # Check for file input if --file is provided
+        file_input = self.read_file_if_provided(getattr(args, 'file', None))
 
         if args.command:
             if args.command.startswith("tests.test") or args.command.startswith("tests/test"):  # Argument used for testing purposes
                 print("test")
                 return "test"
             else:
-                # If stdin input is available, append it to the command
+                # Combine command with any available inputs (stdin and/or file)
+                combined_inputs = []
                 if stdin_input:
-                    combined_prompt = f"{args.command} {stdin_input}"
+                    combined_inputs.append(stdin_input)
+                if file_input:
+                    combined_inputs.append(file_input)
+                
+                if combined_inputs:
+                    combined_prompt = f"{args.command} {' '.join(combined_inputs)}"
                     result = self.handle_direct_prompt(combined_prompt)
                     print(result)
                     return result
@@ -206,20 +234,30 @@ class PraisonAI:
         elif hasattr(args, 'direct_prompt') and args.direct_prompt:
             # Only handle direct prompt if agent_file wasn't explicitly set in constructor
             if original_agent_file == "agents.yaml":  # Default value, so safe to use direct prompt
-                # If stdin input is available, append it to the direct prompt
-                prompt = args.direct_prompt
+                # Combine direct prompt with any available inputs (stdin and/or file)
+                prompt_parts = [args.direct_prompt]
                 if stdin_input:
-                    prompt = f"{args.direct_prompt} {stdin_input}"
+                    prompt_parts.append(stdin_input)
+                if file_input:
+                    prompt_parts.append(file_input)
+                prompt = ' '.join(prompt_parts)
                 result = self.handle_direct_prompt(prompt)
                 print(result)
                 return result
             else:
                 # Agent file was explicitly set, ignore direct prompt and use the file
                 pass
-        elif stdin_input:
-            # If only stdin input is provided (no command), use it as direct prompt
-            if original_agent_file == "agents.yaml":  # Default value, so safe to use stdin as prompt
-                result = self.handle_direct_prompt(stdin_input)
+        elif stdin_input or file_input:
+            # If only stdin/file input is provided (no command), use it as direct prompt
+            if original_agent_file == "agents.yaml":  # Default value, so safe to use input as prompt
+                # Combine any available inputs
+                inputs = []
+                if stdin_input:
+                    inputs.append(stdin_input)
+                if file_input:
+                    inputs.append(file_input)
+                combined_input = ' '.join(inputs)
+                result = self.handle_direct_prompt(combined_input)
                 print(result)
                 return result
         # If no command or direct_prompt, preserve agent_file from constructor (don't overwrite)
@@ -530,6 +568,7 @@ class PraisonAI:
         parser.add_argument("--public", action="store_true", help="Use ngrok to expose the server publicly (only with --call)")
         parser.add_argument("--merge", action="store_true", help="Merge existing agents.yaml with auto-generated agents instead of overwriting")
         parser.add_argument("--claudecode", action="store_true", help="Enable Claude Code integration for file modifications and coding tasks")
+        parser.add_argument("--file", "-f", type=str, help="Read input from a file and append it to the prompt")
         
         # If we're in a test environment, parse with empty args to avoid pytest interference
         if in_test_env:

{praisonai-2.2.35 → praisonai-2.2.37}/praisonai/deploy.py

@@ -1,5 +1,6 @@
 import subprocess
 import os
+import platform
 from dotenv import load_dotenv
 
 class CloudDeployer:
@@ -56,7 +57,7 @@ class CloudDeployer:
             file.write("FROM python:3.11-slim\n")
             file.write("WORKDIR /app\n")
             file.write("COPY . .\n")
-            file.write("RUN pip install flask praisonai==2.2.35 gunicorn markdown\n")
+            file.write("RUN pip install flask praisonai==2.2.37 gunicorn markdown\n")
             file.write("EXPOSE 8080\n")
             file.write('CMD ["gunicorn", "-b", "0.0.0.0:8080", "api:app"]\n')
             
@@ -116,20 +117,66 @@ class CloudDeployer:
         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

{praisonai-2.2.35 → praisonai-2.2.37}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "PraisonAI"
-version = "2.2.35"
+version = "2.2.37"
 description = "PraisonAI is an AI Agents Framework with Self Reflection. PraisonAI application combines PraisonAI Agents, AutoGen, and CrewAI into a low-code solution for building and managing multi-agent LLM systems, focusing on simplicity, customisation, and efficient human-agent collaboration."
 readme = "README.md"
 license = ""
@@ -12,7 +12,7 @@ dependencies = [
     "rich>=13.7",
     "markdown>=3.5",
     "pyparsing>=3.0.0",
-    "praisonaiagents>=0.0.108",
+    "praisonaiagents>=0.0.110",
     "python-dotenv>=0.19.0",
     "instructor>=1.3.3",
     "PyYAML>=6.0",
@@ -95,7 +95,7 @@ autogen = ["pyautogen>=0.2.19", "praisonai-tools>=0.0.15", "crewai"]
 
 [tool.poetry]
 name = "PraisonAI"
-version = "2.2.35"
+version = "2.2.37"
 description = "PraisonAI is an AI Agents Framework with Self Reflection. PraisonAI application combines PraisonAI Agents, AutoGen, and CrewAI into a low-code solution for building and managing multi-agent LLM systems, focusing on simplicity, customisation, and efficient human-agent collaboration."
 authors = ["Mervin Praison"]
 license = ""
@@ -113,7 +113,7 @@ python = ">=3.10,<3.13"
 rich = ">=13.7"
 markdown = ">=3.5"
 pyparsing = ">=3.0.0"
-praisonaiagents = ">=0.0.108"
+praisonaiagents = ">=0.0.110"
 python-dotenv = ">=0.19.0"
 instructor = ">=1.3.3"
 PyYAML = ">=6.0"