polytope-python 1.0.36__tar.gz → 1.0.37__tar.gz

{polytope_python-1.0.36/polytope_python.egg-info → polytope_python-1.0.37}/PKG-INFO

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

{polytope_python-1.0.36 → polytope_python-1.0.37}/polytope_feature/datacube/backends/fdb.py

@@ -236,9 +236,12 @@ class FDBDatacube(Datacube):
                 raise Exception("nearest point search axes are wrong")
 
             second_ax = requests.children[0].children[0].axis
-            nearest_pts = self.nearest_search.get(first_ax_name, None)
+
+            nearest_pts = self.nearest_search.get((first_ax_name, second_ax_name), None)
             if nearest_pts is None:
-                nearest_pts = self.nearest_search[second_ax_name]
+                nearest_pts = self.nearest_search.get((second_ax_name, first_ax_name), None)
+                for i, pt in enumerate(nearest_pts):
+                    nearest_pts[i] = [pt[1], pt[0]]
 
             transformed_nearest_pts = []
             for point in nearest_pts:

{polytope_python-1.0.36 → polytope_python-1.0.37}/polytope_feature/polytope.py

@@ -67,10 +67,10 @@ class Polytope:
         for polytope in request.polytopes():
             method = polytope.method
             if method == "nearest":
-                if self.datacube.nearest_search.get(polytope.axes()[0], None) is None:
-                    self.datacube.nearest_search[polytope.axes()[0]] = polytope.values
+                if self.datacube.nearest_search.get(tuple(polytope.axes()), None) is None:
+                    self.datacube.nearest_search[tuple(polytope.axes())] = polytope.values
                 else:
-                    self.datacube.nearest_search[polytope.axes()[0]].append(polytope.values[0])
+                    self.datacube.nearest_search[tuple(polytope.axes())].append(polytope.values[0])
         request_tree = self.engine.extract(self.datacube, request.polytopes())
         logging.info("Created request tree for %s ", self.context)
         self.datacube.get(request_tree, self.context)

{polytope_python-1.0.36 → polytope_python-1.0.37}/polytope_feature/shapes.py

@@ -68,8 +68,10 @@ class Product(Shape):
         # TODO
         all_axes = []
         for poly in polytopes:
-            all_axes.extend(poly.axes())
-        self._axes = list(set(all_axes))
+            for ax in poly.axes():
+                if ax not in all_axes:
+                    all_axes.append(ax)
+        self._axes = all_axes
         # Check there weren't any duplicates in the polytopes' axes
         assert len(self._axes) == len(all_axes)
 

polytope_python-1.0.37/polytope_feature/version.py

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

{polytope_python-1.0.36 → polytope_python-1.0.37/polytope_python.egg-info}/PKG-INFO

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

{polytope_python-1.0.36 → polytope_python-1.0.37}/tests/test_point_union.py

@@ -117,6 +117,57 @@ class TestSlicingFDBDatacube:
             tot_leaves += len(leaf.result)
         assert tot_leaves == 9
 
+    @pytest.mark.fdb
+    def test_fdb_datacube_axis_order(self):
+        import pygribjump as gj
+
+        request = Request(
+            Select("step", [0]),
+            Select("levtype", ["sfc"]),
+            Span("date", pd.Timestamp("20230625T120000"), pd.Timestamp("20230626T120000")),
+            Select("domain", ["g"]),
+            Select("expver", ["0001"]),
+            Select("param", ["167"]),
+            Select("class", ["od"]),
+            Select("stream", ["oper"]),
+            Select("type", ["an"]),
+            Union(
+                ["latitude", "longitude"],
+                Point(["latitude", "longitude"], [[25, 30]], method="nearest"),
+            ),
+        )
+
+        inverted_request = Request(
+            Select("step", [0]),
+            Select("levtype", ["sfc"]),
+            Span("date", pd.Timestamp("20230625T120000"), pd.Timestamp("20230626T120000")),
+            Select("domain", ["g"]),
+            Select("expver", ["0001"]),
+            Select("param", ["167"]),
+            Select("class", ["od"]),
+            Select("stream", ["oper"]),
+            Select("type", ["an"]),
+            Union(
+                ["longitude", "latitude"],
+                Point(["longitude", "latitude"], [[30, 25]], method="nearest"),
+            ),
+        )
+
+        self.fdbdatacube = gj.GribJump()
+        self.slicer = HullSlicer()
+        self.API = Polytope(
+            datacube=self.fdbdatacube,
+            engine=self.slicer,
+            options=self.options,
+        )
+        result = self.API.retrieve(request)
+        inverted_result = self.API.retrieve(inverted_request)
+        result.pprint()
+        inverted_result.pprint()
+        assert len(result.leaves) == 1
+        assert len(inverted_result.leaves) == 1
+        assert inverted_result.leaves[0].result == result.leaves[0].result
+
     # @pytest.mark.fdb
     # def test_fdb_datacube_mix_methods(self):
     #     import pygribjump as gj

polytope_python-1.0.36/polytope_feature/version.py

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