deezer-python 6.1.1__tar.gz → 7.0.0__tar.gz

{deezer_python-6.1.1 → deezer_python-7.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deezer-python
-Version: 6.1.1
+Version: 7.0.0
 Summary: A friendly wrapper library for the Deezer API
 Home-page: https://github.com/browniebroke/deezer-python
 License: MIT
@@ -20,7 +20,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries
-Requires-Dist: requests (>=2.18)
+Requires-Dist: httpx (>=0.23.0)
 Project-URL: Bug Tracker, https://github.com/browniebroke/deezer-python/issues
 Project-URL: Changelog, https://deezer-python.readthedocs.io/en/latest/changelog.html
 Project-URL: Documentation, https://deezer-python.readthedocs.io
@@ -44,10 +44,10 @@ Description-Content-Type: text/markdown
 </p>
 <p align="center">
   <a href="https://python-poetry.org/">
-    <img src="https://img.shields.io/badge/packaging-poetry-299bd7?style=flat-square&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAASCAYAAABrXO8xAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAJJSURBVHgBfZLPa1NBEMe/s7tNXoxW1KJQKaUHkXhQvHgW6UHQQ09CBS/6V3hKc/AP8CqCrUcpmop3Cx48eDB4yEECjVQrlZb80CRN8t6OM/teagVxYZi38+Yz853dJbzoMV3MM8cJUcLMSUKIE8AzQ2PieZzFxEJOHMOgMQQ+dUgSAckNXhapU/NMhDSWLs1B24A8sO1xrN4NECkcAC9ASkiIJc6k5TRiUDPhnyMMdhKc+Zx19l6SgyeW76BEONY9exVQMzKExGKwwPsCzza7KGSSWRWEQhyEaDXp6ZHEr416ygbiKYOd7TEWvvcQIeusHYMJGhTwF9y7sGnSwaWyFAiyoxzqW0PM/RjghPxF2pWReAowTEXnDh0xgcLs8l2YQmOrj3N7ByiqEoH0cARs4u78WgAVkoEDIDoOi3AkcLOHU60RIg5wC4ZuTC7FaHKQm8Hq1fQuSOBvX/sodmNJSB5geaF5CPIkUeecdMxieoRO5jz9bheL6/tXjrwCyX/UYBUcjCaWHljx1xiX6z9xEjkYAzbGVnB8pvLmyXm9ep+W8CmsSHQQY77Zx1zboxAV0w7ybMhQmfqdmmw3nEp1I0Z+FGO6M8LZdoyZnuzzBdjISicKRnpxzI9fPb+0oYXsNdyi+d3h9bm9MWYHFtPeIZfLwzmFDKy1ai3p+PDls1Llz4yyFpferxjnyjJDSEy9CaCx5m2cJPerq6Xm34eTrZt3PqxYO1XOwDYZrFlH1fWnpU38Y9HRze3lj0vOujZcXKuuXm3jP+s3KbZVra7y2EAAAAAASUVORK5CYII=" alt="Poetry">
+    <img src="https://img.shields.io/endpoint?url=https://python-poetry.org/badge/v0.json" alt="Poetry">
   </a>
-  <a href="https://github.com/ambv/black">
-    <img src="https://img.shields.io/badge/code%20style-black-000000.svg?style=flat-square" alt="black">
+  <a href="https://github.com/astral-sh/ruff">
+    <img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json" alt="Ruff">
   </a>
   <a href="https://github.com/pre-commit/pre-commit">
     <img src="https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white&style=flat-square" alt="pre-commit">
@@ -89,7 +89,7 @@ The package is published on
 Easily query the Deezer API from you Python code. The data returned by the Deezer
 API is mapped to python resources:
 
-```python
+```pycon
 >>> client = deezer.Client()
 >>> client.get_album(680407).title
 'Monkey Business'

{deezer_python-6.1.1 → deezer_python-7.0.0}/README.md

@@ -13,10 +13,10 @@
 </p>
 <p align="center">
   <a href="https://python-poetry.org/">
-    <img src="https://img.shields.io/badge/packaging-poetry-299bd7?style=flat-square&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAASCAYAAABrXO8xAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAJJSURBVHgBfZLPa1NBEMe/s7tNXoxW1KJQKaUHkXhQvHgW6UHQQ09CBS/6V3hKc/AP8CqCrUcpmop3Cx48eDB4yEECjVQrlZb80CRN8t6OM/teagVxYZi38+Yz853dJbzoMV3MM8cJUcLMSUKIE8AzQ2PieZzFxEJOHMOgMQQ+dUgSAckNXhapU/NMhDSWLs1B24A8sO1xrN4NECkcAC9ASkiIJc6k5TRiUDPhnyMMdhKc+Zx19l6SgyeW76BEONY9exVQMzKExGKwwPsCzza7KGSSWRWEQhyEaDXp6ZHEr416ygbiKYOd7TEWvvcQIeusHYMJGhTwF9y7sGnSwaWyFAiyoxzqW0PM/RjghPxF2pWReAowTEXnDh0xgcLs8l2YQmOrj3N7ByiqEoH0cARs4u78WgAVkoEDIDoOi3AkcLOHU60RIg5wC4ZuTC7FaHKQm8Hq1fQuSOBvX/sodmNJSB5geaF5CPIkUeecdMxieoRO5jz9bheL6/tXjrwCyX/UYBUcjCaWHljx1xiX6z9xEjkYAzbGVnB8pvLmyXm9ep+W8CmsSHQQY77Zx1zboxAV0w7ybMhQmfqdmmw3nEp1I0Z+FGO6M8LZdoyZnuzzBdjISicKRnpxzI9fPb+0oYXsNdyi+d3h9bm9MWYHFtPeIZfLwzmFDKy1ai3p+PDls1Llz4yyFpferxjnyjJDSEy9CaCx5m2cJPerq6Xm34eTrZt3PqxYO1XOwDYZrFlH1fWnpU38Y9HRze3lj0vOujZcXKuuXm3jP+s3KbZVra7y2EAAAAAASUVORK5CYII=" alt="Poetry">
+    <img src="https://img.shields.io/endpoint?url=https://python-poetry.org/badge/v0.json" alt="Poetry">
   </a>
-  <a href="https://github.com/ambv/black">
-    <img src="https://img.shields.io/badge/code%20style-black-000000.svg?style=flat-square" alt="black">
+  <a href="https://github.com/astral-sh/ruff">
+    <img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json" alt="Ruff">
   </a>
   <a href="https://github.com/pre-commit/pre-commit">
     <img src="https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white&style=flat-square" alt="pre-commit">
@@ -58,7 +58,7 @@ The package is published on
 Easily query the Deezer API from you Python code. The data returned by the Deezer
 API is mapped to python resources:
 
-```python
+```pycon
 >>> client = deezer.Client()
 >>> client.get_album(680407).title
 'Monkey Business'

{deezer_python-6.1.1 → deezer_python-7.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "deezer-python"
-version = "6.1.1"
+version = "7.0.0"
 description = "A friendly wrapper library for the Deezer API"
 authors = ["Bruno Alla <alla.brunoo@gmail.com>"]
 license = "MIT"
@@ -28,25 +28,25 @@ packages = [
 
 [tool.poetry.dependencies]
 python = "^3.8"
-requests = ">=2.18"
+httpx = ">=0.23.0"
 
 [tool.poetry.group.docs]
 optional = true
 
 [tool.poetry.group.docs.dependencies]
-myst-parser = ">=0.16"
-sphinx = ">=4.0"
-sphinx-autobuild = ">=2021.0"
-furo = ">=2023.5.20"
+myst-parser = { version = ">=0.16", python = ">=3.11" }
+sphinx = { version = ">=4.0", python = ">=3.11" }
+furo = { version = ">=2023.5.20", python = ">=3.11" }
+sphinx-autobuild = { version = ">=2024.0.0", python = ">=3.11" }
 
 [tool.poetry.group.dev.dependencies]
 coverage = "^7.0"
-environs = "^9.3"
-pytest = "^7.0"
-pytest-cov = "^4.0"
+environs = "^11.0.0"
+pytest = "^8.0.0"
+pytest-cov = "^5.0.0"
 pytest-mock = "^3.6"
 pytest-vcr = "^1.0"
-vcrpy = "^5.0.0"
+vcrpy = "^6.0.0"
 deezer-oauth-cli = "^1.0.0"
 
 [tool.semantic_release]
@@ -54,7 +54,6 @@ version_toml = ["pyproject.toml:tool.poetry.version"]
 version_variables = [
     "src/deezer/__init__.py:__version__",
 ]
-branch = "main"
 build_command = "pip install poetry && poetry build"
 
 [tool.semantic_release.changelog]
@@ -66,6 +65,16 @@ exclude_commit_patterns = [
 [tool.semantic_release.changelog.environment]
 keep_trailing_newline = true
 
+[tool.semantic_release.branches.main]
+match = "main"
+
+[tool.semantic_release.branches.stable]
+match = "(?!stable/*$)"
+
+[tool.semantic_release.branches.noop]
+match = "(?!main$)"
+prerelease = true
+
 [tool.pytest.ini_options]
 addopts = "-v -Wdefault --cov=deezer"
 pythonpath = ["src"]
@@ -86,6 +95,8 @@ exclude_lines = [
 [tool.ruff]
 target-version = "py38"
 line-length = 120
+
+[tool.ruff.lint]
 ignore = [
     "D203", # 1 blank line required before class docstring
     "D212", # Multi-line docstring summary should start at the first line
@@ -107,7 +118,7 @@ select = [
     "RUF", # ruff specific
 ]
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "tests/**/*" = [
     "D100",
     "D101",
@@ -120,7 +131,7 @@ select = [
 "conftest.py" = ["D100"]
 "docs/conf.py" = ["D100"]
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 known-first-party = ["deezer"]
 
 [tool.mypy]

{deezer_python-6.1.1 → deezer_python-7.0.0}/src/deezer/__init__.py

@@ -15,7 +15,7 @@ from deezer.resources import (
     User,
 )
 
-__version__ = "6.1.1"
+__version__ = "7.0.0"
 __all__ = [
     "Album",
     "Artist",

deezer_python-7.0.0/src/deezer/auth.py

@@ -0,0 +1,27 @@
+import typing
+
+import httpx
+
+
+class DeezerQueryAuth(httpx.Auth):
+    """
+    Deezer Auth for httpx.
+
+    Attach given access token to the request,
+    by passing it as query parameter.
+
+    :param access_token: Your Deezer access token.
+    """
+
+    def __init__(self, access_token: str):
+        self.access_token = access_token
+
+    def auth_flow(self, request: httpx.Request) -> typing.Generator[httpx.Request, None, None]:
+        """
+        Add authentication query parameter to the request.
+
+        :param request: httpx.Request
+        :return: httpx.Request
+        """
+        request.url = request.url.copy_merge_params({"access_token": self.access_token})
+        yield request

{deezer_python-6.1.1 → deezer_python-7.0.0}/src/deezer/client.py

@@ -2,8 +2,10 @@ from __future__ import annotations
 
 from typing import Any, ClassVar
 
-import requests
+import httpx
+from httpx._types import HeaderTypes
 
+from deezer.auth import DeezerQueryAuth
 from deezer.exceptions import (
     DeezerErrorResponse,
     DeezerHTTPError,
@@ -26,7 +28,7 @@ from deezer.resources import (
 )
 
 
-class Client:
+class Client(httpx.Client):
     """
     A client to retrieve some basic infos about Deezer resources.
 
@@ -34,7 +36,7 @@ class Client:
     be passed in to the constructor as kwargs.
 
         >>> import deezer
-        >>> client = deezer.Client(app_id='foo', app_secret='bar')
+        >>> client = deezer.Client()
 
     This client provides several methods to retrieve the content most
     kinds of Deezer objects, based on their json structure.
@@ -45,8 +47,6 @@ class Client:
         >>> import deezer
         >>> client = deezer.Client(headers={'Accept-Language': 'fr'})
 
-    :param app_id: application ID.
-    :param app_secret: application secret.
     :param access_token: user access token.
     :param headers: a dictionary of headers to be used.
     """
@@ -66,18 +66,21 @@ class Client:
         "track": Track,
         "user": User,
     }
-    base_url = "https://api.deezer.com"
 
     def __init__(
-        self, app_id=None, app_secret=None, access_token=None, headers=None, **kwargs
+        self,
+        access_token: str | None = None,
+        headers: HeaderTypes | None = None,
     ):
-        self.app_id = app_id
-        self.app_secret = app_secret
-        self.access_token = access_token
-        self.session = requests.Session()
-
-        headers = headers or {}
-        self.session.headers.update(headers)
+        if access_token:
+            deezer_auth = DeezerQueryAuth(access_token=access_token)
+        else:
+            deezer_auth = None
+        super().__init__(
+            base_url="https://api.deezer.com",
+            auth=deezer_auth,
+            headers=headers,
+        )
 
     def _process_json(
         self,
@@ -98,9 +101,7 @@ class Client:
         :returns: instance of :class:`~deezer.Resource`
         """
         if "data" in item:
-            parsed_data = [
-                self._process_json(i, parent, paginate_list=False) for i in item["data"]
-            ]
+            parsed_data = [self._process_json(i, parent, paginate_list=False) for i in item["data"]]
             if not paginate_list:
                 return parsed_data
             item["data"] = parsed_data
@@ -139,7 +140,7 @@ class Client:
         resource_type: type[Resource] | None = None,
         resource_id: int | None = None,
         paginate_list=False,
-        **params,
+        **kwargs,
     ):
         """
         Make a request to the API and parse the response.
@@ -150,23 +151,20 @@ class Client:
         :param resource_type: The resource class to use as top level.
         :param resource_id: The resource id to use as top level.
         :param paginate_list: Whether to wrap list into a pagination object.
-        :param params: Query parameters to add to the request
         """
-        if self.access_token is not None:
-            params["access_token"] = str(self.access_token)
-        response = self.session.request(
+        response = super().request(
             method,
-            f"{self.base_url}/{path}",
-            params=params,
+            path,
+            **kwargs,
         )
         try:
             response.raise_for_status()
-        except requests.HTTPError as exc:
+        except httpx.HTTPStatusError as exc:
             raise DeezerHTTPError.from_http_error(exc) from exc
         json_data = response.json()
         if not isinstance(json_data, dict):
             return json_data
-        if "error" in json_data and json_data["error"]:
+        if json_data.get("error"):
             raise DeezerErrorResponse(json_data)
         return self._process_json(
             json_data,
@@ -176,8 +174,8 @@ class Client:
             paginate_list=paginate_list,
         )
 
-    def _get_paginated_list(self, path, **params):
-        return PaginatedList(client=self, base_path=path, **params)
+    def _get_paginated_list(self, path: str, params: dict | None = None):
+        return PaginatedList(client=self, base_path=path, params=params)
 
     def get_album(self, album_id: int) -> Album:
         """
@@ -204,9 +202,7 @@ class Client:
         :param genre_id: the genre ID, default to `All` genre (genre_id = 0).
         :returns: a :class:`~deezer.Chart` instance.
         """
-        return self.request(
-            "GET", f"chart/{genre_id}", resource_type=Chart, resource_id=genre_id
-        )
+        return self.request("GET", f"chart/{genre_id}", resource_type=Chart, resource_id=genre_id)
 
     def get_tracks_chart(self, genre_id: int = 0) -> list[Track]:
         """
@@ -359,9 +355,7 @@ class Client:
         :returns: a :class:`PaginatedList <deezer.PaginatedList>`
                   of :class:`Track <deezer.Track>` instances
         """
-        return PaginatedList(
-            client=self, base_path="user/me/recommendations/tracks", **kwargs
-        )
+        return PaginatedList(client=self, base_path="user/me/recommendations/tracks", **kwargs)
 
     def get_user_recommended_albums(self, **kwargs) -> PaginatedList[Album]:
         """
@@ -370,9 +364,7 @@ class Client:
         :returns: a :class:`PaginatedList <deezer.PaginatedList>`
                   of :class:`Track <deezer.Album>` instances
         """
-        return PaginatedList(
-            client=self, base_path="user/me/recommendations/albums", **kwargs
-        )
+        return PaginatedList(client=self, base_path="user/me/recommendations/albums", **kwargs)
 
     def get_user_recommended_artists(self, **kwargs) -> PaginatedList[Artist]:
         """
@@ -381,9 +373,7 @@ class Client:
         :returns: a :class:`PaginatedList <deezer.PaginatedList>`
                   of :class:`Track <deezer.Artist>` instances
         """
-        return PaginatedList(
-            client=self, base_path="user/me/recommendations/artists", **kwargs
-        )
+        return PaginatedList(client=self, base_path="user/me/recommendations/artists", **kwargs)
 
     def get_user_recommended_playlists(self, **kwargs) -> PaginatedList[Playlist]:
         """
@@ -392,9 +382,7 @@ class Client:
         :returns: a :class:`PaginatedList <deezer.PaginatedList>`
                   of :class:`Track <deezer.Playlist>` instances
         """
-        return PaginatedList(
-            client=self, base_path="user/me/recommendations/playlists", **kwargs
-        )
+        return PaginatedList(client=self, base_path="user/me/recommendations/playlists", **kwargs)
 
     def get_user_flow(self, **kwargs) -> PaginatedList[Track]:
         """
@@ -423,7 +411,7 @@ class Client:
         :param album_id: the ID of the album to add.
         :return: boolean whether the operation succeeded.
         """
-        return self.request("POST", "user/me/albums", album_id=album_id)
+        return self.request("POST", "user/me/albums", params={"album_id": album_id})
 
     def remove_user_album(self, album_id: int) -> bool:
         """
@@ -432,7 +420,7 @@ class Client:
         :param album_id: the ID of the album to remove.
         :return: boolean whether the operation succeeded.
         """
-        return self.request("DELETE", "user/me/albums", album_id=album_id)
+        return self.request("DELETE", "user/me/albums", params={"album_id": album_id})
 
     def get_user_artists(self, user_id: int | None = None) -> PaginatedList[Artist]:
         """
@@ -452,7 +440,7 @@ class Client:
         :param artist_id: the ID of the artist to add.
         :return: boolean whether the operation succeeded.
         """
-        return self.request("POST", "user/me/artists", artist_id=artist_id)
+        return self.request("POST", "user/me/artists", params={"artist_id": artist_id})
 
     def remove_user_artist(self, artist_id: int) -> bool:
         """
@@ -461,7 +449,11 @@ class Client:
         :param artist_id: the ID of the artist to remove.
         :return: boolean whether the operation succeeded.
         """
-        return self.request("DELETE", "user/me/artists", artist_id=artist_id)
+        return self.request(
+            "DELETE",
+            "user/me/artists",
+            params={"artist_id": artist_id},
+        )
 
     def get_user_followers(self, user_id: int | None = None) -> PaginatedList[User]:
         """
@@ -492,7 +484,7 @@ class Client:
         :param user_id: the ID of the user to follow.
         :return: boolean whether the operation succeeded.
         """
-        return self.request("POST", "user/me/followings", user_id=user_id)
+        return self.request("POST", "user/me/followings", params={"user_id": user_id})
 
     def remove_user_following(self, user_id: int) -> bool:
         """
@@ -501,7 +493,7 @@ class Client:
         :param user_id: the ID of the user to stop following.
         :return: boolean whether the operation succeeded.
         """
-        return self.request("DELETE", "user/me/followings", user_id=user_id)
+        return self.request("DELETE", "user/me/followings", params={"user_id": user_id})
 
     def get_user_history(self) -> PaginatedList[Track]:
         """
@@ -530,7 +522,7 @@ class Client:
         :param track_id: the ID of the track to add.
         :return: boolean whether the operation succeeded.
         """
-        return self.request("POST", "user/me/tracks", track_id=track_id)
+        return self.request("POST", "user/me/tracks", params={"track_id": track_id})
 
     def remove_user_track(self, track_id: int) -> bool:
         """
@@ -539,7 +531,7 @@ class Client:
         :param track_id: the ID of the track to remove.
         :return: boolean whether the operation succeeded.
         """
-        return self.request("DELETE", "user/me/tracks", track_id=track_id)
+        return self.request("DELETE", "user/me/tracks", params={"track_id": track_id})
 
     def remove_user_playlist(self, playlist_id: int) -> bool:
         """
@@ -548,7 +540,7 @@ class Client:
         :param playlist_id: the ID of the playlist to remove.
         :return: boolean whether the operation succeeded.
         """
-        return self.request("DELETE", "user/me/playlists", playlist_id=playlist_id)
+        return self.request("DELETE", "user/me/playlists", params={"playlist_id": playlist_id})
 
     def add_user_playlist(self, playlist_id: int) -> bool:
         """
@@ -557,7 +549,7 @@ class Client:
         :param playlist_id: the ID of the playlist to add.
         :return: boolean whether the operation succeeded.
         """
-        return self.request("POST", "user/me/playlists", playlist_id=playlist_id)
+        return self.request("POST", "user/me/playlists", params={"playlist_id": playlist_id})
 
     def create_playlist(self, playlist_name) -> int:
         """
@@ -566,7 +558,7 @@ class Client:
         :param playlist_name: the name of the playlist.
         :return: the ID of the playlist that was created
         """
-        result = self.request("POST", "user/me/playlists", title=playlist_name)
+        result = self.request("POST", "user/me/playlists", params={"title": playlist_name})
         # Note: the REST API call returns a dict with just the "id" key in it,
         # so we return that instead of the full Playlist object
         return result.id
@@ -597,15 +589,15 @@ class Client:
         if query:
             query_parts.append(query)
         query_parts.extend(
-            f'{param_name}:"{param_value}"'
-            for param_name, param_value in advanced_params.items()
-            if param_value
+            f'{param_name}:"{param_value}"' for param_name, param_value in advanced_params.items() if param_value
         )
 
         return self._get_paginated_list(
             path=f"search/{path}" if path else "search",
-            q=" ".join(query_parts),
-            **optional_params,
+            params={
+                "q": " ".join(query_parts),
+                **optional_params,
+            },
         )
 
     def search(

{deezer_python-6.1.1 → deezer_python-7.0.0}/src/deezer/exceptions.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-import requests
+import httpx
 
 
 class DeezerAPIException(Exception):
@@ -12,9 +12,9 @@ class DeezerRetryableException(DeezerAPIException):
 
 
 class DeezerHTTPError(DeezerAPIException):
-    """Specialisation wrapping HTTPError from the requests library."""
+    """Specialization wrapping HTTPError from the httpx library."""
 
-    def __init__(self, http_exception: requests.HTTPError, *args: object) -> None:
+    def __init__(self, http_exception: httpx.HTTPStatusError, *args: object) -> None:
         if http_exception.response is not None and http_exception.response.text:
             url = http_exception.response.request.url
             status_code = http_exception.response.status_code
@@ -24,8 +24,8 @@ class DeezerHTTPError(DeezerAPIException):
             super().__init__(http_exception, *args)
 
     @classmethod
-    def from_http_error(cls, exc: requests.HTTPError) -> DeezerHTTPError:
-        """Initialise the appropriate internal exception from a HTTPError."""
+    def from_http_error(cls, exc: httpx.HTTPStatusError) -> DeezerHTTPError:
+        """Initialize the appropriate internal exception from a HTTPError."""
         if exc.response is not None:
             if exc.response.status_code in {502, 503, 504}:
                 return DeezerRetryableHTTPError(exc)
@@ -37,7 +37,7 @@ class DeezerHTTPError(DeezerAPIException):
 
 
 class DeezerRetryableHTTPError(DeezerRetryableException, DeezerHTTPError):
-    """A HTTP error due to a potentially temporary issue."""
+    """An HTTP error due to a potentially temporary issue."""
 
 
 class DeezerForbiddenError(DeezerHTTPError):

{deezer_python-6.1.1 → deezer_python-7.0.0}/src/deezer/pagination.py

@@ -20,14 +20,14 @@ class PaginatedList(Generic[ResourceType]):
         client: deezer.Client,
         base_path: str,
         parent: deezer.Resource | None = None,
-        **params,
+        params: dict | None = None,
     ):
         self.__elements: list[ResourceType] = []
         self.__client = client
         self.__base_path = base_path
-        self.__base_params = params
+        self.__base_params = params or {}
         self.__next_path: str | None = base_path
-        self.__next_params = params
+        self.__next_params = params or {}
         self.__parent = parent
         self.__total = None
         self.__iter = iter(self)
@@ -41,12 +41,10 @@ class PaginatedList(Generic[ResourceType]):
         return f"<{self.__class__.__name__} {data!r}>"
 
     @overload
-    def __getitem__(self, index: int) -> ResourceType:
-        ...
+    def __getitem__(self, index: int) -> ResourceType: ...
 
     @overload
-    def __getitem__(self, index: slice) -> list[ResourceType]:
-        ...
+    def __getitem__(self, index: slice) -> list[ResourceType]: ...
 
     def __getitem__(
         self,
@@ -92,7 +90,7 @@ class PaginatedList(Generic[ResourceType]):
             self.__next_path,
             parent=self.__parent,
             paginate_list=True,
-            **self.__next_params,
+            params=self.__next_params,
         )
         self.__next_path = None
         self.__total = response_payload.get("total")
@@ -118,7 +116,7 @@ class PaginatedList(Generic[ResourceType]):
                 self.__base_path,
                 parent=self.__parent,
                 paginate_list=True,
-                **params,
+                params=params,
             )
             self.__total = response_payload["total"]
         assert self.__total is not None  # noqa S101

{deezer_python-6.1.1 → deezer_python-7.0.0}/src/deezer/resources/editorial.py

@@ -26,21 +26,21 @@ class Editorial(Resource):
     picture_big: str
     picture_xl: str
 
-    def get_selection(self, **kwargs) -> list[Album]:
+    def get_selection(self) -> list[Album]:
         """
         Get a list of albums selected every week by the Deezer Team.
 
         :returns: a list of :class:`Album <deezer.Album>` instances
         """
-        return self.get_relation("selection", **kwargs)
+        return self.get_relation("selection")
 
-    def get_chart(self, **kwargs) -> Chart:
+    def get_chart(self) -> Chart:
         """
         Get top charts for tracks, albums, artists and playlists.
 
         :returns: a :class:`~deezer.Chart` instance
         """
-        return self.get_relation("charts", resource_type=Chart, **kwargs)
+        return self.get_relation("charts", resource_type=Chart)
 
     def get_releases(self, **kwargs) -> PaginatedList[Album]:
         """

{deezer_python-6.1.1 → deezer_python-7.0.0}/src/deezer/resources/episode.py

@@ -42,7 +42,7 @@ class Episode(Resource):
             return f"{self.link}?utm_source=deezer&utm_content=episode-{self.id}&utm_medium=web"
         return super()._infer_missing_field(item)
 
-    def add_bookmark(self, offset: int, **kwargs) -> bool:
+    def add_bookmark(self, offset: int) -> bool:
         """
         Sets a bookmark on the episode.
 
@@ -52,14 +52,13 @@ class Episode(Resource):
         return self.client.request(
             "POST",
             f"episode/{self.id}/bookmark",
-            offset=offset,
-            **kwargs,
+            params={"offset": offset},
         )
 
-    def remove_bookmark(self, **kwargs) -> bool:
+    def remove_bookmark(self) -> bool:
         """
         Removes the bookmark on the episode.
 
         :returns: a boolean that tells if the operation was successful
         """
-        return self.client.request("DELETE", f"episode/{self.id}/bookmark", **kwargs)
+        return self.client.request("DELETE", f"episode/{self.id}/bookmark")

{deezer_python-6.1.1 → deezer_python-7.0.0}/src/deezer/resources/playlist.py

@@ -58,15 +58,15 @@ class Playlist(Resource):
         """
         return self.get_paginated_list("fans", **kwargs)
 
-    def mark_seen(self, **kwargs) -> bool:
+    def mark_seen(self) -> bool:
         """
         Mark the playlist as seen.
 
         :returns: a boolean that tells if the operation was successful
         """
-        return self.client.request("POST", f"playlist/{self.id}/seen", **kwargs)
+        return self.client.request("POST", f"playlist/{self.id}/seen")
 
-    def add_tracks(self, tracks: Iterable[int | Track], **kwargs) -> bool:
+    def add_tracks(self, tracks: Iterable[int | Track]) -> bool:
         """
         Add tracks to a playlist.
 
@@ -75,11 +75,9 @@ class Playlist(Resource):
         :returns: a boolean that tells if the operation was successful
         """
         track_ids_str = ",".join(str(tid) for tid in gen_ids(tracks))
-        return self.client.request(
-            "POST", f"playlist/{self.id}/tracks", songs=track_ids_str, **kwargs
-        )
+        return self.client.request("POST", f"playlist/{self.id}/tracks", params={"songs": track_ids_str})
 
-    def delete_tracks(self, tracks: Iterable[int | Track], **kwargs) -> bool:
+    def delete_tracks(self, tracks: Iterable[int | Track]) -> bool:
         """
         Delete tracks from a playlist.
 
@@ -88,11 +86,9 @@ class Playlist(Resource):
         :returns: a boolean that tells if the operation was successful
         """
         track_ids_str = ",".join(map(str, gen_ids(tracks)))
-        return self.client.request(
-            "DELETE", f"playlist/{self.id}/tracks", songs=track_ids_str, **kwargs
-        )
+        return self.client.request("DELETE", f"playlist/{self.id}/tracks", params={"songs": track_ids_str})
 
-    def reorder_tracks(self, order: Iterable[int | Track], **kwargs) -> bool:
+    def reorder_tracks(self, order: Iterable[int | Track]) -> bool:
         """
         Reorder the tracks of a playlist.
 
@@ -101,6 +97,4 @@ class Playlist(Resource):
         :returns: a boolean that tells if the operation was successful
         """
         order_track_ids_str = ",".join(map(str, gen_ids(order)))
-        return self.client.request(
-            "POST", f"playlist/{self.id}/tracks", order=order_track_ids_str, **kwargs
-        )
+        return self.client.request("POST", f"playlist/{self.id}/tracks", params={"order": order_track_ids_str})

{deezer_python-6.1.1 → deezer_python-7.0.0}/src/deezer/resources/resource.py

@@ -56,7 +56,12 @@ class Resource:
             result[key] = value
         return result
 
-    def get_relation(self, relation, **kwargs):
+    def get_relation(
+        self,
+        relation: str,
+        resource_type: type[Resource] | None = None,  # type: ignore[valid-type]
+        params: dict | None = None,
+    ):
         """
         Generic method to load the relation from any resource.
 
@@ -69,10 +74,11 @@ class Resource:
             "GET",
             f"{self.type}/{self.id}/{relation}",
             parent=self,
-            **kwargs,
+            resource_type=resource_type,
+            params=params,
         )
 
-    def post_relation(self, relation, **kwargs):
+    def post_relation(self, relation: str, params: dict):
         """
         Generic method to make a POST request to a relation from any resource.
 
@@ -82,10 +88,10 @@ class Resource:
         return self.client.request(
             "POST",
             f"{self.type}/{self.id}/{relation}",
-            **kwargs,
+            params=params,
         )
 
-    def delete_relation(self, relation, **kwargs):
+    def delete_relation(self, relation: str, params: dict | None = None):
         """
         Generic method to make a DELETE request to a relation from any resource.
 
@@ -95,20 +101,20 @@ class Resource:
         return self.client.request(
             "DELETE",
             f"{self.type}/{self.id}/{relation}",
-            **kwargs,
+            params=params,
         )
 
     def get_paginated_list(
         self,
         relation: str,
-        **kwargs,
+        params: dict | None = None,
     ) -> PaginatedList:
         """Build the pagination object based on the relation."""
         return PaginatedList(
             client=self.client,
             base_path=f"{self.type}/{self.id}/{relation}",
             parent=self,
-            **kwargs,
+            params=params,
         )
 
     def __getattr__(self, item: str) -> Any:
@@ -132,9 +138,7 @@ class Resource:
                     setattr(self, field_name, getattr(full_resource, field_name))
                     self._fields += (field_name,)
                 return getattr(self, item)
-        raise AttributeError(
-            f"'{self.__class__.__name__}' object has no attribute '{item}'"
-        )
+        raise AttributeError(f"'{self.__class__.__name__}' object has no attribute '{item}'")
 
     def _infer_missing_field(self, item: str) -> Any:
         """

{deezer_python-6.1.1 → deezer_python-7.0.0}/src/deezer/resources/user.py

@@ -48,14 +48,14 @@ class User(Resource):
     _parse_birthday = staticmethod(parse_date)
     _parse_inscription_date = staticmethod(parse_date)
 
-    def get_albums(self, **kwargs) -> PaginatedList[Album]:
+    def get_albums(self, **params) -> PaginatedList[Album]:
         """
         Get user's favorite albums.
 
         :returns: a :class:`PaginatedList <deezer.PaginatedList>`
                   of :class:`Album <deezer.Album>` instances
         """
-        return self.get_paginated_list("albums", **kwargs)
+        return self.get_paginated_list("albums", params=params)
 
     def add_album(self, album: Album | int):
         """
@@ -64,7 +64,7 @@ class User(Resource):
         :param album: an :class:`~deezer.Album` instance or its ID
         :returns: a boolean that tells if the operation was successful
         """
-        return self.post_relation("albums", album_id=get_id(album))
+        return self.post_relation("albums", params={"album_id": get_id(album)})
 
     def remove_album(self, album: Album | int):
         """
@@ -73,7 +73,7 @@ class User(Resource):
         :param album: an :class:`~deezer.Album` instance or its ID
         :returns: a boolean that tells if the operation was successful
         """
-        return self.delete_relation("albums", album_id=get_id(album))
+        return self.delete_relation("albums", params={"album_id": get_id(album)})
 
     def get_tracks(self, **kwargs) -> PaginatedList[Track]:
         """
@@ -82,7 +82,7 @@ class User(Resource):
         :returns: a :class:`PaginatedList <deezer.PaginatedList>`
                   of :class:`Track <deezer.Track>` instances
         """
-        return self.get_paginated_list("tracks", **kwargs)
+        return self.get_paginated_list("tracks")
 
     def add_track(self, track: Track | int):
         """
@@ -91,7 +91,7 @@ class User(Resource):
         :param track: a :class:`~deezer.Track` instance or its ID
         :returns: a boolean that tells if the operation was successful
         """
-        return self.post_relation("tracks", track_id=get_id(track))
+        return self.post_relation("tracks", params={"track_id": get_id(track)})
 
     def remove_track(self, track: Track | int):
         """
@@ -100,16 +100,16 @@ class User(Resource):
         :param track: a :class:`~deezer.Track` instance or its ID
         :returns: a boolean that tells if the operation was successful
         """
-        return self.delete_relation("tracks", track_id=get_id(track))
+        return self.delete_relation("tracks", params={"track_id": get_id(track)})
 
-    def get_artists(self, **kwargs) -> PaginatedList[Artist]:
+    def get_artists(self, **params) -> PaginatedList[Artist]:
         """
         Get user's favorite artists.
 
         :returns: a :class:`PaginatedList <deezer.PaginatedList>`
                   of :class:`Artist <deezer.Artist>` instances
         """
-        return self.get_paginated_list("artists", **kwargs)
+        return self.get_paginated_list("artists", params=params)
 
     def add_artist(self, artist: Artist | int):
         """
@@ -118,7 +118,7 @@ class User(Resource):
         :param artist: an :class:`~deezer.Artist` instance or its ID
         :returns: a boolean that tells if the operation was successful
         """
-        return self.post_relation("artists", artist_id=get_id(artist))
+        return self.post_relation("artists", params={"artist_id": get_id(artist)})
 
     def remove_artist(self, artist: Artist | int):
         """
@@ -127,25 +127,25 @@ class User(Resource):
         :param artist: an :class:`~deezer.Artist` instance or its ID
         :returns: a boolean that tells if the operation was successful
         """
-        return self.delete_relation("artists", artist_id=get_id(artist))
+        return self.delete_relation("artists", params={"artist_id": get_id(artist)})
 
-    def get_followers(self, **kwargs) -> PaginatedList[User]:
+    def get_followers(self, **params) -> PaginatedList[User]:
         """
         Get user's followers.
 
         :returns: a :class:`PaginatedList <deezer.PaginatedList>`
                   of :class:`User <deezer.User>` instances
         """
-        return self.get_paginated_list("followers", **kwargs)
+        return self.get_paginated_list("followers", params=params)
 
-    def get_followings(self, **kwargs) -> PaginatedList[User]:
+    def get_followings(self, **params) -> PaginatedList[User]:
         """
         Get user's followings.
 
         :returns: a :class:`PaginatedList <deezer.PaginatedList>`
                   of :class:`User <deezer.User>` instances
         """
-        return self.get_paginated_list("followings", **kwargs)
+        return self.get_paginated_list("followings", params=params)
 
     def follow(self, user: User | int):
         """
@@ -154,7 +154,7 @@ class User(Resource):
         :param user: a :class:`~deezer.User` instance or its ID
         :returns: a boolean that tells if the operation was successful
         """
-        return self.post_relation("followings", user_id=get_id(user))
+        return self.post_relation("followings", params={"user_id": get_id(user)})
 
     def unfollow(self, user: User | int):
         """
@@ -163,16 +163,16 @@ class User(Resource):
         :param user: a :class:`~deezer.User` instance or its ID
         :returns: a boolean that tells if the operation was successful
         """
-        return self.delete_relation("followings", user_id=get_id(user))
+        return self.delete_relation("followings", params={"user_id": get_id(user)})
 
-    def get_playlists(self, **kwargs) -> PaginatedList[Playlist]:
+    def get_playlists(self, **params) -> PaginatedList[Playlist]:
         """
         Get user's public playlists.
 
         :returns: a :class:`PaginatedList <deezer.PaginatedList>`
                   of :class:`Playlist <deezer.Playlist>` instances
         """
-        return self.get_paginated_list("playlists", **kwargs)
+        return self.get_paginated_list("playlists", params=params)
 
     def add_playlist(self, playlist: Playlist | int):
         """
@@ -181,7 +181,7 @@ class User(Resource):
         :param playlist: a :class:`~deezer.Playlist` instance or its ID
         :returns: a boolean that tells if the operation was successful
         """
-        return self.post_relation("playlists", playlist_id=get_id(playlist))
+        return self.post_relation("playlists", params={"playlist_id": get_id(playlist)})
 
     def remove_playlist(self, playlist: Playlist | int):
         """
@@ -190,7 +190,7 @@ class User(Resource):
         :param playlist: a :class:`~deezer.Playlist` instance or its ID
         :returns: a boolean that tells if the operation was successful
         """
-        return self.delete_relation("playlists", playlist_id=get_id(playlist))
+        return self.delete_relation("playlists", params={"playlist_id": get_id(playlist)})
 
     def create_playlist(self, title: str) -> int:
         """
@@ -199,7 +199,7 @@ class User(Resource):
         :param title: the title of the playlist
         :returns: the ID of the playlist that was created
         """
-        result = self.post_relation("playlists", title=title)
+        result = self.post_relation("playlists", params={"title": title})
         # Note: the REST API call returns a dict with just the "id" key in it,
         # so we return that instead of the full Playlist object
         return result.id