refactor: fix linting errors

Part-of: <!58>

funkwhale_network/cli.py

@@ -134,7 +134,7 @@ async def crawl(domain, use_public, detail, passes, sort):
     """
     Crawl the network starting from the given domain(s).
     """
-    from . import crawler, settings
+    from . import crawler
 
     kwargs = crawler.get_session_kwargs()
     async with aiohttp.ClientSession(**kwargs) as session:

funkwhale_network/crawler.py

 import asyncio
+import logging
 import sys
 
 import aiohttp
 import aiopg
 import psycopg2
 
-from funkwhale_network import exceptions, schemas, serializers, settings
+from funkwhale_network import exceptions, schemas, settings
 from funkwhale_network.db import DB
 
+logger = logging.getLogger(__name__)
+
 
 def get_session_kwargs():
     headers = {"User-Agent": settings.CRAWLER_USER_AGENT}
@@ -67,12 +70,10 @@ async def crawl_all(session, *domains, stdout, max_passes):
 
     def print_pass():
         stdout(
-            "[Pass {pass_number}] {pending_domains} new domains to crawl, {handled_domains} checked, {valid_domains} valid".format(
-                pass_number=data["pass_number"],
-                pending_domains=len(data["pending_domains"]),
-                handled_domains=len(data["handled_domains"]),
-                valid_domains=len(data["valid_domains"]),
-            )
+            f"[Pass {data['pass_number']}] "
+            f"{len(data['pending_domains'])} new domains to crawl, "
+            f"{len(data['handled_domains'])} checked, "
+            f"{len(data['valid_domains'])} valid"
         )
 
     while data["pending_domains"] and data["pass_number"] < max_passes:
@@ -94,8 +95,9 @@ async def crawl_single(session, domain, data):
         cleaned_data = clean_check(
             {"domain": domain, "up": True}, clean_nodeinfo(nodeinfo_data)
         )
-    except Exception as e:
+    except Exception as exception:
         data["invalid_domains"].add(domain)
+        logger.debug(exception)
         return
     finally:
         data["pending_domains"].remove(domain)
@@ -105,8 +107,8 @@ async def crawl_single(session, domain, data):
     if nodes_url:
         try:
             await gather_known_nodes(session, nodes_url, data)
-        except:
-            pass
+        except Exception as exception:
+            logger.debug(exception)
 
     data["valid_domains"].add(domain)
     data["results"][domain] = cleaned_data
@@ -135,18 +137,18 @@ def recursive_getattr(obj, key, permissive=True):
 
     If the value is not present, returns None
     """
-    v = obj
+    value = obj
     for k in key.split("."):
         try:
-            v = v.get(k)
+            value = value.get(k)
         except (TypeError, AttributeError):
             if not permissive:
                 raise
             return
-        if v is None:
+        if value is None:
             return
 
-    return v
+    return value
 
 
 def clean_check(check_data, nodeinfo_data):
@@ -217,7 +219,7 @@ async def save_check(data):
         ", ".join(fields), ", ".join(["%s" for _ in values])
     )
     await cursor.execute(sql, values)
-    check = await cursor.fetchone()
+    obj = await cursor.fetchone()
 
     if data.get("private") is True:
         # let's clean previous checks
@@ -230,4 +232,4 @@ async def save_check(data):
             [node_name, data["domain"]],
         )
 
-    return check
+    return obj

funkwhale_network/db.py

@@ -92,7 +92,11 @@ class DB:
 
     async def get_latest_check_by_domain(self):
         sql = """
-        SELECT DISTINCT on (domain) domain, * FROM checks INNER JOIN domains ON checks.domain = domains.name WHERE private = %s AND domains.blocked = false ORDER BY domain, time DESC
+            SELECT DISTINCT on (domain) domain, *
+            FROM checks
+            INNER JOIN domains ON checks.domain = domains.name
+            WHERE private = %s AND domains.blocked = false
+            ORDER BY domain, time DESC
         """
         with (
             await self.pool.cursor(cursor_factory=psycopg2.extras.RealDictCursor)
@@ -151,7 +155,13 @@ class DB:
         return data
 
     def get_domain_query(self, **kwargs):
-        base_query = "SELECT DISTINCT on (domain) domain, * FROM checks INNER JOIN domains ON checks.domain = domains.name WHERE domains.blocked = false ORDER BY domain, time DESC"
+        base_query = """
+            SELECT DISTINCT on (domain) domain, *
+            FROM checks
+            INNER JOIN domains ON checks.domain = domains.name
+            WHERE domains.blocked = false
+            ORDER BY domain, time DESC
+        """
         return base_query.format(where_clause=""), []
 
     async def get_all_domains(self):

funkwhale_network/routes.py

 import json
+import logging
 import os
 import urllib.parse
 
@@ -11,6 +12,9 @@ from funkwhale_network.db import DB
 
 from . import crawler, exceptions, serializers, settings
 
+logger = logging.getLogger()
+
+
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 STATIC_DIR = os.path.join(BASE_DIR, "static")
 
@@ -92,7 +96,8 @@ async def domains(request):
             except (
                 aiohttp.client_exceptions.ClientError,
                 exceptions.CrawlerError,
-            ) as e:
+            ) as exception:
+                logger.debug(exception)
                 return web.json_response(
                     {"error": f"Invalid domain name {payload['name']}"}, status=400
                 )

funkwhale_network/serializers.py

@@ -71,7 +71,8 @@ def serialize_domain_from_check(data):
 def serialize_rss_feed_from_checks(checks):
     feed = [
         '<?xml  version="1.0" encoding="UTF-8" ?>',
-        '<rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom">',
+        '<rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" '
+        'xmlns:atom="http://www.w3.org/2005/Atom">',
         "  <channel>",
         "    <title>Latest Funkwhale pods</title>",
         "    <link>https://network.funkwhale.audio/dashboards/</link>",

funkwhale_network/server.py

@@ -23,7 +23,7 @@ async def on_shutdown(app):
 
 def initialize_sentry():
     dsn = environ.Env()("FUNKWHALE_NETWORK_DSN", default=None)
-    if dsn == None:
+    if dsn is None:
         print("Sentry is not configured, skipping")
         return
     sentry_sdk.init(

funkwhale_network/worker.py

 import logging
-import traceback
 
 from aiohttp import ClientSession
 from arq.cron import cron
@@ -7,6 +6,8 @@ from arq.cron import cron
 from funkwhale_network import crawler, settings
 from funkwhale_network.db import DB
 
+logger = logging.getLogger(__name__)
+
 
 async def poll(ctx, domain):
     session: ClientSession = ctx["session"]
@@ -22,9 +23,8 @@ async def update_all(ctx):
         print(f"Checking domain {domain}")
         try:
             await poll(ctx, domain)
-        except Exception as e:
-            print("... couldn't load all information")
-            logging.error(traceback.format_exc())
+        except Exception as exception:
+            logger.exception(f"couldn't load all information: {exception}")
 
 
 async def startup(ctx):

tests/conftest.py

-import os
+# import os
 from unittest.mock import AsyncMock
 
 import aiohttp
-import aiopg
+
+# import aiopg
 import psycopg2
 import pytest
 from aioresponses import aioresponses