mcli-framework 7.11.2__tar.gz → 7.11.3__tar.gz

{mcli_framework-7.11.2 → mcli_framework-7.11.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcli-framework
-Version: 7.11.2
+Version: 7.11.3
 Summary: Portable workflow framework - transform any script into a versioned, schedulable command. Store in ~/.mcli/commands/, version with lockfile, run as daemon or cron job.
 Author-email: Luis Fernandez de la Vara <luis@lefv.io>
 Maintainer-email: Luis Fernandez de la Vara <luis@lefv.io>

{mcli_framework-7.11.2 → mcli_framework-7.11.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mcli-framework"
-version = "7.11.2"
+version = "7.11.3"
 description = "Portable workflow framework - transform any script into a versioned, schedulable command. Store in ~/.mcli/commands/, version with lockfile, run as daemon or cron job."
 readme = "README.md"
 requires-python = ">=3.9"

{mcli_framework-7.11.2 → mcli_framework-7.11.3}/src/mcli/app/main.py

@@ -347,26 +347,32 @@ def _add_lazy_commands(app: click.Group):
     # Note: lib group removed - secrets moved to workflows
     # Previous: mcli lib secrets -> Now: mcli workflows secrets
 
-    # Add workflows group (renamed from 'workflow') with completion-aware lazy loading
+    # Add workflows group directly (not lazy-loaded) to preserve -g/--global option
     try:
-        from mcli.app.completion_helpers import create_completion_aware_lazy_group
-
-        workflows_group = create_completion_aware_lazy_group(
-            "workflows",
-            "mcli.workflow.workflow.workflows",
-            "Runnable workflows for automation, video processing, and daemon management",
-        )
+        from mcli.workflow.workflow import workflows as workflows_group
         app.add_command(workflows_group, name="workflows")
-        logger.debug("Added completion-aware workflows group")
+        logger.debug("Added workflows group with -g/--global support")
     except ImportError as e:
-        logger.debug(f"Could not load completion helpers, using standard lazy group: {e}")
-        # Fallback to standard lazy group
-        workflows_group = LazyGroup(
-            "workflows",
-            "mcli.workflow.workflow.workflows",
-            help="Runnable workflows for automation, video processing, and daemon management",
-        )
-        app.add_command(workflows_group, name="workflows")
+        logger.error(f"Could not load workflows group: {e}")
+        # Fallback to lazy loading if import fails
+        try:
+            from mcli.app.completion_helpers import create_completion_aware_lazy_group
+
+            workflows_group = create_completion_aware_lazy_group(
+                "workflows",
+                "mcli.workflow.workflow.workflows",
+                "Runnable workflows for automation, video processing, and daemon management",
+            )
+            app.add_command(workflows_group, name="workflows")
+            logger.debug("Added completion-aware workflows group (fallback)")
+        except ImportError:
+            workflows_group = LazyGroup(
+                "workflows",
+                "mcli.workflow.workflow.workflows",
+                help="Runnable workflows for automation, video processing, and daemon management",
+            )
+            app.add_command(workflows_group, name="workflows")
+            logger.debug("Added lazy workflows group (fallback)")
 
     # Lazy load other heavy commands that are used less frequently
     # NOTE: chat and model commands have been removed

mcli_framework-7.11.3/src/mcli/workflow/workflow.py

@@ -0,0 +1,129 @@
+"""
+Workflows command group for mcli.
+
+All workflow commands are now loaded from portable JSON files in ~/.mcli/workflows/
+This provides a clean, maintainable way to manage workflow commands.
+"""
+
+import click
+
+
+class ScopedWorkflowsGroup(click.Group):
+    """
+    Custom Click Group that loads workflows from either local or global scope
+    based on the -g/--global flag.
+    """
+
+    def list_commands(self, ctx):
+        """List available commands based on scope."""
+        # Get scope from context
+        is_global = ctx.params.get('is_global', False)
+
+        # Load commands from appropriate directory
+        from mcli.lib.custom_commands import get_command_manager
+
+        manager = get_command_manager(global_mode=is_global)
+        commands = manager.load_all_commands()
+
+        # Filter to only workflow group commands
+        workflow_commands = [cmd.get('name') for cmd in commands if cmd.get('group') == 'workflow']
+
+        # Also include built-in subcommands
+        builtin_commands = list(super().list_commands(ctx))
+
+        return sorted(set(workflow_commands + builtin_commands))
+
+    def get_command(self, ctx, cmd_name):
+        """Get a command by name, loading from appropriate scope."""
+        # First check if it's a built-in command
+        builtin_cmd = super().get_command(ctx, cmd_name)
+        if builtin_cmd:
+            return builtin_cmd
+
+        # Get scope from context
+        is_global = ctx.params.get('is_global', False)
+
+        # Load the workflow command from appropriate directory
+        from mcli.lib.custom_commands import get_command_manager
+
+        manager = get_command_manager(global_mode=is_global)
+        commands = manager.load_all_commands()
+
+        # Find the workflow command
+        for command_data in commands:
+            if command_data.get('name') == cmd_name and command_data.get('group') == 'workflow':
+                # Create a temporary group to register the command
+                temp_group = click.Group()
+                language = command_data.get("language", "python")
+
+                if language == "shell":
+                    manager.register_shell_command_with_click(command_data, temp_group)
+                else:
+                    manager.register_command_with_click(command_data, temp_group)
+
+                return temp_group.commands.get(cmd_name)
+
+        return None
+
+
+@click.group(name="workflows", cls=ScopedWorkflowsGroup, invoke_without_command=True)
+@click.option(
+    "-g",
+    "--global",
+    "is_global",
+    is_flag=True,
+    help="Execute workflows from global directory (~/.mcli/workflows/) instead of local (.mcli/workflows/)",
+)
+@click.pass_context
+def workflows(ctx, is_global):
+    """Runnable workflows for automation, video processing, and daemon management
+
+    Examples:
+        mcli workflows my-workflow              # Execute local workflow (if in git repo)
+        mcli workflows -g my-workflow           # Execute global workflow
+        mcli workflows --global another-workflow # Execute global workflow
+    """
+    # Store the is_global flag in the context for subcommands to access
+    ctx.ensure_object(dict)
+    ctx.obj['is_global'] = is_global
+
+    # If a subcommand was invoked, the subcommand will handle execution
+    if ctx.invoked_subcommand:
+        return
+
+    # If no subcommand, show help
+    click.echo(ctx.get_help())
+
+
+# Add secrets workflow
+try:
+    from mcli.workflow.secrets.secrets_cmd import secrets
+
+    workflows.add_command(secrets)
+except ImportError as e:
+    # Secrets workflow not available
+    import sys
+    from mcli.lib.logger.logger import get_logger
+
+    logger = get_logger()
+    logger.debug(f"Secrets workflow not available: {e}")
+
+# Add notebook subcommand
+try:
+    from mcli.workflow.notebook.notebook_cmd import notebook
+
+    workflows.add_command(notebook)
+except ImportError as e:
+    # Notebook commands not available
+    import sys
+    from mcli.lib.logger.logger import get_logger
+
+    logger = get_logger()
+    logger.debug(f"Notebook commands not available: {e}")
+
+
+# For backward compatibility, keep workflow as an alias
+workflow = workflows
+
+if __name__ == "__main__":
+    workflows()

{mcli_framework-7.11.2 → mcli_framework-7.11.3}/src/mcli_framework.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcli-framework
-Version: 7.11.2
+Version: 7.11.3
 Summary: Portable workflow framework - transform any script into a versioned, schedulable command. Store in ~/.mcli/commands/, version with lockfile, run as daemon or cron job.
 Author-email: Luis Fernandez de la Vara <luis@lefv.io>
 Maintainer-email: Luis Fernandez de la Vara <luis@lefv.io>

mcli_framework-7.11.2/src/mcli/workflow/workflow.py

@@ -1,48 +0,0 @@
-"""
-Workflows command group for mcli.
-
-All workflow commands are now loaded from portable JSON files in ~/.mcli/commands/
-This provides a clean, maintainable way to manage workflow commands.
-"""
-
-import click
-
-
-@click.group(name="workflows")
-def workflows():
-    """Runnable workflows for automation, video processing, and daemon management"""
-    pass
-
-
-# Add secrets workflow
-try:
-    from mcli.workflow.secrets.secrets_cmd import secrets
-
-    workflows.add_command(secrets)
-except ImportError as e:
-    # Secrets workflow not available
-    import sys
-    from mcli.lib.logger.logger import get_logger
-
-    logger = get_logger()
-    logger.debug(f"Secrets workflow not available: {e}")
-
-# Add notebook subcommand
-try:
-    from mcli.workflow.notebook.notebook_cmd import notebook
-
-    workflows.add_command(notebook)
-except ImportError as e:
-    # Notebook commands not available
-    import sys
-    from mcli.lib.logger.logger import get_logger
-
-    logger = get_logger()
-    logger.debug(f"Notebook commands not available: {e}")
-
-
-# For backward compatibility, keep workflow as an alias
-workflow = workflows
-
-if __name__ == "__main__":
-    workflows()