ob-metaflow-extensions 1.1.92__py2.py3-none-any.whl → 1.1.94__py2.py3-none-any.whl

metaflow_extensions/outerbounds/plugins/fast_bakery/docker_environment.py

@@ -123,6 +123,14 @@ class DockerEnvironment(MetaflowEnvironment):
         # Attach environment decorator as needed. This is done on a step-by-step basis
         # as we require a conda decorator for fallback steps, but prefer pypi for the baked ones.
         for step in self.flow:
+            # Mixing @pypi/@conda in a single step is not supported yet.
+            # We validate this before attaching any new ones as the OSS Conda environment requires an implicit conda decorator for pypi environments which would fail the validation.
+            if sum(1 for deco in step.decorators if _is_env_deco(deco)) > 1:
+                raise MetaflowException(
+                    "Mixing and matching PyPI packages and Conda packages within a\n"
+                    "step is not yet supported. Use one of @pypi or @conda only for the *%s* step."
+                    % step.name
+                )
             if step.name in self.skipped_steps:
                 # Conda fallback requires a conda decorator as the default for a step
                 decorators._attach_decorators_to_step(step, ["conda"])
@@ -144,14 +152,6 @@ class DockerEnvironment(MetaflowEnvironment):
                         echo,
                     )
 
-            # Mixing @pypi/@conda in a single step is not supported yet
-            if sum(1 for deco in step.decorators if _is_env_deco(deco)) > 1:
-                raise MetaflowException(
-                    "Mixing and matching PyPI packages and Conda packages within a\n"
-                    "step is not yet supported. Use one of @pypi or @conda only for the *%s* step."
-                    % step.name
-                )
-
         steps_to_bake = [
             step
             for step in self.flow

metaflow_extensions/outerbounds/plugins/nvcf/nvcf.py

@@ -15,7 +15,6 @@ from metaflow.mflog import (
 )
 import requests
 from metaflow.metaflow_config_funcs import init_config
-from metaflow_extensions.outerbounds.plugins.nvcf.heartbeat_store import HeartbeatStore
 
 
 class NvcfException(MetaflowException):
@@ -184,6 +183,14 @@ class Job(object):
             (flow_name, str(run_id), step_name, str(task_id), str(retry_count))
         )
 
+        ## import is done here to avoid the following warning:
+        # RuntimeWarning: 'metaflow_extensions.outerbounds.plugins.nvcf.heartbeat_store' found in sys.modules
+        # after import of package 'metaflow_extensions.outerbounds.plugins.nvcf', but prior to execution of
+        # 'metaflow_extensions.outerbounds.plugins.nvcf.heartbeat_store'; this may result in unpredictable behaviour
+        from metaflow_extensions.outerbounds.plugins.nvcf.heartbeat_store import (
+            HeartbeatStore,
+        )
+
         store = HeartbeatStore(
             main_pid=None,
             storage_backend=backend,

metaflow_extensions/outerbounds/plugins/nvcf/nvcf_decorator.py

@@ -1,6 +1,7 @@
 import os
 import sys
 
+from metaflow.exception import MetaflowException
 from metaflow.decorators import StepDecorator
 from metaflow.metadata.util import sync_local_metadata_to_datastore
 from metaflow.metaflow_config import DATASTORE_LOCAL_DIR
@@ -40,9 +41,18 @@ class NvcfDecorator(StepDecorator):
         self.step = step
         self.flow_datastore = flow_datastore
 
-        # TODO:
-        # 1. Ensure that @batch and @kubernetes decorators are not applied to this step.
-        # 2. Ensure @parallel is not applied to this step.
+        if any([deco.name == "kubernetes" for deco in decos]):
+            raise MetaflowException(
+                "Step *{step}* is marked for execution both on Kubernetes and "
+                "Nvidia. Please use one or the other.".format(step=step)
+            )
+        if any([deco.name == "parallel" for deco in decos]):
+            raise MetaflowException(
+                "Step *{step}* contains a @parallel decorator "
+                "with the @nvidia decorator. @parallel is not supported with @nvidia.".format(
+                    step=step
+                )
+            )
 
         # Set run time limit for the NVCF function.
         self.run_time_limit = get_run_time_limit_for_task(decos)

{ob_metaflow_extensions-1.1.92.dist-info → ob_metaflow_extensions-1.1.94.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: ob-metaflow-extensions
-Version: 1.1.92
+Version: 1.1.94
 Summary: Outerbounds Platform Extensions for Metaflow
 Author: Outerbounds, Inc.
 License: Commercial
 Description-Content-Type: text/markdown
 Requires-Dist: boto3
 Requires-Dist: kubernetes
-Requires-Dist: ob-metaflow (==2.12.20.1)
+Requires-Dist: ob-metaflow (==2.12.22.1)
 
 # Outerbounds platform package
 

{ob_metaflow_extensions-1.1.92.dist-info → ob_metaflow_extensions-1.1.94.dist-info}/RECORD

@@ -5,7 +5,7 @@ metaflow_extensions/outerbounds/plugins/__init__.py,sha256=WwvFcN5kserbPwhrE4hXp
 metaflow_extensions/outerbounds/plugins/auth_server.py,sha256=1v2GBqoMBxp5E7Lejz139w-jxJtPnLDvvHXP0HhEIHI,2361
 metaflow_extensions/outerbounds/plugins/perimeters.py,sha256=QXh3SFP7GQbS-RAIxUOPbhPzQ7KDFVxZkTdKqFKgXjI,2697
 metaflow_extensions/outerbounds/plugins/fast_bakery/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-metaflow_extensions/outerbounds/plugins/fast_bakery/docker_environment.py,sha256=7PaCyOcEV71uHZ6mLdgbYSD-qzv_mC04JLlBwOLoQR4,13814
+metaflow_extensions/outerbounds/plugins/fast_bakery/docker_environment.py,sha256=jpEBbdRLq7826LqUKIHqo3cYei2CNeVAxggw6vFmYso,13996
 metaflow_extensions/outerbounds/plugins/fast_bakery/fast_bakery.py,sha256=MAPRQsfqeEkL1LXqgwPrUJOzZ3kY3C00QjdDgQ7wdIg,5160
 metaflow_extensions/outerbounds/plugins/fast_bakery/fast_bakery_cli.py,sha256=kqFyu2bJSnc9_9aYfBpz5xK6L6luWFZK_NMuh8f1eVk,1494
 metaflow_extensions/outerbounds/plugins/fast_bakery/fast_bakery_decorator.py,sha256=EZDbyrfZ7fgcU-P9dMS_hpCxsdDeUE0K5VU3uNM4aW4,1506
@@ -15,9 +15,9 @@ metaflow_extensions/outerbounds/plugins/nim/__init__.py,sha256=GVnvSTjqYVj5oG2yh
 metaflow_extensions/outerbounds/plugins/nim/nim_manager.py,sha256=SWieODDxtIaeZwdMYtObDi57Kjyfw2DUuE6pJtU750w,9206
 metaflow_extensions/outerbounds/plugins/nvcf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 metaflow_extensions/outerbounds/plugins/nvcf/heartbeat_store.py,sha256=pOWwm8LFQBbtku0zNBBwCyXxLK8U-hhC4naQcmU69nE,6217
-metaflow_extensions/outerbounds/plugins/nvcf/nvcf.py,sha256=s9S_Ntm8Y23fgzQtN_hLMrQaSfOvKqNBUyL1K8Xo9vU,9039
+metaflow_extensions/outerbounds/plugins/nvcf/nvcf.py,sha256=YShky0m7SvIoNm0VX1-_GZh2svc2zQ9oLdGj2FVRpy0,9471
 metaflow_extensions/outerbounds/plugins/nvcf/nvcf_cli.py,sha256=YZb5AvbVgUwUJVxRxQ4JqqP8e1RMJr6dZ9U4KkHE-M8,9134
-metaflow_extensions/outerbounds/plugins/nvcf/nvcf_decorator.py,sha256=E7h94ni8yW9BQkKSBUptPdGAaVmXpR9FlXkPWpLyPd0,6054
+metaflow_extensions/outerbounds/plugins/nvcf/nvcf_decorator.py,sha256=TKWN3mG2twC40uChfWYVsNKqf3euQIM_YHLAuNf1pvA,6525
 metaflow_extensions/outerbounds/plugins/snowpark/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 metaflow_extensions/outerbounds/plugins/snowpark/snowpark.py,sha256=0R8aFN9MpgWraqiaI6ZF82YpLdFJ1f-3z_-BPRpZfxM,10674
 metaflow_extensions/outerbounds/plugins/snowpark/snowpark_cli.py,sha256=ErsVoCQLa33byiykOQzDEeEkRKk0mgffZme43f3jxn4,8747
@@ -33,7 +33,7 @@ metaflow_extensions/outerbounds/toplevel/global_aliases_for_metaflow_package.py,
 metaflow_extensions/outerbounds/toplevel/plugins/azure/__init__.py,sha256=WUuhz2YQfI4fz7nIcipwwWq781eaoHEk7n4GAn1npDg,63
 metaflow_extensions/outerbounds/toplevel/plugins/gcp/__init__.py,sha256=BbZiaH3uILlEZ6ntBLKeNyqn3If8nIXZFq_Apd7Dhco,70
 metaflow_extensions/outerbounds/toplevel/plugins/kubernetes/__init__.py,sha256=5zG8gShSj8m7rgF4xgWBZFuY3GDP5n1T0ktjRpGJLHA,69
-ob_metaflow_extensions-1.1.92.dist-info/METADATA,sha256=ErKr4z77BaOS6alTco5zeVtZc2KqpSeezK9BscAoZio,520
-ob_metaflow_extensions-1.1.92.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
-ob_metaflow_extensions-1.1.92.dist-info/top_level.txt,sha256=NwG0ukwjygtanDETyp_BUdtYtqIA_lOjzFFh1TsnxvI,20
-ob_metaflow_extensions-1.1.92.dist-info/RECORD,,
+ob_metaflow_extensions-1.1.94.dist-info/METADATA,sha256=nE8DERColBTdDM_09M9nhsXhe4owe7eUvpZLno4BZAg,520
+ob_metaflow_extensions-1.1.94.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
+ob_metaflow_extensions-1.1.94.dist-info/top_level.txt,sha256=NwG0ukwjygtanDETyp_BUdtYtqIA_lOjzFFh1TsnxvI,20
+ob_metaflow_extensions-1.1.94.dist-info/RECORD,,