homeconnect-watcher 0.0.12.dev1__tar.gz → 0.0.12.dev2__tar.gz

{homeconnect_watcher-0.0.12.dev1 → homeconnect_watcher-0.0.12.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: homeconnect-watcher
-Version: 0.0.12.dev1
+Version: 0.0.12.dev2
 Summary: Python service that listens to HomeConnect event and logs them.
 Author-email: Rogier van der Geer <rogier@vander-geer.nl>
 License: MIT

{homeconnect_watcher-0.0.12.dev1 → homeconnect_watcher-0.0.12.dev2}/src/homeconnect_watcher/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.12.dev1'
-__version_tuple__ = version_tuple = (0, 0, 12, 'dev1')
+__version__ = version = '0.0.12.dev2'
+__version_tuple__ = version_tuple = (0, 0, 12, 'dev2')

{homeconnect_watcher-0.0.12.dev1 → homeconnect_watcher-0.0.12.dev2}/src/homeconnect_watcher/client/appliance.py

@@ -14,14 +14,13 @@ class HomeConnectAppliance:
         self.appliance_id = appliance_id
         self.appliance_type = appliance_type
         self._available_programs: list[str] | None = None
-        self._last_update: float = time()
+        self._last_update: dict[str, float] = dict()
 
     def __repr__(self) -> str:
         return f"HomeConnect{self.appliance_type}(ha_id={repr(self.appliance_id)})"
 
-    @property
-    def time_since_update(self) -> float:
-        return time() - self._last_update
+    def time_since_update(self, request_type: str) -> float:
+        return time() - self._last_update.get(request_type, 0)
 
     async def get_available_programs(self) -> list[str] | None:
         if self._available_programs is None:
@@ -43,24 +42,24 @@ class HomeConnectAppliance:
         return self._available_programs if len(self._available_programs) else None
 
     async def get_status(self) -> HomeConnectEvent:
-        self._last_update: float = time()
+        self._last_update["status"] = time()
         response = await self.client._get(f"/{self.appliance_id}/status")
         return HomeConnectEvent.from_request(request="STATUS", appliance_id=self.appliance_id, response=response)
 
     async def get_settings(self) -> HomeConnectEvent:
-        self._last_update: float = time()
+        self._last_update["settings"] = time()
         response = await self.client._get(f"/{self.appliance_id}/settings")
         return HomeConnectEvent.from_request(request="SETTINGS", appliance_id=self.appliance_id, response=response)
 
     async def get_active_program(self) -> HomeConnectEvent:
-        self._last_update: float = time()
+        self._last_update["active_program"] = time()
         response = await self.client._get(f"/{self.appliance_id}/programs/active")
         return HomeConnectEvent.from_request(
             request="ACTIVE-PROGRAM", appliance_id=self.appliance_id, response=response
         )
 
     async def get_selected_program(self) -> HomeConnectEvent:
-        self._last_update: float = time()
+        self._last_update["selected_program"] = time()
         response = await self.client._get(f"/{self.appliance_id}/programs/selected")
         return HomeConnectEvent.from_request(
             request="SELECTED-PROGRAM", appliance_id=self.appliance_id, response=response

{homeconnect_watcher-0.0.12.dev1 → homeconnect_watcher-0.0.12.dev2}/src/homeconnect_watcher/client/client.py

@@ -192,17 +192,19 @@ class HomeConnectClient:
         if trigger is None:
             return
         appliance = await self.get_appliance(trigger.appliance_id)
-        if trigger.interval and appliance.time_since_update < 300:
-            return  # If the trigger is an interval trigger, only do requests if last requests were 5 minutes ago.
         if trigger.status:
-            yield await appliance.get_status()
+            if not trigger.interval or appliance.time_since_update("status") >= 300:
+                yield await appliance.get_status()
         if trigger.settings:
-            yield await appliance.get_settings()
+            if not trigger.interval or appliance.time_since_update("settings") >= 300:
+                yield await appliance.get_settings()
         if await appliance.get_available_programs():  # Only if the appliance supports programs.
             if trigger.active_program:
-                yield await appliance.get_active_program()
+                if not trigger.interval or appliance.time_since_update("active_program") >= 300:
+                    yield await appliance.get_active_program()
             if trigger.selected_program:
-                yield await appliance.get_selected_program()
+                if not trigger.interval or appliance.time_since_update("selected_program") >= 300:
+                    yield await appliance.get_selected_program()
 
     def _load_token(self) -> OAuth2Token | None:
         """Load the OAuth token from file."""

{homeconnect_watcher-0.0.12.dev1 → homeconnect_watcher-0.0.12.dev2}/src/homeconnect_watcher/exporter/postgres.py

@@ -24,3 +24,9 @@ class PGExporter(BaseExporter, WatcherDBClient):
         if datetime.now() > self._next_refresh:
             self.refresh_views()
             self._next_refresh: datetime = datetime.now() + self.refresh_interval
+
+    def bulk_export(self, events: list[HomeConnectEvent]) -> None:
+        self.write_events(events)
+        if datetime.now() > self._next_refresh:
+            self.refresh_views()
+            self._next_refresh: datetime = datetime.now() + self.refresh_interval

{homeconnect_watcher-0.0.12.dev1 → homeconnect_watcher-0.0.12.dev2}/src/homeconnect_watcher.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: homeconnect-watcher
-Version: 0.0.12.dev1
+Version: 0.0.12.dev2
 Summary: Python service that listens to HomeConnect event and logs them.
 Author-email: Rogier van der Geer <rogier@vander-geer.nl>
 License: MIT