metaflow 2.12.4__tar.gz → 2.12.5__tar.gz

{metaflow-2.12.4/metaflow.egg-info → metaflow-2.12.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: metaflow
-Version: 2.12.4
+Version: 2.12.5
 Summary: Metaflow: More Data Science, Less Engineering
 Author: Metaflow Developers
 Author-email: help@metaflow.org
@@ -26,7 +26,7 @@ License-File: LICENSE
 Requires-Dist: requests
 Requires-Dist: boto3
 Provides-Extra: stubs
-Requires-Dist: metaflow-stubs==2.12.4; extra == "stubs"
+Requires-Dist: metaflow-stubs==2.12.5; extra == "stubs"
 
 ![Metaflow_Logo_Horizontal_FullColor_Ribbon_Dark_RGB](https://user-images.githubusercontent.com/763451/89453116-96a57e00-d713-11ea-9fa6-82b29d4d6eff.png)
 

{metaflow-2.12.4 → metaflow-2.12.5}/metaflow/cli.py

@@ -946,7 +946,7 @@ def start(
     ctx.obj.environment = [
         e for e in ENVIRONMENTS + [MetaflowEnvironment] if e.TYPE == environment
     ][0](ctx.obj.flow)
-    ctx.obj.environment.validate_environment(echo, datastore)
+    ctx.obj.environment.validate_environment(ctx.obj.logger, datastore)
 
     ctx.obj.event_logger = LOGGING_SIDECARS[event_logger](
         flow=ctx.obj.flow, env=ctx.obj.environment

{metaflow-2.12.4 → metaflow-2.12.5}/metaflow/plugins/cards/card_cli.py

@@ -388,6 +388,22 @@ def card_read_options_and_arguments(func):
     return wrapper
 
 
+def _extract_reload_token(data, task, mf_card):
+    if "render_seq" not in data:
+        return "never"
+
+    if data["render_seq"] == "final":
+        # final data update should always trigger a card reload to show
+        # the final card, hence a different token for the final update
+        return "final"
+    elif mf_card.RELOAD_POLICY == mf_card.RELOAD_POLICY_ALWAYS:
+        return "render-seq-%s" % data["render_seq"]
+    elif mf_card.RELOAD_POLICY == mf_card.RELOAD_POLICY_NEVER:
+        return "never"
+    elif mf_card.RELOAD_POLICY == mf_card.RELOAD_POLICY_ONCHANGE:
+        return mf_card.reload_content_token(task, data)
+
+
 def update_card(mf_card, mode, task, data, timeout_value=None):
     """
     This method will be responsible for creating a card/data-update based on the `mode`.
@@ -432,31 +448,21 @@ def update_card(mf_card, mode, task, data, timeout_value=None):
             - `timeout_stack_trace` : stack trace of the function if it timed out.
     """
 
-    def _reload_token():
-        if "render_seq" not in data:
-            return "never"
-
-        if data["render_seq"] == "final":
-            # final data update should always trigger a card reload to show
-            # the final card, hence a different token for the final update
-            return "final"
-        elif mf_card.RELOAD_POLICY == mf_card.RELOAD_POLICY_ALWAYS:
-            return "render-seq-%s" % data["render_seq"]
-        elif mf_card.RELOAD_POLICY == mf_card.RELOAD_POLICY_NEVER:
-            return "never"
-        elif mf_card.RELOAD_POLICY == mf_card.RELOAD_POLICY_ONCHANGE:
-            return mf_card.reload_content_token(task, data)
-
     def _add_token_html(html):
         if html is None:
             return None
-        return html.replace(mf_card.RELOAD_POLICY_TOKEN, _reload_token())
+        return html.replace(
+            mf_card.RELOAD_POLICY_TOKEN,
+            _extract_reload_token(data=data, task=task, mf_card=mf_card),
+        )
 
     def _add_token_json(json_msg):
         if json_msg is None:
             return None
         return {
-            "reload_token": _reload_token(),
+            "reload_token": _extract_reload_token(
+                data=data, task=task, mf_card=mf_card
+            ),
             "data": json_msg,
             "created_on": time.time(),
         }
@@ -740,8 +746,16 @@ def create(
     #   3. `refresh` is implemented but it raises an exception. (We do nothing. Don't store anything.)
     #   4. `refresh` is implemented but it times out. (We do nothing. Don't store anything.)
 
+    def _render_error_card(stack_trace):
+        _card = error_card()
+        token = _extract_reload_token(data, task, _card)
+        return _card.render(
+            task,
+            stack_trace=stack_trace,
+        ).replace(mf_card.RELOAD_POLICY_TOKEN, token)
+
     if error_stack_trace is not None and mode != "refresh":
-        rendered_content = error_card().render(task, stack_trace=error_stack_trace)
+        rendered_content = _render_error_card(error_stack_trace)
     elif (
         rendered_info.is_implemented
         and rendered_info.timed_out
@@ -753,18 +767,15 @@ def create(
             "To increase the timeout duration for card rendering, please set the `timeout` parameter in the @card decorator. "
             "\nStack Trace : \n%s"
         ) % (timeout, rendered_info.timeout_stack_trace)
-        rendered_content = error_card().render(
-            task,
-            stack_trace=timeout_stack_trace,
-        )
+        rendered_content = _render_error_card(timeout_stack_trace)
     elif (
         rendered_info.is_implemented
         and rendered_info.data is None
         and render_error_card
         and mode != "refresh"
     ):
-        rendered_content = error_card().render(
-            task, stack_trace="No information rendered from card of type %s" % type
+        rendered_content = _render_error_card(
+            "No information rendered from card of type %s" % type
         )
     elif (
         not rendered_info.is_implemented
@@ -775,7 +786,7 @@ def create(
             "Card of type %s is a runtime time card with no `render_runtime` implemented. "
             "Please implement `render_runtime` method to allow rendering this card at runtime."
         ) % type
-        rendered_content = error_card().render(task, stack_trace=message)
+        rendered_content = _render_error_card(message)
 
     # todo : should we save native type for error card or error type ?
     if type is not None and re.match(CARD_ID_PATTERN, type) is not None:

{metaflow-2.12.4 → metaflow-2.12.5}/metaflow/plugins/cards/card_modules/basic.py

@@ -542,11 +542,24 @@ class ErrorCard(MetaflowCard):
 
     type = "error"
 
+    RELOAD_POLICY = MetaflowCard.RELOAD_POLICY_ONCHANGE
+
     def __init__(self, options={}, components=[], graph=None):
         self._only_repr = True
         self._graph = None if graph is None else transform_flow_graph(graph)
         self._components = components
 
+    def reload_content_token(self, task, data):
+        """
+        The reload token will change when the component array has changed in the Metaflow card.
+        The change in the component array is signified by the change in the component_update_ts.
+        """
+        if task.finished:
+            return "final"
+        # `component_update_ts` will never be None. It is set to a default value when the `ComponentStore` is instantiated
+        # And it is updated when components added / removed / changed from the `ComponentStore`.
+        return "runtime-%s" % (str(data["component_update_ts"]))
+
     def render(self, task, stack_trace=None):
         RENDER_TEMPLATE = read_file(RENDER_TEMPLATE_PATH)
         JS_DATA = read_file(JS_PATH)

{metaflow-2.12.4 → metaflow-2.12.5}/metaflow/plugins/pypi/conda_environment.py

@@ -48,9 +48,9 @@ class CondaEnvironment(MetaflowEnvironment):
         # Apply conda decorator to manage the task execution lifecycle.
         return ("conda",) + super().decospecs()
 
-    def validate_environment(self, echo, datastore_type):
+    def validate_environment(self, logger, datastore_type):
         self.datastore_type = datastore_type
-        self.echo = echo
+        self.logger = logger
 
         # Avoiding circular imports.
         from metaflow.plugins import DATASTORES
@@ -165,7 +165,7 @@ class CondaEnvironment(MetaflowEnvironment):
                     self.write_to_environment_manifest([id_, platform, type_], packages)
 
         # First resolve environments through Conda, before PyPI.
-        echo("Bootstrapping virtual environment(s) ...")
+        self.logger("Bootstrapping virtual environment(s) ...")
         for solver in ["conda", "pypi"]:
             with ThreadPoolExecutor() as executor:
                 results = list(
@@ -178,11 +178,9 @@ class CondaEnvironment(MetaflowEnvironment):
                 )
             if self.datastore_type not in ["local"]:
                 # Cache packages only when a remote datastore is in play.
-                storage = self.datastore(
-                    _datastore_packageroot(self.datastore, self.echo)
-                )
+                storage = self.datastore(_datastore_packageroot(self.datastore, echo))
                 cache(storage, results, solver)
-        echo("Virtual environment(s) bootstrapped!")
+        self.logger("Virtual environment(s) bootstrapped!")
 
     def executable(self, step_name, default=None):
         step = next(step for step in self.flow if step.name == step_name)
@@ -220,7 +218,7 @@ class CondaEnvironment(MetaflowEnvironment):
                 disabled = decorator.attributes["disabled"]
                 if not disabled or str(disabled).lower() == "false":
                     environment[decorator.name] = {
-                        k: decorator.attributes[k]
+                        k: copy.deepcopy(decorator.attributes[k])
                         for k in decorator.attributes
                         if k != "disabled"
                     }
@@ -316,7 +314,7 @@ class CondaEnvironment(MetaflowEnvironment):
                             **environment,
                             **{
                                 "package_root": _datastore_packageroot(
-                                    self.datastore, self.echo
+                                    self.datastore, self.logger
                                 )
                             },
                         }

metaflow-2.12.5/metaflow/version.py

@@ -0,0 +1 @@
+metaflow_version = "2.12.5"

{metaflow-2.12.4 → metaflow-2.12.5/metaflow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: metaflow
-Version: 2.12.4
+Version: 2.12.5
 Summary: Metaflow: More Data Science, Less Engineering
 Author: Metaflow Developers
 Author-email: help@metaflow.org
@@ -26,7 +26,7 @@ License-File: LICENSE
 Requires-Dist: requests
 Requires-Dist: boto3
 Provides-Extra: stubs
-Requires-Dist: metaflow-stubs==2.12.4; extra == "stubs"
+Requires-Dist: metaflow-stubs==2.12.5; extra == "stubs"
 
 ![Metaflow_Logo_Horizontal_FullColor_Ribbon_Dark_RGB](https://user-images.githubusercontent.com/763451/89453116-96a57e00-d713-11ea-9fa6-82b29d4d6eff.png)
 

{metaflow-2.12.4 → metaflow-2.12.5}/metaflow.egg-info/requires.txt

@@ -2,4 +2,4 @@ requests
 boto3
 
 [stubs]
-metaflow-stubs==2.12.4
+metaflow-stubs==2.12.5

metaflow-2.12.4/metaflow/version.py

@@ -1 +0,0 @@
-metaflow_version = "2.12.4"