python-linkplay 0.2.13__py3-none-any.whl → 0.2.14__py3-none-any.whl

linkplay/__version__.py

@@ -1 +1 @@
-__version__ = '0.2.13'
+__version__ = '0.2.14'

linkplay/consts.py

@@ -4,7 +4,7 @@ from enum import IntFlag, StrEnum
 LOGGER = logging.getLogger("linkplay")
 
 API_ENDPOINT: str = "{}/httpapi.asp?command={}"
-API_TIMEOUT: int = 5
+API_TIMEOUT: int = 10
 UNKNOWN_TRACK_PLAYING: str = "Unknown"
 UPNP_DEVICE_TYPE = "urn:schemas-upnp-org:device:MediaRenderer:1"
 TCPPORT = 8899

linkplay/exceptions.py

@@ -1,12 +1,21 @@
+"""This module defines custom exceptions for the LinkPlay integration."""
+
+
 class LinkPlayException(Exception):
-    pass
+    """Base exception for LinkPlay errors."""
 
 
 class LinkPlayRequestException(LinkPlayException):
-    pass
+    """Exception raised for errors in LinkPlay requests."""
+
+
+class LinkPlayRequestCancelledException(LinkPlayException):
+    """Exception raised when a LinkPlay request is cancelled."""
 
 
 class LinkPlayInvalidDataException(LinkPlayException):
+    """Exception raised for invalid data received from LinkPlay endpoints."""
+
     def __init__(self, message: str = "Invalid data received", data: str | None = None):
         super().__init__(message)
         self.data = data

linkplay/manufacturers.py

@@ -37,11 +37,15 @@ MODELS_WIIM_AMP: Final[str] = "WiiM Amp"
 MODELS_WIIM_MINI: Final[str] = "WiiM Mini"
 MODELS_WIIM_PRO: Final[str] = "WiiM Pro"
 MODELS_WIIM_PRO_PLUS: Final[str] = "WiiM Pro Plus"
+MODELS_WIIM_AMP_PRO: Final[str] = "WiiM Amp Pro"
+MODELS_WIIM_ULTRA: Final[str] = "WiiM Ultra"
+MODELS_WIIM_AMP_ULTRA: Final[str] = "WiiM Amp Ultra"
+MODELS_WIIM_CI_MOD_S: Final[str] = "WiiM CI MOD S"
+MODELS_WIIM_CI_MOD_A80: Final[str] = "WiiM CI MOD A80"
 MODELS_GGMM_GGMM_E2: Final[str] = "GGMM E2"
 MODELS_MEDION_MD_43970: Final[str] = "Life P66970 (MD 43970)"
 MODELS_WR320: Final[str] = "WR320"
 MODELS_WS350: Final[str] = "WS350"
-MODELS_WIIM_AMP_PRO: Final[str] = "WiiM Amp Pro"
 MODELS_MUZO_COBBLESTONE: Final[str] = "MUZO Cobblestone Wi-Fi Audio Receiver"
 MODELS_AUDIOPRO_C3: Final[str] = "C3"
 MODELS_AUDIOPRO_C10: Final[str] = "C10"
@@ -95,6 +99,10 @@ PROJECTID_LOOKUP: Final[dict[str, tuple[str, str]]] = {
     "AudioPro_C10": (MANUFACTURER_AUDIOPRO, MODELS_AUDIOPRO_C10),
     "AudioPro_A10": (MANUFACTURER_AUDIOPRO, MODELS_AUDIOPRO_A10),
     "U-AIO3v2": (MANUFACTURER_TRIANGLE, MODELS_TRIANGLE_AIO_3),
+    "WiiM_Ultra": (MANUFACTURER_WIIM, MODELS_WIIM_ULTRA),
+    "WiiM_Amp_Ultra": (MANUFACTURER_WIIM, MODELS_WIIM_AMP_ULTRA),
+    "WiiM_CI_MOD_S": (MANUFACTURER_WIIM, MODELS_WIIM_CI_MOD_S),
+    "WiiM_CI_MOD_A80": (MANUFACTURER_WIIM, MODELS_WIIM_CI_MOD_A80),
 }
 
 

linkplay/utils.py

@@ -10,20 +10,25 @@ from http import HTTPStatus
 
 import aiofiles
 import async_timeout
-from aiohttp import ClientError, ClientSession, TCPConnector
+from aiohttp import ClientError, ClientSession, ClientTimeout, TCPConnector
 from appdirs import AppDirs
 from deprecated import deprecated
 
 from linkplay.consts import (
     API_ENDPOINT,
     API_TIMEOUT,
+    LOGGER,
     MTLS_CERTIFICATE_CONTENTS,
     TCP_MESSAGE_LENGTH,
     EqualizerMode,
     PlayerAttribute,
     PlayingStatus,
 )
-from linkplay.exceptions import LinkPlayInvalidDataException, LinkPlayRequestException
+from linkplay.exceptions import (
+    LinkPlayInvalidDataException,
+    LinkPlayRequestCancelledException,
+    LinkPlayRequestException,
+)
 
 
 async def session_call_api(endpoint: str, session: ClientSession, command: str) -> str:
@@ -45,18 +50,29 @@ async def session_call_api(endpoint: str, session: ClientSession, command: str)
     try:
         async with async_timeout.timeout(API_TIMEOUT):
             response = await session.get(url)
-
-    except (asyncio.TimeoutError, ClientError, asyncio.CancelledError) as error:
+            if response.status != HTTPStatus.OK:
+                raise LinkPlayRequestException(
+                    f"Unexpected HTTPStatus {response.status} received from '{url}'"
+                )
+            return await response.text()
+
+    except ClientError as error:
+        LOGGER.warning("ClientError for %s: %s", url, error)
         raise LinkPlayRequestException(
             f"{error} error requesting data from '{url}'"
         ) from error
 
-    if response.status != HTTPStatus.OK:
+    except asyncio.TimeoutError as error:
+        LOGGER.warning("Timeout for %s: %s", url, error)
         raise LinkPlayRequestException(
-            f"Unexpected HTTPStatus {response.status} received from '{url}'"
-        )
+            f"{error} error requesting data from '{url}'"
+        ) from error
 
-    return await response.text()
+    except asyncio.CancelledError as error:
+        LOGGER.warning("Cancelled for %s: %s", url, error)
+        raise LinkPlayRequestCancelledException(
+            f"{error} error requesting data from '{url}'"
+        ) from error
 
 
 async def session_call_api_json(
@@ -81,6 +97,7 @@ async def session_call_api_json(
         return json.loads(result)  # type: ignore
     except json.JSONDecodeError as jsonexc:
         url = API_ENDPOINT.format(endpoint, command)
+        LOGGER.warning("Unexpected json for %s: %s", url, jsonexc)
         raise LinkPlayInvalidDataException(
             message=f"Unexpected JSON ({result}) received from '{url}'", data=result
         ) from jsonexc

{python_linkplay-0.2.13.dist-info → python_linkplay-0.2.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python_linkplay
-Version: 0.2.13
+Version: 0.2.14
 Summary: A Python Library for Seamless LinkPlay Device Control
 Author: Velleman Group nv
 License: MIT

python_linkplay-0.2.14.dist-info/RECORD

@@ -0,0 +1,16 @@
+linkplay/__init__.py,sha256=y9ZehEq-KhS3cwn-PUpwVSJGfDUx7e5wf_G6guODcTk,56
+linkplay/__main__.py,sha256=Wcza80QaWfOaHjyJEfQYhB9kiPLE0NOqIj4zVWv2Nqs,577
+linkplay/__version__.py,sha256=rfy0OFG8rEvQ6bRSAURO04IijvDzG0it93O1BM4V4E0,23
+linkplay/bridge.py,sha256=Id0yDa807qo0Jv_0IUIwnok0EuUa-0z01rABul4AcXs,21834
+linkplay/consts.py,sha256=PYjegdpzXov7UpUaRxgbIe-IFdbt_Gy0qGfZuMzT_8I,15781
+linkplay/controller.py,sha256=U370dMVl-E7iIhDC1wWmsrnFcdrWso84K0vkImsgCTo,4430
+linkplay/discovery.py,sha256=NnkO9gknp3Cyff7830zBu1LwyhkkWCdhDbEDbAwF8D8,4610
+linkplay/endpoint.py,sha256=_gelW0cDWt0SC8EApwaKIVh_YJIMNiOkfrLR_RYW7aM,2677
+linkplay/exceptions.py,sha256=9zBBhNdPj6qQj1SD1nkhruhN8mhlkuTaiUj87FEqzJM,682
+linkplay/manufacturers.py,sha256=UZk8wWZGPOi9pN9wnqOKbcWZBkZZHljkODWPvcNpZPA,6206
+linkplay/utils.py,sha256=otPFrx5c0MFmvXiiZSVUFaIBFG-YVMRi4SeInq0T4rY,10128
+python_linkplay-0.2.14.dist-info/licenses/LICENSE,sha256=bgEtxMyjEHX_4uwaAY3GCFTm234D4AOZ5dM15sk26ms,1073
+python_linkplay-0.2.14.dist-info/METADATA,sha256=kfVa_GqjRt0sil1S2vFcpaaaz7Zaww12kcw0ejI3rl8,3261
+python_linkplay-0.2.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+python_linkplay-0.2.14.dist-info/top_level.txt,sha256=CpSaOVPTzJf5TVIL7MrotSCR34gcIOQy-11l4zGmxxM,9
+python_linkplay-0.2.14.dist-info/RECORD,,

python_linkplay-0.2.13.dist-info/RECORD

@@ -1,16 +0,0 @@
-linkplay/__init__.py,sha256=y9ZehEq-KhS3cwn-PUpwVSJGfDUx7e5wf_G6guODcTk,56
-linkplay/__main__.py,sha256=Wcza80QaWfOaHjyJEfQYhB9kiPLE0NOqIj4zVWv2Nqs,577
-linkplay/__version__.py,sha256=y7T0aODMp6lh_FsLCIWZvm04exJp-NxszVrIpCH9tLE,23
-linkplay/bridge.py,sha256=Id0yDa807qo0Jv_0IUIwnok0EuUa-0z01rABul4AcXs,21834
-linkplay/consts.py,sha256=J2tocNaSyb5xs-qY0PqvOLl8_DzwarWZjTi-F9tXY4U,15780
-linkplay/controller.py,sha256=U370dMVl-E7iIhDC1wWmsrnFcdrWso84K0vkImsgCTo,4430
-linkplay/discovery.py,sha256=NnkO9gknp3Cyff7830zBu1LwyhkkWCdhDbEDbAwF8D8,4610
-linkplay/endpoint.py,sha256=_gelW0cDWt0SC8EApwaKIVh_YJIMNiOkfrLR_RYW7aM,2677
-linkplay/exceptions.py,sha256=UHcV0Yok0hdM0MYgHRwTWnMJ612Ts0iJvMFHX-IxmNo,312
-linkplay/manufacturers.py,sha256=dQOxyMyw1sHu31QGlbbtbNk6Xkvsp1vpc6UsojiXBrg,5746
-linkplay/utils.py,sha256=fZHGnUM4XFrQ7MM6guHhaEmxJbVlwilbwoZXvXwSfMs,9480
-python_linkplay-0.2.13.dist-info/licenses/LICENSE,sha256=bgEtxMyjEHX_4uwaAY3GCFTm234D4AOZ5dM15sk26ms,1073
-python_linkplay-0.2.13.dist-info/METADATA,sha256=qRo-DrimYo1k60u2lRWA46CG0LmLAtqOZ1AfZ0nGxMw,3261
-python_linkplay-0.2.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-python_linkplay-0.2.13.dist-info/top_level.txt,sha256=CpSaOVPTzJf5TVIL7MrotSCR34gcIOQy-11l4zGmxxM,9
-python_linkplay-0.2.13.dist-info/RECORD,,