polytope-python 1.0.11__tar.gz → 1.0.13__tar.gz

{polytope-python-1.0.11/polytope_python.egg-info → polytope-python-1.0.13}/PKG-INFO

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

{polytope-python-1.0.11 → polytope-python-1.0.13}/polytope_feature/datacube/backends/fdb.py

@@ -29,7 +29,9 @@ class FDBDatacube(Datacube):
 
         self.gj = gj
         if len(alternative_axes) == 0:
+            logging.info("Find GribJump axes for %s", context)
             self.fdb_coordinates = self.gj.axes(partial_request, ctx=context)
+            logging.info("Retrieved available GribJump axes for %s", context)
             if len(self.fdb_coordinates) == 0:
                 raise BadRequestError(partial_request)
         else:
@@ -37,6 +39,12 @@ class FDBDatacube(Datacube):
             for axis_config in alternative_axes:
                 self.fdb_coordinates[axis_config.axis_name] = axis_config.values
 
+        fdb_coordinates_copy = deepcopy(self.fdb_coordinates)
+        for axis, vals in fdb_coordinates_copy.items():
+            if len(vals) == 1:
+                if vals[0] == "":
+                    self.fdb_coordinates.pop(axis)
+
         logging.info("Axes returned from GribJump are: " + str(self.fdb_coordinates))
 
         self.fdb_coordinates["values"] = []
@@ -117,7 +125,9 @@ class FDBDatacube(Datacube):
                 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)
+        logging.info("Requests given to GribJump extract for %s", context)
         output_values = self.gj.extract(complete_list_complete_uncompressed_requests, context)
+        logging.info("Requests extracted from GribJump for %s", context)
         logging.debug("GribJump outputs: %s", output_values)
         self.assign_fdb_output_to_nodes(output_values, complete_fdb_decoding_info)
 

{polytope-python-1.0.11 → polytope-python-1.0.13}/polytope_feature/options.py

@@ -1,8 +1,7 @@
-import argparse
 from abc import ABC
 from typing import Dict, List, Literal, Optional, Union
 
-from conflator import ConfigModel, Conflator
+from conflator import ConfigModel
 from pydantic import ConfigDict
 
 
@@ -68,9 +67,7 @@ class Config(ConfigModel):
 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()
+        config_options = Config.model_validate(options)
 
         axis_config = config_options.axis_config
         compressed_axes_config = config_options.compressed_axes_config

{polytope-python-1.0.11 → polytope-python-1.0.13}/polytope_feature/shapes.py

@@ -26,7 +26,7 @@ class ConvexPolytope(Shape):
     def __init__(self, axes, points, method=None, is_orthogonal=False):
         self._axes = list(axes)
         self.is_flat = False
-        if len(self._axes) == 1:
+        if len(self._axes) == 1 and len(points) == 1:
             self.is_flat = True
         self.points = points
         self.method = method

polytope-python-1.0.13/polytope_feature/version.py

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

{polytope-python-1.0.11 → polytope-python-1.0.13/polytope_python.egg-info}/PKG-INFO

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

polytope-python-1.0.11/polytope_feature/version.py

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