Restructured bridges

src/endpoints/hue.py

@@ -1,7 +1,7 @@
 from fastapi import FastAPI, APIRouter
 
 from hue.hue_adapter import HueAdapter
-from ..mash.feature import Feature
+from ..mash.core.feature import Feature
 from fastapi import APIRouter
 from fastapi.responses import HTMLResponse
 

src/fritz_test.py

@@ -1,4 +1,4 @@
-from mash.bridges.fritzbox import FritzBoxBridge, FritzDeviceState
+from mash.bridges.fritzbox.fritzbox_bridge import FritzBoxBridge, FritzDeviceState
 from time import sleep
 import logging
 

src/hue/hue_feature.py

@@ -1,7 +1,7 @@
 from fastapi import FastAPI, APIRouter
 
 from hue.hue_adapter import HueAdapter
-from ..mash.feature import Feature
+from ..mash.core.feature import Feature
 from fastapi import APIRouter
 from fastapi.responses import HTMLResponse
 

src/mash/__init__.py

@@ -0,0 +1 @@
+from .mash import MaSH

src/mash/bridges/fritzbox/__init__.py

@@ -0,0 +1 @@
+from .fritzbox_bridge import FritzBoxBridge

src/mash/bridges/fritzbox/fritzbox_bridge.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 import logging
 from typing import Coroutine, Optional
-from mash.bridges.bridge import Bridge
+from mash.core.bridge import Bridge
 from fritzconnection import FritzConnection
 import asyncio
 

src/mash/bridges/hue/__init__.py

@@ -0,0 +1 @@
+from .hue_bridge import HueBridge

src/mash/bridges/hue/hue_bridge.py

@@ -1,5 +1,5 @@
 import logging
-from mash.bridges.bridge import Bridge
+from mash.core.bridge import Bridge
 from phue import Bridge as phueBridge
 from time import sleep
 

src/mash/bridges/matrixclock/__init__.py

@@ -0,0 +1 @@
+from .matrixclock_entity import MatrixClockEntity

src/mash/bridges/matrixclock/matrixclock_entity.py

@@ -1,4 +1,4 @@
-from mash.entities.entity import Entity
+from mash.core.entity import Entity
 import requests as r
 
 

src/mash/bridges/restapi/__init__.py

@@ -0,0 +1 @@
+from .restapi_bridge import RestApiBridge

src/mash/bridges/restapi/restapi_bridge.py

@@ -0,0 +1,6 @@
+from mash.core.bridge import Bridge
+
+
+class RestApiBridge(Bridge):
+    def __init__(self, *, id: str) -> None:
+        super().__init__(id=id, type="restapi")

src/mash/bridges/zigbee2mqtt/__init__.py

@@ -0,0 +1 @@
+from .zigbee2mqtt_bridge import Z2mBridge

src/mash/bridges/zigbee2mqtt/zigbee2mqtt_bridge.py

@@ -1,6 +1,6 @@
 import logging
 from typing import Optional
-from mash.bridges.bridge import Bridge
+from mash.core.bridge import Bridge
 import paho.mqtt.client as mqtt
 import json
 

src/mash/core/__init__.py

@@ -0,0 +1,5 @@
+from .bridge import Bridge, BridgeException
+from .entity import Entity
+from .group import Group
+from .home import Home
+from .feature import Feature

src/mash/core/group.py

@@ -1,4 +1,4 @@
-from mash.entities.entity import Entity
+from mash.core.entity import Entity
 from fnmatch import fnmatch
 
 

src/mash/core/home.py

@@ -1,5 +1,5 @@
-from mash.entities.entity import Entity
-from mash.entities.group import Group
+from mash.core.entity import Entity
+from mash.core.group import Group
 
 
 class Home(Group):

src/mash/mash.py

@@ -1,7 +1,7 @@
 import yaml
 from fastapi import FastAPI
 
-from mash.feature import Feature
+from mash.core.feature import Feature
 
 
 class MaSH:

src/matrix_clock/matrix_clock_feature.py

@@ -1,4 +1,4 @@
-from mash.feature import Feature
+from mash.core.feature import Feature
 
 
 class MatrixClockIntegration(Feature):

src/mqtt_test.py

@@ -1,5 +1,5 @@
 from time import sleep
-from mash.bridges.zigbee2mqtt import Z2mBridge
+from mash.bridges.zigbee2mqtt.zigbee2mqtt_bridge import Z2mBridge
 
 
 z2m = Z2mBridge(id="z2m", ip="192.168.178.115")