ob-metaflow-extensions 1.1.123rc1__py2.py3-none-any.whl → 1.1.123rc3__py2.py3-none-any.whl

metaflow_extensions/outerbounds/plugins/apps/deploy_decorator.py

@@ -32,8 +32,7 @@ class WorkstationAppDeployDecorator(StepDecorator):
     def step_init(self, flow, graph, step, decos, environment, flow_datastore, logger):
         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)
+                "@app_deploy decorator is only supported locally and does not work with remote execution environments like @kubernetes, @nvidia."
             )
 
         # We always need to have some environment defined through the flow to deploy and app.
@@ -93,6 +92,17 @@ class WorkstationAppDeployDecorator(StepDecorator):
     ):
         deploy_dir = self._deploy_dir
 
+        # By default we assume that the user has a __main__.py file in their app directory.
+        # They can always override this behavior.
+        user_provided_entrypoint = getattr(flow, "entrypoint", None)
+
+        if user_provided_entrypoint is not None and not isinstance(
+            user_provided_entrypoint, str
+        ):
+            raise MetaflowException(
+                f"@app_deploy requires entrypoint to be set to a string. The current value of entrypoint {user_provided_entrypoint} is not valid."
+            )
+
         flow_directory = os.path.dirname(os.path.abspath(sys.argv[0]))
 
         # By default, we assume that the layout of the flow directory is:
@@ -103,11 +113,13 @@ class WorkstationAppDeployDecorator(StepDecorator):
         #   - other_files
         #   - other_dirs/
         # This can be overridden by the user by setting the app_dir attribute.
+        # None of this matters if the user provides a custom entrypoint, since in that case we don't copy
+        # anything anywhere.
         app_location = getattr(
             flow, "app_dir", os.path.join(flow_directory, self.attributes["app_name"])
         )
 
-        if not os.path.exists(app_location):
+        if user_provided_entrypoint is None and not os.path.exists(app_location):
             raise MetaflowException(f"App directory {app_location} does not exist.")
 
         wait_time_for_app_start = getattr(
@@ -116,17 +128,6 @@ class WorkstationAppDeployDecorator(StepDecorator):
             DEFAULT_WAIT_TIME_SECONDS_FOR_PROCESS_TO_START,
         )
 
-        # By default we assume that the user has a __main__.py file in their app directory.
-        # They can always override this behavior.
-        user_provided_entrypoint = getattr(flow, "entrypoint", None)
-
-        if user_provided_entrypoint is not None and not isinstance(
-            user_provided_entrypoint, str
-        ):
-            raise MetaflowException(
-                f"@app_deploy requires entrypoint to be set to a string. The current value of entrypoint {user_provided_entrypoint} is not valid."
-            )
-
         try:
             supervisor_client = SupervisorClient(
                 wait_time_seconds_for_app_start=wait_time_for_app_start

{ob_metaflow_extensions-1.1.123rc1.dist-info → ob_metaflow_extensions-1.1.123rc3.dist-info}/METADATA

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

{ob_metaflow_extensions-1.1.123rc1.dist-info → ob_metaflow_extensions-1.1.123rc3.dist-info}/RECORD

@@ -6,7 +6,7 @@ metaflow_extensions/outerbounds/plugins/auth_server.py,sha256=_Q9_2EL0Xy77bCRphk
 metaflow_extensions/outerbounds/plugins/perimeters.py,sha256=QXh3SFP7GQbS-RAIxUOPbhPzQ7KDFVxZkTdKqFKgXjI,2697
 metaflow_extensions/outerbounds/plugins/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 metaflow_extensions/outerbounds/plugins/apps/app_utils.py,sha256=JrVKlbRx8-nSmI4cRrB7F8BQGDHleABIYZudK4P-XFE,7905
-metaflow_extensions/outerbounds/plugins/apps/deploy_decorator.py,sha256=4-42GwYdOGQahWo4qdersfnT-WcO5U9JVtO9kovKlQA,5686
+metaflow_extensions/outerbounds/plugins/apps/deploy_decorator.py,sha256=usE7qZ2luJ0lRRt6-YlaarpjgaQVNNvb-hjVwr_BNRU,5851
 metaflow_extensions/outerbounds/plugins/apps/supervisord_utils.py,sha256=QDM7s-iVKnnmE7fM8K-nFoLojQvL_cT8hUj1LF1JOBs,8372
 metaflow_extensions/outerbounds/plugins/fast_bakery/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 metaflow_extensions/outerbounds/plugins/fast_bakery/docker_environment.py,sha256=i6F3FXwvEhkmUCTHDJ4VmSoL6vKyQhC_YRCtY6F4EkA,14209
@@ -48,7 +48,7 @@ metaflow_extensions/outerbounds/toplevel/plugins/azure/__init__.py,sha256=WUuhz2
 metaflow_extensions/outerbounds/toplevel/plugins/gcp/__init__.py,sha256=BbZiaH3uILlEZ6ntBLKeNyqn3If8nIXZFq_Apd7Dhco,70
 metaflow_extensions/outerbounds/toplevel/plugins/kubernetes/__init__.py,sha256=5zG8gShSj8m7rgF4xgWBZFuY3GDP5n1T0ktjRpGJLHA,69
 metaflow_extensions/outerbounds/toplevel/plugins/snowflake/__init__.py,sha256=LptpH-ziXHrednMYUjIaosS1SXD3sOtF_9_eRqd8SJw,50
-ob_metaflow_extensions-1.1.123rc1.dist-info/METADATA,sha256=xjw9rSyiPjv7obcoDP91AKMcw2B8dgqBAYD68rrkeuI,523
-ob_metaflow_extensions-1.1.123rc1.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
-ob_metaflow_extensions-1.1.123rc1.dist-info/top_level.txt,sha256=NwG0ukwjygtanDETyp_BUdtYtqIA_lOjzFFh1TsnxvI,20
-ob_metaflow_extensions-1.1.123rc1.dist-info/RECORD,,
+ob_metaflow_extensions-1.1.123rc3.dist-info/METADATA,sha256=tNEDtAg0JjLBd-v_VLRJ9LTp10HxakE3doOFlfMCs3I,523
+ob_metaflow_extensions-1.1.123rc3.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
+ob_metaflow_extensions-1.1.123rc3.dist-info/top_level.txt,sha256=NwG0ukwjygtanDETyp_BUdtYtqIA_lOjzFFh1TsnxvI,20
+ob_metaflow_extensions-1.1.123rc3.dist-info/RECORD,,