Add playback state

src/spotifyaio/__init__.py

@@ -4,9 +4,7 @@
     SpotifyConnectionError,
     SpotifyError,
 )
-from .models import (
-    Device, PlaybackState,
-)
+from .models import Device, PlaybackState
 from .spotify import SpotifyClient
 
 __all__ = [
@@ -15,5 +13,5 @@
     "SpotifyConnectionError",
     "SpotifyAuthenticationFailedError",
     "SpotifyClient",
-    "PlaybackState"
-    ]
+    "PlaybackState",
+]

src/spotifyaio/models.py

@@ -1,21 +1,25 @@
-from dataclasses import dataclass
+"""Models for Spotify."""
+from dataclasses import dataclass, field
 
+from mashumaro import field_options
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
 
 @dataclass
 class Device(DataClassORJSONMixin):
+    """Device model."""
 
-    id: str
+    device_id: str = field(metadata=field_options(alias="id"))
     is_active: bool
     is_private_session: bool
     name: str
     supports_volume: bool
-    type: str
+    device_type: str = field(metadata=field_options(alias="type"))
     volume_percent: int
 
 
 @dataclass
 class PlaybackState(DataClassORJSONMixin):
+    """Playback state model."""
 
     device: Device

src/spotifyaio/spotify.py

@@ -1,7 +1,10 @@
+"""Spotify client for handling connections with Spotify."""
+from __future__ import annotations
+
 import asyncio
 from dataclasses import dataclass
 from importlib import metadata
-from typing import Callable, Awaitable, Any, Self
+from typing import Any, Awaitable, Callable, Self
 
 from aiohttp import ClientSession
 from aiohttp.hdrs import METH_GET

tests/__snapshots__/test_playback.ambr

@@ -2,12 +2,12 @@
 # name: test_get_devices
   dict({
     'device': dict({
-      'id': '21dac6b0e0a1f181870fdc9749b2656466557687',
+      'device_id': '21dac6b0e0a1f181870fdc9749b2656466557687',
+      'device_type': 'Computer',
       'is_active': True,
       'is_private_session': False,
       'name': 'DESKTOP-BKC5SIK',
       'supports_volume': True,
-      'type': 'Computer',
       'volume_percent': 69,
     }),
   })

tests/test_client.py

@@ -2,20 +2,14 @@
 from __future__ import annotations
 
 import asyncio
-import json
 
 import aiohttp
 from aiohttp.hdrs import METH_GET
 from aiohttp.web_request import BaseRequest
 from aresponses import Response, ResponsesMockServer
 import pytest
 
-from spotifyaio import (
-    SpotifyAuthenticationFailedError,
-    SpotifyClient,
-    SpotifyConnectionError,
-    SpotifyError,
-)
+from spotifyaio import SpotifyClient, SpotifyConnectionError, SpotifyError
 
 from . import load_fixture
 from .const import SPOTIFY_URL
@@ -100,4 +94,3 @@ async def response_handler(_: BaseRequest) -> Response:
         with pytest.raises(SpotifyConnectionError):
             assert await spotify.get_playback()
         await spotify.close()
-

tests/test_playback.py

@@ -3,11 +3,10 @@
 import aiohttp
 from aiohttp.hdrs import METH_GET
 from aresponses import ResponsesMockServer
-import pytest
 
+from spotifyaio.spotify import SpotifyClient
 from syrupy import SnapshotAssertion
 
-from spotifyaio.spotify import SpotifyClient
 from . import load_fixture
 from .const import SPOTIFY_URL