ob-metaflow-extensions 1.1.170rc2__tar.gz → 1.1.171__tar.gz

{ob_metaflow_extensions-1.1.170rc2 → ob_metaflow_extensions-1.1.171}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob_metaflow_extensions
-Version: 1.1.170rc2
+Version: 1.1.171
 Summary: Outerbounds Platform Extensions for Metaflow
 Author: Outerbounds, Inc.
 License: Commercial

{ob_metaflow_extensions-1.1.170rc2 → ob_metaflow_extensions-1.1.171}/metaflow_extensions/outerbounds/plugins/__init__.py

@@ -324,7 +324,6 @@ CLIS_DESC = [
     ("nvct", ".nvct.nvct_cli.cli"),
     ("fast-bakery", ".fast_bakery.fast_bakery_cli.cli"),
     ("snowpark", ".snowpark.snowpark_cli.cli"),
-    ("app", ".apps.app_cli.cli"),
 ]
 STEP_DECORATORS_DESC = [
     ("nvidia", ".nvcf.nvcf_decorator.NvcfDecorator"),

{ob_metaflow_extensions-1.1.170rc2 → ob_metaflow_extensions-1.1.171}/metaflow_extensions/outerbounds/plugins/fast_bakery/docker_environment.py

@@ -90,6 +90,7 @@ class DockerEnvironmentException(MetaflowException):
 class DockerEnvironment(MetaflowEnvironment):
     TYPE = "fast-bakery"
     _filecache = None
+    _force_rebuild = False
 
     def __init__(self, flow):
         self.skipped_steps = set()
@@ -178,12 +179,20 @@ class DockerEnvironment(MetaflowEnvironment):
 
         if self.skipped_steps:
             self.delegate = CondaEnvironment(self.flow)
+            self.delegate._force_rebuild = self._force_rebuild
             self.delegate.set_local_root(self.local_root)
             self.delegate.validate_environment(echo, self.datastore_type)
             self.delegate.init_environment(echo, self.skipped_steps)
 
     def _bake(self, steps) -> Dict[str, FastBakeryApiResponse]:
         metafile_path = get_fastbakery_metafile_path(self.local_root, self.flow.name)
+        if self._force_rebuild:
+            # clear the metafile if force rebuilding, effectively skipping the cache.
+            try:
+                os.remove(metafile_path)
+            except Exception:
+                pass
+
         logger_lock = threading.Lock()
 
         @cache_request(metafile_path)
@@ -201,7 +210,8 @@ class DockerEnvironment(MetaflowEnvironment):
                 bakery.pypi_packages(pypi_packages)
                 bakery.conda_packages(conda_packages)
                 bakery.base_image(base_image)
-                # bakery.ignore_cache()
+                if self._force_rebuild:
+                    bakery.ignore_cache()
 
                 with logger_lock:
                     self.logger(f"🍳 Baking [{ref}] ...")

{ob_metaflow_extensions-1.1.170rc2 → ob_metaflow_extensions-1.1.171}/metaflow_extensions/outerbounds/toplevel/ob_internal.py

@@ -1,2 +1 @@
 from ..plugins.kubernetes.pod_killer import PodKiller
-from ..plugins.fast_bakery.baker import bake_image

{ob_metaflow_extensions-1.1.170rc2 → ob_metaflow_extensions-1.1.171}/ob_metaflow_extensions.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob-metaflow-extensions
-Version: 1.1.170rc2
+Version: 1.1.171
 Summary: Outerbounds Platform Extensions for Metaflow
 Author: Outerbounds, Inc.
 License: Commercial

{ob_metaflow_extensions-1.1.170rc2 → ob_metaflow_extensions-1.1.171}/ob_metaflow_extensions.egg-info/SOURCES.txt

@@ -7,7 +7,6 @@ metaflow_extensions/outerbounds/plugins/__init__.py
 metaflow_extensions/outerbounds/plugins/auth_server.py
 metaflow_extensions/outerbounds/plugins/perimeters.py
 metaflow_extensions/outerbounds/plugins/apps/__init__.py
-metaflow_extensions/outerbounds/plugins/apps/app_cli.py
 metaflow_extensions/outerbounds/plugins/apps/app_utils.py
 metaflow_extensions/outerbounds/plugins/apps/consts.py
 metaflow_extensions/outerbounds/plugins/apps/deploy_decorator.py
@@ -23,7 +22,6 @@ metaflow_extensions/outerbounds/plugins/checkpoint_datastores/__init__.py
 metaflow_extensions/outerbounds/plugins/checkpoint_datastores/coreweave.py
 metaflow_extensions/outerbounds/plugins/checkpoint_datastores/nebius.py
 metaflow_extensions/outerbounds/plugins/fast_bakery/__init__.py
-metaflow_extensions/outerbounds/plugins/fast_bakery/baker.py
 metaflow_extensions/outerbounds/plugins/fast_bakery/docker_environment.py
 metaflow_extensions/outerbounds/plugins/fast_bakery/fast_bakery.py
 metaflow_extensions/outerbounds/plugins/fast_bakery/fast_bakery_cli.py

ob_metaflow_extensions-1.1.171/ob_metaflow_extensions.egg-info/requires.txt

@@ -0,0 +1,3 @@
+boto3
+kubernetes
+ob-metaflow==2.15.18.1

{ob_metaflow_extensions-1.1.170rc2 → ob_metaflow_extensions-1.1.171}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_namespace_packages
 from pathlib import Path
 
 
-version = "1.1.170rc2"
+version = "1.1.171"
 this_directory = Path(__file__).parent
 long_description = (this_directory / "README.md").read_text()
 
@@ -18,6 +18,6 @@ setup(
     install_requires=[
         "boto3",
         "kubernetes",
-        "ob-metaflow == 2.15.17.1",
+        "ob-metaflow == 2.15.18.1",
     ],
 )

ob_metaflow_extensions-1.1.170rc2/metaflow_extensions/outerbounds/plugins/apps/app_cli.py

@@ -1,29 +0,0 @@
-from metaflow._vendor import click
-import os
-
-os.environ["APPS_CLI_LOADING_IN_METAFLOW"] = "true"
-OUTERBOUNDS_APP_CLI_AVAILABLE = True
-
-try:
-    import outerbounds.apps.app_cli as ob_apps_cli
-except ImportError:
-    OUTERBOUNDS_APP_CLI_AVAILABLE = False
-
-
-if not OUTERBOUNDS_APP_CLI_AVAILABLE:
-
-    @click.group()
-    def _cli():
-        pass
-
-    @_cli.group(help="Dummy Group to append to CLI for Safety")
-    def app():
-        pass
-
-    @app.command(help="Dummy Command to append to CLI for Safety")
-    def cannot_deploy():
-        raise Exception("Outerbounds App CLI not available")
-
-    cli = _cli
-else:
-    cli = ob_apps_cli.cli

ob_metaflow_extensions-1.1.170rc2/metaflow_extensions/outerbounds/plugins/fast_bakery/baker.py

@@ -1,110 +0,0 @@
-import threading
-import time
-import sys
-from typing import Dict, Optional, Any, Callable
-from functools import partial
-from metaflow.exception import MetaflowException
-from metaflow.metaflow_config import FAST_BAKERY_URL
-
-from .fast_bakery import FastBakery, FastBakeryApiResponse, FastBakeryException
-from .docker_environment import cache_request
-
-BAKERY_METAFILE = ".imagebakery-cache"
-
-
-class BakerException(MetaflowException):
-    headline = "Ran into an error while baking image"
-
-    def __init__(self, msg):
-        super(BakerException, self).__init__(msg)
-
-
-def bake_image(
-    cache_file_path: str,
-    ref: Optional[str] = None,
-    python: Optional[str] = None,
-    pypi_packages: Optional[Dict[str, str]] = None,
-    conda_packages: Optional[Dict[str, str]] = None,
-    base_image: Optional[str] = None,
-    logger: Optional[Callable[[str], Any]] = None,
-) -> FastBakeryApiResponse:
-    """
-    Bakes a Docker image with the specified dependencies.
-
-    Args:
-        cache_file_path: Path to the cache file
-        ref: Reference identifier for this bake (for logging purposes)
-        python: Python version to use
-        pypi_packages: Dictionary of PyPI packages and versions
-        conda_packages: Dictionary of Conda packages and versions
-        base_image: Base Docker image to use
-        logger: Optional logger function to output progress
-
-    Returns:
-        FastBakeryApiResponse: The response from the bakery service
-
-    Raises:
-        BakerException: If the baking process fails
-    """
-    # Default logger if none provided
-    if logger is None:
-        logger = partial(print, file=sys.stderr)
-
-    # Thread lock for logging
-    logger_lock = threading.Lock()
-    images_baked = 0
-
-    @cache_request(cache_file_path)
-    def _cached_bake(
-        ref=None,
-        python=None,
-        pypi_packages=None,
-        conda_packages=None,
-        base_image=None,
-    ):
-        try:
-            bakery = FastBakery(url=FAST_BAKERY_URL)
-            bakery._reset_payload()
-            bakery.python_version(python)
-            bakery.pypi_packages(pypi_packages)
-            bakery.conda_packages(conda_packages)
-            bakery.base_image(base_image)
-            # bakery.ignore_cache()
-
-            with logger_lock:
-                logger(f"🍳 Baking [{ref}] ...")
-                logger(f"     🐍 Python: {python}")
-
-                if pypi_packages:
-                    logger(f"     📦 PyPI packages:")
-                    for package, version in pypi_packages.items():
-                        logger(f"        🔧 {package}: {version}")
-
-                if conda_packages:
-                    logger(f"     📦 Conda packages:")
-                    for package, version in conda_packages.items():
-                        logger(f"        🔧 {package}: {version}")
-
-                logger(f"     🏗️  Base image: {base_image}")
-
-            start_time = time.time()
-            res = bakery.bake()
-            # TODO: Get actual bake time from bakery
-            bake_time = time.time() - start_time
-
-            with logger_lock:
-                logger(f"🏁 Baked [{ref}] in {bake_time:.2f} seconds!")
-            nonlocal images_baked
-            images_baked += 1
-            return res
-        except FastBakeryException as ex:
-            raise BakerException(f"Bake [{ref}] failed: {str(ex)}")
-
-    # Call the cached bake function with the provided parameters
-    return _cached_bake(
-        ref=ref,
-        python=python,
-        pypi_packages=pypi_packages,
-        conda_packages=conda_packages,
-        base_image=base_image,
-    )

ob_metaflow_extensions-1.1.170rc2/ob_metaflow_extensions.egg-info/requires.txt

@@ -1,3 +0,0 @@
-boto3
-kubernetes
-ob-metaflow==2.15.17.1