Linting fixes (#272)

* isort fixes via `isort .`

* black fixes via `black .`

* enable isort in `invoke lint`

* Add isort to `invoke format`

* resolve various flake8 findings

* format commented out code I should have removed to appease black

* nuke large commented out code block

---------

Co-authored-by: Andrew Dickinson <[email protected]>

src/meshapi/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 from django.contrib.admin.options import forms
-from django.db.models import Q, QuerySet
+from django.db.models import Q
 from django.utils.safestring import mark_safe
 from nonrelated_inlines.admin import NonrelatedTabularInline
 

src/meshapi/docs.py

@@ -29,8 +29,8 @@ def get(self, request, *args, **kwargs):
             deepLinking: true,
             onComplete: ui_onComplete,
             plugins: [LogoutViaDjango],
-        }}; 
-        const logoutURL = "{reverse("rest_framework:logout")}"; 
+        }};
+        const logoutURL = "{reverse("rest_framework:logout")}";
         """
         if session_id:
             response.data["settings"] += 'const sessionID = "{session_id}";'

src/meshapi/management/commands/scramble_members.py

@@ -1,9 +1,9 @@
-from django.contrib.auth.models import Group, Permission
+from random import randrange
+
 from django.core.management.base import BaseCommand
 from faker import Faker
-from random import randrange
 
-from meshapi.models import Member, Install
+from meshapi.models import Install, Member
 
 
 # Uses faker to get fake names, emails, and phone numbers

src/meshapi/migrations/0001_initial.py

@@ -2,8 +2,8 @@
 
 import django.contrib.postgres.fields
 import django.core.validators
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

src/meshapi/migrations/0003_alter_install_options_building_panoramas_and_more.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.2.11 on 2024-03-22 01:45
 
-from django.db import migrations, models
 import django_jsonform.models.fields
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

src/meshapi/tests/group_helpers.py

@@ -1,4 +1,4 @@
-from django.contrib.auth.models import Group, Permission
+from django.contrib.auth.models import Group
 from django.core.management import call_command
 
 

src/meshapi/tests/test_admin_change_view.py

@@ -1,7 +1,7 @@
 from django.contrib.auth.models import User
 from django.test import Client, TestCase
 
-from meshapi.models import Building, Device, Install, Link, Member, Node, Sector
+from meshapi.models import Building, Device, Install, Link, Member, Node
 
 from .sample_data import sample_building, sample_device, sample_install, sample_member, sample_node
 

src/meshapi/tests/test_device.py

@@ -3,7 +3,7 @@
 from django.contrib.auth.models import User
 from django.test import Client, TestCase
 
-from ..models import Building, Device, Link, Node
+from ..models import Device, Node
 from .sample_data import sample_device, sample_node
 
 

src/meshapi/tests/test_foreign_key_views_and_perms.py

@@ -3,8 +3,8 @@
 from django.contrib.auth.models import Permission, User
 from django.test import Client, TestCase
 
-from meshapi.models import Building, Install, Link, Member, Node, Sector
-from meshapi.tests.sample_data import sample_building, sample_install, sample_member, sample_node
+from meshapi.models import Building, Install, Member
+from meshapi.tests.sample_data import sample_building, sample_install, sample_member
 
 
 def setup_objects():

src/meshapi/tests/test_join_form.py

@@ -186,7 +186,7 @@ def test_bad_phone_join_form(self):
 
         con = json.loads(response.content.decode("utf-8"))
 
-        self.assertEqual("555-555-5555 is not a valid phone number", con["detail"], f"Content is wrong")
+        self.assertEqual("555-555-5555 is not a valid phone number", con["detail"], "Content is wrong")
 
     def test_bad_email_join_form(self):
         # Name, email, phone, location, apt, rooftop, referral

src/meshapi/tests/test_kml_endpoint.py

@@ -1,13 +1,9 @@
 import datetime
-import json
 
-from django.contrib.auth.models import Group, User
 from django.test import Client, TestCase
-from fastkml import kml
 from lxml import etree
-from rest_framework.authtoken.models import Token
 
-from meshapi.models import Building, Device, Install, Link, Member, Node, Sector
+from meshapi.models import Building, Device, Install, Link, Member, Node
 
 
 def create_building_install_node_and_device(member_ref, nn):

src/meshapi/tests/test_link.py

@@ -3,7 +3,7 @@
 from django.contrib.auth.models import User
 from django.test import Client, TestCase
 
-from ..models import Building, Device, Link, Node
+from ..models import Device, Link, Node
 from .sample_data import sample_device, sample_node
 
 

src/meshapi/tests/test_lookups.py

@@ -5,7 +5,7 @@
 from django.test import Client, TestCase
 
 from ..models import Building, Device, Install, Link, Member, Node, Sector
-from .sample_data import sample_building, sample_device, sample_member
+from .sample_data import sample_building, sample_member
 
 
 class TestMemberLookups(TestCase):

src/meshapi/tests/test_map_endpoints.py

@@ -1,9 +1,7 @@
 import datetime
 import json
 
-from django.contrib.auth.models import Group, User
 from django.test import Client, TestCase
-from rest_framework.authtoken.models import Token
 
 from meshapi.models import Building, Device, Install, Link, Member, Node, Sector
 
@@ -107,7 +105,7 @@ def test_install_data(self):
         ap_device = Device(
             id=123456,
             node=nodes[-1],
-            name=f"Northwest AP",
+            name="Northwest AP",
             model="Unknown",
             type=Device.DeviceType.AP,
             install_date=datetime.date(2024, 1, 27),

src/meshapi/tests/test_node.py

@@ -3,8 +3,8 @@
 from django.contrib.auth.models import User
 from django.test import Client, TestCase
 
-from ..models import Building, Device, Link, Node
-from .sample_data import sample_device, sample_node
+from ..models import Node
+from .sample_data import sample_node
 
 
 class TestNode(TestCase):

src/meshapi/tests/test_sector.py

@@ -3,7 +3,7 @@
 from django.contrib.auth.models import User
 from django.test import Client, TestCase
 
-from ..models import Building, Device, Node, Sector
+from ..models import Device, Node, Sector
 from .sample_data import sample_node
 
 

src/meshapi/tests/test_update_panos_github.py

@@ -4,7 +4,7 @@
 from django.contrib.auth.models import User
 from django.test import Client, TestCase
 
-from meshapi.models import Building, Install, Link, Member, Sector
+from meshapi.models import Building, Install, Member
 from meshapi.views import panoramas
 
 from .sample_data import sample_building, sample_install, sample_member

src/meshapi/tests/test_views_post_delete.py

@@ -37,13 +37,13 @@ def test_views_post_unauthenticated(self):
         assert_correct_response(self, response, 403)
 
     def test_views_delete_unauthenticated(self):
-        response = self.c.delete(f"/api/v1/installs/1/")
+        response = self.c.delete("/api/v1/installs/1/")
         assert_correct_response(self, response, 403)
 
-        response = self.c.delete(f"/api/v1/members/1/")
+        response = self.c.delete("/api/v1/members/1/")
         assert_correct_response(self, response, 403)
 
-        response = self.c.delete(f"/api/v1/buildings/1/")
+        response = self.c.delete("/api/v1/buildings/1/")
         assert_correct_response(self, response, 403)
 
 
@@ -122,13 +122,13 @@ def test_views_post_put_installer(self):
         assert install.notes.endswith("\n abcdef")
 
     def test_views_delete_installer(self):
-        response = self.c.delete(f"/api/v1/installs/1/")
+        response = self.c.delete("/api/v1/installs/1/")
         assert_correct_response(self, response, 403)
 
-        response = self.c.delete(f"/api/v1/members/1/")
+        response = self.c.delete("/api/v1/members/1/")
         assert_correct_response(self, response, 403)
 
-        response = self.c.delete(f"/api/v1/buildings/1/")
+        response = self.c.delete("/api/v1/buildings/1/")
         assert_correct_response(self, response, 403)
 
 

src/meshapi/urls.py

@@ -1,5 +1,4 @@
-from django.urls import include, path
-from rest_framework.urlpatterns import format_suffix_patterns
+from django.urls import path
 
 from meshapi import views
 

src/meshapi/util/django_pglocks.py

@@ -12,7 +12,7 @@
 @contextmanager
 def advisory_lock(lock_id, shared=False, wait=True, using=None):
     import six
-    from django.db import DEFAULT_DB_ALIAS, connections, transaction
+    from django.db import DEFAULT_DB_ALIAS, connections
 
     if using is None:
         using = DEFAULT_DB_ALIAS

src/meshapi/validation.py

@@ -1,12 +1,11 @@
 import json
-import time
-import requests
 from dataclasses import dataclass
-from validate_email import validate_email
+
 import phonenumbers
-from geopy.geocoders import Nominatim
-from meshapi.exceptions import AddressError, AddressAPIError
-from meshapi.zips import NYCZipCodes
+import requests
+from validate_email import validate_email
+
+from meshapi.exceptions import AddressAPIError, AddressError
 from meshdb.utils.spreadsheet_import.building.constants import INVALID_BIN_NUMBERS
 from meshdb.utils.spreadsheet_import.building.pelias import humanify_street_address
 
@@ -61,7 +60,7 @@ def __init__(self, street_address: str, city: str, state: str, zip: int):
                 "text": self.address,
                 "size": 1,
             }
-            nyc_planning_req = requests.get(f"https://geosearch.planninglabs.nyc/v2/search", params=query_params)
+            nyc_planning_req = requests.get("https://geosearch.planninglabs.nyc/v2/search", params=query_params)
             nyc_planning_resp = json.loads(nyc_planning_req.content.decode("utf-8"))
         except Exception as e:
             print(f"Got exception querying geosearch.planninglabs.nyc: {e}")
@@ -107,7 +106,7 @@ def __init__(self, street_address: str, city: str, state: str, zip: int):
             "$select": "heightroof,groundelev",
             "$limit": 1,
         }
-        nyc_dataset_req = requests.get(f"https://data.cityofnewyork.us/resource/qb5r-6dgf.json", params=query_params)
+        nyc_dataset_req = requests.get("https://data.cityofnewyork.us/resource/qb5r-6dgf.json", params=query_params)
         nyc_dataset_resp = json.loads(nyc_dataset_req.content.decode("utf-8"))
 
         if len(nyc_dataset_resp) == 0:

src/meshapi/views/__init__.py

@@ -3,5 +3,5 @@
 from .lookups import *
 from .map import *
 from .model_api import *
-from .query_api import *
 from .panoramas import *
+from .query_api import *

src/meshapi/views/forms.py

@@ -2,7 +2,7 @@
 import logging
 import time
 from dataclasses import dataclass
-from datetime import date, datetime
+from datetime import date
 from json.decoder import JSONDecodeError
 from typing import Optional
 
@@ -127,7 +127,7 @@ def join_form(request):
             print("(NYC) Something went wrong validating the address. Re-trying...")
             time.sleep(3)
     # If we run out of tries, bail.
-    if nyc_addr_info == None:
+    if nyc_addr_info is None:
         print(f"Could not parse address: {r.street_address}, {r.city}, {r.state}, {r.zip}")
         return Response(
             {"detail": "Your address could not be validated."}, status=status.HTTP_500_INTERNAL_SERVER_ERROR
@@ -401,7 +401,7 @@ def network_number_assignment(request):
         return Response({"detail": "Install Number not found"}, status=status.HTTP_404_NOT_FOUND)
 
     # Check if the install already has a network number
-    if nn_install.node != None:
+    if nn_install.node is not None:
         message = f"This Install Number ({r.install_number}) already has a Network Number ({nn_install.node.network_number}) associated with it!"
         print(message)
         return Response(

src/meshapi/views/geography.py

@@ -12,7 +12,7 @@
 from rest_framework.negotiation import BaseContentNegotiation
 from rest_framework.views import APIView
 
-from meshapi.models import Building, Install, Link, Node
+from meshapi.models import Install, Link
 
 KML_CONTENT_TYPE = "application/vnd.google-earth.kml+xml"
 KML_CONTENT_TYPE_WITH_CHARSET = f"{KML_CONTENT_TYPE}; charset=utf-8"

src/meshapi/views/map.py

@@ -4,7 +4,7 @@
 from drf_spectacular.utils import extend_schema, extend_schema_view
 from rest_framework import generics, permissions
 
-from meshapi.models import Building, Device, Install, Link, Node, Sector
+from meshapi.models import Device, Install, Link, Node, Sector
 from meshapi.serializers import (
     ALLOWED_INSTALL_STATUSES,
     EXCLUDED_INSTALL_STATUSES,

src/meshapi/views/model_api.py

@@ -1,12 +1,10 @@
-from django.contrib.auth.models import User
 from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import OpenApiExample, OpenApiResponse, extend_schema, extend_schema_view
 from rest_framework import generics, permissions
 from rest_framework.decorators import api_view, permission_classes
 from rest_framework.response import Response
 
 from meshapi.models import Building, Device, Install, Link, Member, Node, Sector
-from meshapi.permissions import IsReadOnly
 from meshapi.serializers import (
     BuildingSerializer,
     DeviceSerializer,

src/meshapi/views/panoramas.py

@@ -1,17 +1,16 @@
 import os
 from pathlib import Path
+
 import requests
-from rest_framework import permissions
+from celery.schedules import crontab
 from rest_framework.decorators import api_view, permission_classes
 from rest_framework.response import Response
 from rest_framework.views import status
-from meshapi.models import Building, Install
-from meshapi.permissions import HasPanoramaUpdatePermission
 
+from meshapi.models import Install
+from meshapi.permissions import HasPanoramaUpdatePermission
 from meshapi.util.django_pglocks import advisory_lock
-
 from meshdb.celery import app as celery_app
-from celery.schedules import crontab
 
 # Config for gathering/generating panorama links
 PANO_REPO_OWNER = "nycmeshnet"

src/meshapi/views/query_api.py

@@ -1,26 +1,12 @@
-import os
 from typing import Any, Dict, Optional
 
-from drf_spectacular.utils import extend_schema, extend_schema_view
-from meshapi.views.lookups import FilterRequiredListAPIView, InstallFilter
-from rest_framework import generics
-from rest_framework.views import models
-
-from meshapi import permissions
-from meshapi.docs import map_query_filters_to_param_annotations, query_form_password_param
-from meshapi.models import Building, Install, Member
-from meshapi.serializers.query_api import QueryFormSerializer
 from django.db.models import Q
 from django_filters import rest_framework as filters
-from drf_spectacular.types import OpenApiTypes
-from drf_spectacular.utils import OpenApiParameter, extend_schema, extend_schema_view
-from rest_framework import generics
-from rest_framework.response import Response
 
-from rest_framework.decorators import api_view, permission_classes
-
-from rest_framework import permissions
+from meshapi.models import Install
 from meshapi.permissions import LegacyMeshQueryPassword
+from meshapi.serializers.query_api import QueryFormSerializer
+from meshapi.views.lookups import FilterRequiredListAPIView
 
 """
 Re-implements https://docs.nycmesh.net/installs/query/

src/meshapi_hooks/migrations/0001_initial.py

@@ -1,9 +1,9 @@
 # Generated by Django 4.2.9 on 2024-02-06 02:26
 
-from django.conf import settings
-from django.db import migrations, models
 import django.db.models.deletion
 import drf_hooks.models
+from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):