openstef 3.2.74__tar.gz → 3.2.76__tar.gz

{openstef-3.2.74 → openstef-3.2.76}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openstef
-Version: 3.2.74
+Version: 3.2.76
 Summary: Open short term energy forecaster
 Home-page: https://github.com/OpenSTEF/openstef
 Author: Alliander N.V

{openstef-3.2.74 → openstef-3.2.76}/openstef/pipeline/optimize_hyperparameters.py

@@ -188,7 +188,7 @@ def optimize_hyperparameters_pipeline_core(
     )
 
     best_hyperparams = study.best_params
-    best_model = study.user_attrs["best_model"]
+    # The best_model could be accessed via study.user_attrs["best_model"]
 
     logger.info(
         f"Finished hyperparameter optimization, error objective {study.best_value} "
@@ -209,17 +209,14 @@ def optimize_hyperparameters_pipeline_core(
     # Train a model using the regular train pipeline.
     # The train/validation/test split used in hyperparam optimisation
     # is less suitable for an operational model.
-    best_model, report, modelspecs, _ = train_model_pipeline_core(
+    model, report, model_specs, _ = train_model_pipeline_core(
         pj=pj, input_data=input_data, model_specs=model_specs
     )
 
-    # Save model and report. Report is always saved to MLFlow and optionally to disk
-    report = objective.create_report(model=best_model)
-
     trials = objective.get_trial_track()
     best_trial_number = study.best_trial.number
 
-    return best_model, model_specs, report, trials, best_trial_number, study.best_params
+    return model, model_specs, report, trials, best_trial_number, study.best_params
 
 
 def optuna_optimization(

{openstef-3.2.74 → openstef-3.2.76}/openstef/pipeline/train_model.py

@@ -61,7 +61,7 @@ def train_model_pipeline(
             - The test dataset with forecasts
 
     """
-    # Initialize logger and serializer
+    # Initialize serializer
     serializer = MLflowSerializer(mlflow_tracking_uri=mlflow_tracking_uri)
 
     # Get old model and age

{openstef-3.2.74 → openstef-3.2.76}/openstef/tasks/train_model.py

@@ -26,10 +26,16 @@ from openstef.data_classes.prediction_job import PredictionJobDataClass
 
 from openstef.enums import MLModelType, PipelineType
 from openstef.exceptions import SkipSaveTrainingForecasts
-from openstef.pipeline.train_model import train_model_pipeline
+from openstef.pipeline.train_model import (
+    train_model_pipeline,
+    train_pipeline_step_load_model,
+    MAXIMUM_MODEL_AGE,
+)
 from openstef.tasks.utils.predictionjobloop import PredictionJobLoop
 from openstef.tasks.utils.taskcontext import TaskContext
 
+from openstef.model.serializer import MLflowSerializer
+
 TRAINING_PERIOD_DAYS: int = 120
 DEFAULT_CHECK_MODEL_AGE: bool = True
 
@@ -84,13 +90,30 @@ def train_model_task(
 
     context.perf_meter.checkpoint("Added metadata to PredictionJob")
 
+    # Check the model age before retrieving the input data to speed up train job.
+    # (The exact same model age check is also part of the "train_model_pipeline".)
+
+    # Initialize serializer
+    serializer = MLflowSerializer(mlflow_tracking_uri=mlflow_tracking_uri)
+
+    # Get old model and age
+    _, _, old_model_age = train_pipeline_step_load_model(pj, serializer)
+
+    # Check old model age and continue yes/no
+    if (old_model_age < MAXIMUM_MODEL_AGE) and check_old_model_age:
+        context.perf_meter.checkpoint(
+            f"Old model is younger than {MAXIMUM_MODEL_AGE} days, skip training"
+        )
+        if pj.save_train_forecasts:
+            raise SkipSaveTrainingForecasts
+        return
+
     # Define start and end of the training input data
     if datetime_end is None:
         datetime_end = datetime.utcnow()
     if datetime_start is None:
         datetime_start = datetime_end - timedelta(days=TRAINING_PERIOD_DAYS)
 
-    # todo: See if we can check model age before getting the data
     # Get training input data from database
     input_data = context.database.get_model_input(
         pid=pj["id"],

{openstef-3.2.74 → openstef-3.2.76}/openstef.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openstef
-Version: 3.2.74
+Version: 3.2.76
 Summary: Open short term energy forecaster
 Home-page: https://github.com/OpenSTEF/openstef
 Author: Alliander N.V

{openstef-3.2.74 → openstef-3.2.76}/setup.py

@@ -29,7 +29,7 @@ def read_long_description_from_readme():
 
 setup(
     name="openstef",
-    version="3.2.74",
+    version="3.2.76",
     packages=find_packages(include=["openstef", "openstef.*"]),
     description="Open short term energy forecaster",
     long_description=read_long_description_from_readme(),