polytope-python 1.0.25__tar.gz → 1.0.27__tar.gz

{polytope-python-1.0.25/polytope_python.egg-info → polytope-python-1.0.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: polytope-python
-Version: 1.0.25
+Version: 1.0.27
 Summary: Polytope datacube feature extraction library
 Home-page: https://github.com/ecmwf/polytope
 Author: ECMWF

{polytope-python-1.0.25 → polytope-python-1.0.27}/polytope_feature/datacube/backends/fdb.py

@@ -80,10 +80,21 @@ class FDBDatacube(Datacube):
                     (upper, lower, idx) = polytope.extents(ax)
                     if "sfc" in polytope.points[idx]:
                         self.fdb_coordinates.pop("levelist", None)
+
+                if ax == "param":
+                    (upper, lower, idx) = polytope.extents(ax)
+                    if "140251" not in polytope.points[idx]:
+                        self.fdb_coordinates.pop("direction", None)
+                        self.fdb_coordinates.pop("frequency", None)
+                    else:
+                        # special param with direction and frequency
+                        if len(polytope.points[idx]) > 1:
+                            raise ValueError(
+                                "Param 251 is part of a special branching of the datacube. Please request it separately."  # noqa: E501
+                            )
         self.fdb_coordinates.pop("quantile", None)
-        # TODO: When do these not appear??
-        self.fdb_coordinates.pop("direction", None)
-        self.fdb_coordinates.pop("frequency", None)
+        self.fdb_coordinates.pop("year", None)
+        self.fdb_coordinates.pop("month", None)
 
         # NOTE: verify that we also remove the axis object for axes we've removed here
         axes_to_remove = set(self.complete_axes) - set(self.fdb_coordinates.keys())

{polytope-python-1.0.25 → polytope-python-1.0.27}/polytope_feature/datacube/datacube_axis.py

@@ -5,6 +5,7 @@ from typing import Any, List
 
 import numpy as np
 import pandas as pd
+import xarray as xr
 
 from .transformations.datacube_cyclic.datacube_cyclic import DatacubeAxisCyclic
 from .transformations.datacube_mappers.datacube_mappers import DatacubeMapper
@@ -142,22 +143,39 @@ class DatacubeAxis(ABC):
             )
         return indexes_between_ranges
 
+    @staticmethod
+    def values_type(values):
+        type_ = None
+        if isinstance(values, xr.core.variable.IndexVariable) or isinstance(values, xr.core.variable.Variable):
+            # If we have some xarray variable, transform them to actual variable type
+            values = np.array(values)
+            type_ = values.dtype.type
+        else:
+            if len(values) == 0:
+                # If we have no values (newly created axis), default to a float
+                values = np.array(values)
+                type_ = values.dtype.type
+            else:
+                type_ = type(values[0])
+        return type_
+
     @staticmethod
     def create_standard(name, values, datacube):
-        values = np.array(values)
-        DatacubeAxis.check_axis_type(name, values)
+        val_type = DatacubeAxis.values_type(values)
+
+        DatacubeAxis.check_axis_type(name, val_type)
         if datacube._axes is None:
-            datacube._axes = {name: deepcopy(_type_to_axis_lookup[values.dtype.type])}
+            datacube._axes = {name: deepcopy(_type_to_axis_lookup[val_type])}
         else:
-            datacube._axes[name] = deepcopy(_type_to_axis_lookup[values.dtype.type])
+            datacube._axes[name] = deepcopy(_type_to_axis_lookup[val_type])
+
         datacube._axes[name].name = name
         datacube.axis_counter += 1
 
     @staticmethod
-    def check_axis_type(name, values):
-        # NOTE: The values here need to be a numpy array which has a dtype attribute
-        if values.dtype.type not in _type_to_axis_lookup:
-            raise ValueError(f"Could not create a mapper for index type {values.dtype.type} for axis {name}")
+    def check_axis_type(name, val_type):
+        if val_type not in _type_to_axis_lookup:
+            raise ValueError(f"Could not create a mapper for index type {val_type} for axis {name}")
 
 
 transformations_order = [
@@ -302,10 +320,13 @@ _type_to_axis_lookup = {
     np.int64: IntDatacubeAxis(),
     np.datetime64: PandasTimestampDatacubeAxis(),
     np.timedelta64: PandasTimedeltaDatacubeAxis(),
+    pd.Timedelta: PandasTimedeltaDatacubeAxis(),
     np.float64: FloatDatacubeAxis(),
     np.float32: FloatDatacubeAxis(),
     np.int32: IntDatacubeAxis(),
     np.str_: UnsliceableDatacubeAxis(),
     str: UnsliceableDatacubeAxis(),
     np.object_: UnsliceableDatacubeAxis(),
+    int: IntDatacubeAxis(),
+    float: FloatDatacubeAxis(),
 }

{polytope-python-1.0.25 → polytope-python-1.0.27}/polytope_feature/datacube/transformations/datacube_mappers/datacube_mappers.py

@@ -137,4 +137,5 @@ _type_to_datacube_mapper_lookup = {
     "reduced_ll": "ReducedLatLonMapper",
     "local_regular": "LocalRegularGridMapper",
     "healpix_nested": "NestedHealpixGridMapper",
+    "reduced_gaussian": "ReducedGaussianGridMapper",
 }