polytope-python 2.1.7__tar.gz → 2.1.9__tar.gz

polytope_python-2.1.9/.github/workflows/ci.yml

@@ -0,0 +1,32 @@
+name: ci
+
+on:
+  push:
+    branches: [ "main", "develop" ]
+  pull_request:
+    branches: [ "main", "develop" ]
+
+jobs:
+  python-qa:
+    name: python-qa
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v4
+      with:
+        repository: ${{ inputs.repository }}
+        ref: ${{ inputs.ref }}
+    - name: Setup Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: 3.x
+    - name: Install Python Dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install black flake8 isort
+    - name: Check isort
+      run: isort --check --diff . --profile black
+    - name: Check black
+      run: black --check --diff .
+    - name: Check flake8
+      run: flake8 .

{polytope_python-2.1.7 → polytope_python-2.1.9}/.github/workflows/downstream-ci.yml

@@ -28,7 +28,7 @@ jobs:
     with:
       polytope: ecmwf/polytope@${{ github.event.pull_request.head.sha || github.sha }}
       # codecov_upload: true
-      python_qa: true
+      python_qa: false
     secrets: inherit
 
   downstream-ci-hpc:

{polytope_python-2.1.7/polytope_python.egg-info → polytope_python-2.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polytope-python
-Version: 2.1.7
+Version: 2.1.9
 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 → polytope_python-2.1.9}/polytope_feature/_version.py

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

{polytope_python-2.1.7 → polytope_python-2.1.9}/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_python-2.1.7 → polytope_python-2.1.9}/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_python-2.1.7 → polytope_python-2.1.9}/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_python-2.1.7 → polytope_python-2.1.9}/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_python-2.1.7 → polytope_python-2.1.9}/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_python-2.1.7 → polytope_python-2.1.9}/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_python-2.1.7 → polytope_python-2.1.9}/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_python-2.1.7 → polytope_python-2.1.9}/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_python-2.1.7 → polytope_python-2.1.9}/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
 
 
@@ -19,6 +19,7 @@ class QuadTreeSlicer(Engine):
         # TODO: maybe we create the quadtree as soon as we have an unstructured slicer type and return it
         # to the slicer somehow?
         quad_tree = QuadTree()
+        # NOTE: the points here are assumed to be lat/lon implicitly
         points = [tuple(point) for point in points]
         quad_tree.build_point_tree(points)
         self.points = points
@@ -27,17 +28,29 @@ class QuadTreeSlicer(Engine):
     def extract_single(self, datacube, polytope):
         # extract a single polygon
         # if need to find nearest points, then take alternative slicing method using quadtree to find nearest point
+        axes = polytope.axes()
+        assert len(axes) == 2
+        assert "latitude" in axes and "longitude" in axes
+        revert_axes = not (list(axes) == ["latitude", "longitude"])
         if use_rust:
             if len(datacube.nearest_search) == 0:
-                polytope_points = [tuple(point) for point in polytope.points]
+                if revert_axes:
+                    polytope_points = [tuple(reversed(point)) for point in polytope.points]
+                else:
+                    polytope_points = [tuple(point) for point in polytope.points]
                 polygon_points = self.quad_tree.query_polygon(self.points, 0, polytope_points)
             else:
                 k = datacube.nearest_search[tuple(polytope.axes())][1]
-                nn_points = [tuple(pt) for pt in datacube.nearest_search[tuple(polytope.axes())][0]]
+                if revert_axes:
+                    nn_points = [tuple(reversed(pt)) for pt in datacube.nearest_search[tuple(polytope.axes())][0]]
+                else:
+                    nn_points = [tuple(pt) for pt in datacube.nearest_search[tuple(polytope.axes())][0]]
                 polygon_points = []
                 for nn_pt in nn_points:
                     polygon_points.extend(self.quad_tree.k_nearest_neighbor(nn_pt, k, self.points))
         else:
+            if revert_axes:
+                polytope.points = [tuple(reversed(point)) for point in polytope.points]
             polygon_points = self.quad_tree.query_polygon(polytope)
         return polygon_points
 

{polytope_python-2.1.7 → polytope_python-2.1.9/polytope_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polytope-python
-Version: 2.1.7
+Version: 2.1.9
 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 → polytope_python-2.1.9}/polytope_python.egg-info/SOURCES.txt

@@ -14,6 +14,7 @@ tox.ini
 .github/ci-config.yml
 .github/ci-hpc-config.yml
 .github/workflows/cd.yml
+.github/workflows/ci.yml
 .github/workflows/downstream-ci.yml
 .github/workflows/label-public-pr.yml
 .github/workflows/test-pypi.yml

{polytope_python-2.1.7 → polytope_python-2.1.9}/polytope_python.egg-info/requires.txt

@@ -6,13 +6,14 @@ tripy
 xarray
 conflator
 protobuf
+shapely
 
 [catalogue]
 qubed
 
 [switching_grids]
 eccodes
-pyfdb
+pyfdb<=0.1.3
 
 [tests]
 pytest
@@ -23,7 +24,7 @@ h5netcdf
 h5py
 earthkit-data
 matplotlib
-pyfdb
+pyfdb<=0.1.3
 
 [unstructured]
 eckit

{polytope_python-2.1.7 → polytope_python-2.1.9}/pyproject.toml

@@ -39,6 +39,7 @@ dependencies = [
     "xarray",
     "conflator",
     "protobuf",
+    "shapely",
 ]
 
 [project.optional-dependencies]
@@ -51,7 +52,7 @@ tests = [
     "h5py",
     "earthkit-data",
     "matplotlib",
-    "pyfdb"
+    "pyfdb<=0.1.3",
 ]
 
 unstructured = [
@@ -64,7 +65,7 @@ catalogue = [
 
 switching_grids = [
     "eccodes",
-    "pyfdb"
+    "pyfdb<=0.1.3"
 ]
 
 [project.urls]