openstef 3.2.74__py3-none-any.whl → 3.2.76__py3-none-any.whl

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/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/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.dist-info → openstef-3.2.76.dist-info}/METADATA

@@ -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.dist-info → openstef-3.2.76.dist-info}/RECORD

@@ -60,9 +60,9 @@ openstef/pipeline/__init__.py,sha256=bIyGTSA4V5VoOLTwdaiJJAnozmpSzvQooVYlsf8H4eU
 openstef/pipeline/create_basecase_forecast.py,sha256=BPxf2MSvJyfbNCQGCr1Rol5ShqCUVBSDs_0Fjei-eOI,4284
 openstef/pipeline/create_component_forecast.py,sha256=HgByae6ruVhy6TuGIJEuPyLyx7g4zSvJfk6Dynlqjl4,5030
 openstef/pipeline/create_forecast.py,sha256=2vK2cH_VeRcoDWPXR06zFmwQ043FPA9uPvg5_OyxUfU,5008
-openstef/pipeline/optimize_hyperparameters.py,sha256=qptTlg6v0hvHt1ocA7nueLwYRXAB82VI6bQ9ATmBVKQ,10824
+openstef/pipeline/optimize_hyperparameters.py,sha256=KL80enVMUAVEUwGhVygxWh3BluoUVpnBlDgbBz7iseY,10700
 openstef/pipeline/train_create_forecast_backtest.py,sha256=upuoiE01vjjxUu_sY0tANPqdOtpGKrQQ3azhVDnBJdc,5512
-openstef/pipeline/train_model.py,sha256=tYC8xh6eKpea0CutHNoSGYvt6hoQt4vDWqXmZs6ejbk,18567
+openstef/pipeline/train_model.py,sha256=SzKZSKT5diajR2L8eB1JQeasMaaeBll4H21N49wm_r4,18556
 openstef/pipeline/utils.py,sha256=fkc-oNirJ-JiyuOAL08RFrnPYPwudWal_N-BO6Cw980,2086
 openstef/postprocessing/__init__.py,sha256=bIyGTSA4V5VoOLTwdaiJJAnozmpSzvQooVYlsf8H4eU,163
 openstef/postprocessing/postprocessing.py,sha256=nehd0tDpkdIaWFJggQ-fDizIKdfmqJ3IOGfk0sDnrzk,8409
@@ -78,15 +78,15 @@ openstef/tasks/create_wind_forecast.py,sha256=RhshkmNSyFWx4Y6yQn02GzHjWTREbN5A5G
 openstef/tasks/optimize_hyperparameters.py,sha256=s-z8YQJF6Lf3DdYgKHEpAdlbFJ3a-0Gj0Ahsqj1DErc,4758
 openstef/tasks/run_tracy.py,sha256=sU1Aw6litLHw9XT2uqjtbrGUCaD6XRN9asUqtWJjkCg,5037
 openstef/tasks/split_forecast.py,sha256=ilIwmUAEBZz8ksquLLiAxk4IiDqbg4oxPs-_ftrKRm8,9118
-openstef/tasks/train_model.py,sha256=MDtqH9cbtW7_q9FreqENVIxCLXH-N64dzNHc6HvZUK0,5682
+openstef/tasks/train_model.py,sha256=BGRimvLN7AjUx97dcLrzjZGDR8q4V-I6KgP2gb7FWN0,6452
 openstef/tasks/utils/__init__.py,sha256=bIyGTSA4V5VoOLTwdaiJJAnozmpSzvQooVYlsf8H4eU,163
 openstef/tasks/utils/dependencies.py,sha256=Jy9dtV_G7lTEa5Cdy--wvMxJuAb0adb3R0X4QDjVteM,3077
 openstef/tasks/utils/predictionjobloop.py,sha256=u4WQjvqBM6z9T7VFUZ-9JqgdepNJO0ZSr3DURMBus9E,9581
 openstef/tasks/utils/taskcontext.py,sha256=yI6TntOkZcW8JiNVuw4uJIigEBL0_iIrkPklF4ZeCX4,5401
 openstef/validation/__init__.py,sha256=bIyGTSA4V5VoOLTwdaiJJAnozmpSzvQooVYlsf8H4eU,163
 openstef/validation/validation.py,sha256=AYQJBXwbFhpq34bqEhybw0lTIJ8Td4vr2-AbWxGxm3M,16917
-openstef-3.2.74.dist-info/LICENSE,sha256=7Pm2fWFFHHUG5lDHed1vl5CjzxObIXQglnYsEdtjo_k,14907
-openstef-3.2.74.dist-info/METADATA,sha256=OxYuaEyqWnl-M_ovP4MfQ8B7d_kehwJPHGrxzbWafbk,6934
-openstef-3.2.74.dist-info/WHEEL,sha256=5sUXSg9e4bi7lTLOHcm6QEYwO5TIF1TNbTSVFVjcJcc,92
-openstef-3.2.74.dist-info/top_level.txt,sha256=kD0H4PqrQoncZ957FvqwfBxa89kTrun4Z_RAPs_HhLs,9
-openstef-3.2.74.dist-info/RECORD,,
+openstef-3.2.76.dist-info/LICENSE,sha256=7Pm2fWFFHHUG5lDHed1vl5CjzxObIXQglnYsEdtjo_k,14907
+openstef-3.2.76.dist-info/METADATA,sha256=AUF-4s37eesqmP6APrVgT_5z61lbrR--MDCDE-YxhwI,6934
+openstef-3.2.76.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+openstef-3.2.76.dist-info/top_level.txt,sha256=kD0H4PqrQoncZ957FvqwfBxa89kTrun4Z_RAPs_HhLs,9
+openstef-3.2.76.dist-info/RECORD,,

{openstef-3.2.74.dist-info → openstef-3.2.76.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.1)
+Generator: bdist_wheel (0.41.2)
 Root-Is-Purelib: true
 Tag: py3-none-any