merge conflicts resolved

zenml-io · Oct 10, 2024 · 429e445 · 429e445
2 parents 23cc8cd + b8f0580
commit 429e445
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/template/Makefile b/template/Makefile
@@ -20,5 +20,4 @@ install-stack-local:
 	zenml stack register -a default -o default -r mlflow_local_$${stack_name} \
 	-d mlflow_local_$${stack_name} -e mlflow_local_$${stack_name} -dv \
 	evidently_$${stack_name} $${stack_name} && \
-	zenml stack set $${stack_name} && \
-	zenml stack up
+	zenml stack set $${stack_name}
diff --git a/...% if metric_compare_promotion %}compute_performance_metrics_on_current_data.py{% endif %} b/...% if metric_compare_promotion %}compute_performance_metrics_on_current_data.py{% endif %}
@@ -46,7 +46,10 @@ def compute_performance_metrics_on_current_data(
     current_version = Model(name=latest_version.name, version=target_env)
 
     latest_version_number = latest_version.number
-    current_version_number = current_version.number
+    try:
+        current_version_number = current_version.number
+    except KeyError:
+        current_version_number = None
 
     if current_version_number is None:
         current_version_number = -1

diff --git a/...teps/promotion/{% if metric_compare_promotion %}promote_with_metric_compare.py{% endif %} b/...teps/promotion/{% if metric_compare_promotion %}promote_with_metric_compare.py{% endif %}
@@ -47,7 +47,10 @@ def promote_with_metric_compare(
     latest_version = get_step_context().model
     current_version = Model(name=latest_version.name, version=target_env)
 
-    current_version_number = current_version.number
+    try:
+        current_version_number = current_version.number
+    except KeyError:
+        current_version_number = None
 
     if current_version_number is None:
         logger.info("No current model version found - promoting latest")