ocf-data-sampler 0.5.33__py3-none-any.whl → 0.5.35__py3-none-any.whl

ocf_data_sampler/config/model.py

@@ -7,7 +7,7 @@ Prefix with a protocol like s3:// to read from alternative filesystems.
 from collections.abc import Iterator
 from typing import Literal
 
-from pydantic import BaseModel, Field, RootModel, field_validator, model_validator
+from pydantic import BaseModel, ConfigDict, Field, RootModel, field_validator, model_validator
 from typing_extensions import override
 
 NWP_PROVIDERS = [
@@ -23,10 +23,7 @@ NWP_PROVIDERS = [
 class Base(BaseModel):
     """Pydantic Base model where no extras can be added."""
 
-    class Config:
-        """Config class."""
-
-        extra = "forbid"  # forbid use of extra kwargs
+    model_config = ConfigDict(extra="forbid")
 
 
 class General(Base):
@@ -91,7 +88,7 @@ class DropoutMixin(Base):
     )
 
     dropout_fraction: float | list[float] = Field(
-        default=0,
+        default=0.0,
         description="Either a float(Chance of dropout being applied to each sample) or a list of "
         "floats (probability that dropout of the corresponding timedelta is applied)",
     )

ocf_data_sampler/torch_datasets/datasets/site.py

@@ -330,7 +330,12 @@ class SitesDatasetConcurrent(PickleCacheMixin, Dataset):
         self.config = config
 
         # get all locations
-        self.locations = get_locations(datasets_dict["site"])
+        locations = get_locations(datasets_dict["site"])
+        self.locations = add_alterate_coordinate_projections(
+            locations,
+            datasets_dict,
+            primary_coords="lon_lat",
+        )
 
         # Get t0 times where all input data is available
         valid_t0s = self.find_valid_t0s(datasets_dict)

{ocf_data_sampler-0.5.33.dist-info → ocf_data_sampler-0.5.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ocf-data-sampler
-Version: 0.5.33
+Version: 0.5.35
 Author: James Fulton, Peter Dudfield
 Author-email: Open Climate Fix team <info@openclimatefix.org>
 License: MIT License

{ocf_data_sampler-0.5.33.dist-info → ocf_data_sampler-0.5.35.dist-info}/RECORD

@@ -2,7 +2,7 @@ ocf_data_sampler/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,
 ocf_data_sampler/utils.py,sha256=WfmyBacjFGsv_IlUHRezNGc4ixi4wBvom_JF76iJYbY,1487
 ocf_data_sampler/config/__init__.py,sha256=O29mbH0XG2gIY1g3BaveGCnpBO2SFqdu-qzJ7a6evl0,223
 ocf_data_sampler/config/load.py,sha256=LL-7wemI8o4KPkx35j-wQ3HjsMvDgqXr7G46IcASfnU,632
-ocf_data_sampler/config/model.py,sha256=_HAn8C3iRCiKpo8MK6-d8o9QbuvLOjSL6gjACJpgkcI,11885
+ocf_data_sampler/config/model.py,sha256=3aaMZIITDOQ6IGeod9xOYGOzft5zNVfEVBWbmWM50nA,11843
 ocf_data_sampler/config/save.py,sha256=m8SPw5rXjkMm1rByjh3pK5StdBi4e8ysnn3jQopdRaI,1064
 ocf_data_sampler/data/uk_gsp_locations_20220314.csv,sha256=RSh7DRh55E3n8lVAaWXGTaXXHevZZtI58td4d4DhGos,10415772
 ocf_data_sampler/data/uk_gsp_locations_20250109.csv,sha256=XZISFatnbpO9j8LwaxNKFzQSjs6hcHFsV8a9uDDpy2E,9055334
@@ -43,7 +43,7 @@ ocf_data_sampler/select/select_time_slice.py,sha256=cpkdovJMvcjxSGfq9G0OJK5aDAeC
 ocf_data_sampler/torch_datasets/datasets/__init__.py,sha256=o0SsEXXZ6k9iL__5_RN1Sf60lw_eqK91P3UFEHAD2k0,102
 ocf_data_sampler/torch_datasets/datasets/picklecache.py,sha256=b8T5lgKfiPXLwuVQuFpCQBlU-HNBrA-Z-eSwYICKvsQ,1350
 ocf_data_sampler/torch_datasets/datasets/pvnet_uk.py,sha256=Tpf1zVPtBy-815n__-zgsTeNRxlxjLwuu6UgCCyIEL0,12365
-ocf_data_sampler/torch_datasets/datasets/site.py,sha256=F3emPejGQNtm3qzWtIGSFOVVH9l3DxS9YkiSATXROHQ,15095
+ocf_data_sampler/torch_datasets/datasets/site.py,sha256=RuFQZwJ74AJncnnGXIXlpFTgnTIu4_hshm4NotoQ_-Y,15250
 ocf_data_sampler/torch_datasets/sample/__init__.py,sha256=GL84vdZl_SjHDGVyh9Uekx2XhPYuZ0dnO3l6f6KXnHI,100
 ocf_data_sampler/torch_datasets/sample/base.py,sha256=cQ1oIyhdmlotejZK8B3Cw6MNvpdnBPD8G_o2h7Ye4Vc,2206
 ocf_data_sampler/torch_datasets/sample/site.py,sha256=40NwNTqjL1WVhPdwe02zDHHfDLG2u_bvCfRCtGAtFc0,1466
@@ -59,7 +59,7 @@ ocf_data_sampler/torch_datasets/utils/valid_time_periods.py,sha256=xcy75cVxl0Wrg
 ocf_data_sampler/torch_datasets/utils/validation_utils.py,sha256=YqmT-lExWlI8_ul3l0EP73Ik002fStr_bhsZh9mQqEU,4735
 scripts/download_gsp_location_data.py,sha256=rRDXMoqX-RYY4jPdxhdlxJGhWdl6r245F5UARgKV6P4,3121
 scripts/refactor_site.py,sha256=skzvsPP0Cn9yTKndzkilyNcGz4DZ88ctvCJ0XrBdc2A,3135
-ocf_data_sampler-0.5.33.dist-info/METADATA,sha256=L4iZvZhEhEYDQO7biB2D-qJ81igH8AlnNt2AE5R9N-s,13541
-ocf_data_sampler-0.5.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ocf_data_sampler-0.5.33.dist-info/top_level.txt,sha256=deUxqmsONNAGZDNbsntbXH7BRA1MqWaUeAJrCo6q_xA,25
-ocf_data_sampler-0.5.33.dist-info/RECORD,,
+ocf_data_sampler-0.5.35.dist-info/METADATA,sha256=eXjW8gEArkH3NA4tVS5beCxGjsizxomdVUYh0ra8JKE,13541
+ocf_data_sampler-0.5.35.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ocf_data_sampler-0.5.35.dist-info/top_level.txt,sha256=deUxqmsONNAGZDNbsntbXH7BRA1MqWaUeAJrCo6q_xA,25
+ocf_data_sampler-0.5.35.dist-info/RECORD,,