From eb1943d8c05f782b05b945b433870ee5fed46513 Mon Sep 17 00:00:00 2001
From: Simon K <6615834+simon-20@users.noreply.github.com>
Date: Wed, 4 Sep 2024 14:34:35 +0100
Subject: [PATCH] fix: address remaining mypy warnings

---
 requirements_dev.in      | 1 +
 requirements_dev.txt     | 2 ++
 src/handler.py           | 2 +-
 src/library/flatten.py   | 2 +-
 src/library/logger.py    | 2 +-
 src/library/refresher.py | 2 +-
 src/library/solrize.py   | 2 +-
 7 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/requirements_dev.in b/requirements_dev.in
index a5ba51c..fe1fedf 100644
--- a/requirements_dev.in
+++ b/requirements_dev.in
@@ -8,6 +8,7 @@ Flake8-pyproject
 black
 mypy
 types-requests
+types-urllib3
 types-psycopg2
 types-python-dateutil
 lxml-stubs
diff --git a/requirements_dev.txt b/requirements_dev.txt
index df4b711..5e38fb9 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -120,6 +120,8 @@ types-python-dateutil==2.9.0.20240316
     # via -r requirements_dev.in
 types-requests==2.32.0.20240712
     # via -r requirements_dev.in
+types-urllib3==1.26.25.14
+    # via -r requirements_dev.in
 typing-extensions==4.12.2
     # via mypy
 urllib3==2.2.2
diff --git a/src/handler.py b/src/handler.py
index 498a788..3d9ca42 100644
--- a/src/handler.py
+++ b/src/handler.py
@@ -76,7 +76,7 @@ def initialise_prom_metrics(operation: str):
         container_conf_name = operation[:-4].upper()
 
     initialise_prom_metrics_and_start_server(
-        config[container_conf_name]["PROM_METRIC_DEFS"], config[container_conf_name]["PROM_PORT"]
+        config[container_conf_name]["PROM_METRIC_DEFS"], config[container_conf_name]["PROM_PORT"]  # type: ignore
     )
 
 
diff --git a/src/library/flatten.py b/src/library/flatten.py
index 7d882e5..4260fb4 100644
--- a/src/library/flatten.py
+++ b/src/library/flatten.py
@@ -17,7 +17,7 @@
 from library.prometheus import set_prom_metric
 
 logger = getLogger("flatten")
-config_explode_elements = json.loads(config["SOLRIZE"]["EXPLODE_ELEMENTS"])
+config_explode_elements = json.loads(config["SOLRIZE"]["EXPLODE_ELEMENTS"])  # type: ignore
 
 
 class Flattener:
diff --git a/src/library/logger.py b/src/library/logger.py
index 7fa6627..2a03851 100644
--- a/src/library/logger.py
+++ b/src/library/logger.py
@@ -3,7 +3,7 @@
 
 from constants.config import config
 
-loggers = {}
+loggers: dict[str, logging.Logger | None] = {}
 
 
 def getLogger(name="unknown"):
diff --git a/src/library/refresher.py b/src/library/refresher.py
index 84a6561..30d9545 100644
--- a/src/library/refresher.py
+++ b/src/library/refresher.py
@@ -10,7 +10,7 @@
 from azure.storage.blob import BlobServiceClient
 from psycopg2 import Error as DbError
 from requests.adapters import HTTPAdapter
-from requests.packages.urllib3.util.retry import Retry
+from urllib3.util.retry import Retry
 
 import library.db as db
 from constants.config import config
diff --git a/src/library/solrize.py b/src/library/solrize.py
index 7bcc084..823d77b 100644
--- a/src/library/solrize.py
+++ b/src/library/solrize.py
@@ -15,7 +15,7 @@
 
 logger = getLogger("solrize")
 solr_cores = {}
-explode_elements = json.loads(config["SOLRIZE"]["EXPLODE_ELEMENTS"])
+explode_elements = json.loads(config["SOLRIZE"]["EXPLODE_ELEMENTS"])  # type: ignore
 
 
 def parse_status_code(error_str):