polytope-python 1.0.23__tar.gz → 1.0.26__tar.gz

{polytope-python-1.0.23/polytope_python.egg-info → polytope-python-1.0.26}/PKG-INFO

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

{polytope-python-1.0.23 → polytope-python-1.0.26}/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.23 → polytope-python-1.0.26}/polytope_feature/datacube/transformations/datacube_mappers/mapper_types/reduced_ll.py

@@ -22,8 +22,11 @@ class ReducedLatLonMapper(DatacubeMapper):
             raise NotImplementedError("Reduced lat-lon grid with first axis in decreasing order is not supported")
 
     def first_axis_vals(self):
+        start_lat = 90
+        if self._resolution == 3601:
+            start_lat = 89.973092
         resolution = 180 / (self._resolution - 1)
-        vals = [-90 + i * resolution for i in range(self._resolution)]
+        vals = [round(start_lat - i * resolution, 12) for i in range(self._resolution)]
         return vals
 
     def map_first_axis(self, lower, upper):
@@ -5084,8 +5087,11 @@ class ReducedLatLonMapper(DatacubeMapper):
     def second_axis_vals(self, first_val):
         first_idx = self._first_axis_vals.index(first_val[0])
         Ny = self.lon_spacing()[first_idx]
-        second_spacing = 360 / Ny
-        return [i * second_spacing for i in range(Ny)]
+        if Ny != 0:
+            second_spacing = 360 / Ny
+            return [i * second_spacing for i in range(Ny)]
+        else:
+            raise ValueError("Requested latitude value is not within reduced latitude-longitude grid bounds")
 
     def map_second_axis(self, first_val, lower, upper):
         axis_lines = self.second_axis_vals(first_val)

{polytope-python-1.0.23 → polytope-python-1.0.26}/polytope_feature/datacube/transformations/datacube_type_change/datacube_type_change.py

@@ -1,6 +1,8 @@
 from copy import deepcopy
 from importlib import import_module
 
+import pandas as pd
+
 from ..datacube_transformations import DatacubeAxisTransformation
 
 
@@ -75,4 +77,48 @@ class TypeChangeStrToInt(DatacubeAxisTypeChange):
         return tuple(values)
 
 
-_type_to_datacube_type_change_lookup = {"int": "TypeChangeStrToInt"}
+class TypeChangeStrToTimestamp(DatacubeAxisTypeChange):
+    def __init__(self, axis_name, new_type):
+        self.axis_name = axis_name
+        self._new_type = new_type
+
+    def transform_type(self, value):
+        try:
+            return pd.Timestamp(value)
+        except ValueError:
+            return None
+
+    def make_str(self, value):
+        values = []
+        for val in value:
+            values.append(val.strftime("%Y%m%d"))
+        return tuple(values)
+
+
+class TypeChangeStrToTimedelta(DatacubeAxisTypeChange):
+    def __init__(self, axis_name, new_type):
+        self.axis_name = axis_name
+        self._new_type = new_type
+
+    def transform_type(self, value):
+        try:
+            hours = int(value[:2])
+            mins = int(value[2:])
+            return pd.Timedelta(hours=hours, minutes=mins)
+        except ValueError:
+            return None
+
+    def make_str(self, value):
+        values = []
+        for val in value:
+            hours = int(val.total_seconds() // 3600)
+            mins = int((val.total_seconds() % 3600) // 60)
+            values.append(f"{hours:02d}{mins:02d}")
+        return tuple(values)
+
+
+_type_to_datacube_type_change_lookup = {
+    "int": "TypeChangeStrToInt",
+    "date": "TypeChangeStrToTimestamp",
+    "time": "TypeChangeStrToTimedelta",
+}

polytope-python-1.0.26/polytope_feature/version.py

@@ -0,0 +1 @@
+__version__ = "1.0.26"

{polytope-python-1.0.23 → polytope-python-1.0.26/polytope_python.egg-info}/PKG-INFO

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

polytope-python-1.0.23/polytope_feature/version.py

@@ -1 +0,0 @@
-__version__ = "1.0.23"