Initial restructuring (#3)

zigpy · Mar 10, 2024 · 44430d9 · 44430d9
1 parent 98610b2
commit 44430d9
Show file tree

Hide file tree

Showing 51 changed files with 27 additions and 3,670 deletions.
diff --git a/zha/api.py b/zha/api.py
diff --git a/zha/application/__init__.py b/zha/application/__init__.py
diff --git a/zha/core/const.py → zha/application/const.py b/zha/core/const.py → zha/application/const.py
diff --git a/zha/core/decorators.py → zha/application/decorators.py b/zha/core/decorators.py → zha/application/decorators.py
diff --git a/zha/core/discovery.py → zha/application/discovery.py b/zha/core/discovery.py → zha/application/discovery.py
@@ -70,7 +70,7 @@
 from .helpers import get_zha_data, get_zha_gateway
 
 if TYPE_CHECKING:
-    from ..entity import ZhaEntity
+    from ..application.entity import ZhaEntity
     from .device import ZHADevice
     from .endpoint import Endpoint
     from .group import ZHAGroup
@@ -292,9 +292,9 @@ def discover_quirks_v2_entities(self, device: ZHADevice) -> None:
                     not in cluster_handler.ZCL_INIT_ATTRS
                 ):
                     init_attrs = cluster_handler.ZCL_INIT_ATTRS.copy()
-                    init_attrs[
-                        quirk_metadata.entity_metadata.attribute_name
-                    ] = quirk_metadata.attribute_initialized_from_cache
+                    init_attrs[quirk_metadata.entity_metadata.attribute_name] = (
+                        quirk_metadata.attribute_initialized_from_cache
+                    )
                     cluster_handler.__dict__[zha_const.ZCL_INIT_ATTRS] = init_attrs
 
                 endpoint.async_new_entity(

diff --git a/zha/entity.py → zha/application/entity.py b/zha/entity.py → zha/application/entity.py
diff --git a/zha/core/gateway.py → zha/application/gateway.py b/zha/core/gateway.py → zha/application/gateway.py
@@ -92,7 +92,7 @@
 if TYPE_CHECKING:
     from logging import Filter, LogRecord
 
-    from ..entity import ZhaEntity
+    from ..application.entity import ZhaEntity
     from .cluster_handlers import ClusterHandler
 
     _LogFilterType = Filter | Callable[[LogRecord], bool]
@@ -132,9 +132,9 @@ def __init__(
         self._groups: dict[int, ZHAGroup] = {}
         self.application_controller: ControllerApplication = None
         self.coordinator_zha_device: ZHADevice = None  # type: ignore[assignment]
-        self._device_registry: collections.defaultdict[
-            EUI64, list[EntityReference]
-        ] = collections.defaultdict(list)
+        self._device_registry: collections.defaultdict[EUI64, list[EntityReference]] = (
+            collections.defaultdict(list)
+        )
         self._log_levels: dict[str, dict[str, int]] = {
             DEBUG_LEVEL_ORIGINAL: async_capture_log_levels(),
             DEBUG_LEVEL_CURRENT: async_capture_log_levels(),

diff --git a/zha/core/helpers.py → zha/application/helpers.py b/zha/core/helpers.py → zha/application/helpers.py
diff --git a/zha/application/platforms/__init__.py b/zha/application/platforms/__init__.py
diff --git a/zha/alarm_control_panel.py → ...lication/platforms/alarm_control_panel.py b/zha/alarm_control_panel.py → ...lication/platforms/alarm_control_panel.py
diff --git a/zha/binary_sensor.py → zha/application/platforms/binary_sensor.py b/zha/binary_sensor.py → zha/application/platforms/binary_sensor.py
diff --git a/zha/button.py → zha/application/platforms/button.py b/zha/button.py → zha/application/platforms/button.py
diff --git a/zha/climate.py → zha/application/platforms/climate.py b/zha/climate.py → zha/application/platforms/climate.py
diff --git a/zha/cover.py → zha/application/platforms/cover.py b/zha/cover.py → zha/application/platforms/cover.py
diff --git a/zha/device_tracker.py → zha/application/platforms/device_tracker.py b/zha/device_tracker.py → zha/application/platforms/device_tracker.py
diff --git a/zha/fan.py → zha/application/platforms/fan.py b/zha/fan.py → zha/application/platforms/fan.py
diff --git a/zha/light.py → zha/application/platforms/light.py b/zha/light.py → zha/application/platforms/light.py
diff --git a/zha/lock.py → zha/application/platforms/lock.py b/zha/lock.py → zha/application/platforms/lock.py
diff --git a/zha/number.py → zha/application/platforms/number.py b/zha/number.py → zha/application/platforms/number.py
diff --git a/zha/select.py → zha/application/platforms/select.py b/zha/select.py → zha/application/platforms/select.py
diff --git a/zha/sensor.py → zha/application/platforms/sensor.py b/zha/sensor.py → zha/application/platforms/sensor.py
diff --git a/zha/siren.py → zha/application/platforms/siren.py b/zha/siren.py → zha/application/platforms/siren.py
diff --git a/zha/switch.py → zha/application/platforms/switch.py b/zha/switch.py → zha/application/platforms/switch.py
diff --git a/zha/update.py → zha/application/platforms/update.py b/zha/update.py → zha/application/platforms/update.py
diff --git a/zha/core/registries.py → zha/application/registries.py b/zha/core/registries.py → zha/application/registries.py
@@ -18,7 +18,7 @@
 from .decorators import DictRegistry, NestedDictRegistry, SetRegistry
 
 if TYPE_CHECKING:
-    from ..entity import ZhaEntity, ZhaGroupEntity
+    from ..application.entity import ZhaEntity, ZhaGroupEntity
     from .cluster_handlers import ClientClusterHandler, ClusterHandler
 
 
@@ -107,12 +107,12 @@
 DEVICE_CLASS = collections.defaultdict(dict, DEVICE_CLASS)
 
 CLUSTER_HANDLER_ONLY_CLUSTERS = SetRegistry()
-CLIENT_CLUSTER_HANDLER_REGISTRY: DictRegistry[
-    type[ClientClusterHandler]
-] = DictRegistry()
-ZIGBEE_CLUSTER_HANDLER_REGISTRY: NestedDictRegistry[
-    type[ClusterHandler]
-] = NestedDictRegistry()
+CLIENT_CLUSTER_HANDLER_REGISTRY: DictRegistry[type[ClientClusterHandler]] = (
+    DictRegistry()
+)
+ZIGBEE_CLUSTER_HANDLER_REGISTRY: NestedDictRegistry[type[ClusterHandler]] = (
+    NestedDictRegistry()
+)
 
 WEIGHT_ATTR = attrgetter("weight")
 
@@ -277,9 +277,9 @@ class ZHAEntityRegistry:
 
     def __init__(self) -> None:
         """Initialize Registry instance."""
-        self._strict_registry: dict[
-            Platform, dict[MatchRule, type[ZhaEntity]]
-        ] = collections.defaultdict(dict)
+        self._strict_registry: dict[Platform, dict[MatchRule, type[ZhaEntity]]] = (
+            collections.defaultdict(dict)
+        )
         self._multi_entity_registry: dict[
             Platform, dict[int | str | None, dict[MatchRule, list[type[ZhaEntity]]]]
         ] = collections.defaultdict(
@@ -291,9 +291,9 @@ def __init__(self) -> None:
             lambda: collections.defaultdict(lambda: collections.defaultdict(list))
         )
         self._group_registry: dict[str, type[ZhaGroupEntity]] = {}
-        self.single_device_matches: dict[
-            Platform, dict[EUI64, list[str]]
-        ] = collections.defaultdict(lambda: collections.defaultdict(list))
+        self.single_device_matches: dict[Platform, dict[EUI64, list[str]]] = (
+            collections.defaultdict(lambda: collections.defaultdict(list))
+        )
 
     def get_entity(
         self,
@@ -323,9 +323,9 @@ def get_multi_entity(
         dict[Platform, list[EntityClassAndClusterHandlers]], list[ClusterHandler]
     ]:
         """Match ZHA cluster handlers to potentially multiple ZHA Entity classes."""
-        result: dict[
-            Platform, list[EntityClassAndClusterHandlers]
-        ] = collections.defaultdict(list)
+        result: dict[Platform, list[EntityClassAndClusterHandlers]] = (
+            collections.defaultdict(list)
+        )
         all_claimed: set[ClusterHandler] = set()
         for component, stop_match_groups in self._multi_entity_registry.items():
             for stop_match_grp, matches in stop_match_groups.items():
@@ -356,9 +356,9 @@ def get_config_diagnostic_entity(
         dict[Platform, list[EntityClassAndClusterHandlers]], list[ClusterHandler]
     ]:
         """Match ZHA cluster handlers to potentially multiple ZHA Entity classes."""
-        result: dict[
-            Platform, list[EntityClassAndClusterHandlers]
-        ] = collections.defaultdict(list)
+        result: dict[Platform, list[EntityClassAndClusterHandlers]] = (
+            collections.defaultdict(list)
+        )
         all_claimed: set[ClusterHandler] = set()
         for (
             component,

diff --git a/zha/backup.py b/zha/backup.py