mcli-framework 7.11.2__py3-none-any.whl → 7.11.3__py3-none-any.whl

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/workflow/workflow.py

@@ -1,17 +1,98 @@
 """
 Workflows command group for mcli.
 
-All workflow commands are now loaded from portable JSON files in ~/.mcli/commands/
+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
 
 
-@click.group(name="workflows")
-def workflows():
-    """Runnable workflows for automation, video processing, and daemon management"""
-    pass
+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

{mcli_framework-7.11.2.dist-info → mcli_framework-7.11.3.dist-info}/METADATA

@@ -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.dist-info → mcli_framework-7.11.3.dist-info}/RECORD

@@ -5,7 +5,7 @@ mcli/config.toml,sha256=263yEVvP_W9F2zOLssUBgy7amKaRAFQuBrfxcMhKxaQ,1706
 mcli/app/__init__.py,sha256=D4RiKk2gOEXwanbe_jXyNSb5zdgNi47kahtskMnEwjY,489
 mcli/app/commands_cmd.py,sha256=gyvjkX8HyImUKaO37Du6XwklN6FJwvQX-VD3tNU0TGQ,76191
 mcli/app/completion_helpers.py,sha256=e62C6w2N-XoD66GYYHgtvKKoD3kYMuIeBBGzVKbuL04,7497
-mcli/app/main.py,sha256=CzF1iudFhVdAtC5d_KzRVAc6XT5Lkq6WZ1NnNKpdWnE,19165
+mcli/app/main.py,sha256=4rfj8d68OgUErLmIRRFDu9UKBgJwc-HFgJ8MuAPur8s,19517
 mcli/app/model_cmd.py,sha256=LQQD8FaebFoaJGK3u_kt19wZ3HJyo_ecwSMYyC2xIp8,2497
 mcli/app/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcli/app/model/model.py,sha256=EUGu_td-hRlbf4OElkdk1-0p7WyuG7sZmb-Ux2-J9KY,39061
@@ -209,7 +209,7 @@ mcli/self/zsh_cmd.py,sha256=63jKmfjhJp2zxJL2c37OdtdzDrnOreXXfyARN7TyfzU,8294
 mcli/workflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcli/workflow/doc_convert.py,sha256=X7ZCYbGCBZLv6WkxAgHfVOkD-6k-euo6qIaPgaKiwhA,25972
 mcli/workflow/lsh_integration.py,sha256=jop80DUjdOSxmqPb-gX_OBep5f1twViv-pXmkcFqBPY,13314
-mcli/workflow/workflow.py,sha256=zaRXrmVqILvGX9u_Mp0FTBgydzr_z20fiYSFv8MgjK0,1154
+mcli/workflow/workflow.py,sha256=ctnPo6dwSTcwUPPTa6_K_feZJUXkkIc9n9jvQf_4n_Q,4159
 mcli/workflow/daemon/__init__.py,sha256=iDounKzoQhHcgHwK1kFJHnPPhn09JFzvSEpXRZDSnxU,565
 mcli/workflow/daemon/async_command_database.py,sha256=pvfKYjt0Jg1EPwJ1p2C0M3bsBWvjEs4Ok-Y6-jY0qVI,24873
 mcli/workflow/daemon/async_process_manager.py,sha256=hDehiYuWnBOv8LbMLTDEi4DVyrwm8YrrYF8Ca5P66A4,21374
@@ -268,9 +268,9 @@ mcli/workflow/sync/test_cmd.py,sha256=neVgs9zEnKSxlvzDpFkuCGucqnzjrShm2OvJtHibsl
 mcli/workflow/videos/__init__.py,sha256=aV3DEoO7qdKJY4odWKoQbOKDQq4ludTeCLnZcupOFIM,25
 mcli/workflow/wakatime/__init__.py,sha256=wKG8cVIHVtMPhNRFGFtX43bRnocHqOMMkFMkmW-M6pU,2626
 mcli/workflow/wakatime/wakatime.py,sha256=sEjsUKa3-XyE8Ni6sAb_D3GAY5jDcA30KknW9YTbLTA,142
-mcli_framework-7.11.2.dist-info/licenses/LICENSE,sha256=sahwAMfrJv2-V66HNPTp7A9UmMjxtyejwTZZoWQvEcI,1075
-mcli_framework-7.11.2.dist-info/METADATA,sha256=b7Gcj2KCC86Lu2OTxVRCi_NmfDb40mADWTigjuFcATg,18655
-mcli_framework-7.11.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcli_framework-7.11.2.dist-info/entry_points.txt,sha256=dYrZbDIm-KUPsl1wfv600Kx_8sMy89phMkCihbDRgP8,261
-mcli_framework-7.11.2.dist-info/top_level.txt,sha256=_bnO8J2EUkliWivey_1le0UrnocFKmyVMQjbQ8iVXjc,5
-mcli_framework-7.11.2.dist-info/RECORD,,
+mcli_framework-7.11.3.dist-info/licenses/LICENSE,sha256=sahwAMfrJv2-V66HNPTp7A9UmMjxtyejwTZZoWQvEcI,1075
+mcli_framework-7.11.3.dist-info/METADATA,sha256=3YjC0sbDgOscsVMhVbcOsw8pnvhzlq3MlYBvxekbanY,18655
+mcli_framework-7.11.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcli_framework-7.11.3.dist-info/entry_points.txt,sha256=dYrZbDIm-KUPsl1wfv600Kx_8sMy89phMkCihbDRgP8,261
+mcli_framework-7.11.3.dist-info/top_level.txt,sha256=_bnO8J2EUkliWivey_1le0UrnocFKmyVMQjbQ8iVXjc,5
+mcli_framework-7.11.3.dist-info/RECORD,,