Updated pre-commit hooks

.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
         # Check for invalid files
     -   id: check-toml
@@ -14,7 +14,7 @@ repos:
         args: [--fix=lf]
     -   id: check-executables-have-shebangs
 -   repo: https://github.com/psf/black
-    rev: 23.9.1
+    rev: 24.4.2
     hooks:
     -   id: black
         args: ['.']
@@ -24,7 +24,7 @@ repos:
     -   id: blacken-docs
         args: [--line-length=120]
 -   repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
     -   id: isort
 -   repo: local
@@ -37,7 +37,7 @@ repos:
         require_serial: true
         args: [--generated-members=pipe.*]
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: 'v1.5.1'
+    rev: 'v1.10.0'
     hooks:
     -   id: mypy
         additional_dependencies: [types-simplejson]

_version.py

@@ -1,4 +1,5 @@
 """
 Kraken version information.
 """
+
 __version__ = "4.3.6"

async_event_bus.py

@@ -2,6 +2,7 @@
 A lightweight event bus for the asyncio framework that relies on asynchronous
 generators to deliver messages.
 """
+
 from __future__ import annotations
 
 import asyncio

connections/__init__.py

@@ -1,4 +1,5 @@
 """
 Kraken connections module
 """
+
 from .ip_connection import GenericIpConnection

connections/ip_connection.py

@@ -1,6 +1,7 @@
 """
 This file contains an ip connection class, that simplifies the asyncio streamreader and streamwriter
 """
+
 from __future__ import annotations
 
 import asyncio

data_types.py

@@ -1,6 +1,7 @@
 """
 This file contains all custom data types used across the application
 """
+
 from __future__ import annotations
 
 from dataclasses import dataclass, field

database/models.py

@@ -2,6 +2,7 @@
 This file contains all database data models, that represent either sensor
 hosts/nodes or sensors.
 """
+
 from __future__ import annotations
 
 from datetime import datetime

databases.py

@@ -2,6 +2,7 @@
 The database abstraction layer, that handles all application specific tasks of
 the databases.
 """
+
 from __future__ import annotations
 
 import asyncio
@@ -177,6 +178,9 @@ def _log_database_error(
                 timeout,
             )
 
+    async def monitor_changes(self, timeout: float) -> None:
+        raise NotImplementedError
+
     async def _monitor_database(
         self, database_model: Type[DeviceDocument], timeout: float
     ) -> AsyncGenerator[tuple[ChangeType, UUID | Document], None]:

helper_functions.py

@@ -1,6 +1,7 @@
 """
 A collection of helper functions used in Kraken.
 """
+
 from __future__ import annotations
 
 import asyncio

managers.py

@@ -3,6 +3,7 @@
 hosts of a certain type are managed by their managers. The mangers configure the
 hosts extract the data stream from them.
 """
+
 from __future__ import annotations
 
 import asyncio

sensors/drivers/generic_driver.py

@@ -1,6 +1,7 @@
 """
 This is an asyncIO driver for a generic SCPI compatible device.
 """
+
 from __future__ import annotations
 
 import asyncio
@@ -145,16 +146,18 @@ def stream_data(self, initial_config: dict[str, Any]) -> AsyncGenerator[DataEven
                 stream.just(initial_config), stream.iterate(event_bus.subscribe(f"nodes/by_uuid/{self.__uuid}/update"))
             )
             | pipe.action(
-                lambda config: logging.getLogger(__name__).info("Got new configuration for: %s.", self)
-                if config is not None
-                else logging.getLogger(__name__).info("Removed configuration for: %s.", self)
+                lambda config: (
+                    logging.getLogger(__name__).info("Got new configuration for: %s.", self)
+                    if config is not None
+                    else logging.getLogger(__name__).info("Removed configuration for: %s.", self)
+                )
             )
             | pipe.map(self._parse_config)
             | pipe.action(self._log_config_progress)
             | pipe.switchmap(
-                lambda config: stream.empty()
-                if config is None or not config["enabled"]
-                else (self._configure_and_stream(config))
+                lambda config: (
+                    stream.empty() if config is None or not config["enabled"] else (self._configure_and_stream(config))
+                )
             )
         )
 

sensors/drivers/generic_scpi_driver.py

@@ -1,6 +1,7 @@
 """
 This is an asyncIO driver for a generic SCPI compatible device.
 """
+
 from __future__ import annotations
 
 import asyncio
@@ -266,13 +267,13 @@ async def enumerate(self) -> None:
         if manufacturer is None:
             logging.getLogger(__name__).warning("Could not query '*IDN?' of device: %s", self)
 
-    def stream_data(self, config: dict[str, Any]) -> AsyncGenerator[DataEvent, None]:
+    def stream_data(self, initial_config: dict[str, Any]) -> AsyncGenerator[DataEvent, None]:
         """
         Enumerate the device, then read data from it.
 
         Parameters
         ----------
-        config: dict
+        initial_config: dict
             A dict containing the configuration for the device
 
         Yields
@@ -282,5 +283,5 @@ def stream_data(self, config: dict[str, Any]) -> AsyncGenerator[DataEvent, None]
         """
         return stream.chain(
             stream.just(self) | pipe.action(async_(lambda sensor: sensor.enumerate())) | pipe.filter(lambda x: False),
-            super().stream_data(config),
+            super().stream_data(initial_config),
         )

sensors/drivers/hp3478a_driver.py

@@ -1,6 +1,7 @@
 """
 This is an asyncIO driver for a generic SCPI compatible device.
 """
+
 from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any

sensors/drivers/labnode.py

@@ -1,6 +1,7 @@
 """
 This is a wrapper for LabNode devices.
 """
+
 # pylint: disable=duplicate-code
 from __future__ import annotations
 
@@ -72,9 +73,9 @@ def stream_data(self) -> AsyncGenerator[DataEvent, None]:
             )
             | pipe.map(self._create_config)
             | pipe.switchmap(
-                lambda config: stream.empty()
-                if config is None or not config["enabled"]
-                else (self._configure_and_stream(config))
+                lambda config: (
+                    stream.empty() if config is None or not config["enabled"] else (self._configure_and_stream(config))
+                )
             )
         )
 

sensors/drivers/shared.py

@@ -1,6 +1,7 @@
 """
 This file contains all shared classed used by the drivers.
 """
+
 from dataclasses import dataclass
 
 

sensors/drivers/tinkerforge.py

@@ -1,6 +1,7 @@
 """
 This is a wrapper for Tinkerforge devices.
 """
+
 # pylint: disable=duplicate-code
 from __future__ import annotations
 
@@ -117,28 +118,32 @@ def stream_data(self) -> AsyncGenerator[DataEvent, None]:
                 | pipe.map(lambda x: None),
             )
             | pipe.switchmap(
-                lambda sensor: stream.empty()
-                if sensor is None
-                else (
-                    self._stream_config_updates(sensor)
-                    | pipe.switchmap(
-                        lambda config: stream.chain(
-                            stream.just(config),
-                            stream.iterate(event_bus.subscribe(f"nodes/by_uuid/{config['uuid']}/remove"))[:1]
-                            | pipe.map(lambda x: None),
+                lambda sensor: (
+                    stream.empty()
+                    if sensor is None
+                    else (
+                        self._stream_config_updates(sensor)
+                        | pipe.switchmap(
+                            lambda config: stream.chain(
+                                stream.just(config),
+                                stream.iterate(event_bus.subscribe(f"nodes/by_uuid/{config['uuid']}/remove"))[:1]
+                                | pipe.map(lambda x: None),
+                            )
                         )
-                    )
-                    | pipe.action(
-                        lambda config: logging.getLogger(__name__).info(
-                            "Got new configuration for: %s",
-                            sensor.device,
+                        | pipe.action(
+                            lambda config: logging.getLogger(__name__).info(
+                                "Got new configuration for: %s",
+                                sensor.device,
+                            )
+                        )
+                        | pipe.map(self._create_config)
+                        | pipe.switchmap(
+                            lambda config: (
+                                stream.empty()
+                                if config is None or not config["enabled"]
+                                else (self._configure_and_stream(config))
+                            )
                         )
-                    )
-                    | pipe.map(self._create_config)
-                    | pipe.switchmap(
-                        lambda config: stream.empty()
-                        if config is None or not config["enabled"]
-                        else (self._configure_and_stream(config))
                     )
                 )
             )

sensors/factories/sensor_factory.py

@@ -2,6 +2,7 @@
 This file contains the GPIB device factory, that produces sensor devices using
 available special GPIB device drivers.
 """
+
 from typing import Any
 
 from errors import UnknownDriverError
@@ -62,8 +63,7 @@ def get(self, driver: str, connection: Any, **kwargs: Any) -> Any:
             device = self.__available_drivers[driver]
         except KeyError:
             raise UnknownDriverError(f"No driver available for {driver}") from None
-        else:
-            return device(connection=connection, **kwargs)
+        return device(connection=connection, **kwargs)
 
 
 sensor_factory = SensorFactory()

sensors/transports/ethernet.py

@@ -2,6 +2,7 @@
 This is a wrapper for a generic Ethernet transport used by other generic devices like the SCPI driver. It wraps
 the IP connection and adds the stream interface via GenericTransport.
 """
+
 from __future__ import annotations
 
 from typing import Any

sensors/transports/generic_ethernet_transport.py

@@ -1,6 +1,7 @@
 """
 This is a generic transport driver implementing error handling for an ethernet streamer.
 """
+
 # pylint: disable=duplicate-code
 from __future__ import annotations
 

sensors/transports/generic_transport.py

@@ -1,6 +1,7 @@
 """
 This is a generic transport driver implementing the basic streams used by transports, that cannot enumerate its devices.
 """
+
 from __future__ import annotations
 
 import logging

sensors/transports/labnode.py

@@ -2,6 +2,7 @@
 This is a wrapper for the Prologix Ethernet controller used by other generic devices like the SCPI driver. It wraps
 the Prologix library and adds the stream interface via GenericTransport.
 """
+
 from __future__ import annotations
 
 import logging

sensors/transports/linux_gpib.py

@@ -2,6 +2,7 @@
 This is a wrapper for the Prologix Ethernet controller used by other generic devices like the SCPI driver. It wraps
 the Prologix library and adds the stream interface via GenericTransport.
 """
+
 # pylint: disable=duplicate-code
 from __future__ import annotations
 

sensors/transports/prologix_ethernet.py

@@ -2,6 +2,7 @@
 This is a wrapper for the Prologix Ethernet controller used by other generic devices like the SCPI driver. It wraps
 the Prologix library and adds the stream interface via GenericTransport.
 """
+
 from __future__ import annotations
 
 from typing import Any

sensors/transports/tinkerforge.py

@@ -1,6 +1,7 @@
 """
 This is a asyncIO driver for a generic SCPI compatible device.
 """
+
 from __future__ import annotations
 
 import asyncio

sensors/transports/transport_factory.py

@@ -2,6 +2,7 @@
 This file contains a factory to select the correct driver for all supported
 sensor hosts.
 """
+
 from typing import Any, Type
 
 from errors import UnknownDriverError

test-requirements.txt

@@ -1 +1,4 @@
+pre-commit~=3.7.1
+pylint~=3.2.2
+pylint-pydantic~=0.3.2
 pytest~=8.0.1

tests/test_version.py

@@ -1,4 +1,5 @@
 """Test to catch invalid versions when releasing a new git tag"""
+
 import os
 
 from _version import __version__