PraisonAI 2.2.99__tar.gz → 2.3.0__tar.gz

{praisonai-2.2.99 → praisonai-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PraisonAI
-Version: 2.2.99
+Version: 2.3.0
 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
 License: MIT
@@ -11,7 +11,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: rich>=13.7
 Requires-Dist: markdown>=3.5
 Requires-Dist: pyparsing>=3.0.0
-Requires-Dist: praisonaiagents>=0.0.169
+Requires-Dist: praisonaiagents>=0.0.170
 Requires-Dist: python-dotenv>=0.19.0
 Requires-Dist: instructor>=1.3.3
 Requires-Dist: PyYAML>=6.0
@@ -815,6 +815,47 @@ agent = Agent(tools=["my_tool"])  # Works automatically!
 ```
 
 
+## Prompt Expansion
+
+Expand short prompts into detailed, actionable prompts:
+
+### CLI Usage
+
+```bash
+# Expand a short prompt into detailed prompt
+praisonai "write a movie script in 3 lines" --expand-prompt
+
+# With verbose output
+praisonai "blog about AI" --expand-prompt -v
+
+# With tools for context gathering
+praisonai "latest AI trends" --expand-prompt --expand-tools tools.py
+
+# Combine with query rewrite
+praisonai "AI news" --query-rewrite --expand-prompt
+```
+
+### Programmatic Usage
+
+```python
+from praisonaiagents import PromptExpanderAgent, ExpandStrategy
+
+# Basic usage
+agent = PromptExpanderAgent()
+result = agent.expand("write a movie script in 3 lines")
+print(result.expanded_prompt)
+
+# With specific strategy
+result = agent.expand("blog about AI", strategy=ExpandStrategy.DETAILED)
+
+# Available strategies: BASIC, DETAILED, STRUCTURED, CREATIVE, AUTO
+```
+
+**Key Difference:**
+- `--query-rewrite`: Optimizes queries for **search/retrieval** (RAG)
+- `--expand-prompt`: Expands prompts for **detailed task execution**
+
+
 ## Development:
 
 Below is used for development only.
@@ -832,21 +873,14 @@ uv pip install -r pyproject.toml --extra code
 uv pip install -r pyproject.toml --extra "crewai,autogen"
 ```
 
-### Version Bump
+### Bump and Release
 
 ```bash
-# From project root
-python src/praisonai/scripts/bump_version.py 2.2.96
+# From project root - bumps version and releases in one command
+python src/praisonai/scripts/bump_and_release.py 2.2.99
 
 # With praisonaiagents dependency
-python src/praisonai/scripts/bump_version.py 2.2.96 --agents 0.0.167
-```
-
-### Release
-
-```bash
-# From project root (runs uv lock, build, git tag, gh release)
-python src/praisonai/scripts/release.py
+python src/praisonai/scripts/bump_and_release.py 2.2.99 --agents 0.0.169
 
 # Then publish
 cd src/praisonai && uv publish

{praisonai-2.2.99 → praisonai-2.3.0}/PraisonAI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PraisonAI
-Version: 2.2.99
+Version: 2.3.0
 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
 License: MIT
@@ -11,7 +11,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: rich>=13.7
 Requires-Dist: markdown>=3.5
 Requires-Dist: pyparsing>=3.0.0
-Requires-Dist: praisonaiagents>=0.0.169
+Requires-Dist: praisonaiagents>=0.0.170
 Requires-Dist: python-dotenv>=0.19.0
 Requires-Dist: instructor>=1.3.3
 Requires-Dist: PyYAML>=6.0
@@ -815,6 +815,47 @@ agent = Agent(tools=["my_tool"])  # Works automatically!
 ```
 
 
+## Prompt Expansion
+
+Expand short prompts into detailed, actionable prompts:
+
+### CLI Usage
+
+```bash
+# Expand a short prompt into detailed prompt
+praisonai "write a movie script in 3 lines" --expand-prompt
+
+# With verbose output
+praisonai "blog about AI" --expand-prompt -v
+
+# With tools for context gathering
+praisonai "latest AI trends" --expand-prompt --expand-tools tools.py
+
+# Combine with query rewrite
+praisonai "AI news" --query-rewrite --expand-prompt
+```
+
+### Programmatic Usage
+
+```python
+from praisonaiagents import PromptExpanderAgent, ExpandStrategy
+
+# Basic usage
+agent = PromptExpanderAgent()
+result = agent.expand("write a movie script in 3 lines")
+print(result.expanded_prompt)
+
+# With specific strategy
+result = agent.expand("blog about AI", strategy=ExpandStrategy.DETAILED)
+
+# Available strategies: BASIC, DETAILED, STRUCTURED, CREATIVE, AUTO
+```
+
+**Key Difference:**
+- `--query-rewrite`: Optimizes queries for **search/retrieval** (RAG)
+- `--expand-prompt`: Expands prompts for **detailed task execution**
+
+
 ## Development:
 
 Below is used for development only.
@@ -832,21 +873,14 @@ uv pip install -r pyproject.toml --extra code
 uv pip install -r pyproject.toml --extra "crewai,autogen"
 ```
 
-### Version Bump
+### Bump and Release
 
 ```bash
-# From project root
-python src/praisonai/scripts/bump_version.py 2.2.96
+# From project root - bumps version and releases in one command
+python src/praisonai/scripts/bump_and_release.py 2.2.99
 
 # With praisonaiagents dependency
-python src/praisonai/scripts/bump_version.py 2.2.96 --agents 0.0.167
-```
-
-### Release
-
-```bash
-# From project root (runs uv lock, build, git tag, gh release)
-python src/praisonai/scripts/release.py
+python src/praisonai/scripts/bump_and_release.py 2.2.99 --agents 0.0.169
 
 # Then publish
 cd src/praisonai && uv publish

{praisonai-2.2.99 → praisonai-2.3.0}/PraisonAI.egg-info/requires.txt

@@ -1,7 +1,7 @@
 rich>=13.7
 markdown>=3.5
 pyparsing>=3.0.0
-praisonaiagents>=0.0.169
+praisonaiagents>=0.0.170
 python-dotenv>=0.19.0
 instructor>=1.3.3
 PyYAML>=6.0

{praisonai-2.2.99 → praisonai-2.3.0}/README.md

@@ -718,6 +718,47 @@ agent = Agent(tools=["my_tool"])  # Works automatically!
 ```
 
 
+## Prompt Expansion
+
+Expand short prompts into detailed, actionable prompts:
+
+### CLI Usage
+
+```bash
+# Expand a short prompt into detailed prompt
+praisonai "write a movie script in 3 lines" --expand-prompt
+
+# With verbose output
+praisonai "blog about AI" --expand-prompt -v
+
+# With tools for context gathering
+praisonai "latest AI trends" --expand-prompt --expand-tools tools.py
+
+# Combine with query rewrite
+praisonai "AI news" --query-rewrite --expand-prompt
+```
+
+### Programmatic Usage
+
+```python
+from praisonaiagents import PromptExpanderAgent, ExpandStrategy
+
+# Basic usage
+agent = PromptExpanderAgent()
+result = agent.expand("write a movie script in 3 lines")
+print(result.expanded_prompt)
+
+# With specific strategy
+result = agent.expand("blog about AI", strategy=ExpandStrategy.DETAILED)
+
+# Available strategies: BASIC, DETAILED, STRUCTURED, CREATIVE, AUTO
+```
+
+**Key Difference:**
+- `--query-rewrite`: Optimizes queries for **search/retrieval** (RAG)
+- `--expand-prompt`: Expands prompts for **detailed task execution**
+
+
 ## Development:
 
 Below is used for development only.
@@ -735,21 +776,14 @@ uv pip install -r pyproject.toml --extra code
 uv pip install -r pyproject.toml --extra "crewai,autogen"
 ```
 
-### Version Bump
+### Bump and Release
 
 ```bash
-# From project root
-python src/praisonai/scripts/bump_version.py 2.2.96
+# From project root - bumps version and releases in one command
+python src/praisonai/scripts/bump_and_release.py 2.2.99
 
 # With praisonaiagents dependency
-python src/praisonai/scripts/bump_version.py 2.2.96 --agents 0.0.167
-```
-
-### Release
-
-```bash
-# From project root (runs uv lock, build, git tag, gh release)
-python src/praisonai/scripts/release.py
+python src/praisonai/scripts/bump_and_release.py 2.2.99 --agents 0.0.169
 
 # Then publish
 cd src/praisonai && uv publish

{praisonai-2.2.99 → praisonai-2.3.0}/praisonai/cli.py

@@ -579,6 +579,8 @@ class PraisonAI:
         parser.add_argument("--research", action="store_true", help="Run deep research on a topic")
         parser.add_argument("--query-rewrite", action="store_true", help="Rewrite query for better results (works with any command)")
         parser.add_argument("--rewrite-tools", type=str, help="Tools for query rewriter (e.g., 'internet_search' or path to tools.py)")
+        parser.add_argument("--expand-prompt", action="store_true", help="Expand short prompt into detailed prompt (works with any command)")
+        parser.add_argument("--expand-tools", type=str, help="Tools for prompt expander (e.g., 'internet_search' or path to tools.py)")
         parser.add_argument("--tools", "-t", type=str, help="Path to tools.py file for research agent")
         parser.add_argument("--save", "-s", action="store_true", help="Save research output to file (output/research/)")
         parser.add_argument("--verbose", "-v", action="store_true", help="Enable verbose output for research")
@@ -839,12 +841,106 @@ class PraisonAI:
         verbose = getattr(self.args, 'verbose', False)
         return self._rewrite_query(query, rewrite_tools, verbose)
 
+    def _expand_prompt(self, prompt: str, expand_tools: str = None, verbose: bool = False) -> str:
+        """
+        Expand prompt using PromptExpanderAgent.
+        
+        Args:
+            prompt: The prompt to expand
+            expand_tools: Tool names (comma-separated) or path to tools.py
+            verbose: Enable verbose output
+            
+        Returns:
+            Expanded prompt or original if expansion fails
+        """
+        try:
+            from praisonaiagents import PromptExpanderAgent, ExpandStrategy
+            from rich import print
+            
+            print("[bold cyan]Expanding prompt for detailed execution...[/bold cyan]")
+            
+            # Load expand tools if specified
+            expand_tools_list = []
+            if expand_tools:
+                if os.path.isfile(expand_tools):
+                    # Load from file
+                    try:
+                        import inspect
+                        import importlib.util
+                        spec = importlib.util.spec_from_file_location("expand_tools_module", expand_tools)
+                        if spec and spec.loader:
+                            module = importlib.util.module_from_spec(spec)
+                            spec.loader.exec_module(module)
+                            for name, obj in inspect.getmembers(module):
+                                if inspect.isfunction(obj) and not name.startswith('_'):
+                                    expand_tools_list.append(obj)
+                            if expand_tools_list:
+                                print(f"[cyan]Loaded {len(expand_tools_list)} tools for prompt expander[/cyan]")
+                    except Exception as e:
+                        print(f"[yellow]Warning: Failed to load expand tools: {e}[/yellow]")
+                else:
+                    # Treat as comma-separated tool names
+                    try:
+                        from praisonaiagents.tools import TOOL_MAPPINGS
+                        import praisonaiagents.tools as tools_module
+                        
+                        tool_names = [t.strip() for t in expand_tools.split(',')]
+                        for tool_name in tool_names:
+                            if tool_name in TOOL_MAPPINGS:
+                                try:
+                                    tool = getattr(tools_module, tool_name)
+                                    expand_tools_list.append(tool)
+                                except Exception as e:
+                                    print(f"[yellow]Warning: Failed to load expand tool '{tool_name}': {e}[/yellow]")
+                            else:
+                                print(f"[yellow]Warning: Unknown expand tool '{tool_name}'[/yellow]")
+                        if expand_tools_list:
+                            print(f"[cyan]Using expand tools: {', '.join(tool_names)}[/cyan]")
+                    except ImportError:
+                        print("[yellow]Warning: Could not import tools module[/yellow]")
+            
+            expander = PromptExpanderAgent(
+                model="gpt-4o-mini", 
+                verbose=verbose, 
+                tools=expand_tools_list if expand_tools_list else None
+            )
+            result = expander.expand(prompt, strategy=ExpandStrategy.AUTO)
+            expanded = result.expanded_prompt
+            
+            print(f"[cyan]Original:[/cyan] {prompt}")
+            print(f"[cyan]Expanded:[/cyan] {expanded}")
+            
+            return expanded
+            
+        except ImportError:
+            from rich import print
+            print("[yellow]Warning: PromptExpanderAgent not available, using original prompt[/yellow]")
+            return prompt
+        except Exception as e:
+            from rich import print
+            print(f"[yellow]Warning: Prompt expansion failed ({e}), using original prompt[/yellow]")
+            return prompt
+
+    def _expand_prompt_if_enabled(self, prompt: str) -> str:
+        """
+        Expand prompt using PromptExpanderAgent if --expand-prompt is enabled.
+        Returns the expanded prompt or original if expansion is disabled/fails.
+        """
+        if not hasattr(self, 'args') or not getattr(self.args, 'expand_prompt', False):
+            return prompt
+        
+        expand_tools = getattr(self.args, 'expand_tools', None)
+        verbose = getattr(self.args, 'verbose', False)
+        return self._expand_prompt(prompt, expand_tools, verbose)
+
     def handle_direct_prompt(self, prompt):
         """
         Handle direct prompt by creating a single agent and running it.
         """
         # Apply query rewriting if enabled
         prompt = self._rewrite_query_if_enabled(prompt)
+        # Apply prompt expansion if enabled
+        prompt = self._expand_prompt_if_enabled(prompt)
         
         if PRAISONAI_AVAILABLE:
             agent_config = {

{praisonai-2.2.99 → praisonai-2.3.0}/praisonai/deploy.py

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

praisonai-2.3.0/praisonai/version.py

@@ -0,0 +1 @@
+__version__ = "2.3.0"

{praisonai-2.2.99 → praisonai-2.3.0}/pyproject.toml

@@ -12,7 +12,7 @@ dependencies = [
     "rich>=13.7",
     "markdown>=3.5",
     "pyparsing>=3.0.0",
-    "praisonaiagents>=0.0.169",
+    "praisonaiagents>=0.0.170",
     "python-dotenv>=0.19.0",
     "instructor>=1.3.3",
     "PyYAML>=6.0",

{praisonai-2.2.99 → praisonai-2.3.0}/tests/test.py

@@ -59,8 +59,11 @@ class TestPraisonAICommandLine(unittest.TestCase):
             # In CI, it should be set by the workflow
             print("Warning: OPENAI_API_KEY not found in CLI test environment. API calls might fail if not mocked.")
             
-        result = subprocess.run(command, shell=True, capture_output=True, text=True, env=env)
-        return result.stdout + result.stderr
+        try:
+            result = subprocess.run(command, shell=True, capture_output=True, text=True, env=env, timeout=120)
+            return result.stdout + result.stderr
+        except subprocess.TimeoutExpired:
+            return "TIMEOUT: Command exceeded 120 seconds"
 
     @pytest.mark.real
     def test_praisonai_command(self):

praisonai-2.2.99/praisonai/version.py

@@ -1 +0,0 @@
-__version__ = "2.2.99"