polytope-python 2.1.7__py3-none-any.whl → 2.1.8__py3-none-any.whl

polytope_feature/_version.py

@@ -1,2 +1,2 @@
 # Do not change! Do not track in version control!
-__version__ = "2.1.7"
+__version__ = "2.1.8"

polytope_feature/datacube/backends/fdb.py

@@ -113,11 +113,19 @@ class FDBDatacube(Datacube):
                         # 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
+                                "Param 140251 is part of a special branching of the datacube. Please request it separately."  # noqa: E501
+                            )
+                if ax == "stream":
+                    upper, lower, idx = polytope.extents(ax)
+                    if "clmn" not in polytope.points[idx]:
+                        self.fdb_coordinates.pop("year", None)
+                        self.fdb_coordinates.pop("month", None)
+                    else:
+                        if len(polytope.points[idx]) > 1:
+                            raise ValueError(
+                                "Stream clmn is part of a special branching of the datacube. Please request it separately."  # noqa: E501
                             )
         self.fdb_coordinates.pop("quantile", 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_feature/datacube/transformations/datacube_mappers/mapper_types/healpix_nested.py

@@ -13,8 +13,8 @@ try:
     )
 
     use_rust = True
-except (ModuleNotFoundError, ImportError):
-    print("Failed to load Rust extension, falling back to Python implementation.")
+except (ModuleNotFoundError, ImportError) as e:
+    print(f"Failed to load Rust extension with error: {e}, falling back to Python implementation.")
 
 
 class NestedHealpixGridMapper(DatacubeMapper):

polytope_feature/datacube/transformations/datacube_mappers/mapper_types/irregular_mapper_types/lambert_conformal.py

@@ -7,8 +7,8 @@ try:
     from polytope_feature.polytope_rs import get_latlons_oblate, get_latlons_sphere
 
     use_rust = True
-except (ModuleNotFoundError, ImportError):
-    print("Failed to load Rust extension, falling back to Python implementation.")
+except (ModuleNotFoundError, ImportError) as e:
+    print(f"Failed to load Rust extension with error: {e}, falling back to Python implementation.")
 
 
 class LambertConformalGridMapper(DatacubeMapper):

polytope_feature/datacube/transformations/datacube_mappers/mapper_types/local_regular.py

@@ -114,8 +114,7 @@ class LocalRegularGridMapper(DatacubeMapper):
         descending = self._axis_reversed[self._mapped_axes[0]]
         if descending:
             # right descending order for searchsorted
-            first_idx = np.searchsorted(first_array[::-1], first_val[0])
-            first_idx = len(first_array) - 1 - first_idx
+            first_idx = np.searchsorted(-first_array, -first_val[0])
         else:
             first_idx = np.searchsorted(first_array, first_val[0])
         if first_idx > 0 and first_idx < len(first_array):
@@ -124,6 +123,12 @@ class LocalRegularGridMapper(DatacubeMapper):
             if abs(first_val[0] - left_val) < abs(first_val[0] - right_val):
                 first_idx -= 1
         second_idxs = np.searchsorted(second_array, second_vals)
+        for i, second_idx in enumerate(second_idxs):
+            if second_idx > 0 and second_idx < len(second_array):
+                left_val = second_array[second_idx - 1]
+                right_val = second_array[second_idx]
+                if abs(second_vals[i] - left_val) < abs(second_vals[i] - right_val):
+                    second_idxs[i] -= 1
 
         # map to grid idx
         final_idxs = first_idx * (self.second_resolution + 1) + second_idxs

polytope_feature/datacube/transformations/datacube_mappers/mapper_types/octahedral.py

@@ -12,8 +12,8 @@ try:
     )
 
     use_rust = True
-except (ModuleNotFoundError, ImportError):
-    print("Failed to load Rust extension, falling back to Python implementation.")
+except (ModuleNotFoundError, ImportError) as e:
+    print(f"Failed to load Rust extension with error: {e}, falling back to Python implementation.")
 
 
 class OctahedralGridMapper(DatacubeMapper):

polytope_feature/engine/optimised_point_in_polygon_slicer.py

@@ -9,8 +9,8 @@ try:
     from polytope_feature.polytope_rs import extract_point_in_poly_bbox
 
     use_rust = True
-except (ModuleNotFoundError, ImportError):
-    print("Failed to load Rust extension, falling back to Python implementation.")
+except (ModuleNotFoundError, ImportError) as e:
+    print(f"Failed to load Rust extension with error: {e}, falling back to Python implementation.")
 
     from shapely.geometry import Point
     from shapely.geometry.polygon import Polygon

polytope_feature/engine/optimised_quadtree_slicer.py

@@ -10,8 +10,9 @@ try:
     from polytope_feature.polytope_rs import QuadTree
 
     use_rust = True
-except (ModuleNotFoundError, ImportError):
-    print("Failed to load Rust extension, falling back to Python implementation.")
+
+except (ModuleNotFoundError, ImportError) as e:
+    print(f"Failed to load Rust extension with error: {e}, falling back to Python implementation.")
     from ..datacube.quadtree.quad_tree import QuadTree
 
 

polytope_feature/engine/point_in_polygon_slicer.py

@@ -9,8 +9,8 @@ try:
     from polytope_feature.polytope_rs import extract_point_in_poly
 
     use_rust = True
-except (ModuleNotFoundError, ImportError):
-    print("Failed to load Rust extension, falling back to Python implementation.")
+except (ModuleNotFoundError, ImportError) as e:
+    print(f"Failed to load Rust extension with error: {e}, falling back to Python implementation.")
 
     from shapely.geometry import Point
     from shapely.geometry.polygon import Polygon

polytope_feature/engine/quadtree_slicer.py

@@ -7,8 +7,8 @@ try:
     from polytope_feature.polytope_rs import QuadTree
 
     use_rust = True
-except (ModuleNotFoundError, ImportError):
-    print("Failed to load Rust extension, falling back to Python implementation.")
+except (ModuleNotFoundError, ImportError) as e:
+    print(f"Failed to load Rust extension with error: {e}, falling back to Python implementation.")
     from ..datacube.quadtree.quad_tree import QuadTree
 
 

{polytope_python-2.1.7.dist-info → polytope_python-2.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polytope-python
-Version: 2.1.7
+Version: 2.1.8
 Summary: Polytope datacube feature extraction library
 Author-email: "European Centre for Medium-Range Weather Forecasts (ECMWF)" <software.support@ecmwf.int>
 Maintainer-email: James Hawkes <James.Hawkes@ecmwf.int>, Mathilde Leuridan <Mathilde.Leuridan@ecmwf.int>
@@ -31,6 +31,7 @@ Requires-Dist: tripy
 Requires-Dist: xarray
 Requires-Dist: conflator
 Requires-Dist: protobuf
+Requires-Dist: shapely
 Provides-Extra: tests
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-cov; extra == "tests"
@@ -40,14 +41,14 @@ Requires-Dist: h5netcdf; extra == "tests"
 Requires-Dist: h5py; extra == "tests"
 Requires-Dist: earthkit-data; extra == "tests"
 Requires-Dist: matplotlib; extra == "tests"
-Requires-Dist: pyfdb; extra == "tests"
+Requires-Dist: pyfdb<=0.1.3; extra == "tests"
 Provides-Extra: unstructured
 Requires-Dist: eckit; extra == "unstructured"
 Provides-Extra: catalogue
 Requires-Dist: qubed; extra == "catalogue"
 Provides-Extra: switching-grids
 Requires-Dist: eccodes; extra == "switching-grids"
-Requires-Dist: pyfdb; extra == "switching-grids"
+Requires-Dist: pyfdb<=0.1.3; extra == "switching-grids"
 Dynamic: license-file
 
 

{polytope_python-2.1.7.dist-info → polytope_python-2.1.8.dist-info}/RECORD

@@ -1,5 +1,5 @@
 polytope_feature/__init__.py,sha256=1OP0y5Ubza4LaBUhegJvJe24u-8zZGrEzAgwPJVqZlk,58
-polytope_feature/_version.py,sha256=nkG9B6WCwkUF5yOcMZupKa1Izq86wBMY_euyxoChYh4,72
+polytope_feature/_version.py,sha256=ihCTfvA20gwPoIcNhKAsDkildKDuhkPRooZtPJV1kCE,72
 polytope_feature/options.py,sha256=sL-LURTJKEE649O4Y15SHqClCxZxwrVJLwjVsy5ZGX8,5467
 polytope_feature/polytope.py,sha256=TM4X4nxAio0fgLC8vjhzXcJjylZRVS5nRTv4LdbPziM,9805
 polytope_feature/shapes.py,sha256=ZhMrHTNEqEgnpMTDU1Rd5zjJeyRBQMYNDRoKqDd2Ejs,16473
@@ -13,7 +13,7 @@ polytope_feature/datacube/tree_encoding.py,sha256=5Bk6x-NyDXd7BKPIsKuSJk7GETOcJg
 polytope_feature/datacube/backends/__init__.py,sha256=vQDvMYOAYS7YSmjKohLsBE9zQ7rJwwyT3A-zZJOIdbc,34
 polytope_feature/datacube/backends/catalogue_helper.py,sha256=SZaJ_UjQfgalsC9SvzdlXRZ9_0yoUEdBSEKrt96qkoY,1059
 polytope_feature/datacube/backends/datacube.py,sha256=Pmd_4J_4eeWf_7LdGgxTclwQ6bAuMmEE86mXkGoaYd4,8313
-polytope_feature/datacube/backends/fdb.py,sha256=jHnNyA_qcZ7Xrr5DQpnrFpd35O__tPPdhLCCG4xBe20,21170
+polytope_feature/datacube/backends/fdb.py,sha256=C54yArP0JWAr559wc-3LB3A1EZAHz8MdUhXReMh0ckg,21658
 polytope_feature/datacube/backends/mock.py,sha256=OASnzHjxCOLwrei7fTbTwwtLWQv1qDRkTLnhOCpTDNc,2214
 polytope_feature/datacube/backends/xarray.py,sha256=aewVHXrxN26dlXkJ0wXx4vcCxrsox0JJok9zHnvlvzc,6813
 polytope_feature/datacube/quadtree/quad_tree.py,sha256=KfGwA3rBVcAkU17Se2WjP9sD6sVi-0dEZx2_dutkg_k,6062
@@ -26,16 +26,16 @@ polytope_feature/datacube/transformations/datacube_mappers/__init__.py,sha256=Gc
 polytope_feature/datacube/transformations/datacube_mappers/datacube_mappers.py,sha256=IFYNXcbqiIxFYjTKkS1aPUyCi6-8aYP4wAwrOvepqJ4,6811
 polytope_feature/datacube/transformations/datacube_mappers/mapper_types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 polytope_feature/datacube/transformations/datacube_mappers/mapper_types/healpix.py,sha256=T_sDGEOJQcHC_5gyya7w88ktFymRuA0fUrOnpTcbyQU,6026
-polytope_feature/datacube/transformations/datacube_mappers/mapper_types/healpix_nested.py,sha256=qbdG_YV3RSkf62W552NKSrXo9HuUWBsiNxCT7Q-4bE4,10086
+polytope_feature/datacube/transformations/datacube_mappers/mapper_types/healpix_nested.py,sha256=6BPUDRIWoaNmGB_HJ9nd3vHJBF88uuXxNvXOgdlpKAM,10108
 polytope_feature/datacube/transformations/datacube_mappers/mapper_types/irregular.py,sha256=Z7gNINU6cpGeJxuNLhQUqtzBEIr3MXsxP3NkoJIJrA8,2095
-polytope_feature/datacube/transformations/datacube_mappers/mapper_types/local_regular.py,sha256=Q0tH8Tp3q3D2msl1okEsCdLSHcU4SNMMgYzU_FtjDyE,5271
-polytope_feature/datacube/transformations/datacube_mappers/mapper_types/octahedral.py,sha256=6deRO2fxp8AP8FZmtvdtz0lKwlIzDRUDwo53K8dGC1I,274147
+polytope_feature/datacube/transformations/datacube_mappers/mapper_types/local_regular.py,sha256=Rv3CLsKoNNV8JxGvusrIh6ILbI-iTJEfPcDMflAlyJM,5563
+polytope_feature/datacube/transformations/datacube_mappers/mapper_types/octahedral.py,sha256=Wz4i_zAQlG1frJR14ClO8eOnoW1OsrlPyMeFRDUDRY0,274169
 polytope_feature/datacube/transformations/datacube_mappers/mapper_types/reduced_gaussian.py,sha256=ajtgG76LbRKzqpoqnzR3eDSI4jwjtmaFPFj_4RyliJ0,40383
 polytope_feature/datacube/transformations/datacube_mappers/mapper_types/reduced_ll.py,sha256=CcmzRQYGOSPdSYWMFjMluWuKuMJ_Hes6dIOlh7HBxI8,113387
 polytope_feature/datacube/transformations/datacube_mappers/mapper_types/regular.py,sha256=DUKoACooucuQ7Kwk2PR6cTzBgE3bWqAGICIlTfoRgVA,3568
 polytope_feature/datacube/transformations/datacube_mappers/mapper_types/irregular_mapper_types/__init__.py,sha256=bh0QAy3gr9hz5O8fu5tm6zI7ukI1UnQ-xszAiBYDNhg,33
 polytope_feature/datacube/transformations/datacube_mappers/mapper_types/irregular_mapper_types/icon.py,sha256=eV2sEF-R--ZK8r0OX7r_qRYyGcyvvytavXZBKRzTx5A,1011
-polytope_feature/datacube/transformations/datacube_mappers/mapper_types/irregular_mapper_types/lambert_conformal.py,sha256=rdzdWdrO1TUy35mAT6El6NHwEwik6FDiaHLkB6qrbpQ,9617
+polytope_feature/datacube/transformations/datacube_mappers/mapper_types/irregular_mapper_types/lambert_conformal.py,sha256=i7ZfdXBZJyg7j2iHLCw2M4RDMWax8HcsanLoJ3dFPIo,9639
 polytope_feature/datacube/transformations/datacube_mappers/mapper_types/irregular_mapper_types/unstructured.py,sha256=MU2Hxhk8wJNdXf_hbGtwDyDeRb_G6mOOYI9m8fXDQK4,823
 polytope_feature/datacube/transformations/datacube_merger/__init__.py,sha256=551OlMzHoR-AcuIbohQb3JOKuXobyR4ueV1rcfPorvg,31
 polytope_feature/datacube/transformations/datacube_merger/datacube_merger.py,sha256=JQSqKBQ9xKAJEqUiB8smvVGWQwDSFK_1jkWMVWxOuQk,3782
@@ -46,10 +46,10 @@ polytope_feature/datacube/transformations/datacube_type_change/datacube_type_cha
 polytope_feature/engine/__init__.py,sha256=ZbkKZTGfSD-IsrwGn1QZlWMVV9SqWrkpfAiH4RSMFTU,22
 polytope_feature/engine/engine.py,sha256=w3fUJ7r8jKlN_RS3F282PqnRi3_hwarwOPxwNGZl6Fc,1353
 polytope_feature/engine/hullslicer.py,sha256=1B710iKNfe7pjEQdeUGNmSqE7YjUJ-ZyuuyCqCXw6h0,8868
-polytope_feature/engine/optimised_point_in_polygon_slicer.py,sha256=6WJRo0vXYeS1rTPps76qbT0_pjGH1W8NR58JTvIwVfI,5003
-polytope_feature/engine/optimised_quadtree_slicer.py,sha256=HyIhE5BWV1RNWircFXhxsBrkvjYNuDNcGDKQ9phkanw,3824
-polytope_feature/engine/point_in_polygon_slicer.py,sha256=ZT99GQty2jH70SaT_3unruWPcM5PuQQqZqbRlqOpv0A,4349
-polytope_feature/engine/quadtree_slicer.py,sha256=0lNGkrbzy_gBhel17g2Nk0z9BE07pE4h7rUxg7H88XU,3222
+polytope_feature/engine/optimised_point_in_polygon_slicer.py,sha256=SOHm-0tQK6AQ62sd7lMCEbryQF2aiuxgNsl_d3V-DBs,5025
+polytope_feature/engine/optimised_quadtree_slicer.py,sha256=ecf5Uhd0bmgCPyQXYZixeE-eZH42wyN_vnWslwqmAu8,3847
+polytope_feature/engine/point_in_polygon_slicer.py,sha256=tnoA-4cMU6WYljq0XVoNDE9ap5ssmSNLjkqVN_of6Zc,4371
+polytope_feature/engine/quadtree_slicer.py,sha256=DA6-ni1YCqwbbABCJUj3hnAizeKmvP9umep6Rk-YeDY,3244
 polytope_feature/engine/slicing_tools.py,sha256=a-bzBgnSbSlJLkd22JrIAntIDuOkUanwhlegp2iwvVQ,5349
 polytope_feature/utility/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 polytope_feature/utility/combinatorics.py,sha256=Vucp-78wpw8wTDiGv889w_kdYbFsHafcCAwgsg2MzYc,1586
@@ -58,8 +58,8 @@ polytope_feature/utility/exceptions.py,sha256=cIgX7YiARpfPsjxax0dGQmkg9vfinEUVj2
 polytope_feature/utility/geometry.py,sha256=DHCYFKJWC7BBbMwnCQlcQVzYp8T_e-RZVuSbKPo7-60,1063
 polytope_feature/utility/list_tools.py,sha256=0WeWCRzm8jHdcM_1BPu1s-yr5D0UUmtQIVe4HHGfRJk,760
 polytope_feature/utility/profiling.py,sha256=PS8z7u6xyiBMlbcddOO5LS6ua8E1CJOzi3CtDaDv7p4,322
-polytope_python-2.1.7.dist-info/licenses/LICENSE,sha256=VtcDVlw8N6T2GAxlk6b-8OvqAG_V751y269wWcv_lEU,11379
-polytope_python-2.1.7.dist-info/METADATA,sha256=kh9WTfLnfvETAaTPbCiIOaf3eR8Gh5kddo3dotC7XLg,11579
-polytope_python-2.1.7.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-polytope_python-2.1.7.dist-info/top_level.txt,sha256=4I919dNk-eQpuqcYHdiBpwAZcNrWeMPYuROzfpqmGRk,17
-polytope_python-2.1.7.dist-info/RECORD,,
+polytope_python-2.1.8.dist-info/licenses/LICENSE,sha256=VtcDVlw8N6T2GAxlk6b-8OvqAG_V751y269wWcv_lEU,11379
+polytope_python-2.1.8.dist-info/METADATA,sha256=100JnJyAWDZg95Xs1e9KALrggn3RfT77cY26SDv5wm8,11616
+polytope_python-2.1.8.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+polytope_python-2.1.8.dist-info/top_level.txt,sha256=4I919dNk-eQpuqcYHdiBpwAZcNrWeMPYuROzfpqmGRk,17
+polytope_python-2.1.8.dist-info/RECORD,,