mcli-framework 8.0.58__tar.gz → 8.0.60__tar.gz

{mcli_framework-8.0.58/src/mcli_framework.egg-info → mcli_framework-8.0.60}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcli-framework
-Version: 8.0.58
+Version: 8.0.60
 Summary: Portable workflow framework - transform any script into a versioned, schedulable command. Store in ~/.mcli/workflows/, 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-8.0.58 → mcli_framework-8.0.60}/pyproject.toml

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

{mcli_framework-8.0.58 → mcli_framework-8.0.60}/src/mcli/lib/constants/messages.py

@@ -1124,6 +1124,7 @@ class VenvMessages:
     USING_SYSTEM_PYTHON_ENV_SET = "Using system Python (MCLI_USE_SYSTEM_PYTHON set)"
     CREATING_GLOBAL_VENV = "Creating global MCLI venv at {path}..."
     GLOBAL_VENV_CREATED = "Created global MCLI venv at {path}"
+    GLOBAL_VENV_ALREADY_EXISTS = "Global venv already exists at {path}"
 
     # Dependency messages
     NO_DEPS_SPECIFIED = "No dependencies specified"

{mcli_framework-8.0.58 → mcli_framework-8.0.60}/src/mcli/lib/constants/paths.py

@@ -101,5 +101,11 @@ class VenvPaths:
     PYTHON_UNIX = "python"
     PYTHON_WINDOWS = "python.exe"
 
+    # Framework runtime primitives that mcli python workflows assume are
+    # importable. The generated script templates `import click` unconditionally,
+    # so an isolated (bare) global venv must be seeded with these even when a
+    # script omits them from its @requires metadata.
+    BASE_RUNTIME_PACKAGES = ["click"]
+
 
 __all__ = ["DirNames", "FileNames", "PathPatterns", "GitIgnorePatterns", "VenvPaths"]

{mcli_framework-8.0.58 → mcli_framework-8.0.60}/src/mcli/lib/pyenv/deps.py

@@ -75,6 +75,26 @@ class DependencyChecker:
 
         return installed, missing
 
+    def merge_base_runtime(self, packages: List[str], base: List[str]) -> List[str]:
+        """Append base runtime packages that are not already declared.
+
+        Comparison is by normalized package name, so a declared spec like
+        ``click>=8.0`` or ``Click`` suppresses adding the bare ``click`` base.
+
+        Args:
+            packages: Packages already requested (from @requires).
+            base: Base runtime packages to ensure are present.
+
+        Returns:
+            ``packages`` plus any base package whose normalized name is absent.
+        """
+        have = {self._normalize_package_name(self._extract_package_name(p)) for p in packages}
+        merged = list(packages)
+        for pkg in base:
+            if self._normalize_package_name(self._extract_package_name(pkg)) not in have:
+                merged.append(pkg)
+        return merged
+
     def install_packages(self, packages: List[str], venv_path: Path) -> bool:
         """Install packages using uv pip install.
 

{mcli_framework-8.0.58 → mcli_framework-8.0.60}/src/mcli/lib/pyenv/manager.py

@@ -12,7 +12,7 @@ from typing import Dict, List, Optional, Tuple
 
 import click
 
-from mcli.lib.constants import EnvVars, VenvMessages
+from mcli.lib.constants import EnvVars, VenvMessages, VenvPaths
 from mcli.lib.logger import get_logger
 
 from .deps import DependencyChecker
@@ -119,10 +119,6 @@ class PyEnvManager:
         Returns:
             True if all dependencies are satisfied or installed.
         """
-        if not requires:
-            logger.debug(VenvMessages.NO_DEPS_SPECIFIED)
-            return True
-
         venv_path, source = self.resolve_environment()
 
         # Ensure the venv exists (create global venv if needed)
@@ -132,8 +128,16 @@ class PyEnvManager:
         python_exe = self.get_python_executable()
         checker = DependencyChecker(python_exe)
 
-        # Parse and check dependencies
-        packages = checker.parse_requires(requires)
+        # Parse declared dependencies, then ensure framework runtime primitives
+        # (e.g. click) are present even when @requires is empty — an isolated
+        # global venv is created bare and mcli workflow scripts import click.
+        packages = checker.parse_requires(requires) if requires else []
+        packages = checker.merge_base_runtime(packages, VenvPaths.BASE_RUNTIME_PACKAGES)
+
+        if not packages:
+            logger.debug(VenvMessages.NO_DEPS_SPECIFIED)
+            return True
+
         logger.debug(VenvMessages.CHECKING_DEPS.format(script=script_name))
 
         installed, missing = checker.check_installed(packages)

{mcli_framework-8.0.58 → mcli_framework-8.0.60}/src/mcli/lib/pyenv/venv.py

@@ -67,7 +67,7 @@ class VenvManager:
         venv_path = self.get_global_venv_path()
 
         if venv_path.is_dir() and self._is_valid_venv(venv_path):
-            logger.debug(f"Global venv already exists at {venv_path}")
+            logger.debug(VenvMessages.GLOBAL_VENV_ALREADY_EXISTS.format(path=venv_path))
             return venv_path
 
         logger.info(VenvMessages.CREATING_GLOBAL_VENV.format(path=venv_path))
@@ -95,8 +95,12 @@ class VenvManager:
         venv_path.parent.mkdir(parents=True, exist_ok=True)
 
         try:
+            # --clear recreates over an existing directory. ensure_global_venv()
+            # only calls this when no *valid* venv exists, so a directory present
+            # here is stale/partial (e.g. pyvenv.cfg but no bin/python). Without
+            # --clear, uv aborts with "A virtual environment already exists".
             result = subprocess.run(
-                ["uv", "venv", str(venv_path)],
+                ["uv", "venv", "--clear", str(venv_path)],
                 capture_output=True,
                 text=True,
                 timeout=60,

{mcli_framework-8.0.58 → mcli_framework-8.0.60/src/mcli_framework.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcli-framework
-Version: 8.0.58
+Version: 8.0.60
 Summary: Portable workflow framework - transform any script into a versioned, schedulable command. Store in ~/.mcli/workflows/, 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>