lint: reformat python code with black

app/lists/bc2.py

@@ -26,13 +26,15 @@ def onion_alternative(origin: Origin) -> List[BC2Alternative]:
     url: Optional[str] = origin.onion()
     if url is None:
         return []
-    return [{
-        "proto": "tor",
-        "type": "eotk",
-        "created_at": str(origin.added),
-        "updated_at": str(origin.updated),
-        "url": url
-    }]
+    return [
+        {
+            "proto": "tor",
+            "type": "eotk",
+            "created_at": str(origin.added),
+            "updated_at": str(origin.updated),
+            "url": url,
+        }
+    ]
 
 
 def proxy_alternative(proxy: Proxy) -> Optional[BC2Alternative]:
@@ -43,43 +45,51 @@ def proxy_alternative(proxy: Proxy) -> Optional[BC2Alternative]:
         "type": "mirror",
         "created_at": proxy.added.isoformat(),
         "updated_at": proxy.updated.isoformat(),
-        "url": proxy.url
+        "url": proxy.url,
     }
 
 
 def main_domain(origin: Origin) -> str:
     description: str = origin.description
     if description.startswith("proxy:"):
-        return description[len("proxy:"):].replace("www.", "")
+        return description[len("proxy:") :].replace("www.", "")
     domain_name: str = origin.domain_name
     return domain_name.replace("www.", "")
 
 
 def active_proxies(origin: Origin, pool: Pool) -> List[Proxy]:
     return [
-        proxy for proxy in origin.proxies
-        if proxy.url is not None and not proxy.deprecated and not proxy.destroyed and proxy.pool_id == pool.id
+        proxy
+        for proxy in origin.proxies
+        if proxy.url is not None
+        and not proxy.deprecated
+        and not proxy.destroyed
+        and proxy.pool_id == pool.id
     ]
 
 
 def mirror_sites(pool: Pool) -> BypassCensorship2:
-    origins = Origin.query.filter(Origin.destroyed.is_(None)).order_by(Origin.domain_name).all()
+    origins = (
+        Origin.query.filter(Origin.destroyed.is_(None))
+        .order_by(Origin.domain_name)
+        .all()
+    )
 
     sites: List[BC2Site] = []
     for origin in origins:
         # Gather alternatives, filtering out None values from proxy_alternative
         alternatives = onion_alternative(origin) + [
-            alt for proxy in active_proxies(origin, pool)
+            alt
+            for proxy in active_proxies(origin, pool)
             if (alt := proxy_alternative(proxy)) is not None
         ]
 
         # Add the site dictionary to the list
-        sites.append({
-            "main_domain": main_domain(origin),
-            "available_alternatives": list(alternatives)
-        })
+        sites.append(
+            {
+                "main_domain": main_domain(origin),
+                "available_alternatives": list(alternatives),
+            }
+        )
 
-    return {
-        "version": "2.0",
-        "sites": sites
-    }
+    return {"version": "2.0", "sites": sites}

app/lists/bridgelines.py

@@ -11,12 +11,14 @@ class BridgelinesDict(TypedDict):
     bridgelines: List[str]
 
 
-def bridgelines(pool: Pool, *, distribution_method: Optional[str] = None) -> BridgelinesDict:
+def bridgelines(
+    pool: Pool, *, distribution_method: Optional[str] = None
+) -> BridgelinesDict:
     # Fetch bridges with selectinload for related data
     query = Bridge.query.options(selectinload(Bridge.conf)).filter(
         Bridge.destroyed.is_(None),
         Bridge.deprecated.is_(None),
-        Bridge.bridgeline.is_not(None)
+        Bridge.bridgeline.is_not(None),
     )
 
     if distribution_method is not None:
@@ -26,7 +28,4 @@ def bridgelines(pool: Pool, *, distribution_method: Optional[str] = None) -> Bri
     bridgelines = [b.bridgeline for b in query.all() if b.conf.pool_id == pool.id]
 
     # Return dictionary directly, inlining the previous `to_dict` functionality
-    return {
-        "version": "1.0",
-        "bridgelines": bridgelines
-    }
+    return {"version": "1.0", "bridgelines": bridgelines}

app/lists/mirror_mapping.py

@@ -48,7 +48,9 @@ def mirror_mapping(_: Optional[Pool]) -> MirrorMapping:
 
         countries = proxy.origin.risk_level
         if countries:
-            highest_risk_country_code, highest_risk_level = max(countries.items(), key=lambda x: x[1])
+            highest_risk_country_code, highest_risk_level = max(
+                countries.items(), key=lambda x: x[1]
+            )
         else:
             highest_risk_country_code = "ZZ"
             highest_risk_level = 0
@@ -61,7 +63,7 @@ def mirror_mapping(_: Optional[Pool]) -> MirrorMapping:
             "valid_to": proxy.destroyed.isoformat() if proxy.destroyed else None,
             "countries": countries,
             "country": highest_risk_country_code,
-            "risk": highest_risk_level
+            "risk": highest_risk_level,
         }
 
     groups = db.session.query(Group).options(selectinload(Group.pools))
@@ -70,8 +72,4 @@ def mirror_mapping(_: Optional[Pool]) -> MirrorMapping:
         for g in groups.filter(Group.destroyed.is_(None)).all()
     ]
 
-    return {
-        "version": "1.2",
-        "mappings": result,
-        "s3_buckets": s3_buckets
-    }
+    return {"version": "1.2", "mappings": result, "s3_buckets": s3_buckets}

app/lists/redirector.py

@@ -26,15 +26,17 @@ def redirector_pool_origins(pool: Pool) -> Dict[str, str]:
             Proxy.deprecated.is_(None),
             Proxy.destroyed.is_(None),
             Proxy.url.is_not(None),
-            Proxy.pool_id == pool.id
+            Proxy.pool_id == pool.id,
         )
     }
 
 
 def redirector_data(_: Optional[Pool]) -> RedirectorData:
-    active_pools = Pool.query.options(
-        selectinload(Pool.proxies)
-    ).filter(Pool.destroyed.is_(None)).all()
+    active_pools = (
+        Pool.query.options(selectinload(Pool.proxies))
+        .filter(Pool.destroyed.is_(None))
+        .all()
+    )
 
     pools: List[RedirectorPool] = [
         {
@@ -42,12 +44,9 @@ def redirector_data(_: Optional[Pool]) -> RedirectorData:
             "description": pool.description,
             "api_key": pool.api_key,
             "redirector_domain": pool.redirector_domain,
-            "origins": redirector_pool_origins(pool)
+            "origins": redirector_pool_origins(pool),
         }
         for pool in active_pools
     ]
 
-    return {
-        "version": "1.0",
-        "pools": pools
-    }
+    return {"version": "1.0", "pools": pools}