flake issues

Author: JohannesSchnell

pygeoapi/api/__init__.py

@@ -1510,6 +1510,7 @@ def validate_bbox(value=None) -> list:
 
     return bbox
 
+
 def validate_filter_dims(query_string):
     if not isinstance(query_string, str):
         msg = 'dimension query must be string'

pygeoapi/openapi.py

@@ -609,7 +609,7 @@ def get_oas_30_parameters(cfg: dict, locale_: str):
                 'type': 'string'
             }
         },
-        'dims':{
+        'dims': {
             'name': 'dims',
             'in': 'query',
             'description': 'Allows to select dims from multi dimensional EDR',

pygeoapi/provider/xarray_.py

@@ -144,10 +144,8 @@ def get_dims(self):
                         'x-ogc-unit': value.attrs.get('units'),
                         'values': value.values.tolist()
                     }
-
         return self._dims
 
-
     def query(self, properties=[], subsets={}, bbox=[], bbox_crs=4326,
               datetime_=None, format_='json', **kwargs):
         """

pygeoapi/provider/xarray_edr.py

@@ -129,11 +129,11 @@ def position(self, **kwargs):
                                 else:
                                     query_params[coord] = self._dims[coord]['type'](level)
                             else:
-                                raise ProviderInvalidQueryError(user_msg = f"""Invalid Value '{level}' for Dimension Parameter '{coord}'. Valid Values are '{self._dims[coord]['values']}'""")
+                                raise ProviderInvalidQueryError(user_msg=f"""Invalid Value '{level}' for Dimension Parameter '{coord}'. Valid Values are '{self._dims[coord]['values']}'""")
 
                             data = data.sel(string_query)
                         else:
-                            raise ProviderInvalidQueryError(user_msg = f"""Invalid Dimension Parameter '{coord}'""")
+                            raise ProviderInvalidQueryError(user_msg=f"""Invalid Dimension Parameter '{coord}'""")
 
             LOGGER.debug(query_params)
 
@@ -229,31 +229,32 @@ def cube(self, **kwargs):
 
         dims = kwargs.get('dims')
 
-        if dims:
-            string_query = {}
-            if isinstance(dims, dict):
-                for coord, level in dims.items():
-                    if coord in self._dims:
-                        if self._dims[coord]['type'](level) in self._dims[coord]['values']:
-                            if self._dims[coord]['type'] == str:
-                                string_query[coord] = self._dims[coord]['type'](level)
-                            else:
-                                query_params[coord] = self._dims[coord]['type'](level)
-                        else:
-                            raise ProviderInvalidQueryError(
-                                user_msg=f"""Invalid Value '{level}' for Dimension Parameter '{coord}'. Valid Values are '{self._dims[coord]['values']}'""")
-
-                        data = data.sel(string_query)
-                    else:
-                        raise ProviderInvalidQueryError(user_msg=f"""Invalid Dimension Parameter '{coord}'""")
-
         LOGGER.debug(f'query parameters: {query_params}')
         try:
             if select_properties:
                 self._fields = {k: v for k, v in self._fields.items() if k in select_properties}  # noqa
                 data = self._data[[*select_properties]]
             else:
                 data = self._data
+
+            if dims:
+                string_query = {}
+                if isinstance(dims, dict):
+                    for coord, level in dims.items():
+                        if coord in self._dims:
+                            if self._dims[coord]['type'](level) in self._dims[coord]['values']:
+                                if self._dims[coord]['type'] == str:
+                                    string_query[coord] = self._dims[coord]['type'](level)
+                                else:
+                                    query_params[coord] = self._dims[coord]['type'](level)
+                            else:
+                                raise ProviderInvalidQueryError(
+                                    user_msg=f"""Invalid Value '{level}' for Dimension Parameter '{coord}'. Valid Values are '{self._dims[coord]['values']}'""")
+
+                            data = data.sel(string_query)
+                        else:
+                            raise ProviderInvalidQueryError(user_msg=f"""Invalid Dimension Parameter '{coord}'""")
+
             data = data.sel(query_params)
             data = _convert_float32_to_float64(data)
         except KeyError: