ocf-data-sampler 0.1.9__py3-none-any.whl → 0.1.11__py3-none-any.whl

tests/test_sample/test_site_sample.py

@@ -74,17 +74,9 @@ def sample_data():
     )
 
 
-def test_site_sample_init():
-    """ Test initialisation """
-    sample = SiteSample()
-    assert isinstance(sample._data, dict)
-    assert len(sample._data) == 0
-
-
 def test_site_sample_with_data(sample_data):
     """ Testing of defined sample with actual data """
-    sample = SiteSample()
-    sample._data = sample_data
+    sample = SiteSample(sample_data)
     
     # Assert data structure
     assert isinstance(sample._data, Dataset)
@@ -109,8 +101,7 @@ def test_site_sample_with_data(sample_data):
 
 def test_save_load(tmp_path, sample_data):
     """ Save and load functionality """
-    sample = SiteSample()
-    sample._data = sample_data    
+    sample = SiteSample(sample_data)
     filepath = tmp_path / "test_sample.nc"
     sample.save(filepath)
     
@@ -127,36 +118,16 @@ def test_save_load(tmp_path, sample_data):
     xr.testing.assert_identical(sample._data, loaded._data)
 
 
-def test_invalid_save_format(sample_data):
-    """ Saving with invalid format """
-    sample = SiteSample()
-    sample._data = sample_data
-    with pytest.raises(ValueError, match="Only .nc format is supported"):
-        sample.save("invalid.txt")
-
-
-def test_invalid_load_format():
-    """ Loading with invalid format """
-    with pytest.raises(ValueError, match="Only .nc format is supported"):
-        SiteSample.load("invalid.txt")
-
-
 def test_invalid_data_type():
     """ Handling of invalid data types """
-    sample = SiteSample()
-    sample._data = {"invalid": "data"}
     
     with pytest.raises(TypeError, match="Data must be xarray Dataset"):
-        sample.to_numpy()
-    
-    with pytest.raises(TypeError, match="Data must be xarray Dataset for saving"):
-        sample.save("test.nc")
+        _ = SiteSample({"invalid": "data"})
 
 
 def test_to_numpy(sample_data):
     """ To numpy conversion """
-    sample = SiteSample()
-    sample._data = sample_data
+    sample = SiteSample(sample_data)
     numpy_data = sample.to_numpy()
     
     # Assert structure
@@ -180,8 +151,7 @@ def test_to_numpy(sample_data):
 
 def test_data_consistency(sample_data):
     """ Consistency of data across operations """
-    sample = SiteSample()
-    sample._data = sample_data    
+    sample = SiteSample(sample_data)
     numpy_data = sample.to_numpy()
     
     # Assert components remain consistent after conversion above

tests/test_sample/test_uk_regional_sample.py

@@ -16,7 +16,6 @@ from ocf_data_sampler.numpy_sample import (
 from ocf_data_sampler.sample.uk_regional import UKRegionalSample
 
 
-# Fixture define
 @pytest.fixture
 def pvnet_config_filename(tmp_path):
     """ Minimal config file - testing """
@@ -50,8 +49,8 @@ def pvnet_config_filename(tmp_path):
     config_file.write_text(config_content)
     return str(config_file)
 
-
-def create_test_data():
+@pytest.fixture
+def numpy_sample():
     """ Synthetic data generation """
 
     # Field / spatial coordinates
@@ -73,18 +72,8 @@ def create_test_data():
     }
 
 
-# UKRegionalSample testing
-def test_sample_init():
-    """ Initialisation """
-    sample = UKRegionalSample()
-    assert hasattr(sample, '_data'), "Sample should have _data attribute"
-    assert isinstance(sample._data, dict)
-    assert len(sample._data) == 0
-
-
-def test_sample_save_load():
-   sample = UKRegionalSample()
-   sample._data = create_test_data()
+def test_sample_save_load(numpy_sample):
+   sample = UKRegionalSample(numpy_sample)
    
    with tempfile.NamedTemporaryFile(suffix='.pt') as tf:
        sample.save(tf.name)
@@ -105,24 +94,6 @@ def test_sample_save_load():
        )
 
 
-def test_save_unsupported_format():
-   """ Test saving - unsupported file format """
-   sample = UKRegionalSample()
-   sample._data = create_test_data()
-  
-   with tempfile.NamedTemporaryFile(suffix='.npz') as tf:
-       with pytest.raises(ValueError, match="Only .pt format is supported"):
-           sample.save(tf.name)
-
-
-def test_load_unsupported_format():
-    """ Test loading - unsupported file format """
-
-    with tempfile.NamedTemporaryFile(suffix='.npz') as tf:
-        with pytest.raises(ValueError, match="Only .pt format is supported"):
-            UKRegionalSample.load(tf.name)
-
-
 def test_load_corrupted_file():
     """ Test loading - corrupted / empty file """
 
@@ -136,8 +107,8 @@ def test_load_corrupted_file():
 
 def test_to_numpy():
     """ To numpy conversion check """
-    sample = UKRegionalSample()
-    sample._data = {
+
+    data = {
         'nwp': {
             'ukv': {
                 'nwp': np.random.rand(4, 1, 2, 2),
@@ -150,6 +121,8 @@ def test_to_numpy():
         GSPSampleKey.solar_azimuth: np.random.rand(7),
         GSPSampleKey.solar_elevation: np.random.rand(7)
     }
+
+    sample = UKRegionalSample(data)
     
     numpy_data = sample.to_numpy()
     

tests/torch_datasets/test_pvnet_uk.py

@@ -12,24 +12,14 @@ from ocf_data_sampler.torch_datasets.datasets.pvnet_uk import (
 )
 from ocf_data_sampler.select.location import Location
 
-def test_process_and_combine_datasets(pvnet_config_filename):
 
-    # Load in config for function and define location 
+def test_process_and_combine_datasets(pvnet_config_filename, ds_nwp_ukv_time_sliced):
+
     config = load_yaml_configuration(pvnet_config_filename)
+    
     t0 = pd.Timestamp("2024-01-01 00:00")
     location = Location(coordinate_system="osgb", x=1234, y=5678, id=1)
 
-    nwp_data = xr.DataArray(
-        np.random.rand(4, 2, 2, 2),
-        dims=["time_utc", "channel", "y", "x"],
-        coords={
-            "time_utc": pd.date_range("2024-01-01 00:00", periods=4, freq="h"),
-            "channel": ["t", "dswrf"],
-            "step": ("time_utc", pd.timedelta_range(start='0h', periods=4, freq='h')),
-            "init_time_utc": pd.Timestamp("2024-01-01 00:00")
-        }
-    )
-
     sat_data = xr.DataArray(
         np.random.rand(7, 1, 2, 2),
         dims=["time_utc", "channel", "y", "x"],
@@ -41,20 +31,17 @@ def test_process_and_combine_datasets(pvnet_config_filename):
         }
     )
 
-    # Combine as dict
     dataset_dict = {
-        "nwp": {"ukv": nwp_data},
+        "nwp": {"ukv": ds_nwp_ukv_time_sliced},
         "sat": sat_data
     }
 
-    # Call relevant function
     sample = process_and_combine_datasets(dataset_dict, config, t0, location)
 
-    # Assert result is dict - check and validate
     assert isinstance(sample, dict)
     assert "nwp" in sample
-    assert sample["satellite_actual"].shape == (7, 1, 2, 2)
-    assert sample["nwp"]["ukv"]["nwp"].shape == (4, 2, 2, 2)
+    assert sample["satellite_actual"].shape == sat_data.shape
+    assert sample["nwp"]["ukv"]["nwp"].shape == ds_nwp_ukv_time_sliced.shape
     assert "gsp_id" in sample