PraisonAI 4.6.63__tar.gz → 4.6.65__tar.gz

{praisonai-4.6.63 → praisonai-4.6.65}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PraisonAI
-Version: 4.6.63
+Version: 4.6.65
 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>=1.6.63
+Requires-Dist: praisonaiagents>=1.6.65
 Requires-Dist: python-dotenv>=0.19.0
 Requires-Dist: litellm<2,>=1.83.14
 Requires-Dist: PyYAML>=6.0

{praisonai-4.6.63 → praisonai-4.6.65}/PraisonAI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PraisonAI
-Version: 4.6.63
+Version: 4.6.65
 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>=1.6.63
+Requires-Dist: praisonaiagents>=1.6.65
 Requires-Dist: python-dotenv>=0.19.0
 Requires-Dist: litellm<2,>=1.83.14
 Requires-Dist: PyYAML>=6.0

{praisonai-4.6.63 → praisonai-4.6.65}/PraisonAI.egg-info/SOURCES.txt

@@ -12,6 +12,7 @@ praisonai/_approval_spec.py
 praisonai/_async_bridge.py
 praisonai/_entrypoint.py
 praisonai/_framework_availability.py
+praisonai/_lazy_cache.py
 praisonai/_lockmap.py
 praisonai/_logging.py
 praisonai/_registry.py
@@ -69,22 +70,30 @@ praisonai/bots/_commands.py
 praisonai/bots/_config_schema.py
 praisonai/bots/_debounce.py
 praisonai/bots/_defaults.py
+praisonai/bots/_delivery.py
 praisonai/bots/_discord_approval.py
 praisonai/bots/_dlq.py
+praisonai/bots/_durable_adapter.py
 praisonai/bots/_email_utils.py
 praisonai/bots/_http_approval.py
 praisonai/bots/_ingress.py
 praisonai/bots/_mirror.py
+praisonai/bots/_outbox.py
 praisonai/bots/_pairing_ui.py
+praisonai/bots/_presentation_approval.py
+praisonai/bots/_presentation_renderer.py
 praisonai/bots/_protocol_mixin.py
 praisonai/bots/_rate_limit.py
 praisonai/bots/_registry.py
+praisonai/bots/_reset_policy.py
 praisonai/bots/_resilience.py
 praisonai/bots/_run_control.py
 praisonai/bots/_session.py
 praisonai/bots/_slack_approval.py
+praisonai/bots/_status.py
 praisonai/bots/_streaming.py
 praisonai/bots/_telegram_approval.py
+praisonai/bots/_typing.py
 praisonai/bots/_typing_indicator.py
 praisonai/bots/_unknown_user.py
 praisonai/bots/_webhook_approval.py
@@ -92,6 +101,7 @@ praisonai/bots/_whatsapp_web_adapter.py
 praisonai/bots/agentmail.py
 praisonai/bots/bot.py
 praisonai/bots/botos.py
+praisonai/bots/delivery.py
 praisonai/bots/discord.py
 praisonai/bots/email.py
 praisonai/bots/linear.py
@@ -146,7 +156,9 @@ praisonai/claw/__init__.py
 praisonai/claw/default_app.py
 praisonai/cli/__init__.py
 praisonai/cli/_paths.py
+praisonai/cli/_warnings.py
 praisonai/cli/app.py
+praisonai/cli/approval_backend.py
 praisonai/cli/branding.py
 praisonai/cli/config_loader.py
 praisonai/cli/fallback_schema.py
@@ -158,9 +170,11 @@ praisonai/cli/schema_provider.py
 praisonai/cli/unified_schema.py
 praisonai/cli/commands/__init__.py
 praisonai/cli/commands/acp.py
+praisonai/cli/commands/agent.py
 praisonai/cli/commands/agents.py
 praisonai/cli/commands/app.py
 praisonai/cli/commands/audit.py
+praisonai/cli/commands/auth.py
 praisonai/cli/commands/batch.py
 praisonai/cli/commands/benchmark.py
 praisonai/cli/commands/bot.py
@@ -169,6 +183,7 @@ praisonai/cli/commands/call.py
 praisonai/cli/commands/chat.py
 praisonai/cli/commands/claw.py
 praisonai/cli/commands/code.py
+praisonai/cli/commands/command.py
 praisonai/cli/commands/commit.py
 praisonai/cli/commands/completion.py
 praisonai/cli/commands/config.py
@@ -203,6 +218,7 @@ praisonai/cli/commands/onboard.py
 praisonai/cli/commands/package.py
 praisonai/cli/commands/pairing.py
 praisonai/cli/commands/paths.py
+praisonai/cli/commands/permissions.py
 praisonai/cli/commands/plugins.py
 praisonai/cli/commands/port.py
 praisonai/cli/commands/profile.py
@@ -235,8 +251,10 @@ praisonai/cli/commands/up.py
 praisonai/cli/commands/version.py
 praisonai/cli/commands/workflow.py
 praisonai/cli/configuration/__init__.py
+praisonai/cli/configuration/credentials.py
 praisonai/cli/configuration/loader.py
 praisonai/cli/configuration/paths.py
+praisonai/cli/configuration/resolver.py
 praisonai/cli/configuration/schema.py
 praisonai/cli/execution/__init__.py
 praisonai/cli/execution/core.py
@@ -244,6 +262,8 @@ praisonai/cli/execution/profiler.py
 praisonai/cli/execution/request.py
 praisonai/cli/execution/result.py
 praisonai/cli/features/__init__.py
+praisonai/cli/features/_endpoint_registry.py
+praisonai/cli/features/_search_registry.py
 praisonai/cli/features/acp.py
 praisonai/cli/features/action_orchestrator.py
 praisonai/cli/features/agent_scheduler.py
@@ -269,6 +289,7 @@ praisonai/cli/features/config_hierarchy.py
 praisonai/cli/features/context_manager.py
 praisonai/cli/features/cost_tracker.py
 praisonai/cli/features/csv_test_runner.py
+praisonai/cli/features/custom_definitions.py
 praisonai/cli/features/debug.py
 praisonai/cli/features/deploy.py
 praisonai/cli/features/diag.py
@@ -355,6 +376,7 @@ praisonai/cli/features/doctor/checks/bot_checks.py
 praisonai/cli/features/doctor/checks/config_checks.py
 praisonai/cli/features/doctor/checks/db_checks.py
 praisonai/cli/features/doctor/checks/env_checks.py
+praisonai/cli/features/doctor/checks/gateway_checks.py
 praisonai/cli/features/doctor/checks/lsp_checks.py
 praisonai/cli/features/doctor/checks/mcp_checks.py
 praisonai/cli/features/doctor/checks/memory_checks.py
@@ -430,6 +452,7 @@ praisonai/cli/ui/events.py
 praisonai/cli/ui/mg_backend.py
 praisonai/cli/ui/plain.py
 praisonai/cli/ui/rich_backend.py
+praisonai/cli/utils/env_utils.py
 praisonai/cli/utils/project.py
 praisonai/cli_backends/__init__.py
 praisonai/cli_backends/claude.py
@@ -471,6 +494,7 @@ praisonai/deploy/main.py
 praisonai/deploy/models.py
 praisonai/deploy/schema.py
 praisonai/deploy/providers/__init__.py
+praisonai/deploy/providers/_registry.py
 praisonai/deploy/providers/aws.py
 praisonai/deploy/providers/azure.py
 praisonai/deploy/providers/base.py
@@ -514,6 +538,7 @@ praisonai/gateway/auth.py
 praisonai/gateway/cookie_auth.py
 praisonai/gateway/exec_approval.py
 praisonai/gateway/gateway_approval.py
+praisonai/gateway/health_monitor.py
 praisonai/gateway/kanban_dispatcher.py
 praisonai/gateway/magic_link.py
 praisonai/gateway/origin_check.py
@@ -535,7 +560,6 @@ praisonai/inc/__init__.py
 praisonai/inc/config.py
 praisonai/inc/models.py
 praisonai/integration/__init__.py
-praisonai/integration/_legacy_handlers.py
 praisonai/integration/context_files.py
 praisonai/integration/gateway_host.py
 praisonai/integration/host_app.py
@@ -584,6 +608,7 @@ praisonai/kanban/models.py
 praisonai/kanban/paths.py
 praisonai/kanban/sqlite_store.py
 praisonai/llm/__init__.py
+praisonai/llm/credentials.py
 praisonai/llm/env.py
 praisonai/llm/registry.py
 praisonai/mcp_server/__init__.py
@@ -713,6 +738,7 @@ praisonai/replay/storage.py
 praisonai/replay/writer.py
 praisonai/sandbox/__init__.py
 praisonai/sandbox/_compat.py
+praisonai/sandbox/_registry.py
 praisonai/sandbox/_shell.py
 praisonai/sandbox/daytona.py
 praisonai/sandbox/docker.py

{praisonai-4.6.63 → praisonai-4.6.65}/PraisonAI.egg-info/requires.txt

@@ -1,7 +1,7 @@
 rich>=13.7
 markdown>=3.5
 pyparsing>=3.0.0
-praisonaiagents>=1.6.63
+praisonaiagents>=1.6.65
 python-dotenv>=0.19.0
 litellm<2,>=1.83.14
 PyYAML>=6.0

{praisonai-4.6.63 → praisonai-4.6.65}/praisonai/_async_bridge.py

@@ -16,7 +16,10 @@ T = TypeVar("T")
 
 _DEFAULT_TIMEOUT = float(os.environ.get("PRAISONAI_RUN_SYNC_TIMEOUT", "300"))
 
-class _BackgroundLoop:
+class AsyncBridge:
+    """Per-instance async runner. The module-level `run_sync()` keeps the
+    historical shared default; embedders/services should construct their own."""
+
     def __init__(self) -> None:
         self._loop: asyncio.AbstractEventLoop | None = None
         self._thread: threading.Thread | None = None
@@ -53,6 +56,34 @@ class _BackgroundLoop:
             loop = self._spawn_locked()
             return asyncio.run_coroutine_threadsafe(coro, loop)
 
+    def run_sync(self, coro: Awaitable[T], *, timeout: float | None = _DEFAULT_TIMEOUT) -> T:
+        try:
+            asyncio.get_running_loop()
+        except RuntimeError:
+            pass
+        else:
+            raise RuntimeError(
+                "run_sync() cannot be called from a running event loop"
+            )
+        fut = self.submit(coro)
+        try:
+            return fut.result(timeout=timeout)
+        except (TimeoutError, concurrent.futures.TimeoutError):
+            fut.cancel()
+            try:
+                fut.exception(timeout=1.0)
+            except (
+                TimeoutError,
+                concurrent.futures.TimeoutError,
+                asyncio.CancelledError,
+                FutureCancelledError,
+            ):
+                pass
+            raise
+        except BaseException:
+            fut.cancel()
+            raise
+
     def shutdown(self, timeout: float = 5.0) -> None:
         with self._lock:
             loop, thread = self._loop, self._thread
@@ -75,16 +106,17 @@ class _BackgroundLoop:
                 self._loop = None
                 self._thread = None
 
-_BG: "_BackgroundLoop | None" = None
-_BG_LOCK = threading.Lock()
+# Backwards-compatible module-level shared default:
+_DEFAULT_BRIDGE: AsyncBridge | None = None
+_DEFAULT_LOCK = threading.Lock()
 
-def _get_bg() -> "_BackgroundLoop":
-    global _BG
-    if _BG is None:
-        with _BG_LOCK:
-            if _BG is None:
-                _BG = _BackgroundLoop()
-    return _BG
+def _default_bridge() -> AsyncBridge:
+    global _DEFAULT_BRIDGE
+    if _DEFAULT_BRIDGE is None:
+        with _DEFAULT_LOCK:
+            if _DEFAULT_BRIDGE is None:
+                _DEFAULT_BRIDGE = AsyncBridge()
+    return _DEFAULT_BRIDGE
 
 
 def run_sync(coro: Awaitable[T], *, timeout: float | None = _DEFAULT_TIMEOUT) -> T:
@@ -106,44 +138,13 @@ def run_sync(coro: Awaitable[T], *, timeout: float | None = _DEFAULT_TIMEOUT) ->
         TimeoutError: If timeout is exceeded
         Any exception raised by the coroutine
     """
-    try:
-        asyncio.get_running_loop()
-    except RuntimeError:
-        pass
-    else:
-        raise RuntimeError(
-            "run_sync() cannot be called from a running event loop; "
-            "await the coroutine directly instead."
-        )
-
-    # Submit the coroutine atomically
-    fut = _get_bg().submit(coro)
-    
-    try:
-        return fut.result(timeout=timeout)
-    except (TimeoutError, concurrent.futures.TimeoutError):
-        # Propagate cancellation into the background loop so the underlying
-        # awaitable (DB query, HTTP call, subprocess wait) actually unwinds.
-        fut.cancel()
-        try:
-            # Give cancellation a short grace period to release resources.
-            fut.exception(timeout=1.0)
-        except (
-            TimeoutError,
-            concurrent.futures.TimeoutError,
-            asyncio.CancelledError,
-            FutureCancelledError,
-        ):
-            pass
-        raise
-    except BaseException:
-        # Ctrl-C / GeneratorExit / SystemExit must also cancel the bg task.
-        fut.cancel()
-        raise
+    return _default_bridge().run_sync(coro, timeout=timeout)
 
 
 def shutdown() -> None:
-    """Public hook for long-running server processes to stop the bridge cleanly."""
-    bg = _BG
-    if bg is not None:
-        bg.shutdown()
+    """Shut down ONLY the shared default bridge (not user-owned instances)."""
+    global _DEFAULT_BRIDGE
+    with _DEFAULT_LOCK:
+        if _DEFAULT_BRIDGE is not None:
+            _DEFAULT_BRIDGE.shutdown()
+            _DEFAULT_BRIDGE = None

praisonai-4.6.65/praisonai/_lazy_cache.py

@@ -0,0 +1,38 @@
+"""Single source of truth for thread-safe lazy loading of optional deps."""
+import threading
+from typing import Callable, Dict, Optional, TypeVar
+
+T = TypeVar("T")
+
+
+class LazyCache:
+    """Thread-safe double-checked lazy cache. Caches None for ImportError."""
+
+    def __init__(self) -> None:
+        self._cache: Dict[str, object] = {}
+        self._lock = threading.Lock()
+
+    def get(self, key: str, loader: Callable[[], T]) -> Optional[T]:
+        if key in self._cache:
+            return self._cache[key]  # type: ignore[return-value]
+        with self._lock:
+            if key in self._cache:
+                return self._cache[key]  # type: ignore[return-value]
+            try:
+                value: object = loader()
+            except ImportError:
+                value = None
+            self._cache[key] = value
+            return value  # type: ignore[return-value]
+
+    def reset(self, key: Optional[str] = None) -> None:
+        with self._lock:
+            if key is None:
+                self._cache.clear()
+            else:
+                self._cache.pop(key, None)
+
+
+_GLOBAL = LazyCache()
+lazy_get = _GLOBAL.get
+lazy_reset = _GLOBAL.reset

{praisonai-4.6.63 → praisonai-4.6.65}/praisonai/agent.py

@@ -30,6 +30,7 @@ class Agent(CoreAgent):
                 - None: No CLI backend
             **kwargs: Keyword arguments for core Agent
         """
+        # Deprecation warning will be emitted by the core Agent class
         # Resolve CLI backend configuration using unified resolver
         if cli_backend is not None and not self._is_protocol_instance(cli_backend):
             from .cli_backends import resolve_cli_backend_config

{praisonai-4.6.63 → praisonai-4.6.65}/praisonai/agents_generator.py

@@ -386,7 +386,7 @@ class AgentsGenerator:
         assert_framework_available(adapter.name)
         
         # Validate cli_backend compatibility
-        self._validate_cli_backend_compatibility(config, adapter)
+        self._validate_cli_backend_compatibility(config, adapter.name)
         
         # Initialize observability hooks
         from .observability.hooks import init_observability
@@ -411,65 +411,13 @@ class AgentsGenerator:
     
     def _build_tools_dict(self, config):
         """Shared tool resolution logic for sync and async paths."""
-        tools_dict = {}
-        
-        # Demand-driven tool resolution - only resolve tools actually used in YAML
-        if is_available("crewai") or is_available("autogen") or is_available("praisonaiagents") or is_available("ag2"):
-            try:
-                # Collect all tool names mentioned in the YAML config
-                needed_tools: set[str] = set()
-                for role_cfg in config.get('roles', {}).values():
-                    for t in role_cfg.get('tools') or []:
-                        if isinstance(t, str) and t.strip():
-                            needed_tools.add(t.strip())
-                    for task_cfg in (role_cfg.get('tasks') or {}).values():
-                        if not isinstance(task_cfg, dict):
-                            continue
-                        for t in task_cfg.get('tools') or []:
-                            if isinstance(t, str) and t.strip():
-                                needed_tools.add(t.strip())
-
-                # Resolve only the tools actually referenced in YAML
-                for tool_name in needed_tools:
-                    try:
-                        resolved_tool = self.tool_resolver.resolve(tool_name)
-                        if resolved_tool is None:
-                            self.logger.warning(f"Tool '{tool_name}' not found")
-                            continue
-                        tools_dict[tool_name] = (
-                            resolved_tool() if inspect.isclass(resolved_tool) else resolved_tool
-                        )
-                    except Exception as e:
-                        self.logger.warning(f"Failed to initialize tool '{tool_name}': {e}")
-                        continue
-                            
-            except Exception as e:
-                self.logger.warning(f"Error collecting YAML tool references: {e}")
-            
-            # Add tools from class names - use tool_resolver to check tool validity
-            for tool_class in self.tools:
-                if isinstance(tool_class, type):
-                    try:
-                        tool_instance = tool_class()
-                        tool_name = tool_class.__name__
-                        tools_dict[tool_name] = tool_instance
-                        self.logger.debug(f"Added tool: {tool_name}")
-                    except Exception as e:
-                        self.logger.warning(f"Failed to instantiate tool class {tool_class.__name__}: {e}")
-
-        root_directory = os.getcwd()
-        tools_py_path = os.path.join(root_directory, 'tools.py')
-        tools_dir_path = Path(root_directory) / 'tools'
-        
-        # Use consolidated ToolResolver for tools.py loading
-        tools_dict.update(self.tool_resolver.get_local_tool_classes())
-        if os.path.isfile(tools_py_path):
-            self.logger.debug("tools.py exists in the root directory. Loading tools.py and skipping tools folder.")
-        elif tools_dir_path.is_dir():
-            tools_dict.update(self.tool_resolver.get_local_tool_classes_from_dir(tools_dir_path))
-            if tools_dict:
-                self.logger.debug("tools folder exists in the root directory")
-        
+        tools_dict = self.tool_resolver.resolve_all_from_yaml(config)
+        for tool_class in self.tools:
+            if isinstance(tool_class, type):
+                try:
+                    tools_dict[tool_class.__name__] = tool_class()
+                except (TypeError, ValueError, RuntimeError) as e:
+                    self.logger.warning(f"Failed to instantiate tool class {tool_class.__name__}: {e}")
         return tools_dict
     
     def _select_framework(self, framework: str, config: Dict[str, Any]) -> Any:
@@ -601,68 +549,6 @@ class AgentsGenerator:
                         f"Unknown field '{field_name}' in {entity_name} '{name}'.{suggestion}"
                     )
 
-    def is_function_or_decorated(self, obj):
-        """
-        Checks if the given object is a function or has a __call__ method.
-
-        Parameters:
-            obj (object): The object to be checked.
-
-        Returns:
-            bool: True if the object is a function or has a __call__ method, False otherwise.
-        """
-        return inspect.isfunction(obj) or hasattr(obj, '__call__')
-
-    def load_tools_from_module(self, module_path):
-        """
-        Load function tools from a user-supplied module (gated by PRAISONAI_ALLOW_LOCAL_TOOLS).
-
-        Parameters:
-            module_path (str): The path to the module containing the tools.
-
-        Returns:
-            dict: A dictionary containing the names of the tools as keys and the corresponding functions or objects as values.
-                  Returns an empty dict if the module cannot be loaded (path missing, loading blocked by PRAISONAI_ALLOW_LOCAL_TOOLS, or any other load error).
-        """
-        from ._safe_loader import load_user_module
-        module = load_user_module(module_path, name="tools_module")
-        if module is None:
-            return {}
-        return {name: obj for name, obj in inspect.getmembers(module, self.is_function_or_decorated)}
-    
-    def load_tools_from_module_class(self, module_path):
-        """
-        Load BaseTool / langchain tool classes from a user-supplied module (gated by PRAISONAI_ALLOW_LOCAL_TOOLS).
-        """
-        from ._safe_loader import load_user_module
-        module = load_user_module(module_path, name="tools_module")
-        if module is None:
-            return {}
-        return self.tool_resolver._extract_tool_classes(module)
-
-    def load_tools_from_package(self, package_path):
-        """
-        Loads tools from a specified package path containing modules with functions or classes.
-
-        Parameters:
-            package_path (str): The path to the package containing the tools.
-
-        Returns:
-            dict: A dictionary containing the names of the tools as keys and the corresponding initialized instances of the classes as values.
-
-        Raises:
-            FileNotFoundError: If the specified package path does not exist.
-
-        This function iterates through all the .py files in the specified package path, excluding those that start with "__". For each file, it imports the corresponding module and checks if it contains any functions or classes that can be loaded as tools. The function then returns a dictionary containing the names of the tools as keys and the corresponding initialized instances of the classes as values.
-        """
-        tools_dict = {}
-        for module_file in os.listdir(package_path):
-            if module_file.endswith('.py') and not module_file.startswith('__'):
-                module_name = f"{package_path.name}.{module_file[:-3]}"  # Remove .py for import
-                module = importlib.import_module(module_name)
-                for name, obj in inspect.getmembers(module, self.is_function_or_decorated):
-                    tools_dict[name] = obj
-        return tools_dict
 
 
     def _load_config(self):

{praisonai-4.6.63 → praisonai-4.6.65}/praisonai/auto.py

@@ -24,11 +24,7 @@ T = TypeVar('T')
 # THREAD-SAFE LAZY LOADING INFRASTRUCTURE - All heavy imports are deferred
 # =============================================================================
 
-import threading
-
-# Thread-safe lazy cache for optional dependencies
-_optional_lock = threading.Lock()
-_optional_cache: dict[str, object] = {}
+from ._lazy_cache import lazy_get
 
 def _rich_print(*args, **kwargs):
     """Lazy-loaded rich.print wrapper."""
@@ -46,29 +42,6 @@ def _yaml_safe_load(stream):
     return yaml.safe_load(stream)
 
 
-def _load_optional(key: str, loader):
-    """Thread-safe lazy loading for optional dependencies.
-    
-    Args:
-        key: Unique key for the dependency
-        loader: Function that imports and returns the dependency
-        
-    Returns:
-        The loaded dependency or None if import fails
-    """
-    if key in _optional_cache:
-        return _optional_cache[key]
-    
-    with _optional_lock:
-        if key in _optional_cache:
-            return _optional_cache[key]
-        
-        try:
-            _optional_cache[key] = loader()
-        except ImportError:
-            _optional_cache[key] = None
-        
-        return _optional_cache[key]
 
 
 
@@ -82,7 +55,7 @@ from ._framework_availability import is_available
 
 def _get_crewai():
     """Lazy load crewai classes (thread-safe)."""
-    return _load_optional("crewai_classes", lambda: (
+    return lazy_get("crewai_classes", lambda: (
         __import__("crewai", fromlist=["Agent", "Task", "Crew"]).Agent,
         __import__("crewai", fromlist=["Agent", "Task", "Crew"]).Task,
         __import__("crewai", fromlist=["Agent", "Task", "Crew"]).Crew,
@@ -91,7 +64,7 @@ def _get_crewai():
 
 def _get_autogen():
     """Lazy load autogen module (thread-safe)."""
-    return _load_optional("autogen_module", lambda: __import__("autogen"))
+    return lazy_get("autogen_module", lambda: __import__("autogen"))
 
 
 def _get_autogen_v4():
@@ -101,7 +74,7 @@ def _get_autogen_v4():
         from autogen_ext.models.openai import OpenAIChatCompletionClient
         return (AssistantAgent, OpenAIChatCompletionClient)
     
-    return _load_optional("autogen_v4_classes", autogen_v4_loader)
+    return lazy_get("autogen_v4_classes", autogen_v4_loader)
 
 
 def _get_praisonai():
@@ -110,7 +83,7 @@ def _get_praisonai():
         from praisonaiagents import Agent as PraisonAgent, Task as PraisonTask, AgentTeam as Agents
         return (PraisonAgent, PraisonTask, Agents)
     
-    return _load_optional("praisonai_classes", praisonai_loader)
+    return lazy_get("praisonai_classes", praisonai_loader)
 
 
 # --- PraisonAI Tools lazy loading ---
@@ -144,12 +117,12 @@ def _get_praisonai_tools():
             'YoutubeVideoSearchTool': YoutubeVideoSearchTool,
         }
     
-    return _load_optional("praisonai_tools_dict", tools_loader)
+    return lazy_get("praisonai_tools_dict", tools_loader)
 
 
 def _get_litellm():
     """Lazy load litellm module."""
-    result = _load_optional("litellm", lambda: __import__("litellm"))
+    result = lazy_get("litellm", lambda: __import__("litellm"))
     if result is None:
         raise ImportError("Install with: pip install litellm")
     return result
@@ -619,19 +592,9 @@ class BaseAutoGenerator:
 # Pydantic Models for Structured Output - Lazy Loaded
 # =============================================================================
 
-# Models are created on first use to avoid importing pydantic at module level
-_models_cache = {}
-_models_lock = threading.Lock()
-
 def _get_team_models():
     """Get team structure models, creating them on first use."""
-    if 'team_models' in _models_cache:
-        return _models_cache['team_models']
-    
-    with _models_lock:
-        if 'team_models' in _models_cache:
-            return _models_cache['team_models']
-        
+    def _create_team_models():
         from pydantic import BaseModel
         
         class TaskDetails(BaseModel):
@@ -674,7 +637,7 @@ def _get_team_models():
             pass_action: str  # Action if validation passes (e.g., "continue", "next_step")
             fail_action: str  # Action if validation fails (e.g., "retry", "escalate", "abort")
         
-        _models_cache['team_models'] = {
+        return {
             'TaskDetails': TaskDetails,
             'RoleDetails': RoleDetails,
             'TeamStructure': TeamStructure,
@@ -682,7 +645,8 @@ def _get_team_models():
             'PatternRecommendation': PatternRecommendation,
             'ValidationGate': ValidationGate
         }
-        return _models_cache['team_models']
+    
+    return lazy_get('team_models', _create_team_models)
 
 class AutoGenerator(BaseAutoGenerator):
     """