Reformat code

mkdocs.yml

@@ -102,4 +102,5 @@ nav:
       - Items:
           - Base: api/items/base.md
           - Lighting: api/items/lighting.md
-          - Automation: api/items/automation.md
+          - Automation: api/items/automation.md
+          - Gateway: api/items/gateway.md

pyown/client/client.py

@@ -8,7 +8,7 @@
 from ..exceptions import InvalidSession, ParseError, InvalidMessage, InvalidTag
 from ..items.base import BaseItem
 from ..items.utils import ITEM_TYPES
-from ..messages import MessageType
+from ..messages import MessageType, BaseMessage
 from ..tags import Who, Where
 
 __all__ = [
@@ -135,18 +135,27 @@ async def loop(self, *, client: BaseClient | None = None):
                 log.info(f"Item type not supported, WHO={who}, WHERE={where}")
                 continue
 
-            # because callbacks are defined inside items, we need to loop through all items to find the correct one
-            for item_obj in BaseItem.__subclasses__():
-                if message.who == item_obj.who:
-                    try:
-                        tasks = await item_obj.call_callbacks(item, message)
-                    except InvalidMessage as e:
-                        log.warning(f"Message not supported {e.message}")
-                    else:
-                        self._loop.create_task(self._check_task_result(tasks))
-                        break
-            else:
-                log.warning(f"Item not found for message {message}")
+            await self._dispatch_callbacks(item, message)
+
+    async def _dispatch_callbacks(self, item: BaseItem, message: BaseMessage):
+        """
+        Dispatches the message to the correct callbacks for the item.
+        Args:
+            item: The item that triggered the event.
+            message: The message that triggered the event.
+        """
+        # because callbacks are defined inside items, we need to loop through all items to find the correct one
+        for item_obj in BaseItem.__subclasses__():
+            if message.who == item_obj.who:
+                try:
+                    tasks = await item_obj.call_callbacks(item, message)
+                except InvalidMessage as e:
+                    log.warning(f"Message not supported {e.message}")
+                else:
+                    self._loop.create_task(self._check_task_result(tasks))
+                    break
+        else:
+            log.warning(f"Item not found for message {message}")
 
     @staticmethod
     async def _check_task_result(tasks: list[Task]):

pyown/items/__init__.py

@@ -1,3 +1,3 @@
-from .lighting import *
 from .automation import *
 from .gateway import *
+from .lighting import *

pyown/items/gateway/gateway.py

@@ -42,7 +42,6 @@ class GatewayModel(StrEnum):
     HL4684 = "23"
 
 
-
 class WhatGateway(What, StrEnum):
     """
     This enum is used to define the various types of data that can be retrieved from a gateway.
@@ -541,4 +540,3 @@ async def call_callbacks(cls, item: Self, message: BaseMessage) -> list[Task]:
             raise InvalidMessage("The message is not a DimensionResponse message.")
 
         return tasks
-

pyown/items/lighting/dimmer.py

@@ -13,6 +13,7 @@ class Dimmer(BaseLight):
     """
     Dimmer items are items that can have their brightness level changed or colors changed.
     """
+
     async def turn_on(self, speed: int | None = None):
         """
         Turns the light on.

pyown/items/lighting/light.py

@@ -12,6 +12,7 @@ class Light(BaseLight):
     """
     Light items are item with only two states: on and off.
     """
+
     async def turn_on(self):
         """Turns the light on."""
         await self.send_normal_message(WhatLight.ON)

pyown/items/utils.py

@@ -10,7 +10,6 @@
     "ITEM_TYPES"
 ]
 
-
 ITEM_TYPES: Final[dict[Who, Type[BaseItem]]] = {
     Who.LIGHTING: Light,
     Who.AUTOMATION: Automation,

pyown/protocol/protocol.py

@@ -41,7 +41,7 @@ def connection_made(self, transport: Transport):  # type: ignore[override]
         """
         Called by the transport class when the socket is connected to the server.
         """
-        log.info(f"Connection made")
+        log.info("Connection made")
         self._transport = transport
         self._on_connection_start.set_result(transport)
 
@@ -52,7 +52,7 @@ def connection_lost(self, exc: Exception | None):
         if exc is not None:
             log.info(f"Connection lost with exception: {exc}")
         else:
-            log.info(f"Connection lost")
+            log.info("Connection lost")
         if exc is None:
             self._on_connection_end.set_result(None)
         else:

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyown"
-version = "0.1.0"
+version = "0.2.0"
 description = "Python wrapper for OpenWebNet protocol"
 authors = ["John Toniutti <[email protected]>"]
 license = "GPL-3.0"