reduce pydantic opticalflow model - DataSourceMixin

Author: peterdudfield

nowcasting_dataset/config/gcp.yaml

@@ -76,8 +76,8 @@ input_data:
   # ------------------------- Optical Flow ---------------
   opticalflow:
     opticalflow_zarr_path: gs://solar-pv-nowcasting-data/satellite/EUMETSAT/SEVIRI_RSS/OSGB36/all_zarr_int16_single_timestep.zarr
-    opticalflow_history_minutes: 5
-    opticalflow_forecast_minutes: 120
+    history_minutes: 5
+    forecast_minutes: 120
     opticalflow_input_image_size_pixels: 102
     opticalflow_output_image_size_pixels: 24
     opticalflow_source_data_source_class_name: SatelliteDataSource

nowcasting_dataset/config/model.py

@@ -202,18 +202,16 @@ class OpticalFlow(DataSourceMixin):
             " satellite.satellite_zarr_path."
         ),
     )
-    opticalflow_history_minutes: int = Field(
-        5,
-        description=(
-            "Duration of historical data to use when computing the optical flow field."
-            " For example, set to 5 to use just two images: the t-1 and t0 images.  Set to 10 to"
-            " compute the optical flow field separately for the image pairs (t-2, t-1), and"
-            " (t-1, t0) and to use the mean optical flow field."
-        ),
-    )
-    opticalflow_forecast_minutes: int = Field(
-        120, description="Duration of the optical flow predictions."
-    )
+
+    # history_minutes, set in DataSourceMixin.
+    # Duration of historical data to use when computing the optical flow field.
+    # For example, set to 5 to use just two images: the t-1 and t0 images.  Set to 10 to
+    # compute the optical flow field separately for the image pairs (t-2, t-1), and
+    # (t-1, t0) and to use the mean optical flow field.
+
+    # forecast_minutes, set in DataSourceMixin.
+    # Duration of the optical flow predictions.
+
     opticalflow_meters_per_pixel: int = METERS_PER_PIXEL_FIELD
     opticalflow_input_image_size_pixels: int = Field(
         IMAGE_SIZE_PIXELS * 2,

nowcasting_dataset/config/on_premises.yaml

@@ -66,8 +66,8 @@ input_data:
   # ------------------------- Optical Flow ---------------
   opticalflow:
     opticalflow_zarr_path: /mnt/storage_ssd_8tb/data/ocf/solar_pv_nowcasting/nowcasting_dataset_pipeline/satellite/EUMETSAT/SEVIRI_RSS/zarr/v2/eumetsat_zarr_*
-    opticalflow_history_minutes: 5
-    opticalflow_forecast_minutes: 120
+    history_minutes: 5
+    forecast_minutes: 120
     opticalflow_input_image_size_pixels: 102
     opticalflow_output_image_size_pixels: 24
     opticalflow_source_data_source_class_name: SatelliteDataSource