Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion PyMyGekko/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
from .data_provider import DataProvider
from .data_provider import DummyDataProvider


_LOGGER: logging.Logger = logging.getLogger(__name__)


Expand Down
14 changes: 10 additions & 4 deletions PyMyGekko/data_provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ def update_resources(self, resources):
class EntityValueAccessor(DataSubscriberInterface):
"""Base class for entity values accessors"""

_data = {}
def __init__(self):
self._data = {}

def get_value(self, entity: Entity, value_name: str) -> str | None:
"""Returns a data value of this entity"""
Expand All @@ -43,9 +44,10 @@ def get_value(self, entity: Entity, value_name: str) -> str | None:
class DataProviderBase(ABC):
"""Base class for data providers"""

_subscriber: list[DataSubscriberInterface] = []
_status = None
_resources = None
def __init__(self):
self._subscriber: list[DataSubscriberInterface] = []
self._status = None
self._resources = None

@property
def resources(self):
Expand Down Expand Up @@ -101,6 +103,9 @@ async def try_connect(self) -> None:
class DummyDataProvider(DataProviderBase):
"""Dummy data provider returning static test data"""

def __init__(self):
super().__init__()

async def try_connect(self) -> None:
_LOGGER.debug("try_connect in DummyDataProvider")

Expand All @@ -122,6 +127,7 @@ class DataProvider(DataProviderBase):
def __init__(
self, url: URL, authentication_params: dict[str, str], session: ClientSession
):
super().__init__()
self._url = url
self._authentication_params = authentication_params
self._session = session
Expand Down
2 changes: 1 addition & 1 deletion PyMyGekko/resources/AccessDoors.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class AccessDoorValueAccessor(EntityValueAccessor):
"""AccessDoor value accessor"""

def __init__(self, data_provider: DataProviderBase):
self._data = {}
super().__init__()
self._data_provider = data_provider
self._data_provider.subscribe(self)

Expand Down
2 changes: 1 addition & 1 deletion PyMyGekko/resources/Actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class ActionValueAccessor(EntityValueAccessor):
"""Action value accessor"""

def __init__(self, data_provider: DataProviderBase):
self._data = {}
super().__init__()
self._data_provider = data_provider
data_provider.subscribe(self)

Expand Down
2 changes: 1 addition & 1 deletion PyMyGekko/resources/AlarmsLogics.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class AlarmsLogicValueAccessor(EntityValueAccessor):
"""AlarmsLogic value accessor"""

def __init__(self, data_provider: DataProviderBase):
self._data = {}
super().__init__()
self._data_provider = data_provider
data_provider.subscribe(self)

Expand Down
2 changes: 1 addition & 1 deletion PyMyGekko/resources/Blinds.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class BlindValueAccessor(EntityValueAccessor):
"""Blind value accessor"""

def __init__(self, data_provider: DataProviderBase):
self._data = {}
super().__init__()
self._data_provider = data_provider
self._data_provider.subscribe(self)

Expand Down
2 changes: 1 addition & 1 deletion PyMyGekko/resources/Cams.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class CamValueAccessor(EntityValueAccessor):
"""Cam value accessor"""

def __init__(self, data_provider: DataProviderBase):
self._data = {}
super().__init__()
self._data_provider = data_provider
self._data_provider.subscribe(self)

Expand Down
2 changes: 1 addition & 1 deletion PyMyGekko/resources/DoorInterComs.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class DoorInterComValueAccessor(EntityValueAccessor):
"""DoorInterCom value accessor"""

def __init__(self, data_provider: DataProviderBase):
self._data = {}
super().__init__()
self._data_provider = data_provider
self._data_provider.subscribe(self)

Expand Down
3 changes: 1 addition & 2 deletions PyMyGekko/resources/EnergyCosts.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from PyMyGekko.data_provider import EntityValueAccessor
from PyMyGekko.resources import Entity


_LOGGER: logging.Logger = logging.getLogger(__name__)


Expand All @@ -31,7 +30,7 @@ class EnergyCostValueAccessor(EntityValueAccessor):
"""EnergyCost value accessor"""

def __init__(self, data_provider: DataProviderBase):
self._data = {}
super().__init__()
self._data_provider = data_provider
self._data_provider.subscribe(self)

Expand Down
2 changes: 1 addition & 1 deletion PyMyGekko/resources/HotWaterSystems.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class HotWaterSystemValueAccessor(EntityValueAccessor):
"""HotWaterSystem value accessor"""

def __init__(self, data_provider: DataProviderBase):
self._data = {}
super().__init__()
self._data_provider = data_provider
data_provider.subscribe(self)

Expand Down
2 changes: 1 addition & 1 deletion PyMyGekko/resources/Lights.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class LightValueAccessor(EntityValueAccessor):
"""Lights value accessor"""

def __init__(self, data_provider: DataProviderBase):
self._data = {}
super().__init__()
self._data_provider = data_provider
data_provider.subscribe(self)

Expand Down
2 changes: 1 addition & 1 deletion PyMyGekko/resources/Loads.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class LoadValueAccessor(EntityValueAccessor):
"""Loads value accessor"""

def __init__(self, data_provider: DataProviderBase):
self._data = {}
super().__init__()
self._data_provider = data_provider
data_provider.subscribe(self)

Expand Down
3 changes: 1 addition & 2 deletions PyMyGekko/resources/Meteo.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from PyMyGekko.data_provider import EntityValueAccessor
from PyMyGekko.resources import ReadOnlyEntity


_LOGGER: logging.Logger = logging.getLogger(__name__)


Expand All @@ -31,7 +30,7 @@ class MeteoValueAccessor(EntityValueAccessor):
"""Meteo value accessor"""

def __init__(self, data_provider: DataProviderBase):
self._data = {}
super().__init__()
self._data_provider = data_provider
self._data_provider.subscribe(self)

Expand Down
2 changes: 1 addition & 1 deletion PyMyGekko/resources/RoomTemps.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class RoomTempsValueAccessor(EntityValueAccessor):
"""RoomTemps value accessor"""

def __init__(self, data_provider: DataProviderBase):
self._data = {}
super().__init__()
self._data_provider = data_provider
self._data_provider.subscribe(self)

Expand Down
2 changes: 1 addition & 1 deletion PyMyGekko/resources/Vents.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ class VentValueAccessor(EntityValueAccessor):
"""Vent value accessor"""

def __init__(self, data_provider: DataProviderBase):
self._data = {}
super().__init__()
self._data_provider = data_provider
self._data_provider.subscribe(self)

Expand Down