fix(lint): mostly type hints

Author: edeckers

poetry.lock

@@ -8,24 +8,18 @@ classifiers = [
     "Environment :: Console",
     "Operating System :: MacOS",
     "Operating System :: POSIX :: Linux",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Topic :: System :: Logging",
     "Topic :: System :: Monitoring",
 ]
 description = "Monitor your Philips Hue network"
 documentation = "https://github.com/edeckers/huemon"
 homepage = "https://github.com/edeckers/huemon"
-include = [
-    "LICENSE",
-]
-keywords = [
-    "Hue",
-    "Monitoring",
-    "Zabbix",
-    "Zigbee",
-]
+include = ["LICENSE"]
+keywords = ["Hue", "Monitoring", "Zabbix", "Zigbee"]
 license = "MPL-2.0"
 maintainers = ["Ely Deckers"]
 name = "huemon"
@@ -35,7 +29,7 @@ version = "2.0.4"
 
 [tool.poetry.dependencies]
 fastapi = "^0.115.6"
-pyella = "^2.0.0"
+pyella = "^3.1.0"
 python = "^3.9"
 PyYAML = "^6.0"
 types-PyYAML = "^6.0.4"
@@ -44,7 +38,7 @@ uvicorn = "^0.17.5"
 [tool.poetry.dev-dependencies]
 black = "^24.10.0"
 bandit = "^1.7"
-coverage = {extras = ["toml"], version = "^6.3.2"}
+coverage = { extras = ["toml"], version = "^6.3.2" }
 isort = "^5.12.0"
 mypy = "^1.0.0"
 nox = "^2022.1.7"
@@ -54,10 +48,6 @@ pytest = "^7"
 pytest-cov = "^4"
 python-semantic-release = "^8.0.8"
 
-#########################################################################################
-# Testing
-#########################################################################################
-
 [tool.pytest.ini_options]
 log_cli = true
 log_cli_level = "INFO"
@@ -74,26 +64,37 @@ directory = "reports/coverage/html"
 [tool.coverage.xml]
 output = "reports/coverage/coverage.xml"
 
-#########################################################################################
-# Style checking
-#########################################################################################
+[tool.semantic_release]
+build_command = "poetry build"
+commit_message = "chore: release {version}"
+version_toml = ["pyproject.toml:tool.poetry.version"]
+
+[tool.semantic_release.branches.develop]
+match = "develop"
 
 [tool.bandit]
+assert_used = { skips = ["**/test_*.py"] }
 
 [tool.black]
-target-version = ["py38", "py39"]
+target-version = ["py312"]
 
 [tool.isort]
 profile = "black"
 
-#########################################################################################
-# Publishing
-#########################################################################################
+[tool.pylint.BASIC]
+good-names = "log"
 
-[tool.semantic_release]
-build_command = "poetry build"
-commit_message = "chore: release {version}"
-version_toml = ["pyproject.toml:tool.poetry.version"]
+[tool.pylint.MASTER]
+disable = [
+    "C0114", # missing-module-docstring
+    "C0115", # missing-class-docstring
+    "C0116", # missing-function-docstring
+    "R0801", # duplicate-code
+    "W0511", # fixme
+]
 
-[tool.semantic_release.branches.develop]
-match = "develop"
+[tool.pylint.pre-commit-hook]
+limit = 10
+
+[tool.mypy]
+strict = true

pyproject.toml

@@ -26,7 +26,9 @@ def create_name_to_command_mapping(
     return reduce(lambda p, c: {**p, c.name(): c(config, api)}, plugins, {})
 
 
-def __load_command_plugins(config: dict, command_plugins_path: str = None) -> dict:
+def __load_command_plugins(
+    config: dict, command_plugins_path: str | None = None
+) -> dict:
     LOG.debug("Loading command plugins (path=%s)", command_plugins_path)
     if not command_plugins_path:
         return {}
@@ -44,7 +46,7 @@ def __load_command_plugins(config: dict, command_plugins_path: str = None) -> di
 
 
 def __load_plugins_and_hardwired_handlers(
-    config: dict, command_plugins_path: str = None
+    config: dict, command_plugins_path: str | None = None
 ) -> dict:
     hardwired_commands_path = create_local_path(os.path.join("commands", "internal"))
 

src/huemon/commands/command_handler.py

@@ -10,7 +10,7 @@
 
 
 class WhitelistedSchemaOpener(urllib.request.OpenerDirector):
-    def __init__(self, handlers: typing.Iterable = None):
+    def __init__(self, handlers: typing.Iterable | None = None):
         super().__init__()
         handlers = handlers or (
             urllib.request.UnknownHandler,

src/huemon/infrastructure/urllib_safe_opener.py

@@ -4,7 +4,9 @@
 # LICENSE file in the root directory of this source tree.
 
 
-def __create_plugins_path(plugin_type: str, config: dict, fallback_path: str = None):
+def __create_plugins_path(
+    plugin_type: str, config: dict, fallback_path: str | None = None
+):
     plugins_section_exists = "plugins" in config
     if not plugins_section_exists:
         return fallback_path
@@ -20,9 +22,9 @@ def __create_plugins_path(plugin_type: str, config: dict, fallback_path: str = N
     )
 
 
-def get_command_plugins_path(config: dict, fallback_path: str = None):
+def get_command_plugins_path(config: dict, fallback_path: str | None = None):
     return __create_plugins_path("commands", config, fallback_path)
 
 
-def get_discovery_plugins_path(config: dict, fallback_path: str = None):
+def get_discovery_plugins_path(config: dict, fallback_path: str | None = None):
     return __create_plugins_path("discoveries", config, fallback_path)

src/huemon/utils/plugins.py

@@ -21,13 +21,13 @@ def __generate_version():
     return str(time.process_time())
 
 
-def create_system_config(version: str = None, is_update_available: bool = False):
+def create_system_config(version: str | None = None, is_update_available: bool = False):
     return {
         FIELD_SYSTEM_SWUPDATE2: {
             FIELD_SYSTEM_SWUPDATE2_BRIDGE: {
-                FIELD_STATE: FIELD_SYSTEM_SWUPDATE2_NOUPDATES
-                if is_update_available
-                else ""
+                FIELD_STATE: (
+                    FIELD_SYSTEM_SWUPDATE2_NOUPDATES if is_update_available else ""
+                )
             }
         },
         FIELD_SYSTEM_SWVERSION: version if version else __generate_version(),

src/tests/fixtures.py

@@ -92,7 +92,7 @@ def test_when_light_exists_return_status(mock_print: MagicMock):
         command_handler.exec("light", [SOME_LIGHT_MAC_0, "status"])
         command_handler.exec("light", [SOME_LIGHT_MAC_1, "status"])
 
-        mock_print.assert_has_calls(map(call, [1, 0]))
+        mock_print.assert_has_calls(list(map(call, [1, 0])))
 
     @staticmethod
     @patch("builtins.print")
@@ -122,7 +122,7 @@ def test_when_light_exists_return_is_upgrade_available(mock_print: MagicMock):
         command_handler.exec("light", [SOME_LIGHT_MAC_0, "is_upgrade_available"])
         command_handler.exec("light", [SOME_LIGHT_MAC_1, "is_upgrade_available"])
 
-        mock_print.assert_has_calls(map(call, [0, 1]))
+        mock_print.assert_has_calls(list(map(call, [0, 1])))
 
     @staticmethod
     @patch("builtins.print")
@@ -147,7 +147,7 @@ def test_when_light_exists_return_is_reachable(mock_print: MagicMock):
         command_handler.exec("light", [SOME_LIGHT_MAC_0, "reachable"])
         command_handler.exec("light", [SOME_LIGHT_MAC_1, "reachable"])
 
-        mock_print.assert_has_calls(map(call, [0, 1]))
+        mock_print.assert_has_calls(list(map(call, [0, 1])))
 
     @staticmethod
     @patch("builtins.print")
@@ -176,4 +176,4 @@ def test_when_light_exists_return_version(mock_print: MagicMock):
         command_handler.exec("light", [SOME_LIGHT_MAC_0, "version"])
         command_handler.exec("light", [SOME_LIGHT_MAC_1, "version"])
 
-        mock_print.assert_has_calls(map(call, [some_version_0, some_version_1]))
+        mock_print.assert_has_calls(list(map(call, [some_version_0, some_version_1])))

src/tests/test_light_command.py

@@ -60,7 +60,7 @@ def test_when_sensor_exists_return_battery_level(mock_print: MagicMock):
         command_handler.exec("sensor", [SOME_SENSOR_MAC_0, "battery:level"])
         command_handler.exec("sensor", [SOME_SENSOR_MAC_1, "battery:level"])
 
-        mock_print.assert_has_calls(map(call, [some_level_0, some_level_1]))
+        mock_print.assert_has_calls(list(map(call, [some_level_0, some_level_1])))
 
     @staticmethod
     @patch("builtins.print")
@@ -93,7 +93,7 @@ def test_when_sensor_exists_return_light_level(mock_print: MagicMock):
         command_handler.exec("sensor", [SOME_SENSOR_MAC_0, "light:level"])
         command_handler.exec("sensor", [SOME_SENSOR_MAC_1, "light:level"])
 
-        mock_print.assert_has_calls(map(call, [some_level_0, some_level_1]))
+        mock_print.assert_has_calls(list(map(call, [some_level_0, some_level_1])))
 
     @staticmethod
     @patch("builtins.print")
@@ -127,7 +127,7 @@ def test_when_sensor_exists_return_temperature(mock_print: MagicMock):
         command_handler.exec("sensor", [SOME_SENSOR_MAC_1, "temperature"])
 
         mock_print.assert_has_calls(
-            map(call, [some_temperature_0 * 0.01, some_temperature_1 * 0.01])
+            list(map(call, [some_temperature_0 * 0.01, some_temperature_1 * 0.01]))
         )
 
     @staticmethod
@@ -161,7 +161,7 @@ def test_when_sensor_exists_return_presence(mock_print: MagicMock):
         command_handler.exec("sensor", [SOME_SENSOR_MAC_0, "presence"])
         command_handler.exec("sensor", [SOME_SENSOR_MAC_1, "presence"])
 
-        mock_print.assert_has_calls(map(call, [some_presence_0, some_presence_1]))
+        mock_print.assert_has_calls(list(map(call, [some_presence_0, some_presence_1])))
 
     @staticmethod
     @patch("builtins.print")
@@ -195,5 +195,5 @@ def test_when_sensor_exists_return_reachable(mock_print: MagicMock):
         command_handler.exec("sensor", [SOME_SENSOR_MAC_1, "reachable"])
 
         mock_print.assert_has_calls(
-            map(call, [some_reachability_0, some_reachability_1])
+            list(map(call, [some_reachability_0, some_reachability_1]))
         )