ob-metaflow-extensions 1.1.97__py2.py3-none-any.whl → 1.1.99__py2.py3-none-any.whl

metaflow_extensions/outerbounds/plugins/nvcf/nvcf.py

@@ -59,11 +59,11 @@ class Nvcf(object):
             code_package_url, code_package_ds
         )
         init_expr = " && ".join(init_cmds)
-        heartbeat_expr = f'python -m metaflow_extensions.outerbounds.plugins.nvcf.heartbeat_store "$MAIN_PID" {code_package_ds} nvcf_heartbeats 1>> $MFLOG_STDOUT 2>> $MFLOG_STDERR'
+        heartbeat_expr = f'python -m metaflow_extensions.outerbounds.plugins.nvcf.heartbeat_store "$MAIN_PID" {code_package_ds} nvcf_heartbeats & HEARTBEAT_PID=$!;'
         step_expr = bash_capture_logs(
             " && ".join(
                 self.environment.bootstrap_commands(step_name, code_package_ds)
-                + [step_cli + " & MAIN_PID=$!; " + heartbeat_expr]
+                + [step_cli + " & MAIN_PID=$!; " + heartbeat_expr + " wait $MAIN_PID"]
             )
         )
 
@@ -84,7 +84,10 @@ class Nvcf(object):
         #
         # Note that if step_expr OOMs, this tail expression is never executed.
         # We lose the last logs in this scenario.
-        cmd_str += "c=$?; %s; exit $c" % BASH_SAVE_LOGS
+        cmd_str += (
+            "c=$?; kill $HEARTBEAT_PID; wait $HEARTBEAT_PID; %s; exit $c"
+            % BASH_SAVE_LOGS
+        )
         cmd_str = (
             '${METAFLOW_INIT_SCRIPT:+eval \\"${METAFLOW_INIT_SCRIPT}\\"} && %s'
             % cmd_str
@@ -222,10 +225,10 @@ class Job(object):
             self._invocation_id = response.headers.get("NVCF-REQID")
             if response.getcode() == 200:
                 data = json.loads(response.read())
-                if data["status"].startswith("Oops"):
-                    self._status = JobStatus.FAILED
-                else:
+                if data.get("exit_code") == 0:
                     self._status = JobStatus.SUCCESSFUL
+                else:
+                    self._status = JobStatus.FAILED
                 self._result = data
             elif response.getcode() == 202:
                 self._status = JobStatus.SUBMITTED
@@ -270,11 +273,11 @@ class Job(object):
             response = urlopen(request)
             if response.getcode() == 200:
                 data = json.loads(response.read())
-                if data["status"].startswith("Oops"):
-                    # TODO: Propagate the internal error forward
-                    self._status = JobStatus.FAILED
-                else:
+                # TODO: Propagate the internal error forward
+                if data.get("exit_code") == 0:
                     self._status = JobStatus.SUCCESSFUL
+                else:
+                    self._status = JobStatus.FAILED
                 self._result = data
             elif response.getcode() in [400, 500]:
                 self._status = JobStatus.FAILED

{ob_metaflow_extensions-1.1.97.dist-info → ob_metaflow_extensions-1.1.99.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: ob-metaflow-extensions
-Version: 1.1.97
+Version: 1.1.99
 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.24.1)
+Requires-Dist: ob-metaflow (==2.12.25.2)
 
 # Outerbounds platform package
 

{ob_metaflow_extensions-1.1.97.dist-info → ob_metaflow_extensions-1.1.99.dist-info}/RECORD

@@ -15,7 +15,7 @@ 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=YShky0m7SvIoNm0VX1-_GZh2svc2zQ9oLdGj2FVRpy0,9471
+metaflow_extensions/outerbounds/plugins/nvcf/nvcf.py,sha256=1ayR5YLiEy3XRGVEnRUpsDCH_UyK7z-7A8L5GxI4qOE,9535
 metaflow_extensions/outerbounds/plugins/nvcf/nvcf_cli.py,sha256=YZb5AvbVgUwUJVxRxQ4JqqP8e1RMJr6dZ9U4KkHE-M8,9134
 metaflow_extensions/outerbounds/plugins/nvcf/nvcf_decorator.py,sha256=TKWN3mG2twC40uChfWYVsNKqf3euQIM_YHLAuNf1pvA,6525
 metaflow_extensions/outerbounds/plugins/snowpark/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -34,7 +34,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.97.dist-info/METADATA,sha256=DuTSqhJsXs0n1kfud4ayP92V0uos7h7ZYsNFc8eZidQ,520
-ob_metaflow_extensions-1.1.97.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
-ob_metaflow_extensions-1.1.97.dist-info/top_level.txt,sha256=NwG0ukwjygtanDETyp_BUdtYtqIA_lOjzFFh1TsnxvI,20
-ob_metaflow_extensions-1.1.97.dist-info/RECORD,,
+ob_metaflow_extensions-1.1.99.dist-info/METADATA,sha256=oBe6bSzZL9iBxorXqhVdGW_yKtv4JupzrO9gXsF21lw,520
+ob_metaflow_extensions-1.1.99.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
+ob_metaflow_extensions-1.1.99.dist-info/top_level.txt,sha256=NwG0ukwjygtanDETyp_BUdtYtqIA_lOjzFFh1TsnxvI,20
+ob_metaflow_extensions-1.1.99.dist-info/RECORD,,