Autogenerated type safety parameterisation of all methods

core/activity_lookup_helper.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 import re
 

core/activity_utils.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from core.enums import ActivityName
 from data.activities import ACTIVITIES
 from data.activity import Activity

core/call_lookup_helper.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import re
 
 from core.data_providers import DATA_PROVIDERS

core/cleanup.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from datetime import datetime
 from threading import Event, Thread

core/config.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import importlib
 import logging
 import os

core/constants.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from core.config import SERVER_OWNER_CALLSIGN
 from data.band import Band
 

core/data_providers.py

@@ -3,14 +3,19 @@ from __future__ import annotations
 import logging
 import threading
 import time
+from typing import TYPE_CHECKING
 
 from core.config import config, create_provider_from_config
-from providers.activityrefdata.activity_ref_data_provider import ActivityRefDataProvider
-from providers.alert.alert_provider import AlertProvider
-from providers.callsigndata.callsign_data_provider import CallsignDataProvider
-from providers.solarconditions.solar_conditions_provider import SolarConditionsProvider
-from providers.spot.spot_provider import SpotProvider
-from providers.staticdata.static_data_provider import StaticDataProvider
+
+if TYPE_CHECKING:
+    # Can't find a way to resolve the circular dependency on types but apparently this is a way of managing that
+    # while still having type safety in method definitions.
+    from providers.activityrefdata.activity_ref_data_provider import ActivityRefDataProvider
+    from providers.alert.alert_provider import AlertProvider
+    from providers.callsigndata.callsign_data_provider import CallsignDataProvider
+    from providers.solarconditions.solar_conditions_provider import SolarConditionsProvider
+    from providers.spot.spot_provider import SpotProvider
+    from providers.staticdata.static_data_provider import StaticDataProvider
 
 logger = logging.getLogger(__name__)
 

core/enums.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from enum import Enum
 
 
@@ -46,7 +44,7 @@ class Mode(str, Enum):
         return not (self.is_cw or self.is_phone)
 
     @staticmethod
-    def from_name(name: str) -> Mode | None:
+    def from_name(name: str) -> "Mode | None":
         """Convert a string to an enum mode using the alias table."""
 
         if not name:

core/geo_utils.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 import re
 from math import floor, isnan

core/live_data_cache.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 import threading
 import time

core/prometheus_metrics_handler.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from prometheus_client import (
     CollectorRegistry,
     Counter,

core/single_object_data_cache.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 import threading
 from typing import Generic, TypeVar

core/status_reporter.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 import os
 from datetime import datetime

core/url_data_cache.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import threading
 from datetime import timedelta
 from typing import Any

core/utils.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 import re
 from typing import Any

data/activities.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from core.enums import ActivityName, ActivityRefType, ActivityType
 from data.activity import Activity
 

data/activity.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from dataclasses import dataclass, field
 
 from core.enums import ActivityName, ActivityRefType, ActivityType

data/activity_ref.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from dataclasses import dataclass
 
 from core.enums import ActivityRefType

data/alert.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import hashlib
 import json
 import logging

data/callsign.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from dataclasses import dataclass
 
 from core.enums import Continent, LocationSourceForCallsign

data/lookup_credentials.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from dataclasses import dataclass
 
 from tornado.httputil import HTTPHeaders

data/solar_conditions.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import json
 from dataclasses import dataclass
 from typing import Any, TypeVar

data/spot.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import hashlib
 import json
 import logging

providers/activityrefdata/activity_ref_data_provider.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from datetime import datetime
 from threading import Event

providers/activityrefdata/arlhs.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import csv
 from time import sleep
 from typing import Any

providers/activityrefdata/cota.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from time import sleep
 from typing import Any
 

providers/activityrefdata/dce.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import io
 from time import sleep
 from typing import Any

providers/activityrefdata/defe.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import io
 from time import sleep
 from typing import Any

providers/activityrefdata/dme.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import csv
 from time import sleep
 from typing import Any

providers/activityrefdata/dmue.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import csv
 from time import sleep
 from typing import Any

providers/activityrefdata/dmve.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import io
 from time import sleep
 from typing import Any

providers/activityrefdata/dtmba.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from time import sleep
 from typing import Any
 

providers/activityrefdata/fea.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from io import BytesIO
 from time import sleep
 from typing import Any

providers/activityrefdata/file_download_activity_ref_data_provider.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from datetime import datetime
 from threading import Thread

providers/activityrefdata/gma.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import csv
 from time import sleep
 from typing import Any

providers/activityrefdata/illw.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import csv
 from time import sleep
 from typing import Any

providers/activityrefdata/iota.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from time import sleep
 from typing import Any

providers/activityrefdata/krmnpa.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import Any
 
 from core.enums import ActivityName

providers/activityrefdata/llota.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from time import sleep
 from typing import Any
 

providers/activityrefdata/local_file_activity_ref_data_provider.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from datetime import datetime
 from typing import Any

providers/activityrefdata/mota.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import csv
 from time import sleep
 from typing import Any

providers/activityrefdata/pga.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from time import sleep
 from typing import Any
 

providers/activityrefdata/pnp_kml_activity_ref_data_provider.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import re
 from time import sleep
 from typing import Any

providers/activityrefdata/pota.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import csv
 from time import sleep
 from typing import Any

providers/activityrefdata/sanpcpa.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import Any
 
 from core.enums import ActivityName

providers/activityrefdata/siota.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import csv
 from time import sleep
 from typing import Any

providers/activityrefdata/sota.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import csv
 from time import sleep
 from typing import Any

providers/activityrefdata/toilets.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import csv
 from typing import Any
 

providers/activityrefdata/towers.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import csv
 from time import sleep
 from typing import Any

providers/activityrefdata/wca.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import csv
 import logging
 from time import sleep

providers/activityrefdata/wota.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from time import sleep
 from typing import Any
 

providers/activityrefdata/wwbota.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import csv
 from time import sleep
 from typing import Any

providers/activityrefdata/wwff.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import csv
 from time import sleep
 from typing import Any

providers/activityrefdata/zlota.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from time import sleep
 from typing import Any
 

providers/alert/alert_provider.py

@@ -1,17 +1,11 @@
-from __future__ import annotations
-
 from datetime import datetime
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 import pytz
 
 from core.data_store import DATA_STORE
 from core.live_data_cache import LiveDataCache
-
-if TYPE_CHECKING:
-    # Deferred to avoid a circular import: data.alert imports core.call_lookup_helper, which imports
-    # core.data_providers, which imports this module.
-    from data.alert import Alert
+from data.alert import Alert
 
 
 class AlertProvider:

providers/alert/bota.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from datetime import datetime, timedelta
 from typing import Any
 

providers/alert/hamsat.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from datetime import datetime
 from typing import Any
 

providers/alert/http_alert_provider.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from datetime import datetime
 from threading import Event, Thread

providers/alert/ical_alert_provider.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from datetime import date, datetime, time
 from typing import Any, cast
 

providers/alert/ng3k.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import re
 from datetime import datetime
 from typing import Any, cast

providers/alert/parksnpeaks.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from datetime import datetime
 from typing import Any

providers/alert/pota.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from datetime import datetime
 from typing import Any
 

providers/alert/rsgb_ical_alert_provider.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import re
 from typing import Any
 

providers/alert/rsgbhfcontests.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import Any
 
 from providers.alert.rsgb_ical_alert_provider import RSGBICALAlertProvider

providers/alert/rsgbvhfcontests.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import Any
 
 from providers.alert.rsgb_ical_alert_provider import RSGBICALAlertProvider

providers/alert/sota.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from datetime import datetime
 from typing import Any
 

providers/alert/wa7bnm.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import Any
 
 from icalendar import Event

providers/alert/wota.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from datetime import datetime
 from typing import Any, cast

providers/alert/wwff.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from datetime import datetime
 from typing import Any
 

providers/callsigndata/api_query_callsign_data_provider.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import Any
 
 import diskcache

providers/callsigndata/callsign_data_provider.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from datetime import datetime
 from typing import Any
 

providers/callsigndata/clublogapi.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from datetime import datetime
 from typing import Any

providers/callsigndata/clublogxml.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import gzip
 import logging
 from typing import Any

providers/callsigndata/countryfiles.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from typing import Any
 

providers/callsigndata/file_download_callsign_data_provider.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from datetime import datetime
 from threading import Event, Thread

providers/callsigndata/hamqth.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 import urllib.parse
 from datetime import datetime, timedelta

providers/callsigndata/qrz.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 import urllib.parse
 from datetime import datetime, timedelta

providers/solarconditions/giroionosonde.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import csv
 import logging
 from datetime import datetime, timedelta, timezone

providers/solarconditions/hamqsl.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from typing import Any
 from xml.etree import ElementTree

providers/solarconditions/http_solar_conditions_provider.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from datetime import datetime
 from threading import Event, Thread

providers/solarconditions/ionosonde_utils.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from core.constants import BANDS
 from data.band import Band
 

providers/solarconditions/kc2gprop.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from datetime import datetime, timedelta, timezone
 from threading import Event, Thread

providers/solarconditions/noaa3dayforecast.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 import re
 from datetime import date, datetime, timezone
@@ -152,11 +150,11 @@ class NOAA3dayForecast(HTTPSolarConditionsProvider):
                 except (ValueError, IndexError):
                     continue
 
-                date = column_dates[i]
+                column_date = column_dates[i]
                 start_dt = datetime(
-                    date.year,
-                    date.month,
-                    date.day,
+                    column_date.year,
+                    column_date.month,
+                    column_date.day,
                     start_hour,
                     0,
                     0,

providers/solarconditions/solar_conditions_provider.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from datetime import datetime
 from typing import Any
 

providers/spot/aprsis.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from datetime import datetime
 from threading import Event, Thread

providers/spot/dxcluster.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 import re
 import socket

providers/spot/gma.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from datetime import datetime
 from typing import Any

providers/spot/hema.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 import re
 from datetime import datetime

providers/spot/http_spot_provider.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from datetime import datetime
 from threading import Event, Thread

providers/spot/llota.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from datetime import datetime
 from typing import Any
 

providers/spot/parksnpeaks.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 import re
 from datetime import datetime

providers/spot/pota.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from datetime import datetime
 from typing import Any
 

providers/spot/rbn.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 import re
 import socket

providers/spot/sota.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from datetime import datetime
 from typing import Any, ClassVar

providers/spot/spot_provider.py

@@ -1,17 +1,11 @@
-from __future__ import annotations
-
 from datetime import datetime
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 import pytz
 
 from core.data_store import DATA_STORE
 from core.live_data_cache import LiveDataCache
-
-if TYPE_CHECKING:
-    # Deferred to avoid a circular import: data.spot imports core.call_lookup_helper, which imports
-    # core.data_providers, which imports this module.
-    from data.spot import Spot
+from data.spot import Spot
 
 
 class SpotProvider:

providers/spot/sse_spot_provider.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from datetime import datetime
 from threading import Event, Lock, Thread

providers/spot/tiles.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from datetime import datetime
 from typing import Any, ClassVar

providers/spot/towers.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import json
 from datetime import datetime
 from typing import Any

providers/spot/ukpacketnet.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import re
 from datetime import datetime
 from typing import Any

providers/spot/websocket_spot_provider.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from datetime import datetime
 from threading import Event, Thread