Dynamically load avalable programs and options

Author: ekutner

home_connect_async/api.py

@@ -100,7 +100,7 @@ async def async_delete(self, endpoint:str) -> ApiResponse:
 
     async def async_get_event_stream(self, endpoint):
         """ Returns a Server Sent Events (SSE) stream to be consumed by the caller """
-        return await self._auth.stream(endpoint)
+        return await self._auth.stream(endpoint, self._lang)
 
 
     async def async_stream(self, endpoint:str, event_handler:Callable[[str], None]):
@@ -109,7 +109,7 @@ async def async_stream(self, endpoint:str, event_handler:Callable[[str], None]):
         event_source = None
         while True:
             try:
-                event_source = await self._auth.stream(endpoint)
+                event_source = await self._auth.stream(endpoint, self._lang)
                 await event_source.connect()
                 async for event in event_source:
                     backoff = 1

home_connect_async/appliance.py

@@ -39,21 +39,23 @@ async def request(self, method, endpoint:str, lang:str=None, **kwargs) -> Client
         access_token = await self.async_get_access_token()
         headers['authorization'] = f'Bearer {access_token}'
         headers['Accept'] = 'application/vnd.bsh.sdk.v1+json'
-        headers['Accept-Language'] = lang if lang else 'en-GB'
+        if lang:
+            headers['Accept-Language'] = lang
         if method == 'put':
             headers['Content-Type'] = 'application/vnd.bsh.sdk.v1+json'
 
         return await self.websession.request(
             method, f"{self.host}{endpoint}", **kwargs, headers=headers,
         )
 
-    async def stream(self, endpoint:str, **kwargs) -> sse_client.EventSource:
+    async def stream(self, endpoint:str, lang:str=None, **kwargs) -> sse_client.EventSource:
         """ Initiate a SSE stream """
         headers = {}
         access_token = await self.async_get_access_token()
         headers['authorization'] = f'Bearer {access_token}'
         headers['Accept'] = 'application/vnd.bsh.sdk.v1+json'
-        #headers['Accept-Language'] = 'en-GB'
+        if lang:
+            headers['Accept-Language'] = lang
         #timeout = aiohttp.ClientTimeout(total = ( self._auth.access_token_expirs_at - datetime.now() ).total_seconds() )
         timeout = aiohttp.ClientTimeout(total = 3600 )
         return sse_client.EventSource(f"{self.host}{endpoint}", session=self.websession, headers=headers, timeout=timeout, **kwargs)

home_connect_async/auth.py

@@ -18,6 +18,7 @@ class CallbackRegistry():
     def __init__(self) -> None:
         self._callbacks = {}
 
+
     def register_callback(self,
         callback:Callable[[Appliance, str, any], None] | Callable[[Appliance, str], None] | Callable[[Appliance], None] | Callable[[], None],
         keys:str|Events|Sequence[str|Events],

home_connect_async/callback_registery.py

@@ -1,5 +1,8 @@
 """ Common classes shared across the code """
 
+import asyncio
+
+
 class HomeConnectError(Exception):
     """ Common exception class for the SDK """
     def __init__(self, msg:str = None, code:int = None, response = None, inner_exception = None):
@@ -18,3 +21,7 @@ def __init__(self, msg:str = None, code:int = None, response = None, inner_excep
         super().__init__(msg, code, self.error_key, self.error_description, inner_exception)
 
 
+class Synchronization():
+    """ Class to hold global syncronization objects """
+    selected_program_lock = asyncio.Lock()
+

home_connect_async/common.py

@@ -14,6 +14,7 @@ class Events(str,Enum):
     DISCONNECTED = "DISCONNECTED"
     PAIRED = "PAIRED"
     DEPAIRED = "DEPAIRED"
+    PROGRAM_SELECTED = "PROGRAM_SELECTED"
     PROGRAM_STARTED = "PROGRAM_STARTED"
     PROGRAM_FINISHED = "PROGRAM_FINISHED"
     UNHANDLED = "UNHANDLED"

home_connect_async/const.py

@@ -97,6 +97,7 @@ async def async_create(cls,
                 for appliance in hc.appliances.values():
                     appliance._homeconnect = hc
                     appliance._callbacks = hc._callbacks
+                    appliance._api = api
             except Exception as ex:
                 _LOGGER.exception("Exception when loading HomeConnect data from JSON", exc_info=ex)
         if not hc:
@@ -332,7 +333,7 @@ async def _async_process_updates(self, event:MessageEvent):
                     # haid = self._get_haId_from_event(item) if 'uri' in item else haid
                     if haid in self.appliances:
                         appliance = self.appliances[haid]
-                        await appliance.async_update_data(item['key'], item['value'])
+                        await appliance.async_update_data(item)
 
 
     # def _get_haId_from_event(self, event:dict):

home_connect_async/homeconnect.py

@@ -3,7 +3,7 @@
 setup(
     name = 'home-connect-async',
     packages = ['home_connect_async'],
-    version = '0.5.8',
+    version = '0.6.0',
     license='MIT',
     description = 'Async SDK for BSH Home Connect API',
     author = 'Eran Kutner',