spotapi 1.1.2__tar.gz → 1.1.4__tar.gz

{spotapi-1.1.2/spotapi.egg-info → spotapi-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spotapi
-Version: 1.1.2
+Version: 1.1.4
 Summary: A sleek API wrapper for Spotify's private API
 Home-page: UNKNOWN
 Author: Aran
@@ -48,6 +48,7 @@ Everything you can do with Spotify, **SpotAPI** can do with just a user’s
 
 
 ## Docs
+- [**Public.py**](./docs/public.md)
 - [**Artist.py**](./docs/artist.md)
 - [**Album.py**](./docs/album.md)
 - [**Creator.py**](./docs/creator.md)

{spotapi-1.1.2 → spotapi-1.1.4}/README.md

@@ -33,6 +33,7 @@ Everything you can do with Spotify, **SpotAPI** can do with just a user’s logi
 
 
 ## Docs
+- [**Public.py**](./docs/public.md)
 - [**Artist.py**](./docs/artist.md)
 - [**Album.py**](./docs/album.md)
 - [**Creator.py**](./docs/creator.md)

{spotapi-1.1.2 → spotapi-1.1.4}/setup.py

@@ -55,5 +55,5 @@ setup(
     ],
     long_description=long_description,
     long_description_content_type="text/markdown",
-    version="1.1.2",
+    version="1.1.4",
 )

{spotapi-1.1.2 → spotapi-1.1.4}/spotapi/artist.py

@@ -83,6 +83,42 @@ class Artist:
 
         return resp.response
 
+    def get_artist(
+        self, artist_id: str, /, *, locale_code: str = "en"
+    ) -> Mapping[str, Any]:
+        """Gets an artist by ID"""
+        if "artist:" in artist_id:
+            artist_id = artist_id.split("artist:")[-1]
+
+        url = "https://api-partner.spotify.com/pathfinder/v1/query"
+        params = {
+            "operationName": "queryArtistOverview",
+            "variables": json.dumps(
+                {
+                    "uri": f"spotify:artist:{artist_id}",
+                    "locale": locale_code,
+                }
+            ),
+            "extensions": json.dumps(
+                {
+                    "persistedQuery": {
+                        "version": 1,
+                        "sha256Hash": self.base.part_hash("queryArtistOverview"),
+                    }
+                }
+            ),
+        }
+
+        resp = self.base.client.get(url, params=params, authenticate=True)
+
+        if resp.fail:
+            raise ArtistError("Could not get artist by ID", error=resp.error.string)
+
+        if not isinstance(resp.response, Mapping):
+            raise ArtistError("Invalid JSON response")
+
+        return resp.response
+
     def paginate_artists(
         self, query: str, /
     ) -> Generator[Mapping[str, Any], None, None]:

{spotapi-1.1.2 → spotapi-1.1.4}/spotapi/client.py

@@ -75,8 +75,13 @@ class BaseClient:
         if resp.fail:
             raise BaseClientError("Could not get session", error=resp.error.string)
 
-        pattern = r"https:\/\/open\.spotifycdn\.com\/cdn\/build\/web-player\/web-player.*?\.js"
-        self.js_pack = re.findall(pattern, resp.response)[1]
+        try:
+            pattern = r"https:\/\/open\.spotifycdn\.com\/cdn\/build\/web-player\/web-player.*?\.js"
+            self.js_pack = re.findall(pattern, resp.response)[1]
+        except IndexError:
+            pattern = r"https:\/\/open-exp.spotifycdn\.com\/cdn\/build\/web-player\/web-player.*?\.js"
+            self.js_pack = re.findall(pattern, resp.response)[1]
+            
         self.access_token = parse_json_string(resp.response, "accessToken")
         self.client_id = parse_json_string(resp.response, "clientId")
         self.device_id = parse_json_string(resp.response, "correlationId")

{spotapi-1.1.2 → spotapi-1.1.4}/spotapi/playlist.py

@@ -48,7 +48,7 @@ class PublicPlaylist:
         self.playlist_link = f"https://open.spotify.com/playlist/{self.playlist_id}"
 
     def get_playlist_info(
-        self, limit: int = 25, *, offset: int = 0
+        self, limit: int = 25, *, offset: int = 0, enable_watch_feed_entrypoint: bool = False
     ) -> Mapping[str, Any]:
         """Gets the public playlist information"""
         url = "https://api-partner.spotify.com/pathfinder/v1/query"
@@ -59,6 +59,7 @@ class PublicPlaylist:
                     "uri": f"spotify:playlist:{self.playlist_id}",
                     "offset": offset,
                     "limit": limit,
+                    "enableWatchFeedEntrypoint": enable_watch_feed_entrypoint,
                 }
             ),
             "extensions": json.dumps(

{spotapi-1.1.2 → spotapi-1.1.4}/spotapi/user.py

@@ -4,12 +4,12 @@ from typing import Any
 from collections.abc import Mapping
 from spotapi.types.annotations import enforce
 
+from spotapi import utils
 from spotapi.exceptions import UserError
 from spotapi.login import Login
 
 __all__ = ["User", "UserError"]
 
-
 @enforce
 class User:
     """
@@ -110,9 +110,17 @@ class User:
                 "country": profile_dump["country"],
             },
             "recaptcha_token": captcha_response,
+            "client_nonce": utils.random_nonce(),
+            "callback_url": "https://www.spotify.com/account/profile/challenge",
+            "client_info": {
+                "locale": "en_US",
+                "capabilities": [
+                    1
+                ]
+            }
         }
 
-        url = "https://www.spotify.com/api/account-settings/v1/profile"
+        url = "https://www.spotify.com/api/account-settings/v2/profile"
 
         headers = {
             "Content-Type": "application/json",

{spotapi-1.1.2 → spotapi-1.1.4}/spotapi/utils/strings.py

@@ -4,6 +4,7 @@ import random
 import base64
 import os
 
+
 __all__ = [
     "random_b64_string",
     "random_hex_string",
@@ -12,9 +13,9 @@ __all__ = [
     "random_domain",
     "random_email",
     "random_dob",
+    "random_nonce"
 ]
 
-
 def random_b64_string(length: int) -> str:
     """Used by Spotify internally"""
 
@@ -84,3 +85,6 @@ def random_email() -> str:
 
 def random_dob() -> str:
     return f"{random.randint(1950, 2000)}-{random.randint(1, 12):02d}-{random.randint(1, 28):02d}"
+
+def random_nonce() -> str:
+    return ''.join(str(random.getrandbits(32)) for _ in range(2))

{spotapi-1.1.2 → spotapi-1.1.4/spotapi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spotapi
-Version: 1.1.2
+Version: 1.1.4
 Summary: A sleek API wrapper for Spotify's private API
 Home-page: UNKNOWN
 Author: Aran
@@ -48,6 +48,7 @@ Everything you can do with Spotify, **SpotAPI** can do with just a user’s
 
 
 ## Docs
+- [**Public.py**](./docs/public.md)
 - [**Artist.py**](./docs/artist.md)
 - [**Album.py**](./docs/album.md)
 - [**Creator.py**](./docs/creator.md)