Revert "[pre-commit.ci] auto fixes from pre-commit.com hooks"

This reverts commit e0aa69f
to do issues detected in #581

Author: jeremyh

cubedash/_api.py

@@ -33,9 +33,9 @@ def datasets_geojson(
     time = _utils.as_time_range(year, month, day, tzinfo=_model.STORE.grouping_timezone)
 
     return as_geojson(
-        {
-            "type": "FeatureCollection",
-            "features": [
+        dict(
+            type="FeatureCollection",
+            features=[
                 s.as_geojson()
                 for s in _model.STORE.search_items(
                     product_names=[product_name],
@@ -45,7 +45,7 @@ def datasets_geojson(
                 )
                 if s.geom_geojson is not None
             ],
-        },
+        ),
         downloadable_filename_prefix=_utils.api_path_as_filename_prefix(),
     )
 

cubedash/_filters.py

@@ -173,7 +173,9 @@ def _format_albers_area(shape: MultiPolygon):
 @bp.app_template_filter("query_value")
 def _format_query_value(val):
     if isinstance(val, Range):
-        return f"{_format_query_value(val.begin)} to {_format_query_value(val.end)}"
+        return "{} to {}".format(
+            _format_query_value(val.begin), _format_query_value(val.end)
+        )
     if isinstance(val, datetime):
         return _format_datetime(val)
     if val is None:

cubedash/_model.py

@@ -76,10 +76,10 @@
 
 # Global defaults
 app.config.from_mapping(
-    {
-        "CUBEDASH_DEFAULT_API_LIMIT": 500,
-        "CUBEDASH_HARD_API_LIMIT": 4000,
-    }
+    dict(
+        CUBEDASH_DEFAULT_API_LIMIT=500,
+        CUBEDASH_HARD_API_LIMIT=4000,
+    )
 )
 
 cache = Cache(app=app, config=app.config)
@@ -187,15 +187,15 @@ def get_footprint_geojson(
     if not footprint:
         return None
 
-    return {
-        "type": "Feature",
-        "geometry": footprint.__geo_interface__,
-        "properties": {
-            "dataset_count": period.footprint_count,
-            "product_name": product_name,
-            "time_spec": [year, month, day],
-        },
-    }
+    return dict(
+        type="Feature",
+        geometry=footprint.__geo_interface__,
+        properties=dict(
+            dataset_count=period.footprint_count,
+            product_name=product_name,
+            time_spec=[year, month, day],
+        ),
+    )
 
 
 @cache.memoize(timeout=60)
@@ -302,4 +302,4 @@ def internal_server_error(error):
     from prometheus_flask_exporter.multiprocess import GunicornInternalPrometheusMetrics
 
     metrics = GunicornInternalPrometheusMetrics(app, group_by="endpoint")
-    _LOG.info("Prometheus metrics enabled : {metrics}", extra={"metrics": metrics})
+    _LOG.info("Prometheus metrics enabled : {metrics}", extra=dict(metrics=metrics))

cubedash/_pages.py

@@ -230,7 +230,7 @@ def search_page(  # noqa: C901
 
     if request_wants_json():
         return as_rich_json(
-            {"datasets": [build_dataset_info(_model.STORE.index, d) for d in datasets]}
+            dict(datasets=[build_dataset_info(_model.STORE.index, d) for d in datasets])
         )
 
     # For display on the page (and future searches).
@@ -329,12 +329,12 @@ def region_page(
         )
     )
 
-    same_region_products = [
+    same_region_products = list(
         product.name
         for product in _model.STORE.find_products_for_region(
             region_code, year, month, day, limit=limit + 1, offset=offset
         )
-    ]
+    )
 
     def url_with_offset(new_offset: int):
         """Currently request url with a different offset."""
@@ -356,7 +356,7 @@ def url_with_offset(new_offset: int):
 
     if request_wants_json():
         return as_rich_json(
-            {"datasets": [build_dataset_info(_model.STORE.index, d) for d in datasets]}
+            dict(datasets=[build_dataset_info(_model.STORE.index, d) for d in datasets])
         )
 
     return utils.render(
@@ -404,10 +404,10 @@ def region_geojson(
 
     geojson = region_info.region(region_code).footprint_geojson
     geojson["properties"].update(
-        {
-            "product_name": product_name,
-            "year_month_day_filter": [year, month, day],
-        }
+        dict(
+            product_name=product_name,
+            year_month_day_filter=[year, month, day],
+        )
     )
     return utils.as_geojson(
         geojson,
@@ -474,27 +474,25 @@ def inject_globals():
         if product_summary:
             last_updated = product_summary.last_successful_summary_time
 
-    return {
+    return dict(
         # Only the known, summarised products in groups.
-        "grouped_products": _get_grouped_products(),
+        grouped_products=_get_grouped_products(),
         # All products in the datacube, summarised or not.
-        "datacube_products": list(_model.STORE.index.products.get_all()),
-        "hidden_product_list": app.config.get(
-            "CUBEDASH_HIDE_PRODUCTS_BY_NAME_LIST", []
-        ),
-        "datacube_metadata_types": list(_model.STORE.index.metadata_types.get_all()),
-        "current_time": datetime.utcnow(),
-        "datacube_version": datacube.__version__,
-        "app_version": cubedash.__version__,
-        "grouping_timezone": tz.gettz(_model.DEFAULT_GROUPING_TIMEZONE),
-        "last_updated_time": last_updated,
-        "explorer_instance_title": app.config.get(
+        datacube_products=list(_model.STORE.index.products.get_all()),
+        hidden_product_list=app.config.get("CUBEDASH_HIDE_PRODUCTS_BY_NAME_LIST", []),
+        datacube_metadata_types=list(_model.STORE.index.metadata_types.get_all()),
+        current_time=datetime.utcnow(),
+        datacube_version=datacube.__version__,
+        app_version=cubedash.__version__,
+        grouping_timezone=tz.gettz(_model.DEFAULT_GROUPING_TIMEZONE),
+        last_updated_time=last_updated,
+        explorer_instance_title=app.config.get(
             "CUBEDASH_INSTANCE_TITLE",
         )
         or app.config.get("STAC_ENDPOINT_TITLE", ""),
-        "explorer_sister_instances": app.config.get("CUBEDASH_SISTER_SITES", None),
-        "breadcrumb": _get_breadcrumbs(request.path, request.script_root),
-    }
+        explorer_sister_instances=app.config.get("CUBEDASH_SISTER_SITES", None),
+        breadcrumb=_get_breadcrumbs(request.path, request.script_root),
+    )
 
 
 HREF = str

cubedash/_stac.py

@@ -414,7 +414,9 @@ def _list_arg(arg: list):
     """
     if isinstance(arg, str):
         arg = list(arg)
-    return [json.loads(a.replace("'", '"')) if isinstance(a, str) else a for a in arg]
+    return list(
+        map(lambda a: json.loads(a.replace("'", '"')) if isinstance(a, str) else a, arg)
+    )
 
 
 # Search
@@ -506,20 +508,20 @@ def next_page_url(next_offset):
 
     feature_collection.extra_fields["links"].extend(
         (
-            {
-                "href": url_for(".stac_search"),
-                "rel": "search",
-                "title": "Search",
-                "type": "application/geo+json",
-                "method": "GET",
-            },
-            {
-                "href": url_for(".stac_search"),
-                "rel": "search",
-                "title": "Search",
-                "type": "application/geo+json",
-                "method": "POST",
-            },
+            dict(
+                href=url_for(".stac_search"),
+                rel="search",
+                title="Search",
+                type="application/geo+json",
+                method="GET",
+            ),
+            dict(
+                href=url_for(".stac_search"),
+                rel="search",
+                title="Search",
+                type="application/geo+json",
+                method="POST",
+            ),
         )
     )
     return feature_collection
@@ -747,18 +749,18 @@ def search_stac_items(
     page = 0
     if limit != 0:
         page = offset // limit
-    extra_properties = {
-        "links": [],
+    extra_properties = dict(
+        links=[],
         # Stac standard
-        "numberReturned": len(returned),
+        numberReturned=len(returned),
         # Compatibility with older implementation. Was removed from stac-api standard.
         # (page numbers + limits are not ideal as they prevent some big db optimisations.)
-        "context": {
-            "page": page,
-            "limit": limit,
-            "returned": len(returned),
-        },
-    }
+        context=dict(
+            page=page,
+            limit=limit,
+            returned=len(returned),
+        ),
+    )
     if include_total_count:
         count_matching = _model.STORE.get_count(
             product_names=product_names, time=time, bbox=bbox, dataset_ids=dataset_ids
@@ -775,34 +777,34 @@ def search_stac_items(
     result = ItemCollection(items, extra_fields=extra_properties)
 
     if there_are_more:
-        next_link = {
-            "rel": "next",
-            "title": "Next page of Items",
-            "type": "application/geo+json",
-        }
+        next_link = dict(
+            rel="next",
+            title="Next page of Items",
+            type="application/geo+json",
+        )
         if use_post_request:
             next_link.update(
-                {
-                    "method": "POST",
-                    "merge": True,
+                dict(
+                    method="POST",
+                    merge=True,
                     # Unlike GET requests, we can tell them to repeat their same request args
                     # themselves.
                     #
                     # Same URL:
-                    "href": flask.request.url,
+                    href=flask.request.url,
                     # ... with a new offset.
-                    "body": {
-                        "_o": offset + limit,
-                    },
-                }
+                    body=dict(
+                        _o=offset + limit,
+                    ),
+                )
             )
         else:
             # Otherwise, let the route create the next url.
             next_link.update(
-                {
-                    "method": "GET",
-                    "href": get_next_url(offset + limit),
-                }
+                dict(
+                    method="GET",
+                    href=get_next_url(offset + limit),
+                )
             )
 
         result.extra_fields["links"].append(next_link)
@@ -904,10 +906,10 @@ def _geojson_stac_response(doc: Union[STACObject, ItemCollection]) -> flask.Resp
 
 def stac_endpoint_information() -> Dict:
     config = _model.app.config
-    o = {
-        "id": config.get("STAC_ENDPOINT_ID", "odc-explorer"),
-        "title": config.get("STAC_ENDPOINT_TITLE", "Default ODC Explorer instance"),
-    }
+    o = dict(
+        id=config.get("STAC_ENDPOINT_ID", "odc-explorer"),
+        title=config.get("STAC_ENDPOINT_TITLE", "Default ODC Explorer instance"),
+    )
     description = config.get(
         "STAC_ENDPOINT_DESCRIPTION",
         "Configure stac endpoint information in your Explorer `settings.env.py` file",
@@ -995,7 +997,7 @@ def root():
         "http://www.opengis.net/spec/ogcapi-features-3/1.0/conf/filter",
         "https://api.stacspec.org/v1.0.0-rc.1/collections",
     ]
-    c.extra_fields = {"conformsTo": conformance_classes}
+    c.extra_fields = dict(conformsTo=conformance_classes)
 
     return _stac_response(c)
 
@@ -1033,18 +1035,18 @@ def collections():
      an array (instead of just a link to each collection).
     """
     return _utils.as_json(
-        {
-            "links": [
-                {"rel": "self", "type": "application/json", "href": request.url},
-                {"rel": "root", "type": "application/json", "href": url_for(".root")},
-                {"rel": "parent", "type": "application/json", "href": url_for(".root")},
+        dict(
+            links=[
+                dict(rel="self", type="application/json", href=request.url),
+                dict(rel="root", type="application/json", href=url_for(".root")),
+                dict(rel="parent", type="application/json", href=url_for(".root")),
             ],
-            "collections": [
+            collections=[
                 # TODO: This has a root link, right?
                 _stac_collection(product.name).to_dict()
                 for product, product_summary in _model.get_products_with_summaries()
             ],
-        }
+        )
     )