ruff format

Author: pka

src/search_geom_service.py

@@ -11,7 +11,9 @@
 
 # Extract coords from bbox string like
 # BOX(2644230.6300308 1246806.79350726,2644465.86084414 1246867.82022007)
-BBOX_RE = re.compile(r'^BOX\((-?\d+(\.\d+)?) (-?\d+(\.\d+)?),(-?\d+(\.\d+)?) (-?\d+(\.\d+)?)\)$')
+BBOX_RE = re.compile(
+    r"^BOX\((-?\d+(\.\d+)?) (-?\d+(\.\d+)?),(-?\d+(\.\d+)?) (-?\d+(\.\d+)?)\)$"
+)
 
 
 class SearchGeomService:
@@ -33,11 +35,11 @@ def __init__(self, tenant, logger):
         self.resources = SearchResources(config, permissions)
 
         self.db_engine = DatabaseEngine()
-        self.dbs = {}   # db connections with db_url as key
-        self.default_db_url = config.get('db_url')
+        self.dbs = {}  # db connections with db_url as key
+        self.default_db_url = config.get("db_url")
 
     def _get_db(self, cfg):
-        db_url = cfg.get('db_url', self.default_db_url)
+        db_url = cfg.get("db_url", self.default_db_url)
         if db_url not in self.dbs:
             self.dbs[db_url] = self.db_engine.db_engine(db_url)
         return self.dbs[db_url]
@@ -52,43 +54,46 @@ def query(self, identity, dataset, filterexpr):
         solr_facets = self.resources.solr_facets(identity)
         resource_cfg = solr_facets.get(dataset)
 
-        if resource_cfg is not None and len(resource_cfg) == 1 and filterexpr is not None:
+        if (
+            resource_cfg is not None
+            and len(resource_cfg) == 1
+            and filterexpr is not None
+        ):
             # Column for feature ID. If unset, field from filterexpr is used
-            self.primary_key = resource_cfg[0].get('search_id_col')
+            self.primary_key = resource_cfg[0].get("search_id_col")
             # parse and validate input filter
             filterexpr = self._parse_filter(filterexpr)
             if filterexpr[0] is None:
                 return {
-                    'error': "Invalid filter expression: " + filterexpr[1],
-                    'error_code': 400
+                    "error": "Invalid filter expression: " + filterexpr[1],
+                    "error_code": 400,
                 }
-            facet_column = resource_cfg[0].get('facet_column')
+            facet_column = resource_cfg[0].get("facet_column")
             # Append dataset where clause for search view
             if facet_column:
                 sql = " AND ".join([filterexpr[0], '"%s"=:vs' % facet_column])
                 filterexpr[1]["vs"] = dataset
                 filterexpr = (sql, filterexpr[1])
 
             feature_collection = self._index(filterexpr, resource_cfg[0])
-            return {'feature_collection': feature_collection}
+            return {"feature_collection": feature_collection}
         else:
-            return {'error': "Dataset not found or permission error"}
+            return {"error": "Dataset not found or permission error"}
 
     def _index(self, filterexpr, cfg):
         """Find features by filter query.
 
         :param (sql, params) filterexpr: A filter expression as a tuple (sql_expr, bind_params)
         """
         db = self._get_db(cfg)
-        table_name = cfg.get('table_name', 'search_v')
-        geometry_column = cfg.get('geometry_column', 'geom')
+        table_name = cfg.get("table_name", "search_v")
+        geometry_column = cfg.get("geometry_column", "geom")
 
         # build query SQL
 
         # select id
-        columns = ', '.join(['"%s"' % self.primary_key])
-        quoted_table = '.'.join(
-            map(lambda s: '"%s"' % s, table_name.split('.')))
+        columns = ", ".join(['"%s"' % self.primary_key])
+        quoted_table = ".".join(map(lambda s: '"%s"' % s, table_name.split(".")))
 
         where_clauses = []
         params = {}
@@ -97,18 +102,23 @@ def _index(self, filterexpr, cfg):
             where_clauses.append(filterexpr[0])
             params.update(filterexpr[1])
 
-        where_clause = "WHERE " + " AND ".join(
-            where_clauses) if where_clauses else ""
+        where_clause = "WHERE " + " AND ".join(where_clauses) if where_clauses else ""
 
-        sql = sql_text("""
+        sql = sql_text(
+            """
             SELECT {columns},
                 ST_AsGeoJSON(ST_CurveToLine("{geom}")) AS json_geom,
                 ST_Srid("{geom}") AS srid,
                 ST_Extent("{geom}") OVER () AS bbox_
             FROM {table}
             {where_clause}
-        """.format(columns=columns, geom=geometry_column,
-                   table=quoted_table, where_clause=where_clause))
+        """.format(
+                columns=columns,
+                geom=geometry_column,
+                table=quoted_table,
+                where_clause=where_clause,
+            )
+        )
 
         # connect to database and start transaction (for read-only access)
         conn = db.connect()
@@ -123,32 +133,36 @@ def _index(self, filterexpr, cfg):
         for row in result:
             # NOTE: feature CRS removed by marshalling
             features.append(self._feature_from_query(row))
-            srid = row['srid']
-            bbox = row['bbox_']
+            srid = row["srid"]
+            bbox = row["bbox_"]
 
         if bbox:
             m = BBOX_RE.match(bbox)
             # xmin, ymin, xmax, ymax
-            bbox = [float(m.group(1)), float(m.group(3)),
-                    float(m.group(5)), float(m.group(7))]
+            bbox = [
+                float(m.group(1)),
+                float(m.group(3)),
+                float(m.group(5)),
+                float(m.group(7)),
+            ]
 
         # roll back transaction and close database connection
         trans.rollback()
         conn.close()
 
         return {
-            'type': 'FeatureCollection',
-            'crs': {
-                'type': 'name',
-                'properties': {
+            "type": "FeatureCollection",
+            "crs": {
+                "type": "name",
+                "properties": {
                     # NOTE: return CRS name as EPSG:xxxx and not as OGC URN
                     #       to work with QWC2 dataset search
-                    'name': 'EPSG:%d' % srid
+                    "name": "EPSG:%d" % srid
                     # 'name': 'urn:ogc:def:crs:EPSG::%d' % srid
-                }
+                },
             },
-            'features': features,
-            'bbox': bbox
+            "features": features,
+            "bbox": bbox,
         }
 
     def _parse_filter(self, filterstr):
@@ -201,8 +215,8 @@ def _feature_from_query(self, row):
             pk = str(pk)
 
         return {
-            'type': 'Feature',
-            'id': pk,
-            'geometry': json.loads(row['json_geom'] or 'null'),
-            'properties': {}
+            "type": "Feature",
+            "id": pk,
+            "geometry": json.loads(row["json_geom"] or "null"),
+            "properties": {},
         }

src/search_resources.py

@@ -17,14 +17,12 @@ def _load_resources(self, config):
         """
         # collect service resources (group by facet name)
         facets = {}
-        for facet in config.resources().get('facets', []):
-            if facet['name'] not in facets:
-                facets[facet['name']] = []
-            facets[facet['name']].append(facet)
+        for facet in config.resources().get("facets", []):
+            if facet["name"] not in facets:
+                facets[facet["name"]] = []
+            facets[facet["name"]].append(facet)
 
-        return {
-            'facets': facets
-        }
+        return {"facets": facets}
 
     def solr_facets(self, identity):
         """Return permitted search facets.
@@ -33,13 +31,13 @@ def solr_facets(self, identity):
         """
         # get permitted facets
         permitted_facets = self.permissions.resource_permissions(
-            'solr_facets', identity
+            "solr_facets", identity
         )
-        all_facets_permitted = '*' in permitted_facets
+        all_facets_permitted = "*" in permitted_facets
 
         facets = {}
 
-        for facet, config in self.resources['facets'].items():
+        for facet, config in self.resources["facets"].items():
             if all_facets_permitted or facet in permitted_facets:
                 facets[facet] = config
 
@@ -52,7 +50,7 @@ def dataproducts(self, identity):
         """
         # get permitted dataproducts
         permitted_dataproducts = self.permissions.resource_permissions(
-            'dataproducts', identity
+            "dataproducts", identity
         )
 
         # return unique sorted dataproducts