Merge pull request #655 from openclimatefix/fake-sun-topo

Fake sun topo

Author: peterdudfield

nowcasting_dataset/data_sources/fake/batch.py

@@ -77,15 +77,12 @@ def make_fake_batch(configuration: Configuration, temporally_align_examples: boo
             metadata=metadata,
         ),
         sun=sun_fake(
-            batch_size=batch_size,
-            seq_length_5=configuration.input_data.sun.seq_length_5_minutes,
+            configuration=configuration,
             metadata=metadata,
         ),
         topographic=topographic_fake(
-            batch_size=batch_size,
             metadata=metadata,
-            image_size_pixels_height=configuration.input_data.topographic.topographic_image_size_pixels_height,  # noqa
-            image_size_pixels_width=configuration.input_data.topographic.topographic_image_size_pixels_width,  # noqa
+            configuration=configuration,
         ),
     )
 
@@ -442,17 +439,23 @@ def optical_flow_fake(
 
 
 def sun_fake(
-    batch_size,
-    seq_length_5,
+    configuration,
     metadata: Optional[Metadata] = None,
 ):
     """Create fake data"""
 
+    if configuration.input_data.sun is None:
+        return None
+
+    batch_size = configuration.process.batch_size
+
     if metadata is None:
         t0_datetimes_utc = make_t0_datetimes_utc(batch_size)
     else:
         t0_datetimes_utc = metadata.t0_datetimes_utc
 
+    seq_length_5 = configuration.input_data.sun.seq_length_5_minutes
+
     # create dataset with both azimuth and elevation, index with time
     # make batch of arrays
     xr_arrays = [
@@ -467,13 +470,23 @@ def sun_fake(
 
 
 def topographic_fake(
-    batch_size,
-    image_size_pixels_height,
-    image_size_pixels_width,
+    configuration,
     metadata: Optional[Metadata] = None,
 ):
     """Create fake data"""
 
+    if configuration.input_data.topographic is None:
+        return None
+
+    batch_size = configuration.process.batch_size
+
+    image_size_pixels_height = (
+        configuration.input_data.topographic.topographic_image_size_pixels_height
+    )
+    image_size_pixels_width = (
+        configuration.input_data.topographic.topographic_image_size_pixels_width
+    )
+
     if metadata is None:
         x_centers_osgb, y_centers_osgb = make_random_x_and_y_osgb_centers(batch_size)
     else:

tests/data_sources/fake/test_fake_datasource_output.py

@@ -61,14 +61,14 @@ def test_satellite(configuration):
     assert s.x_geostationary is not None
 
 
-def test_sun():
+def test_sun(configuration):
     """Test sun fake"""
-    _ = sun_fake(
-        batch_size=4,
-        seq_length_5=13,
-    )
+
+    configuration.process.batch_size = 4
+    _ = sun_fake(configuration=configuration)
 
 
-def test_topo():
+def test_topo(configuration):
     """Test topo fake"""
-    _ = topographic_fake(batch_size=4, image_size_pixels_height=64, image_size_pixels_width=64)
+    configuration.process.batch_size = 4
+    _ = topographic_fake(configuration=configuration)

tests/data_sources/sun/test_sun_model.py

@@ -9,12 +9,14 @@
 from nowcasting_dataset.data_sources.sun.sun_model import Sun
 
 
-def test_sun_init():  # noqa: D103
-    _ = sun_fake(batch_size=4, seq_length_5=17)
+def test_sun_init(configuration):  # noqa: D103
+    configuration.process.batch_size = 4
+    _ = sun_fake(configuration=configuration)
 
 
-def test_sun_validation():  # noqa: D103
-    sun = sun_fake(batch_size=4, seq_length_5=17)
+def test_sun_validation(configuration):  # noqa: D103
+    configuration.process.batch_size = 4
+    sun = sun_fake(configuration=configuration)
 
     Sun.model_validation(sun)
 
@@ -23,8 +25,9 @@ def test_sun_validation():  # noqa: D103
         Sun.model_validation(sun)
 
 
-def test_sun_validation_elevation():  # noqa: D103
-    sun = sun_fake(batch_size=4, seq_length_5=17)
+def test_sun_validation_elevation(configuration):  # noqa: D103
+    configuration.process.batch_size = 4
+    sun = sun_fake(configuration=configuration)
 
     Sun.model_validation(sun)
 
@@ -33,8 +36,9 @@ def test_sun_validation_elevation():  # noqa: D103
         Sun.model_validation(sun)
 
 
-def test_sun_validation_azimuth():  # noqa: D103
-    sun = sun_fake(batch_size=4, seq_length_5=17)
+def test_sun_validation_azimuth(configuration):  # noqa: D103
+    configuration.process.batch_size = 4
+    sun = sun_fake(configuration=configuration)
 
     Sun.model_validation(sun)
 
@@ -43,9 +47,11 @@ def test_sun_validation_azimuth():  # noqa: D103
         Sun.model_validation(sun)
 
 
-def test_sun_save():  # noqa: D103
+def test_sun_save(configuration):  # noqa: D103
+
+    configuration.process.batch_size = 4
     with tempfile.TemporaryDirectory() as dirpath:
-        sun = sun_fake(batch_size=4, seq_length_5=17)
+        sun = sun_fake(configuration=configuration)
         sun.save_netcdf(path=dirpath, batch_i=0)
 
         assert os.path.exists(f"{dirpath}/sun/000000.nc")