From 0574574397373f56fbe15e5c77eb20017a8a59dc Mon Sep 17 00:00:00 2001 From: Adam Hendel Date: Tue, 16 Jan 2024 22:37:31 -0600 Subject: [PATCH 1/4] handle model deploy when no metrics to compare --- pgml-extension/src/api.rs | 59 ++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 22 deletions(-) diff --git a/pgml-extension/src/api.rs b/pgml-extension/src/api.rs index 380bfb330..24164a9f1 100644 --- a/pgml-extension/src/api.rs +++ b/pgml-extension/src/api.rs @@ -264,37 +264,52 @@ fn train_joint( ); let mut deploy = true; + match automatic_deploy { // Deploy only if metrics are better than previous model. Some(true) | None => { if let Ok(Some(deployed_metrics)) = deployed_metrics { - let deployed_metrics = deployed_metrics.0.as_object().unwrap(); - let deployed_metric = deployed_metrics - .get(&project.task.default_target_metric()) - .unwrap() - .as_f64() - .unwrap(); - info!( - "Comparing to deployed model {}: {:?}", - project.task.default_target_metric(), - deployed_metric - ); - if project.task.value_is_better( - deployed_metric, - new_metrics - .get(&project.task.default_target_metric()) - .unwrap() - .as_f64() - .unwrap(), - ) { + if let Some(deployed_metrics_obj) = deployed_metrics.0.as_object() { + let default_target_metric = project.task.default_target_metric(); + let deployed_metric = deployed_metrics_obj + .get(&default_target_metric) + .and_then(|v| v.as_f64()); + info!( + "Comparing to deployed model {}: {:?}", + default_target_metric, deployed_metric + ); + if let (Some(deployed_metric_value), Some(new_metric_value)) = ( + deployed_metric, + new_metrics.get(&default_target_metric).and_then(|v| v.as_f64()), + ) { + if project.task.value_is_better(deployed_metric_value, new_metric_value) { + warning!( + "New model's {} is not better than old model: {} is not better than {}", + &project.task.default_target_metric(), + new_metric_value, + deployed_metric_value + ); + deploy = false; + } + } else { + warning!("Failed to retrieve or parse deployed/new metrics for {}. Ensure train/test split results in both positive and negative label records.", + &project.task.default_target_metric()); + deploy = false; + } + } else { + warning!("Failed to parse deployed model metrics. Ensure train/test split results in both positive and negative label records."); deploy = false; } + } else { + warning!("Failed to obtain currently deployed model metrics. Check if the deployed model metrics are available and correctly formatted."); + deploy = false; } } - - Some(false) => deploy = false, + Some(false) => { + warning!("Automatic deployment disabled via configuration."); + deploy = false; + } }; - if deploy { project.deploy(model.id, Strategy::new_score); } else { From 667f68ec88ab530e96828a11d25941080d7783a9 Mon Sep 17 00:00:00 2001 From: Adam Hendel Date: Tue, 16 Jan 2024 22:40:31 -0600 Subject: [PATCH 2/4] better warn msg --- pgml-extension/src/api.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pgml-extension/src/api.rs b/pgml-extension/src/api.rs index 24164a9f1..f2308a139 100644 --- a/pgml-extension/src/api.rs +++ b/pgml-extension/src/api.rs @@ -284,7 +284,7 @@ fn train_joint( ) { if project.task.value_is_better(deployed_metric_value, new_metric_value) { warning!( - "New model's {} is not better than old model: {} is not better than {}", + "New model's {} is not better than current model. New: {}, Current {}", &project.task.default_target_metric(), new_metric_value, deployed_metric_value From d0ff7251d381ac575a7376ded27022431d21cf17 Mon Sep 17 00:00:00 2001 From: Adam Hendel Date: Wed, 17 Jan 2024 15:17:24 +0000 Subject: [PATCH 3/4] fix first run case --- pgml-extension/src/api.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pgml-extension/src/api.rs b/pgml-extension/src/api.rs index f2308a139..ada756c7a 100644 --- a/pgml-extension/src/api.rs +++ b/pgml-extension/src/api.rs @@ -266,7 +266,7 @@ fn train_joint( let mut deploy = true; match automatic_deploy { - // Deploy only if metrics are better than previous model. + // Deploy only if metrics are better than previous model, or if its the first model Some(true) | None => { if let Ok(Some(deployed_metrics)) = deployed_metrics { if let Some(deployed_metrics_obj) = deployed_metrics.0.as_object() { @@ -297,12 +297,9 @@ fn train_joint( deploy = false; } } else { - warning!("Failed to parse deployed model metrics. Ensure train/test split results in both positive and negative label records."); + warning!("Failed to parse deployed model metrics. Check data types of model metadata on pgml.models.metrics"); deploy = false; } - } else { - warning!("Failed to obtain currently deployed model metrics. Check if the deployed model metrics are available and correctly formatted."); - deploy = false; } } Some(false) => { From 58310256fae05912aedda7fda7c0aee1ee10f9ea Mon Sep 17 00:00:00 2001 From: Adam Hendel Date: Wed, 17 Jan 2024 22:29:24 +0000 Subject: [PATCH 4/4] handle case where exists has no metrics --- pgml-extension/src/api.rs | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/pgml-extension/src/api.rs b/pgml-extension/src/api.rs index ada756c7a..1580de944 100644 --- a/pgml-extension/src/api.rs +++ b/pgml-extension/src/api.rs @@ -278,23 +278,29 @@ fn train_joint( "Comparing to deployed model {}: {:?}", default_target_metric, deployed_metric ); - if let (Some(deployed_metric_value), Some(new_metric_value)) = ( - deployed_metric, - new_metrics.get(&default_target_metric).and_then(|v| v.as_f64()), - ) { - if project.task.value_is_better(deployed_metric_value, new_metric_value) { - warning!( - "New model's {} is not better than current model. New: {}, Current {}", - &project.task.default_target_metric(), - new_metric_value, - deployed_metric_value - ); + let new_metric = new_metrics.get(&default_target_metric).and_then(|v| v.as_f64()); + + match (deployed_metric, new_metric) { + (Some(deployed), Some(new)) => { + // only compare metrics when both new and old model have metrics to compare + if project.task.value_is_better(deployed, new) { + warning!( + "New model's {} is not better than current model. New: {}, Current {}", + &default_target_metric, + new, + deployed + ); + deploy = false; + } + } + (None, None) => { + warning!("No metrics available for both deployed and new model. Deploying new model.") + } + (Some(_deployed), None) => { + warning!("No metrics for new model. Retaining old model."); deploy = false; } - } else { - warning!("Failed to retrieve or parse deployed/new metrics for {}. Ensure train/test split results in both positive and negative label records.", - &project.task.default_target_metric()); - deploy = false; + (None, Some(_new)) => warning!("No metrics for deployed model. Deploying new model."), } } else { warning!("Failed to parse deployed model metrics. Check data types of model metadata on pgml.models.metrics"); pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy