ocf-data-sampler 0.2.34__py3-none-any.whl → 0.2.36__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of ocf-data-sampler might be problematic. Click here for more details.
- ocf_data_sampler/load/nwp/nwp.py +14 -10
- {ocf_data_sampler-0.2.34.dist-info → ocf_data_sampler-0.2.36.dist-info}/METADATA +1 -1
- {ocf_data_sampler-0.2.34.dist-info → ocf_data_sampler-0.2.36.dist-info}/RECORD +5 -5
- {ocf_data_sampler-0.2.34.dist-info → ocf_data_sampler-0.2.36.dist-info}/WHEEL +0 -0
- {ocf_data_sampler-0.2.34.dist-info → ocf_data_sampler-0.2.36.dist-info}/top_level.txt +0 -0
ocf_data_sampler/load/nwp/nwp.py
CHANGED
|
@@ -29,7 +29,7 @@ def _validate_nwp_data(data_array: xr.DataArray, provider: str) -> None:
|
|
|
29
29
|
common_expected_dtypes = {
|
|
30
30
|
"init_time_utc": np.datetime64,
|
|
31
31
|
"step": np.timedelta64,
|
|
32
|
-
"channel": np.str_,
|
|
32
|
+
"channel": (np.str_, np.object_),
|
|
33
33
|
}
|
|
34
34
|
|
|
35
35
|
geographic_spatial_dtypes = {
|
|
@@ -43,8 +43,8 @@ def _validate_nwp_data(data_array: xr.DataArray, provider: str) -> None:
|
|
|
43
43
|
"gfs": geographic_spatial_dtypes,
|
|
44
44
|
"mo_global": geographic_spatial_dtypes,
|
|
45
45
|
"ukv": {
|
|
46
|
-
"x_osgb": np.
|
|
47
|
-
"y_osgb": np.
|
|
46
|
+
"x_osgb": np.number,
|
|
47
|
+
"y_osgb": np.number,
|
|
48
48
|
},
|
|
49
49
|
"cloudcasting": {
|
|
50
50
|
"x_geostationary": np.floating,
|
|
@@ -57,17 +57,21 @@ def _validate_nwp_data(data_array: xr.DataArray, provider: str) -> None:
|
|
|
57
57
|
**provider_specific_spatial_dtypes.get(provider, {}),
|
|
58
58
|
}
|
|
59
59
|
|
|
60
|
-
if not expected_dtypes:
|
|
61
|
-
raise ValueError(f"Unknown provider: {provider}")
|
|
62
|
-
|
|
63
60
|
for coord, expected_dtype in expected_dtypes.items():
|
|
64
61
|
if coord not in data_array.coords:
|
|
65
62
|
raise ValueError(f"Coordinate '{coord}' missing for provider '{provider}'")
|
|
66
|
-
|
|
67
|
-
|
|
63
|
+
|
|
64
|
+
actual_dtype = data_array.coords[coord].dtype
|
|
65
|
+
|
|
66
|
+
if not np.issubdtype(actual_dtype, expected_dtype):
|
|
67
|
+
if isinstance(expected_dtype, tuple):
|
|
68
|
+
expected_name_str = " or ".join([t.__name__ for t in expected_dtype])
|
|
69
|
+
else:
|
|
70
|
+
expected_name_str = expected_dtype.__name__
|
|
71
|
+
|
|
68
72
|
err_msg = (
|
|
69
|
-
f"'{coord}' for {provider} should be {
|
|
70
|
-
f"not {actual_dtype}"
|
|
73
|
+
f"'{coord}' for {provider} should be {expected_name_str}, "
|
|
74
|
+
f"not {actual_dtype.name}"
|
|
71
75
|
)
|
|
72
76
|
raise TypeError(err_msg)
|
|
73
77
|
|
|
@@ -13,7 +13,7 @@ ocf_data_sampler/load/satellite.py,sha256=Gsc3oyPydEZLy6slUDtIpBCYLxWy9P3pD1VyI4
|
|
|
13
13
|
ocf_data_sampler/load/site.py,sha256=WtOy20VMHJIY0IwEemCdcecSDUGcVaLUown-4ixJw90,2147
|
|
14
14
|
ocf_data_sampler/load/utils.py,sha256=sZ0-zzconcLkVQwAkCYrqKDo98Hrh5ChdiQJv5Bh91g,2040
|
|
15
15
|
ocf_data_sampler/load/nwp/__init__.py,sha256=SmcrnbygO5xtCKmGR4wtHrj-HI7nOAvnAtfuvRufBGQ,25
|
|
16
|
-
ocf_data_sampler/load/nwp/nwp.py,sha256=
|
|
16
|
+
ocf_data_sampler/load/nwp/nwp.py,sha256=0E9shei3Mq1N7F-fBlEKY5Hm0_kI7ysY_rffnWIshvk,3612
|
|
17
17
|
ocf_data_sampler/load/nwp/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
18
18
|
ocf_data_sampler/load/nwp/providers/cloudcasting.py,sha256=fozXpB3a2rNqQgnpRDC7xunxffh7Wwmc0kkCiYmDVJ4,1521
|
|
19
19
|
ocf_data_sampler/load/nwp/providers/ecmwf.py,sha256=an-gXsZwkPQvRXeza1U_4MNU5yEnVm0_8tn03rxTudI,997
|
|
@@ -55,7 +55,7 @@ ocf_data_sampler/torch_datasets/utils/validation_utils.py,sha256=YqmT-lExWlI8_ul
|
|
|
55
55
|
scripts/download_gsp_location_data.py,sha256=rRDXMoqX-RYY4jPdxhdlxJGhWdl6r245F5UARgKV6P4,3121
|
|
56
56
|
scripts/refactor_site.py,sha256=skzvsPP0Cn9yTKndzkilyNcGz4DZ88ctvCJ0XrBdc2A,3135
|
|
57
57
|
utils/compute_icon_mean_stddev.py,sha256=a1oWMRMnny39rV-dvu8rcx85sb4bXzPFrR1gkUr4Jpg,2296
|
|
58
|
-
ocf_data_sampler-0.2.
|
|
59
|
-
ocf_data_sampler-0.2.
|
|
60
|
-
ocf_data_sampler-0.2.
|
|
61
|
-
ocf_data_sampler-0.2.
|
|
58
|
+
ocf_data_sampler-0.2.36.dist-info/METADATA,sha256=4I78nZuCOi2WLEvxfsI9knfka0ebhKxtGtDGp2ky5QY,12184
|
|
59
|
+
ocf_data_sampler-0.2.36.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
|
60
|
+
ocf_data_sampler-0.2.36.dist-info/top_level.txt,sha256=LEFU4Uk-PEo72QGLAfnVZIUEm37Q8mKuMeg_Xk-p33g,31
|
|
61
|
+
ocf_data_sampler-0.2.36.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|