Without pydantic

mypy.ini

@@ -2,21 +2,12 @@
 # Specify the target platform details in config, so your developers are
 # free to run mypy on Windows, Linux, or macOS and get consistent
 # results.
-python_version=3.6
+python_version=3.8
 platform=linux
 
-# flake8-mypy expects the two following for sensible formatting
-show_column_numbers=True
-show_error_context=False
-
 # Follow imports but not show errors in other files
 follow_imports=silent
 
-# # since we're ignoring imports, writing .mypy_cache doesn't make any sense
-# cache_dir=/dev/null
-
-# suppress errors about unsatisfied imports
-ignore_missing_imports=True
 
 # allow untyped calls as a consequence of the options above
 disallow_untyped_calls=False
@@ -25,7 +16,9 @@ disallow_untyped_calls=False
 warn_return_any=False
 
 # treat Optional per PEP 484
-strict_optional=True
+# Implicit optional allows for more flexible code, but can be a source of bugs.
+# If you want to be strict, you can set this to False.
+no_implicit_optional=False
 
 # ensure all execution paths are returning
 warn_no_return=True
@@ -39,3 +32,9 @@ warn_unused_ignores=False
 # Flip them on if you feel adventurous.
 disallow_untyped_defs=False
 check_untyped_defs=True
+
+[mypy-urlobject.*]
+ignore_missing_imports = True
+
+[mypy-snapshottest.*]
+ignore_missing_imports = True

pyproject.toml

@@ -27,7 +27,7 @@ classifiers = [
 [tool.poetry.dependencies]
 python = "^3.8"
 urlobject = "^2"
-pydantic = ">=0.23"
+typing-extensions = "^4.9.0"
 
 [tool.poetry.dev-dependencies]
 pytest = "^7.0"
@@ -38,15 +38,16 @@ pytest-cov = "^4.0"
 sphinx = "^1.8"
 sphinx-autodoc-typehints = "^1.6"
 sphinx_rtd_theme = "^0.4.3"
-aiohttp = "^3.5"
+aiohttp = "^3.9"
 requests = "^2.21"
 astor = "^0.7.1"
-pytest-asyncio = "^0.21"
+pytest-asyncio = "^0.23.4"
 sphinxcontrib-asyncio = "^0.2.0"
 
 [tool.poetry.group.dev.dependencies]
 snapshottest = "^0.6.0"
 pluggy = "^1.4.0"
+types-requests = "^2.31.0.20240125"
 
 [tool.black]
 line-length = 79

setup.cfg

@@ -1,8 +1,13 @@
 [tool:pytest]
 addopts=--cov spoffy --no-cov-on-fail
+asyncio_mode = auto
 
 [flake8]
-max-line-length = 79
+max-line-length = 120
 builtins =
     _
-exclude = ./tests/mock/responses/
+    # exlucd test/mock/responses and tests/modules/snapshots
+exclude = ./tests/mock/responses/, ./tests/modules/snapshots
+
+
+

spoffy/client/common.py

@@ -105,7 +105,7 @@ def access_token(self) -> Union[str, None]:
         if self._access_token:
             return self._access_token
         elif self.token:
-            return self.token.access_token
+            return self.token["access_token"]
         return None
 
     @access_token.setter

spoffy/io/aiohttp.py

@@ -47,7 +47,10 @@ async def request(self, request: Request) -> Response:
             headers=request.headers,
         ) as resp:
             response = Response(
-                request, resp.status, resp.headers, await resp.read()
+                request,
+                resp.status,
+                resp.headers,  # type: ignore
+                await resp.read(),
             )
             response.raise_for_status()
             return response

spoffy/models/base.py

@@ -1,32 +1,5 @@
-from pydantic import BaseModel, BaseConfig, Extra
+from typing_extensions import TypedDict
 
 
-class Cfg(BaseConfig):
-    extra = Extra.allow
-
-
-class CustomMeta(BaseModel.__class__):  # type:ignore
-    def __new__(mcs, name, bases, namespace):
-        ret = super().__new__(mcs, name, bases, namespace)
-        for field in ret.__fields__.values():
-            field.required = False
-            field.prepare()
-        return ret
-
-
-class SpotifyObject(BaseModel, metaclass=CustomMeta):
-    Config = Cfg
-
-    def __init__(self, **data) -> None:
-        super().__init__(**data)
-        for field in self.__fields_set__:
-            if field not in self.__fields__:
-                value = getattr(self, field)
-                if isinstance(value, dict):
-                    setattr(self, field, SpotifyObject(**value))
-                elif (
-                    value
-                    and isinstance(value, list)
-                    and isinstance(value[0], dict)
-                ):
-                    setattr(self, field, [SpotifyObject(**v) for v in value])
+class SpotifyObject(TypedDict):
+    pass

spoffy/models/core.py

@@ -19,7 +19,7 @@ class Restrictions(SpotifyObject):
 
 
 class ExternalIds(SpotifyObject):
-    upc: Opt[str] = None
+    upc: Opt[str]
 
 
 class TrackExternalIds(SpotifyObject):
@@ -69,9 +69,9 @@ class TrackSimple(SpotifyObject):
     type: str
     is_local: bool
     uri: str
-    available_markets: Opt[List[str]] = None
-    linked_from: Opt[TrackLink] = None
-    is_playable: Opt[bool] = None
+    available_markets: Opt[List[str]]
+    linked_from: Opt[TrackLink]
+    is_playable: Opt[bool]
 
 
 class AlbumBase(SpotifyObject):
@@ -90,22 +90,18 @@ class AlbumBase(SpotifyObject):
 
 
 class AlbumSimple(AlbumBase):
-    restrictions: Opt[Restrictions] = None
-    available_markets: Opt[List[str]] = None
+    restrictions: Opt[Restrictions]
+    available_markets: Opt[List[str]]
 
 
 class Track(TrackSimple):
-    explicit: bool
     album: AlbumSimple
     popularity: int
     external_ids: TrackExternalIds
-    available_markets: Opt[List[str]] = None
-    linked_from: Opt[TrackLink] = None
-    is_playable: Opt[bool] = None
 
 
-class AlbumTracksPaging(OffsetPaging):
-    items: List[TrackSimple]
+class AlbumTracksPaging(OffsetPaging[TrackSimple]):
+    pass
 
 
 class Album(AlbumBase):
@@ -115,12 +111,12 @@ class Album(AlbumBase):
     label: str
     popularity: int
     tracks: AlbumTracksPaging
-    restrictions: Opt[Restrictions] = None
-    available_markets: Opt[List[str]] = None
+    restrictions: Opt[Restrictions]
+    available_markets: Opt[List[str]]
 
 
-class AlbumSimplePaging(OffsetPaging):
-    items: List[AlbumSimple]
+class AlbumSimplePaging(OffsetPaging[AlbumSimple]):
+    pass
 
 
 class NewAlbumReleases(SpotifyObject):

spoffy/models/image.py

@@ -5,5 +5,5 @@
 
 class Image(SpotifyObject):
     url: str
-    width: Opt[int] = None
-    height: Opt[int] = None
+    width: Opt[int]
+    height: Opt[int]

spoffy/models/library.py

@@ -1,5 +1,3 @@
-from typing import List
-
 from spoffy.models.core import Track, Album
 from spoffy.models.paging import OffsetPaging
 from spoffy.models.base import SpotifyObject
@@ -10,14 +8,14 @@ class SavedTrack(SpotifyObject):
     track: Track
 
 
-class SavedTracksPaging(OffsetPaging):
-    items: List[SavedTrack]
+class SavedTracksPaging(OffsetPaging[SavedTrack]):
+    pass
 
 
 class SavedAlbum(SpotifyObject):
     added_at: str
     album: Album
 
 
-class SavedAlbumsPaging(OffsetPaging):
-    items: List[SavedAlbum]
+class SavedAlbumsPaging(OffsetPaging[SavedAlbum]):
+    pass

spoffy/models/paging.py

@@ -1,17 +1,19 @@
-from typing import Optional as Opt, List, Any
+from typing import Optional as Opt, List, Generic, TypeVar
 
 from spoffy.models.base import SpotifyObject
 
+TPageItem = TypeVar("TPageItem")
 
-class Paging(SpotifyObject):
+
+class Paging(SpotifyObject, Generic[TPageItem]):
     href: str
     limit: int
     next: Opt[str]
     previous: Opt[str]
-    items: List[Any]
+    items: List[TPageItem]
 
 
-class OffsetPaging(Paging):
+class OffsetPaging(Paging[TPageItem]):
     """
     Offset based paging object
 
@@ -23,21 +25,16 @@ class OffsetPaging(Paging):
     :param previous: URL to previous page (if available)
     """
 
-    # Jedi doesn't support generics, do this for now
-    href: str
-    limit: int
     offset: int
     total: int
-    next: Opt[str]
-    previous: Opt[str]
 
 
 class Cursor(SpotifyObject):
     after: str
     before: str
 
 
-class CursorPaging(Paging):
+class CursorPaging(Paging[TPageItem]):
     """
     Cursor based paging object
 
@@ -48,8 +45,4 @@ class CursorPaging(Paging):
     :param previous: URL to previous page (if available)
     """
 
-    href: str
-    limit: int
     cursors: Cursor
-    next: Opt[str] = None
-    previous: Opt[str] = None

spoffy/models/personalization.py

@@ -1,13 +1,10 @@
-from typing import List
-
-
 from spoffy.models.core import Track, Artist
 from spoffy.models.paging import OffsetPaging
 
 
-class TopArtistsPaging(OffsetPaging):
-    items: List[Artist]
+class TopArtistsPaging(OffsetPaging[Artist]):
+    pass
 
 
-class TopTracksPaging(OffsetPaging):
-    items: List[Track]
+class TopTracksPaging(OffsetPaging[Track]):
+    pass

spoffy/models/player.py

@@ -44,5 +44,5 @@ class PlayHistoryItem(SpotifyObject):
     context: Opt[Context]
 
 
-class PlayHistoryPaging(CursorPaging):
-    items: List[PlayHistoryItem]
+class PlayHistoryPaging(CursorPaging[PlayHistoryItem]):
+    pass

spoffy/models/playlists.py

@@ -2,7 +2,7 @@
 
 from spoffy.models.image import Image
 from spoffy.models.users import UserBase
-from spoffy.models.core import Track, TrackLink, ExternalUrls, Followers
+from spoffy.models.core import Track, ExternalUrls, Followers
 from spoffy.models.paging import OffsetPaging
 from spoffy.models.base import SpotifyObject
 
@@ -24,9 +24,7 @@ class VideoThumbnail(SpotifyObject):
 
 
 class PlaylistTrackTrack(Track):
-    available_markets: Opt[List[str]] = None
-    linked_from: Opt[TrackLink] = None
-    is_playable: Opt[bool] = None
+    pass
 
 
 class PlaylistTrack(SpotifyObject):
@@ -36,8 +34,8 @@ class PlaylistTrack(SpotifyObject):
     track: PlaylistTrackTrack
 
 
-class PlaylistTracksPaging(OffsetPaging):
-    items: List[PlaylistTrack]
+class PlaylistTracksPaging(OffsetPaging[PlaylistTrack]):
+    pass
 
 
 class PlaylistBase(SpotifyObject):
@@ -80,8 +78,7 @@ class PlaylistBase(SpotifyObject):
 
 
 class TracksHref(SpotifyObject):
-    """
-    """
+    """ """
 
     href: str
     total: int
@@ -118,8 +115,8 @@ class Playlist(PlaylistBase):
     tracks: PlaylistTracksPaging
 
 
-class PlaylistSimplePaging(OffsetPaging):
-    items: List[PlaylistSimple]
+class PlaylistSimplePaging(OffsetPaging[PlaylistSimple]):
+    pass
 
 
 Playlist.__doc__ += PlaylistBase.__doc__  # type: ignore