PraisonAI 4.6.133__tar.gz → 4.6.134__tar.gz

{praisonai-4.6.133 → praisonai-4.6.134}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PraisonAI
-Version: 4.6.133
+Version: 4.6.134
 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,9 +11,9 @@ Description-Content-Type: text/markdown
 Requires-Dist: rich>=13.7
 Requires-Dist: markdown>=3.5
 Requires-Dist: pyparsing>=3.0.0
-Requires-Dist: praisonaiagents>=1.6.136
-Requires-Dist: praisonai-code>=0.0.32
-Requires-Dist: praisonai-bot>=0.0.17
+Requires-Dist: praisonaiagents>=1.6.137
+Requires-Dist: praisonai-code>=0.0.33
+Requires-Dist: praisonai-bot>=0.0.18
 Requires-Dist: python-dotenv>=0.19.0
 Requires-Dist: litellm<2,>=1.83.14
 Requires-Dist: PyYAML>=6.0

{praisonai-4.6.133 → praisonai-4.6.134}/PraisonAI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PraisonAI
-Version: 4.6.133
+Version: 4.6.134
 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,9 +11,9 @@ Description-Content-Type: text/markdown
 Requires-Dist: rich>=13.7
 Requires-Dist: markdown>=3.5
 Requires-Dist: pyparsing>=3.0.0
-Requires-Dist: praisonaiagents>=1.6.136
-Requires-Dist: praisonai-code>=0.0.32
-Requires-Dist: praisonai-bot>=0.0.17
+Requires-Dist: praisonaiagents>=1.6.137
+Requires-Dist: praisonai-code>=0.0.33
+Requires-Dist: praisonai-bot>=0.0.18
 Requires-Dist: python-dotenv>=0.19.0
 Requires-Dist: litellm<2,>=1.83.14
 Requires-Dist: PyYAML>=6.0

{praisonai-4.6.133 → praisonai-4.6.134}/PraisonAI.egg-info/requires.txt

@@ -1,9 +1,9 @@
 rich>=13.7
 markdown>=3.5
 pyparsing>=3.0.0
-praisonaiagents>=1.6.136
-praisonai-code>=0.0.32
-praisonai-bot>=0.0.17
+praisonaiagents>=1.6.137
+praisonai-code>=0.0.33
+praisonai-bot>=0.0.18
 python-dotenv>=0.19.0
 litellm<2,>=1.83.14
 PyYAML>=6.0

{praisonai-4.6.133 → praisonai-4.6.134}/praisonai/agents_generator.py

@@ -870,19 +870,29 @@ class AgentsGenerator:
             cli_config=getattr(self, 'cli_config', None),
         )
 
+    async def _aload_config(self):
+        """Async-safe config loading (blocking file I/O off the event loop)."""
+        import asyncio
+        return await asyncio.to_thread(self._load_config)
+
+    async def _aprepare_for_run(self, config):
+        """Async-safe run preparation (heavy imports + adapter.setup() off the loop)."""
+        import asyncio
+        return await asyncio.to_thread(self._prepare_for_run, config)
+
     async def agenerate_crew_and_kickoff(self):
         """
         Async version of generate_crew_and_kickoff.
         Generates a crew of agents and initiates tasks based on the provided configuration.
         """
-        config = self._load_config()
+        config = await self._aload_config()
         if config is None:
             return
         if self._is_workflow_yaml(config):
             return await self._arun_yaml_workflow(config)
 
-        # Use shared preparation logic
-        prep = self._prepare_for_run(config)
+        # Use shared preparation logic (off the event loop to avoid blocking imports)
+        prep = await self._aprepare_for_run(config)
         
         self.logger.info(f"Using framework: {prep['adapter'].name}")
         return await prep['adapter'].arun(
@@ -896,28 +906,29 @@ class AgentsGenerator:
         )
 
 
-    async def _arun_yaml_workflow(self, config):
+    def _build_yaml_workflow(self, config):
         """
-        Async version of _run_yaml_workflow using YAMLWorkflowParser.
-        
-        This method handles agents.yaml files that have:
-        - process: workflow
-        
+        Single source of truth for YAML workflow preparation.
+
+        Handles: praisonaiagents availability check, parser import guard,
+        name defaulting, framework validation, default_llm merge, yaml.dump,
+        and parser.parse_string. Returns the parsed workflow plus input data.
+
         Args:
-            config: YAML configuration dictionary
-            
+            config (dict): The parsed YAML configuration
+
         Returns:
-            str: Workflow execution result
+            Tuple[Any, Any]: (workflow, input_data)
         """
         if not is_available("praisonaiagents"):
             raise ImportError("PraisonAI is not installed. Please install it with 'pip install praisonaiagents'")
-        
+
         try:
             from praisonaiagents.workflows import YAMLWorkflowParser
         except ImportError as err:
             raise ImportError("YAMLWorkflowParser not available. Please update praisonaiagents.") from err
-        
-        # Ensure name is present
+
+        # Ensure name is present (YAMLWorkflowParser handles roles->agents conversion)
         if 'name' not in config:
             config['name'] = config.get('topic', 'Workflow')
 
@@ -925,12 +936,19 @@ class AgentsGenerator:
             framework_from_config,
             validate_workflow_framework,
         )
-        effective_framework = (self.framework or framework_from_config(config))
+        # Validate the YAML-declared framework first so a non-native workflow
+        # YAML (e.g. framework: crewai) can't slip through just because the
+        # generator instance still holds the default 'praisonai'.
         validate_workflow_framework(
-            effective_framework,
+            framework_from_config(config),
             source="agents.yaml workflow section",
         )
-        
+        if self.framework:
+            validate_workflow_framework(
+                self.framework,
+                source="AgentsGenerator framework",
+            )
+
         # Pass model from config_list to workflow as default_llm
         if self.config_list and self.config_list[0].get('model'):
             model_from_cli = self.config_list[0]['model']
@@ -938,93 +956,72 @@ class AgentsGenerator:
                 config['workflow'] = {}
             if 'default_llm' not in config['workflow']:
                 config['workflow']['default_llm'] = model_from_cli
-        
+
+        # Convert config back to YAML string for parser
+        # Note: YAMLWorkflowParser handles 'roles' to 'agents' conversion internally
         import yaml as yaml_module
         yaml_content = yaml_module.dump(config, default_flow_style=False)
-        
+
         parser = YAMLWorkflowParser()
         workflow = parser.parse_string(yaml_content)
-        
+
+        # Get input: 'input' is canonical, 'topic' is alias for backward compatibility
         input_data = config.get('input', config.get('topic', ''))
-        
+
+        return workflow, input_data
+
+    @staticmethod
+    def _finalise_workflow_result(result):
+        """Normalize a workflow execution result into a string."""
+        if result.get("status") == "completed":
+            return result.get("output", "Workflow completed successfully")
+        return f"Workflow failed: {result.get('error', 'Unknown error')}"
+
+    async def _arun_yaml_workflow(self, config):
+        """
+        Async version of _run_yaml_workflow using YAMLWorkflowParser.
+
+        This method handles agents.yaml files that have:
+        - process: workflow
+
+        Args:
+            config: YAML configuration dictionary
+
+        Returns:
+            str: Workflow execution result
+        """
+        import asyncio
+        workflow, input_data = await asyncio.to_thread(self._build_yaml_workflow, config)
+
         self.logger.info(f"Starting async YAML workflow with topic: {input_data}")
-        
+
         if hasattr(workflow, 'astart'):
             result = await workflow.astart(input_data)
         else:
-            import asyncio
             result = await asyncio.to_thread(workflow.start, input_data)
-            
-        if result.get("status") == "completed":
-            return result.get("output", "Workflow completed successfully")
-        else:
-            return f"Workflow failed: {result.get('error', 'Unknown error')}"
+
+        return self._finalise_workflow_result(result)
 
     def _run_yaml_workflow(self, config):
         """
         Run a YAML workflow using the YAMLWorkflowParser.
-        
+
         This method handles agents.yaml files that have:
         - process: workflow
         - steps section with workflow patterns (route, parallel, loop, repeat)
-        
+
         Args:
             config (dict): The parsed YAML configuration
-            
+
         Returns:
             str: Result of the workflow execution
         """
-        if not is_available("praisonaiagents"):
-            raise ImportError("PraisonAI is not installed. Please install it with 'pip install praisonaiagents'")
-        
-        try:
-            from praisonaiagents.workflows import YAMLWorkflowParser
-        except ImportError:
-            raise ImportError("YAMLWorkflowParser not available. Please update praisonaiagents.")
-        
-        # Ensure name is present (YAMLWorkflowParser handles roles->agents conversion)
-        if 'name' not in config:
-            config['name'] = config.get('topic', 'Workflow')
+        workflow, input_data = self._build_yaml_workflow(config)
 
-        from .framework_adapters.workflow_framework import (
-            framework_from_config,
-            validate_workflow_framework,
-        )
-        effective_framework = (self.framework or framework_from_config(config))
-        validate_workflow_framework(
-            effective_framework,
-            source="agents.yaml workflow section",
-        )
-        
-        # Pass model from config_list to workflow as default_llm
-        if self.config_list and self.config_list[0].get('model'):
-            model_from_cli = self.config_list[0]['model']
-            # Set default_llm in workflow config if not already set
-            if 'workflow' not in config:
-                config['workflow'] = {}
-            if 'default_llm' not in config['workflow']:
-                config['workflow']['default_llm'] = model_from_cli
-        
-        # Convert config back to YAML string for parser
-        # Note: YAMLWorkflowParser handles 'roles' to 'agents' conversion internally
-        import yaml as yaml_module
-        yaml_content = yaml_module.dump(config, default_flow_style=False)
-        
-        # Parse and execute
-        parser = YAMLWorkflowParser()
-        workflow = parser.parse_string(yaml_content)
-        
-        # Get input: 'input' is canonical, 'topic' is alias for backward compatibility
-        input_data = config.get('input', config.get('topic', ''))
-        
-        # Execute workflow
         self.logger.debug(f"Running workflow: {workflow.name}")
         result = workflow.start(input_data)
-        
-        if result.get("status") == "completed":
-            return result.get("output", "Workflow completed successfully")
-        else:
-            return f"Workflow failed: {result.get('error', 'Unknown error')}"
+
+        return self._finalise_workflow_result(result)
 
 
 # Standalone function for backward compatibility with tests

{praisonai-4.6.133 → praisonai-4.6.134}/praisonai/auto.py

@@ -1635,7 +1635,7 @@ Example structure:
         workflow_yaml = {
             'name': data.get('name', 'Auto-Generated Workflow'),
             'description': data.get('description', ''),
-            'framework': 'praisonai',
+            'framework': self.framework,
             'workflow': {
                 'output': 'verbose',  # Use output= instead of deprecated verbose=
                 'planning': False,

{praisonai-4.6.133 → praisonai-4.6.134}/praisonai/mcp_server/registry.py

@@ -10,6 +10,7 @@ MCP Protocol Version: 2025-11-25
 import base64
 import inspect
 import logging
+import threading
 from dataclasses import dataclass, field
 from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 
@@ -141,6 +142,7 @@ class MCPToolRegistry:
     def __init__(self):
         self._tools: Dict[str, MCPToolDefinition] = {}
         self._lazy_loaders: List[Callable[[], None]] = []
+        self._lock = threading.RLock()
     
     def register(
         self,
@@ -172,16 +174,23 @@ class MCPToolRegistry:
     
     def register_lazy(self, loader: Callable[[], None]) -> None:
         """Register a lazy loader that will be called before listing tools."""
-        self._lazy_loaders.append(loader)
+        with self._lock:
+            self._lazy_loaders.append(loader)
     
     def _ensure_loaded(self) -> None:
-        """Ensure all lazy loaders have been called."""
-        for loader in self._lazy_loaders:
-            try:
-                loader()
-            except Exception as e:
-                logger.warning(f"Lazy loader failed: {e}")
-        self._lazy_loaders.clear()
+        """Ensure all lazy loaders have been called (thread-safe, run-once)."""
+        with self._lock:
+            # Swap out pending loaders atomically so concurrent callers don't
+            # iterate a list being cleared underneath them or double-run loaders.
+            pending, self._lazy_loaders = self._lazy_loaders, []
+            # Run loaders while holding the (re-entrant) lock so a concurrent
+            # caller blocks until loading completes instead of observing an
+            # empty/partial registry mid-load.
+            for loader in pending:
+                try:
+                    loader()
+                except Exception as e:
+                    logger.warning(f"Lazy loader failed: {e}")
     
     def get(self, name: str) -> Optional[MCPToolDefinition]:
         """Get a tool by name."""
@@ -382,6 +391,7 @@ class MCPResourceRegistry:
     def __init__(self):
         self._resources: Dict[str, MCPResourceDefinition] = {}
         self._lazy_loaders: List[Callable[[], None]] = []
+        self._lock = threading.RLock()
     
     def register(
         self,
@@ -410,16 +420,18 @@ class MCPResourceRegistry:
     
     def register_lazy(self, loader: Callable[[], None]) -> None:
         """Register a lazy loader."""
-        self._lazy_loaders.append(loader)
+        with self._lock:
+            self._lazy_loaders.append(loader)
     
     def _ensure_loaded(self) -> None:
-        """Ensure all lazy loaders have been called."""
-        for loader in self._lazy_loaders:
+        """Ensure all lazy loaders have been called (thread-safe, run-once)."""
+        with self._lock:
+            pending, self._lazy_loaders = self._lazy_loaders, []
+        for loader in pending:
             try:
                 loader()
             except Exception as e:
                 logger.warning(f"Lazy loader failed: {e}")
-        self._lazy_loaders.clear()
     
     def get(self, uri: str) -> Optional[MCPResourceDefinition]:
         """Get a resource by URI."""
@@ -477,6 +489,7 @@ class MCPPromptRegistry:
     def __init__(self):
         self._prompts: Dict[str, MCPPromptDefinition] = {}
         self._lazy_loaders: List[Callable[[], None]] = []
+        self._lock = threading.RLock()
     
     def register(
         self,
@@ -504,16 +517,18 @@ class MCPPromptRegistry:
     
     def register_lazy(self, loader: Callable[[], None]) -> None:
         """Register a lazy loader."""
-        self._lazy_loaders.append(loader)
+        with self._lock:
+            self._lazy_loaders.append(loader)
     
     def _ensure_loaded(self) -> None:
-        """Ensure all lazy loaders have been called."""
-        for loader in self._lazy_loaders:
+        """Ensure all lazy loaders have been called (thread-safe, run-once)."""
+        with self._lock:
+            pending, self._lazy_loaders = self._lazy_loaders, []
+        for loader in pending:
             try:
                 loader()
             except Exception as e:
                 logger.warning(f"Lazy loader failed: {e}")
-        self._lazy_loaders.clear()
     
     def get(self, name: str) -> Optional[MCPPromptDefinition]:
         """Get a prompt by name."""

praisonai-4.6.134/praisonai/version.py

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

{praisonai-4.6.133 → praisonai-4.6.134}/pyproject.toml

@@ -12,9 +12,9 @@ dependencies = [
     "rich>=13.7",
     "markdown>=3.5",
     "pyparsing>=3.0.0",
-    "praisonaiagents>=1.6.136",
-    "praisonai-code>=0.0.32",
-    "praisonai-bot>=0.0.17",
+    "praisonaiagents>=1.6.137",
+    "praisonai-code>=0.0.33",
+    "praisonai-bot>=0.0.18",
     "python-dotenv>=0.19.0",
     "litellm>=1.83.14,<2",
     "PyYAML>=6.0",

praisonai-4.6.133/praisonai/version.py

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