PraisonAI 2.2.19__tar.gz → 2.2.20__tar.gz

{praisonai-2.2.19 → praisonai-2.2.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: PraisonAI
-Version: 2.2.19
+Version: 2.2.20
 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

{praisonai-2.2.19 → praisonai-2.2.20}/praisonai/__init__.py

@@ -3,4 +3,4 @@ import os
 os.environ["OTEL_SDK_DISABLED"] = "true"
 os.environ["EC_TELEMETRY"] = "false"
 from .cli import PraisonAI
-from .version import __version__
+from .version import __version__

{praisonai-2.2.19 → praisonai-2.2.20}/praisonai/api/call.py

@@ -39,9 +39,6 @@ LOG_EVENT_TYPES = [
 
 app = FastAPI()
 
-if not OPENAI_API_KEY:
-    raise ValueError('Missing the OpenAI API key. Please set it in the .env file.')
-
 # Set up logging
 logger = logging.getLogger(__name__)
 log_level = os.getenv("LOGLEVEL", "INFO").upper()
@@ -266,6 +263,9 @@ def setup_public_url(port):
 
 def run_server(port: int, use_public: bool = False):
     """Run the FastAPI server using uvicorn."""
+    if not OPENAI_API_KEY:
+        raise ValueError('Missing the OpenAI API key. Please set it in the .env file or configure it through the GUI.')
+    
     if use_public:
         setup_public_url(port)
     else:

{praisonai-2.2.19 → praisonai-2.2.20}/praisonai/cli.py

@@ -54,7 +54,7 @@ except ImportError:
     pass
 
 try:
-    from crewai import Agent, Task, Crew
+    import crewai
     CREWAI_AVAILABLE = True
 except ImportError:
     pass
@@ -147,6 +147,21 @@ class PraisonAI:
         """
         return self.main()
 
+    def read_stdin_if_available(self):
+        """
+        Read from stdin if it's available (when data is piped in).
+        Returns the stdin content or None if no piped input is available.
+        """
+        try:
+            # Check if stdin is not a terminal (i.e., has piped input)
+            if not sys.stdin.isatty():
+                stdin_content = sys.stdin.read().strip()
+                return stdin_content if stdin_content else None
+        except Exception:
+            # If there's any error reading stdin, ignore it
+            pass
+        return None
+
     def main(self):
         """
         The main function of the PraisonAI object. It parses the command-line arguments,
@@ -164,21 +179,41 @@ class PraisonAI:
 
         self.framework = args.framework or self.framework
 
+        # Check for piped input from stdin
+        stdin_input = self.read_stdin_if_available()
+
         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:
-                self.agent_file = args.command
+                # If stdin input is available, append it to the command
+                if stdin_input:
+                    combined_prompt = f"{args.command} {stdin_input}"
+                    result = self.handle_direct_prompt(combined_prompt)
+                    print(result)
+                    return result
+                else:
+                    self.agent_file = args.command
         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
-                result = self.handle_direct_prompt(args.direct_prompt)
+                # If stdin input is available, append it to the direct prompt
+                prompt = args.direct_prompt
+                if stdin_input:
+                    prompt = f"{args.direct_prompt} {stdin_input}"
+                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)
+                print(result)
+                return result
         # If no command or direct_prompt, preserve agent_file from constructor (don't overwrite)
 
         if args.deploy:
@@ -248,17 +283,29 @@ class PraisonAI:
                 print("All packages installed")
                 return
 
+            # Check if conda is available and environment exists
+            conda_available = True
+            conda_env_exists = False
+            
             try:
                 result = subprocess.check_output(['conda', 'env', 'list'])
                 if 'praison_env' in result.decode('utf-8'):
                     print("Conda environment 'praison_env' found.")
+                    conda_env_exists = True
                 else:
-                    raise subprocess.CalledProcessError(1, 'grep')
-            except subprocess.CalledProcessError:
-                print("Conda environment 'praison_env' not found. Setting it up...")
-                from praisonai.setup.setup_conda_env import main as setup_conda_main
-                setup_conda_main()
-                print("All packages installed.")
+                    print("Conda environment 'praison_env' not found. Setting it up...")
+                    from praisonai.setup.setup_conda_env import main as setup_conda_main
+                    setup_conda_main()
+                    print("All packages installed.")
+                    # Check again if environment was created successfully
+                    try:
+                        result = subprocess.check_output(['conda', 'env', 'list'])
+                        conda_env_exists = 'praison_env' in result.decode('utf-8')
+                    except subprocess.CalledProcessError:
+                        conda_env_exists = False
+            except (subprocess.CalledProcessError, FileNotFoundError):
+                print("Conda not available or failed to check environment.")
+                conda_available = False
 
             train_args = sys.argv[2:]  # Get all arguments after 'train'
             
@@ -278,7 +325,18 @@ class PraisonAI:
             env = os.environ.copy()
             env['PYTHONUNBUFFERED'] = '1'
 
-            stream_subprocess(['conda', 'run', '--no-capture-output', '--name', 'praison_env', 'python', '-u', train_script_path, 'train'], env=env)
+            # Try conda run first, fallback to direct Python execution
+            if conda_available and conda_env_exists:
+                try:
+                    print("Attempting to run training using conda environment...")
+                    stream_subprocess(['conda', 'run', '--no-capture-output', '--name', 'praison_env', 'python', '-u', train_script_path, 'train'], env=env)
+                except subprocess.CalledProcessError as e:
+                    print(f"Conda run failed with error: {e}")
+                    print("Falling back to direct Python execution...")
+                    stream_subprocess([sys.executable, '-u', train_script_path, 'train'], env=env)
+            else:
+                print("Conda environment not available, using direct Python execution...")
+                stream_subprocess([sys.executable, '-u', train_script_path, 'train'], env=env)
             return
 
         if args.auto or self.auto:
@@ -500,6 +558,7 @@ class PraisonAI:
             result = agent.start(prompt)
             return result
         elif CREWAI_AVAILABLE:
+            from crewai import Agent, Task, Crew
             agent_config = {
                 "name": "DirectAgent",
                 "role": "Assistant",

{praisonai-2.2.19 → praisonai-2.2.20}/praisonai/deploy.py

@@ -56,7 +56,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.19 gunicorn markdown\n")
+            file.write("RUN pip install flask praisonai==2.2.20 gunicorn markdown\n")
             file.write("EXPOSE 8080\n")
             file.write('CMD ["gunicorn", "-b", "0.0.0.0:8080", "api:app"]\n')
             

{praisonai-2.2.19 → praisonai-2.2.20}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "PraisonAI"
-version = "2.2.19"
+version = "2.2.20"
 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 = ""
@@ -19,6 +19,11 @@ dependencies = [
     "mcp>=1.6.0",
 ]
 
+[project.scripts]
+praisonai = "praisonai.__main__:main"
+setup-conda-env = "praisonai.setup.setup_conda_env:main"
+praisonai-call = "praisonai.api.call:main"
+
 [project.optional-dependencies]
 ui = [
     "chainlit==2.5.5",
@@ -89,7 +94,7 @@ autogen = ["pyautogen>=0.2.19", "praisonai-tools>=0.0.15", "crewai"]
 
 [tool.poetry]
 name = "PraisonAI"
-version = "2.2.19"
+version = "2.2.20"
 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 = ""