polytope-python 1.0.4__tar.gz → 1.0.6__tar.gz

{polytope-python-1.0.4/polytope_python.egg-info → polytope-python-1.0.6}/PKG-INFO

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

{polytope-python-1.0.4 → polytope-python-1.0.6}/polytope/datacube/backends/fdb.py

@@ -55,7 +55,7 @@ class FDBDatacube(Datacube):
                 val = self._axes[name].type
                 self._check_and_add_axes(options, name, val)
 
-        logging.info("Polytope created axes for: " + str(self._axes.keys()))
+        logging.info("Polytope created axes for %s", self._axes.keys())
 
     def check_branching_axes(self, request):
         polytopes = request.polytopes()
@@ -78,6 +78,7 @@ class FDBDatacube(Datacube):
             self._axes.pop(axis_name, None)
 
     def get(self, requests: TensorIndexTree):
+        requests.pprint()
         if len(requests.children) == 0:
             return requests
         fdb_requests = []
@@ -85,12 +86,9 @@ class FDBDatacube(Datacube):
         self.get_fdb_requests(requests, fdb_requests, fdb_requests_decoding_info)
 
         # here, loop through the fdb requests and request from gj and directly add to the nodes
-
-        # TODO: here, loop through the fdb requests and request from gj and directly add to the nodes
         complete_list_complete_uncompressed_requests = []
         complete_fdb_decoding_info = []
         for j, compressed_request in enumerate(fdb_requests):
-            # TODO: can we do gj extract outside of this loop?
             uncompressed_request = {}
 
             # Need to determine the possible decompressed requests
@@ -109,7 +107,9 @@ class FDBDatacube(Datacube):
                 complete_uncompressed_request = (uncompressed_request, compressed_request[1])
                 complete_list_complete_uncompressed_requests.append(complete_uncompressed_request)
                 complete_fdb_decoding_info.append(fdb_requests_decoding_info[j])
+        logging.debug("The requests we give GribJump are: %s", complete_list_complete_uncompressed_requests)
         output_values = self.gj.extract(complete_list_complete_uncompressed_requests)
+        logging.debug("GribJump outputs: %s", output_values)
         self.assign_fdb_output_to_nodes(output_values, complete_fdb_decoding_info)
 
     def get_fdb_requests(
@@ -124,7 +124,7 @@ class FDBDatacube(Datacube):
 
         # First when request node is root, go to its children
         if requests.axis.name == "root":
-            logging.info("Looking for data for the tree: " + str([leaf.flatten() for leaf in requests.leaves]))
+            logging.info("Looking for data for the tree: %s", [leaf.flatten() for leaf in requests.leaves])
 
             for c in requests.children:
                 self.get_fdb_requests(c, fdb_requests, fdb_requests_decoding_info)
@@ -162,7 +162,7 @@ class FDBDatacube(Datacube):
                 for j, idx in enumerate(sub_lat_idxs):
                     if idx not in seen_indices:
                         # TODO: need to remove it from the values in the corresponding tree node
-                        # TODO: need to readjust the range we give to gj ... DONE?
+                        # TODO: need to read just the range we give to gj ... DONE?
                         original_fdb_node_range_vals.append(actual_fdb_node[0].values[j])
                         seen_indices.add(idx)
                         new_current_start_idx.append(idx)
@@ -325,6 +325,8 @@ class FDBDatacube(Datacube):
         request_ranges_with_idx = list(enumerate(interm_request_ranges))
         sorted_list = sorted(request_ranges_with_idx, key=lambda x: x[1][0])
         original_indices, sorted_request_ranges = zip(*sorted_list)
+        logging.debug("We sorted the request ranges into: %s", sorted_request_ranges)
+        logging.debug("The sorted and unique leaf node ranges are: %s", new_fdb_node_ranges)
         return (original_indices, sorted_request_ranges, new_fdb_node_ranges)
 
     def datacube_natural_indexes(self, axis, subarray):

{polytope-python-1.0.4 → polytope-python-1.0.6}/polytope/datacube/tensor_index_tree.py

@@ -81,8 +81,12 @@ class TensorIndexTree(object):
                     for i in range(len(other.values)):
                         other_val = other.values[i]
                         self_val = self.values[i]
-                        if abs(other_val - self_val) > 2 * max(other.axis.tol, self.axis.tol):
-                            return False
+                        if self.axis.can_round:
+                            if abs(other_val - self_val) > 2 * max(other.axis.tol, self.axis.tol):
+                                return False
+                        else:
+                            if other_val != self_val:
+                                return False
                     return True
 
     def __lt__(self, other):
@@ -217,7 +221,7 @@ class TensorIndexTree(object):
     def get_ancestors(self):
         ancestors = []
         current_node = self
-        while current_node.axis != TensorIndexTree.root:
+        while current_node.axis.name != "root":
             ancestors.append(current_node)
             current_node = current_node.parent
         return ancestors[::-1]

{polytope-python-1.0.4 → polytope-python-1.0.6}/polytope/engine/hullslicer.py

@@ -91,7 +91,7 @@ class HullSlicer(Engine):
                 flattened = {flattened_tuple[0]: flattened_tuple[1]}
 
         values = self.axis_values_between.get((flattened_tuple, ax.name, lower, upper, method), None)
-        if self.axis_values_between.get((flattened_tuple, ax.name, lower, upper, method), None) is None:
+        if values is None:
             values = datacube.get_indices(flattened, ax, lower, upper, method)
             self.axis_values_between[(flattened_tuple, ax.name, lower, upper, method)] = values
         return values
@@ -109,9 +109,6 @@ class HullSlicer(Engine):
         return remapped_val
 
     def _build_sliceable_child(self, polytope, ax, node, datacube, values, next_nodes, slice_axis_idx):
-        if len(values) == 0:
-            node.remove_branch()
-
         for i, value in enumerate(values):
             if i == 0:
                 fvalue = ax.to_float(value)
@@ -140,8 +137,16 @@ class HullSlicer(Engine):
 
     def _build_branch(self, ax, node, datacube, next_nodes):
         if ax.name not in self.compressed_axes:
+            parent_node = node.parent
+            right_unsliced_polytopes = []
             for polytope in node["unsliced_polytopes"]:
                 if ax.name in polytope._axes:
+                    right_unsliced_polytopes.append(polytope)
+            # for polytope in node["unsliced_polytopes"]:
+            for i, polytope in enumerate(right_unsliced_polytopes):
+                node._parent = parent_node
+                # if ax.name in polytope._axes:
+                if True:
                     lower, upper, slice_axis_idx = polytope.extents(ax.name)
                     # here, first check if the axis is an unsliceable axis and directly build node if it is
                     # NOTE: we should have already created the ax_is_unsliceable cache before
@@ -149,13 +154,22 @@ class HullSlicer(Engine):
                         self._build_unsliceable_child(polytope, ax, node, datacube, [lower], next_nodes, slice_axis_idx)
                     else:
                         values = self.find_values_between(polytope, ax, node, datacube, lower, upper)
+                        # NOTE: need to only remove the branches if the values are empty,
+                        # but only if there are no other possible children left in the tree that
+                        # we can append and if somehow this happens before and we need to remove, then what do we do??
+                        if i == len(right_unsliced_polytopes) - 1:
+                            # we have iterated all polytopes and we can now remove the node if we need to
+                            if len(values) == 0 and len(node.children) == 0:
+                                node.remove_branch()
                         self._build_sliceable_child(polytope, ax, node, datacube, values, next_nodes, slice_axis_idx)
         else:
             all_values = []
             all_lowers = []
             first_polytope = False
             first_slice_axis_idx = False
+            parent_node = node.parent
             for polytope in node["unsliced_polytopes"]:
+                node._parent = parent_node
                 if ax.name in polytope._axes:
                     # keep track of the first polytope defined on the given axis
                     if not first_polytope:
@@ -173,6 +187,8 @@ class HullSlicer(Engine):
                     first_polytope, ax, node, datacube, all_lowers, next_nodes, first_slice_axis_idx
                 )
             else:
+                if len(all_values) == 0:
+                    node.remove_branch()
                 self._build_sliceable_child(
                     first_polytope, ax, node, datacube, all_values, next_nodes, first_slice_axis_idx
                 )

polytope-python-1.0.6/polytope/options.py

@@ -0,0 +1,79 @@
+import argparse
+from abc import ABC
+from typing import Dict, List, Literal, Optional, Union
+
+from conflator import ConfigModel, Conflator
+from pydantic import ConfigDict
+
+
+class TransformationConfig(ConfigModel):
+    model_config = ConfigDict(extra="forbid")
+    name: str = ""
+
+
+class CyclicConfig(TransformationConfig):
+    name: Literal["cyclic"]
+    range: List[float] = [0]
+
+
+class MapperConfig(TransformationConfig):
+    name: Literal["mapper"]
+    type: str = ""
+    resolution: Union[int, List[int]] = 0
+    axes: List[str] = [""]
+    local: Optional[List[float]] = None
+
+
+class ReverseConfig(TransformationConfig):
+    name: Literal["reverse"]
+    is_reverse: bool = False
+
+
+class TypeChangeConfig(TransformationConfig):
+    name: Literal["type_change"]
+    type: str = "int"
+
+
+class MergeConfig(TransformationConfig):
+    name: Literal["merge"]
+    other_axis: str = ""
+    linkers: List[str] = [""]
+
+
+action_subclasses_union = Union[CyclicConfig, MapperConfig, ReverseConfig, TypeChangeConfig, MergeConfig]
+
+
+class AxisConfig(ConfigModel):
+    axis_name: str = ""
+    transformations: list[action_subclasses_union]
+
+
+path_subclasses_union = Union[str, int, float]
+
+
+class GribJumpAxesConfig(ConfigModel):
+    axis_name: str = ""
+    values: List[str] = [""]
+
+
+class Config(ConfigModel):
+    axis_config: List[AxisConfig] = []
+    compressed_axes_config: List[str] = [""]
+    pre_path: Optional[Dict[str, path_subclasses_union]] = {}
+    alternative_axes: List[GribJumpAxesConfig] = []
+
+
+class PolytopeOptions(ABC):
+    @staticmethod
+    def get_polytope_options(options):
+
+        parser = argparse.ArgumentParser(allow_abbrev=False)
+        conflator = Conflator(app_name="polytope", model=Config, cli=False, argparser=parser, **options)
+        config_options = conflator.load()
+
+        axis_config = config_options.axis_config
+        compressed_axes_config = config_options.compressed_axes_config
+        pre_path = config_options.pre_path
+        alternative_axes = config_options.alternative_axes
+
+        return (axis_config, compressed_axes_config, pre_path, alternative_axes)

polytope-python-1.0.6/polytope/version.py

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

{polytope-python-1.0.4 → polytope-python-1.0.6/polytope_python.egg-info}/PKG-INFO

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

{polytope-python-1.0.4 → polytope-python-1.0.6}/polytope_python.egg-info/requires.txt

@@ -4,5 +4,5 @@ scipy
 sortedcontainers
 tripy
 xarray
-conflator@ git+https://github.com/ecmwf/conflator.git@main
+conflator
 protobuf

{polytope-python-1.0.4 → polytope-python-1.0.6}/requirements.txt

@@ -4,5 +4,5 @@ scipy
 sortedcontainers
 tripy
 xarray
-conflator @ git+https://github.com/ecmwf/conflator.git@main
+conflator
 protobuf

polytope-python-1.0.4/polytope/options.py

@@ -1,71 +0,0 @@
-import argparse
-from abc import ABC
-from typing import Dict, List, Literal, Optional, Union
-
-from conflator import ConfigModel, Conflator
-from pydantic import ConfigDict
-
-
-class PolytopeOptions(ABC):
-    @staticmethod
-    def get_polytope_options(options):
-        class TransformationConfig(ConfigModel):
-            model_config = ConfigDict(extra="forbid")
-            name: str = ""
-
-        class CyclicConfig(TransformationConfig):
-            name: Literal["cyclic"]
-            range: List[float] = [0]
-
-        class MapperConfig(TransformationConfig):
-            name: Literal["mapper"]
-            type: str = ""
-            resolution: Union[int, List[int]] = 0
-            axes: List[str] = [""]
-            local: Optional[List[float]] = None
-
-        class ReverseConfig(TransformationConfig):
-            name: Literal["reverse"]
-            is_reverse: bool = False
-
-        class TypeChangeConfig(TransformationConfig):
-            name: Literal["type_change"]
-            type: str = "int"
-
-        class MergeConfig(TransformationConfig):
-            name: Literal["merge"]
-            other_axis: str = ""
-            linkers: List[str] = [""]
-
-        action_subclasses_union = Union[CyclicConfig, MapperConfig, ReverseConfig, TypeChangeConfig, MergeConfig]
-
-        class AxisConfig(ConfigModel):
-            axis_name: str = ""
-            transformations: list[action_subclasses_union]
-
-        path_subclasses_union = Union[str, int, float]
-
-        class GribJumpAxesConfig(ConfigModel):
-            axis_name: str = ""
-            values: List[str] = [""]
-
-        class Config(ConfigModel):
-            axis_config: List[AxisConfig] = []
-            compressed_axes_config: List[str] = [""]
-            pre_path: Optional[Dict[str, path_subclasses_union]] = {}
-            alternative_axes: List[GribJumpAxesConfig] = []
-
-        parser = argparse.ArgumentParser(allow_abbrev=False)
-        config_options = Conflator(app_name="polytope", model=Config, cli=False, argparser=parser).load()
-        config_options = Config(
-            axis_config=options.get("axis_config", []),
-            compressed_axes_config=options.get("compressed_axes_config", [""]),
-            pre_path=options.get("pre_path", {}),
-            alternative_axes=options.get("alternative_axes", []),
-        )
-        axis_config = config_options.axis_config
-        compressed_axes_config = config_options.compressed_axes_config
-        pre_path = config_options.pre_path
-        alternative_axes = config_options.alternative_axes
-
-        return (axis_config, compressed_axes_config, pre_path, alternative_axes)

polytope-python-1.0.4/polytope/version.py

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