PraisonAI 2.0.53__cp311-cp311-macosx_15_0_arm64.whl → 2.2.16__cp311-cp311-macosx_15_0_arm64.whl

praisonai/README.md

@@ -0,0 +1,5 @@
+# PraisonAI Package
+
+This is the PraisonAI package, which serves as a wrapper for PraisonAIAgents.
+
+It provides a simple and intuitive interface for working with AI agents and their capabilities.

praisonai/agents_generator.py

@@ -437,20 +437,26 @@ class AgentsGenerator:
             llm_model = details.get('llm')
             if llm_model:
                 llm = PraisonAIModel(
-                    model=llm_model.get("model", os.environ.get("MODEL_NAME", "openai/gpt-4o")),
+                    model=llm_model.get("model") or os.environ.get("MODEL_NAME") or "openai/gpt-4o",
+                    base_url=self.config_list[0].get('base_url') if self.config_list else None
                 ).get_model()
             else:
-                llm = PraisonAIModel().get_model()
+                llm = PraisonAIModel(
+                    base_url=self.config_list[0].get('base_url') if self.config_list else None
+                ).get_model()
 
             # Configure function calling LLM
             function_calling_llm_model = details.get('function_calling_llm')
             if function_calling_llm_model:
                 function_calling_llm = PraisonAIModel(
-                    model=function_calling_llm_model.get("model", os.environ.get("MODEL_NAME", "openai/gpt-4o")),
+                    model=function_calling_llm_model.get("model") or os.environ.get("MODEL_NAME") or "openai/gpt-4o",
+                    base_url=self.config_list[0].get('base_url') if self.config_list else None
                 ).get_model()
             else:
-                function_calling_llm = PraisonAIModel().get_model()
-            
+                function_calling_llm = PraisonAIModel(
+                    base_url=self.config_list[0].get('base_url') if self.config_list else None
+                ).get_model()
+
             # Create CrewAI agent
             agent = Agent(
                 role=role_filled,
@@ -460,14 +466,14 @@ class AgentsGenerator:
                 allow_delegation=details.get('allow_delegation', False),
                 llm=llm,
                 function_calling_llm=function_calling_llm,
-                max_iter=details.get('max_iter', 15),
-                max_rpm=details.get('max_rpm'),
-                max_execution_time=details.get('max_execution_time'),
+                max_iter=details.get('max_iter') or 15,
+                max_rpm=details.get('max_rpm') or None,
+                max_execution_time=details.get('max_execution_time') or None,
                 verbose=details.get('verbose', True),
                 cache=details.get('cache', True),
-                system_template=details.get('system_template'),
-                prompt_template=details.get('prompt_template'),
-                response_template=details.get('response_template'),
+                system_template=details.get('system_template') or None,
+                prompt_template=details.get('prompt_template') or None,
+                response_template=details.get('response_template') or None,
             )
             
             # Set agent callback if provided
@@ -516,7 +522,7 @@ class AgentsGenerator:
         crew = Crew(
             agents=list(agents.values()),
             tasks=tasks,
-            verbose=2
+            verbose=True
         )
         
         self.logger.debug("Final Crew Configuration:")
@@ -557,8 +563,8 @@ class AgentsGenerator:
                 backstory=backstory_filled,
                 tools=tools_list,  # Pass the entire tools list to the agent
                 allow_delegation=details.get('allow_delegation', False),
-                llm=details.get('llm', {}).get("model", os.environ.get("MODEL_NAME", "gpt-4o")),
-                function_calling_llm=details.get('function_calling_llm', {}).get("model", os.environ.get("MODEL_NAME", "gpt-4o")),
+                llm=details.get('llm', {}).get("model") or os.environ.get("MODEL_NAME") or "openai/gpt-4o",
+                function_calling_llm=details.get('function_calling_llm', {}).get("model") or os.environ.get("MODEL_NAME") or "openai/gpt-4o",
                 max_iter=details.get('max_iter', 15),
                 max_rpm=details.get('max_rpm'),
                 max_execution_time=details.get('max_execution_time'),
@@ -567,7 +573,7 @@ class AgentsGenerator:
                 system_template=details.get('system_template'),
                 prompt_template=details.get('prompt_template'),
                 response_template=details.get('response_template'),
-                reflect_llm=details.get('reflect_llm', {}).get("model", os.environ.get("MODEL_NAME", "gpt-4o")),
+                reflect_llm=details.get('reflect_llm', {}).get("model") or os.environ.get("MODEL_NAME") or "openai/gpt-4o",
                 min_reflect=details.get('min_reflect', 1),
                 max_reflect=details.get('max_reflect', 3),
             )
@@ -623,14 +629,14 @@ class AgentsGenerator:
                 tasks=tasks,
                 verbose=True,
                 process="hierarchical",
-                manager_llm=config.get('manager_llm', 'gpt-4o'),
+                manager_llm=config.get('manager_llm') or os.environ.get("MODEL_NAME") or "openai/gpt-4o",
                 memory=memory
             )
         else:
             agents = PraisonAIAgents(
                 agents=list(agents.values()),
                 tasks=tasks,
-                verbose=2,
+                verbose=True,
                 memory=memory
             )
 

praisonai/auto.py

@@ -104,7 +104,7 @@ Tools are not available for {framework}. To use tools, install:
         self.client = instructor.patch(
             OpenAI(
                 base_url=self.config_list[0]['base_url'],
-                api_key=os.getenv("OPENAI_API_KEY"),
+                api_key=self.config_list[0]['api_key'],
             ),
             mode=instructor.Mode.JSON,
         )

praisonai/cli.py

@@ -25,7 +25,6 @@ CALL_MODULE_AVAILABLE = False
 CREWAI_AVAILABLE = False
 AUTOGEN_AVAILABLE = False
 PRAISONAI_AVAILABLE = False
-
 try:
     # Create necessary directories and set CHAINLIT_APP_ROOT
     if "CHAINLIT_APP_ROOT" not in os.environ:
@@ -114,11 +113,14 @@ class PraisonAI:
         Initialize the PraisonAI object with default parameters.
         """
         self.agent_yaml = agent_yaml
+        # Create config_list with AutoGen compatibility
+        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"),
-                'api_key': os.environ.get("OPENAI_API_KEY")
+                'api_key': api_key,
+                'api_type': 'openai'        # AutoGen expects this field
             }
         ]
         self.agent_file = agent_file
@@ -131,7 +133,7 @@ class PraisonAI:
         """
         Run the PraisonAI application.
         """
-        self.main()
+        return self.main()
 
     def main(self):
         """
@@ -139,17 +141,33 @@ class PraisonAI:
         initializes the necessary attributes, and then calls the appropriate methods based on the
         provided arguments.
         """
+        # Store the original agent_file from constructor
+        original_agent_file = self.agent_file
+        
         args = self.parse_args()
+        # Store args for use in handle_direct_prompt
+        self.args = args
         invocation_cmd = "praisonai"
         version_string = f"PraisonAI version {__version__}"
 
         self.framework = args.framework or self.framework
 
         if args.command:
-            if args.command.startswith("tests.test"):  # Argument used for testing purposes
+            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
+        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)
+                print(result)
+                return result
+            else:
+                # Agent file was explicitly set, ignore direct prompt and use the file
+                pass
+        # If no command or direct_prompt, preserve agent_file from constructor (don't overwrite)
 
         if args.deploy:
             from .deploy import CloudDeployer
@@ -180,8 +198,18 @@ class PraisonAI:
             package_root = os.path.dirname(os.path.abspath(__file__))
             config_yaml_destination = os.path.join(os.getcwd(), 'config.yaml')
 
-            # Create config.yaml only if it doesn't exist or --model or --dataset is provided
-            if not os.path.exists(config_yaml_destination) or args.model or args.dataset:
+            if not os.path.exists(config_yaml_destination):
+                config = generate_config(
+                    model_name=args.model,
+                    hf_model_name=args.hf,
+                    ollama_model_name=args.ollama,
+                    dataset=[{
+                        "name": args.dataset
+                    }]
+                )
+                with open('config.yaml', 'w') as f:
+                    yaml.dump(config, f, default_flow_style=False, indent=2)
+            elif args.model or args.hf or args.ollama or (args.dataset and args.dataset != "yahma/alpaca-cleaned"):
                 config = generate_config(
                     model_name=args.model,
                     hf_model_name=args.hf,
@@ -192,6 +220,9 @@ class PraisonAI:
                 )
                 with open('config.yaml', 'w') as f:
                     yaml.dump(config, f, default_flow_style=False, indent=2)
+            else:
+                with open(config_yaml_destination, 'r') as f:
+                    config = yaml.safe_load(f)
 
             # Overwrite huggingface_save and ollama_save if --hf or --ollama are provided
             if args.hf:
@@ -218,7 +249,18 @@ class PraisonAI:
                 print("All packages installed.")
 
             train_args = sys.argv[2:]  # Get all arguments after 'train'
-            train_script_path = os.path.join(package_root, 'train.py')
+            
+            # Check if this is a vision model - handle all case variations
+            model_name = config.get("model_name", "").lower()
+            is_vision_model = any(x in model_name for x in ["-vl-", "-vl", "vl-", "-vision-", "-vision", "vision-", "visionmodel"])
+            
+            # Choose appropriate training script
+            if is_vision_model:
+                train_script_path = os.path.join(package_root, 'train_vision.py')
+                print("Using vision training script for VL model...")
+            else:
+                train_script_path = os.path.join(package_root, 'train.py')
+                print("Using standard training script...")
 
             # Set environment variables
             env = os.environ.copy()
@@ -285,22 +327,41 @@ class PraisonAI:
         """
         Parse the command-line arguments for the PraisonAI CLI.
         """
+        # Check if we're running in a test environment
+        in_test_env = (
+            'pytest' in sys.argv[0] or 
+            'unittest' in sys.argv[0] or
+            any('test' in arg for arg in sys.argv[1:3]) or  # Check first few args for test indicators
+            'pytest' in sys.modules or
+            'unittest' in sys.modules
+        )
+        
+        # Define special commands
+        special_commands = ['chat', 'code', 'call', 'realtime', 'train', 'ui']
+        
         parser = argparse.ArgumentParser(prog="praisonai", description="praisonAI command-line interface")
         parser.add_argument("--framework", choices=["crewai", "autogen", "praisonai"], help="Specify the framework")
         parser.add_argument("--ui", choices=["chainlit", "gradio"], help="Specify the UI framework (gradio or chainlit).")
         parser.add_argument("--auto", nargs=argparse.REMAINDER, help="Enable auto mode and pass arguments for it")
         parser.add_argument("--init", nargs=argparse.REMAINDER, help="Initialize agents with optional topic")
-        parser.add_argument("command", nargs="?", help="Command to run")
+        parser.add_argument("command", nargs="?", help="Command to run or direct prompt")
         parser.add_argument("--deploy", action="store_true", help="Deploy the application")
         parser.add_argument("--model", type=str, help="Model name")
+        parser.add_argument("--llm", type=str, help="LLM model to use for direct prompts")
         parser.add_argument("--hf", type=str, help="Hugging Face model name")
         parser.add_argument("--ollama", type=str, help="Ollama model name")
         parser.add_argument("--dataset", type=str, help="Dataset name for training", default="yahma/alpaca-cleaned")
         parser.add_argument("--realtime", action="store_true", help="Start the realtime voice interaction interface")
         parser.add_argument("--call", action="store_true", help="Start the PraisonAI Call server")
         parser.add_argument("--public", action="store_true", help="Use ngrok to expose the server publicly (only with --call)")
-        args, unknown_args = parser.parse_known_args()
+        
+        # If we're in a test environment, parse with empty args to avoid pytest interference
+        if in_test_env:
+            args, unknown_args = parser.parse_known_args([])
+        else:
+            args, unknown_args = parser.parse_known_args()
 
+        # Handle special cases first
         if unknown_args and unknown_args[0] == '-b' and unknown_args[1] == 'api:app':
             args.command = 'agents.yaml'
         if args.command == 'api:app' or args.command == '/app/api:app':
@@ -331,9 +392,7 @@ class PraisonAI:
             call_module.main(call_args)
             sys.exit(0)
 
-        # Handle special commands first
-        special_commands = ['chat', 'code', 'call', 'realtime', 'train', 'ui']
-
+        # Handle special commands
         if args.command in special_commands:
             if args.command == 'chat':
                 if not CHAINLIT_AVAILABLE:
@@ -380,9 +439,8 @@ class PraisonAI:
                 sys.exit(0)
 
             elif args.command == 'train':
-                print("[red]ERROR: Train feature is not installed. Install with:[/red]")
-                print("\npip install \"praisonai[train]\"\n")
-                sys.exit(1)
+                package_root = os.path.dirname(os.path.abspath(__file__))
+                config_yaml_destination = os.path.join(os.getcwd(), 'config.yaml')
 
             elif args.command == 'ui':
                 if not CHAINLIT_AVAILABLE:
@@ -402,8 +460,79 @@ class PraisonAI:
                 print("pip install praisonaiagents # For PraisonAIAgents\n")  
                 sys.exit(1)
 
+        # Handle direct prompt if command is not a special command or file
+        # Skip this during testing to avoid pytest arguments interfering
+        if not in_test_env and args.command and not args.command.endswith('.yaml') and args.command not in special_commands:
+            args.direct_prompt = args.command
+            args.command = None
+
         return args
 
+    def handle_direct_prompt(self, prompt):
+        """
+        Handle direct prompt by creating a single agent and running it.
+        """
+        if PRAISONAI_AVAILABLE:
+            agent_config = {
+                "name": "DirectAgent",
+                "role": "Assistant",
+                "goal": "Complete the given task",
+                "backstory": "You are a helpful AI assistant"
+            }
+            
+            # Add llm if specified
+            if hasattr(self, 'args') and self.args.llm:
+                agent_config["llm"] = self.args.llm
+            
+            agent = PraisonAgent(**agent_config)
+            result = agent.start(prompt)
+            return result
+        elif CREWAI_AVAILABLE:
+            agent_config = {
+                "name": "DirectAgent",
+                "role": "Assistant",
+                "goal": "Complete the given task",
+                "backstory": "You are a helpful AI assistant"
+            }
+            
+            # Add llm if specified
+            if hasattr(self, 'args') and self.args.llm:
+                agent_config["llm"] = self.args.llm
+            
+            agent = Agent(**agent_config)
+            task = Task(
+                description=prompt,
+                agent=agent
+            )
+            crew = Crew(
+                agents=[agent],
+                tasks=[task]
+            )
+            return crew.kickoff()
+        elif AUTOGEN_AVAILABLE:
+            config_list = self.config_list
+            # Add llm if specified
+            if hasattr(self, 'args') and self.args.llm:
+                config_list[0]['model'] = self.args.llm
+                
+            assistant = autogen.AssistantAgent(
+                name="DirectAgent",
+                llm_config={"config_list": config_list}
+            )
+            user_proxy = autogen.UserProxyAgent(
+                name="UserProxy",
+                code_execution_config={"work_dir": "coding"}
+            )
+            user_proxy.initiate_chat(assistant, message=prompt)
+            return "Task completed"
+        else:
+            print("[red]ERROR: No framework is installed. Please install at least one framework:[/red]")
+            print("\npip install \"praisonai\\[crewai]\"  # For CrewAI")
+            print("pip install \"praisonai\\[autogen]\"  # For AutoGen")
+            print("pip install \"praisonai\\[crewai,autogen]\"  # For both frameworks\n")
+            print("pip install praisonaiagents # For PraisonAIAgents\n")  
+            sys.exit(1)
+
     def create_chainlit_chat_interface(self):
         """
         Create a Chainlit interface for the chat application.

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

praisonai/inbuilt_tools/__init__.py

@@ -1,4 +1,4 @@
-# Only try to import autogen_tools if either CrewAI or AutoGen is available
+# Only try to import autogen_tools if either CrewAI or AG2 is available
 CREWAI_AVAILABLE = False
 AUTOGEN_AVAILABLE = False
 PRAISONAI_TOOLS_AVAILABLE = False

praisonai/setup/setup_conda_env.sh

@@ -11,6 +11,38 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
 elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
     # Linux
     MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh"
+    
+    # Install libcurl development package if not present (Debian based)
+    if command -v dpkg &> /dev/null; then
+        if ! dpkg -s libcurl4-openssl-dev &> /dev/null; then
+            echo "libcurl4-openssl-dev is not installed. Installing..."
+            sudo apt-get update
+            sudo apt-get install -y libcurl4-openssl-dev
+        else
+            echo "libcurl4-openssl-dev is already installed."
+        fi
+    else
+        echo "Non-Debian based Linux detected. Please ensure libcurl development libraries are installed."
+    fi
+
+    # Check if ollama is installed and executable; if not, install it
+    if ! command -v ollama &> /dev/null; then
+        echo "Ollama is not installed. Installing Ollama..."
+        curl -fsSL https://ollama.com/install.sh | sh
+        
+        # Generate SSH key non-interactively only if it doesn't already exist
+        if [ ! -f ~/.ssh/id_ed25519 ]; then
+            echo "Generating SSH key for Ollama..."
+            ssh-keygen -t ed25519 -N "" -f ~/.ssh/id_ed25519 -q
+        else
+            echo "SSH key ~/.ssh/id_ed25519 already exists. Skipping generation."
+        fi
+        echo "Copying SSH key to /usr/share/ollama/.ollama..."
+        sudo cp ~/.ssh/id_ed25519 /usr/share/ollama/.ollama
+    else
+        echo "Ollama is already installed."
+    fi
+
 elif [[ "$OSTYPE" == "msys" || "$OSTYPE" == "win32" ]]; then
     # Windows
     MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-latest-Windows-x86_64.exe"
@@ -21,12 +53,12 @@ else
     exit 1
 fi
 
-# Check if conda is already installed
+# Check if conda is installed
 if ! command -v conda &> /dev/null; then
     echo "Conda is not installed. Installing Miniconda..."
-    wget $MINICONDA_URL -O ~/miniconda.sh
-    bash ~/miniconda.sh -b -p $HOME/miniconda
-    source $HOME/miniconda/bin/activate
+    wget "$MINICONDA_URL" -O ~/miniconda.sh
+    bash ~/miniconda.sh -b -p "$HOME/miniconda"
+    source "$HOME/miniconda/bin/activate"
     conda init
 else
     echo "Conda is already installed."
@@ -34,39 +66,40 @@ fi
 
 # Create and activate the Conda environment
 ENV_NAME="praison_env"
-if conda info --envs | grep -q $ENV_NAME; then
+if conda info --envs | grep -q "$ENV_NAME"; then
     echo "Environment $ENV_NAME already exists. Recreating..."
-    conda env remove -y -n $ENV_NAME  # Remove existing environment
+    conda env remove -y -n "$ENV_NAME"
     if [[ "$OSTYPE" == "darwin"* ]]; then
-        # macOS (both Intel and M1/M2)
-        conda create --name $ENV_NAME python=3.10 pytorch=2.3.0 -c pytorch -y
+        conda create --name "$ENV_NAME" python=3.10 pytorch=2.3.0 -c pytorch -y
     elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
-        # Linux
-        conda create --name $ENV_NAME python=3.10 pytorch=2.3.0 cudatoolkit=11.8 -c pytorch -c nvidia -y
+        conda create --name "$ENV_NAME" python=3.10 pytorch=2.3.0 cudatoolkit=11.8 -c pytorch -c nvidia -y
     fi
-    # conda activate $ENV_NAME
 else
     echo "Creating new environment $ENV_NAME..."
     if [[ "$OSTYPE" == "darwin"* ]]; then
-        # macOS (both Intel and M1/M2)
-        conda create --name $ENV_NAME python=3.10 pytorch=2.3.0 -c pytorch -y
+        conda create --name "$ENV_NAME" python=3.10 pytorch=2.3.0 -c pytorch -y
     elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
-        # Linux
-        conda create --name $ENV_NAME python=3.10 pytorch=2.3.0 cudatoolkit=11.8 -c pytorch -c nvidia -y
+        conda create --name "$ENV_NAME" python=3.10 pytorch=2.3.0 cudatoolkit=11.8 -c pytorch -c nvidia -y
     fi
-    # conda activate $ENV_NAME
 fi
 
-# source $HOME/miniconda/bin/activate $ENV_NAME
+# Activate the environment
+source "$HOME/miniconda/bin/activate" "$ENV_NAME"
+
+# Install cmake via conda
+echo "Installing cmake..."
+conda install -y cmake
 
-# Get full path of pip
-PIP_FULL_PATH=$(conda run -n $ENV_NAME which pip)
+# Get full path of pip within the activated environment
+PIP_FULL_PATH=$(conda run -n "$ENV_NAME" which pip)
 
-# Install other packages within the activated environment
-# Use PIP_FULL_PATH to run pip commands
+# Install other packages using pip
 $PIP_FULL_PATH install --upgrade pip 
 $PIP_FULL_PATH install "xformers==0.0.26.post1"
-$PIP_FULL_PATH install "unsloth[colab-new] @ git+https://github.com/unslothai/unsloth.git@4e570be9ae4ced8cdc64e498125708e34942befc"
+$PIP_FULL_PATH install "unsloth[colab-new] @ git+https://github.com/unslothai/unsloth.git@53a773e4fbc53a1d96c7ba107e5fe75dab07027b"
 $PIP_FULL_PATH install --no-deps "trl<0.9.0" peft accelerate bitsandbytes 
+$PIP_FULL_PATH install unsloth_zoo
+$PIP_FULL_PATH install cut_cross_entropy
+$PIP_FULL_PATH install sentencepiece protobuf datasets huggingface_hub hf_transfer wandb
 
 echo "Setup completed successfully!"