spotapi 1.2.7__tar.gz → 1.2.8__tar.gz

{spotapi-1.2.7/spotapi.egg-info → spotapi-1.2.8}/PKG-INFO

@@ -1,17 +1,34 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: spotapi
-Version: 1.2.7
+Version: 1.2.8
 Summary: A sleek API wrapper for Spotify's private API
-Home-page: UNKNOWN
 Author: Aran
-License: UNKNOWN
 Keywords: Spotify,API,Spotify API,Spotify Private API,Follow,Like,Creator,Music,Music API,Streaming,Music Data,Track,Playlist,Album,Artist,Music Search,Music Metadata,SpotAPI,Python Spotify Wrapper,Music Automation,Web Scraping,Python Music API,Spotify Integration,Spotify Playlist,Spotify Tracks
-Platform: UNKNOWN
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: requests
+Requires-Dist: colorama
+Requires-Dist: Pillow
+Requires-Dist: readerwriterlock
+Requires-Dist: curl_cffi
+Requires-Dist: typing_extensions
+Requires-Dist: validators
+Requires-Dist: pyotp
+Requires-Dist: beautifulsoup4
 Provides-Extra: websocket
+Requires-Dist: websockets; extra == "websocket"
 Provides-Extra: redis
+Requires-Dist: redis; extra == "redis"
 Provides-Extra: pymongo
-License-File: LICENSE
+Requires-Dist: pymongo; extra == "pymongo"
+Dynamic: author
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: keywords
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 # Legal Notice
 
@@ -32,8 +49,8 @@ Welcome to SpotAPI! This Python library is designed to interact with the private
 5. [Quick Examples](#quick-examples)
 6. [Import Cookies](#import-cookies)
 7. [Contributing](#contributing)
-8. [Roadmap](#roadmap)
-9. [License](#license)
+8. [License](#license)
+9. **[Extended Functionality & Private Modules](#private-modules)**
 
 
 ## Features
@@ -41,8 +58,9 @@ Welcome to SpotAPI! This Python library is designed to interact with the private
 - **Public API Access**: Retrieve and manipulate public Spotify data such as playlists, albums, and tracks with ease.
 - **Private API Access**: Explore private Spotify endpoints to tailor your application to your needs.
 - **Ready to Use**: **SpotAPI** is designed for immediate integration, allowing you to accomplish tasks with just a few lines of code.
-- **No API Key Required**: Seamlessly use **SpotAPI** without needing a Spotify API key. It’s straightforward and hassle free!
+- **No API Key Required**: Seamlessly use **SpotAPI** without needing a Spotify API key. It's straightforward and hassle free!
 - **Browser-like Requests**: Accurately replicate the HTTP requests Spotify makes in the browser, providing a true to web experience while remaining undetected.
+- **Multi-Language Support**: Set your preferred language for API responses using ISO 639-1 language codes (e.g., 'ko', 'ja', 'zh', 'en').
 
 Everything you can do with Spotify, **SpotAPI** can do with just a user’s login credentials.
 
@@ -119,6 +137,21 @@ data = songs["data"]["searchV2"]["tracksV2"]["items"]
 for idx, item in enumerate(data):
     print(idx, item['item']['data']['name'])
 ```
+
+### With Language Support
+```py
+from spotapi import Artist, PublicPlaylist, Song
+
+# Initialize with Korean language
+artist = Artist(language="ko")
+playlist = PublicPlaylist("37i9dQZF1DXcBWIGoYBM5M", language="ko")
+
+# Change language at runtime
+song = Song(language="en")
+song.base.set_language("ja")  # Switch to Japanese
+
+# Supported languages: ko, ja, zh, en, and any ISO 639-1 code
+```
 ### Results
 ```
 0 Island In The Sun
@@ -152,17 +185,8 @@ If you prefer not to use a third party CAPTCHA solver, you can import cookies to
 ## Contributing
 Contributions are welcome! If you find any issues or have suggestions, please open an issue or submit a pull request.
 
-## Roadmap
-> I'll most likely do these if the project gains some traction
-
-- [ ] No Captcha For Login (**100 Stars**)
-- [x] In Depth Documentation
-- [x] Websocket Listener
-- [x] Player
-- [ ] More wrappers around this project
-
 ## License
 This project is licensed under the **GPL 3.0** License. See [LICENSE](https://choosealicense.com/licenses/gpl-3.0/) for details.
 
-
-
+## **Private Modules**
+For the full scale account generation and "engagement" modules that can't be posted here, reach out on Telegram: **@aran_xyz**

{spotapi-1.2.7 → spotapi-1.2.8}/README.md

@@ -17,8 +17,8 @@ Welcome to SpotAPI! This Python library is designed to interact with the private
 5. [Quick Examples](#quick-examples)
 6. [Import Cookies](#import-cookies)
 7. [Contributing](#contributing)
-8. [Roadmap](#roadmap)
-9. [License](#license)
+8. [License](#license)
+9. **[Extended Functionality & Private Modules](#private-modules)**
 
 
 ## Features
@@ -26,8 +26,9 @@ Welcome to SpotAPI! This Python library is designed to interact with the private
 - **Public API Access**: Retrieve and manipulate public Spotify data such as playlists, albums, and tracks with ease.
 - **Private API Access**: Explore private Spotify endpoints to tailor your application to your needs.
 - **Ready to Use**: **SpotAPI** is designed for immediate integration, allowing you to accomplish tasks with just a few lines of code.
-- **No API Key Required**: Seamlessly use **SpotAPI** without needing a Spotify API key. It’s straightforward and hassle free!
+- **No API Key Required**: Seamlessly use **SpotAPI** without needing a Spotify API key. It's straightforward and hassle free!
 - **Browser-like Requests**: Accurately replicate the HTTP requests Spotify makes in the browser, providing a true to web experience while remaining undetected.
+- **Multi-Language Support**: Set your preferred language for API responses using ISO 639-1 language codes (e.g., 'ko', 'ja', 'zh', 'en').
 
 Everything you can do with Spotify, **SpotAPI** can do with just a user’s login credentials.
 
@@ -104,6 +105,21 @@ data = songs["data"]["searchV2"]["tracksV2"]["items"]
 for idx, item in enumerate(data):
     print(idx, item['item']['data']['name'])
 ```
+
+### With Language Support
+```py
+from spotapi import Artist, PublicPlaylist, Song
+
+# Initialize with Korean language
+artist = Artist(language="ko")
+playlist = PublicPlaylist("37i9dQZF1DXcBWIGoYBM5M", language="ko")
+
+# Change language at runtime
+song = Song(language="en")
+song.base.set_language("ja")  # Switch to Japanese
+
+# Supported languages: ko, ja, zh, en, and any ISO 639-1 code
+```
 ### Results
 ```
 0 Island In The Sun
@@ -137,15 +153,8 @@ If you prefer not to use a third party CAPTCHA solver, you can import cookies to
 ## Contributing
 Contributions are welcome! If you find any issues or have suggestions, please open an issue or submit a pull request.
 
-## Roadmap
-> I'll most likely do these if the project gains some traction
-
-- [ ] No Captcha For Login (**100 Stars**)
-- [x] In Depth Documentation
-- [x] Websocket Listener
-- [x] Player
-- [ ] More wrappers around this project
-
 ## License
 This project is licensed under the **GPL 3.0** License. See [LICENSE](https://choosealicense.com/licenses/gpl-3.0/) for details.
 
+## **Private Modules**
+For the full scale account generation and "engagement" modules that can't be posted here, reach out on Telegram: **@aran_xyz**

{spotapi-1.2.7 → spotapi-1.2.8}/setup.py

@@ -6,7 +6,7 @@ __install_require__ = [
     "colorama",
     "Pillow",
     "readerwriterlock",
-    "tls_client",
+    "curl_cffi",
     "typing_extensions",
     "validators",
     "pyotp",
@@ -57,5 +57,5 @@ setup(
     ],
     long_description=long_description,
     long_description_content_type="text/markdown",
-    version="1.2.7",
+    version="1.2.8",
 )

spotapi-1.2.8/spotapi/_tests/client_refresh_test.py

@@ -0,0 +1,223 @@
+# type: ignore
+"""Unit tests for the hybrid token refresh flow in BaseClient / TLSClient.
+
+These tests do not hit the network: the HTTP layer is patched so the
+refresh/retry decision logic can be exercised in isolation.
+"""
+import time
+from unittest.mock import MagicMock
+
+import pytest
+
+from spotapi.client import BaseClient
+from spotapi.http.data import Response
+from spotapi.http.request import TLSClient
+from spotapi.types.alias import _Undefined
+
+
+def _make_base():
+    """A BaseClient whose init-time network methods are stubbed out."""
+    client = TLSClient("chrome_120", "", auto_retries=1)
+    base = BaseClient(client=client)
+    # Pre-populate so _auth_rule does not fall into the first-time init branches
+    base.client_token = "ct"
+    base.access_token = "at"
+    base.client_id = "cid"
+    base.client_version = "1.0.0"
+    base.device_id = "did"
+    base.access_token_expires_at_ms = (time.time() + 600) * 1000  # 10 min out
+    return base
+
+
+def _make_tls_response(status_code, headers=None, text=""):
+    mock = MagicMock()
+    mock.status_code = status_code
+    mock.headers = headers or {}
+    mock.text = text
+    mock.url = "https://example.com/x"
+    mock.json.return_value = None
+    return mock
+
+
+def _make_response(status_code, headers=None):
+    raw = _make_tls_response(status_code, headers=headers)
+    return Response(raw=raw, status_code=status_code, response=None)
+
+
+# ---------- _auth_rule proactive refresh ----------
+
+
+def test_proactive_refresh_fires_when_near_expiry():
+    base = _make_base()
+    base.access_token_expires_at_ms = (time.time() + 1) * 1000  # inside skew window
+    calls = []
+    base._get_auth_vars = lambda: calls.append("called")
+
+    base._auth_rule({})
+
+    assert calls == ["called"]
+
+
+def test_proactive_refresh_skipped_when_fresh():
+    base = _make_base()  # expiry is 10 min out
+    calls = []
+    base._get_auth_vars = lambda: calls.append("called")
+
+    base._auth_rule({})
+
+    assert calls == []
+
+
+def test_auth_rule_sets_expected_headers():
+    base = _make_base()
+    kwargs = base._auth_rule({})
+
+    headers = kwargs["headers"]
+    assert headers["Authorization"] == "Bearer at"
+    assert headers["Client-Token"] == "ct"
+    assert headers["Spotify-App-Version"] == "1.0.0"
+
+
+# ---------- _handle_auth_failure ----------
+
+
+def test_handle_401_refreshes_access_token():
+    base = _make_base()
+    calls = []
+
+    def fake_refresh():
+        calls.append("called")
+        base.access_token = "new_at"
+
+    base._get_auth_vars = fake_refresh
+    base.access_token = _Undefined  # simulate reset-before-refresh
+
+    retried = base._handle_auth_failure(_make_response(401))
+
+    assert retried is True
+    assert calls == ["called"]
+
+
+def test_handle_401_resets_access_token_before_refresh():
+    base = _make_base()
+    seen = []
+    base._get_auth_vars = lambda: seen.append(base.access_token)
+
+    base._handle_auth_failure(_make_response(401))
+
+    assert seen == [_Undefined], "access_token must be reset before _get_auth_vars runs"
+
+
+def test_handle_400_with_client_token_error_refreshes_client_token():
+    base = _make_base()
+    calls = []
+
+    def fake_refresh():
+        calls.append("called")
+        base.client_token = "new_ct"
+
+    base.get_client_token = fake_refresh
+
+    retried = base._handle_auth_failure(
+        _make_response(400, headers={"Client-Token-Error": "INVALID_CLIENTTOKEN"})
+    )
+
+    assert retried is True
+    assert calls == ["called"]
+
+
+def test_handle_400_without_client_token_error_returns_false():
+    base = _make_base()
+    base.get_client_token = lambda: pytest.fail("should not refresh")
+    base._get_auth_vars = lambda: pytest.fail("should not refresh")
+
+    retried = base._handle_auth_failure(_make_response(400))
+
+    assert retried is False
+
+
+def test_handle_500_returns_false():
+    base = _make_base()
+    base.get_client_token = lambda: pytest.fail("should not refresh")
+    base._get_auth_vars = lambda: pytest.fail("should not refresh")
+
+    retried = base._handle_auth_failure(_make_response(500))
+
+    assert retried is False
+
+
+def test_handle_200_returns_false():
+    base = _make_base()
+    retried = base._handle_auth_failure(_make_response(200))
+    assert retried is False
+
+
+# ---------- TLSClient._send retry-once ----------
+
+
+def _patch_send(client, responses):
+    """Make build_request return the given TLS responses in sequence."""
+    it = iter(responses)
+    client.build_request = lambda *args, **kwargs: next(it)
+
+
+def test_send_retries_once_on_auth_failure():
+    client = TLSClient("chrome_120", "", auto_retries=1)
+    _patch_send(
+        client,
+        [
+            _make_tls_response(401, headers={"Www-Authenticate": "Bearer"}),
+            _make_tls_response(200),
+        ],
+    )
+
+    auth_calls = []
+    client.authenticate = lambda kwargs: (auth_calls.append(1) or kwargs)
+    client.on_auth_failure = lambda resp: True
+
+    resp = client.get("https://example.com/x", authenticate=True)
+
+    assert resp.status_code == 200
+    assert len(auth_calls) == 2, "authenticate should run once per attempt"
+
+
+def test_send_does_not_retry_when_handler_returns_false():
+    client = TLSClient("chrome_120", "", auto_retries=1)
+    _patch_send(client, [_make_tls_response(500)])
+
+    client.authenticate = lambda kwargs: kwargs
+    client.on_auth_failure = lambda resp: False
+
+    resp = client.get("https://example.com/x", authenticate=True)
+
+    assert resp.status_code == 500
+
+
+def test_send_does_not_retry_without_authenticate_flag():
+    client = TLSClient("chrome_120", "", auto_retries=1)
+    _patch_send(client, [_make_tls_response(401)])
+
+    client.authenticate = lambda kwargs: kwargs
+    client.on_auth_failure = lambda resp: pytest.fail("should not be called")
+
+    resp = client.get("https://example.com/x", authenticate=False)
+
+    assert resp.status_code == 401
+
+
+def test_send_retries_at_most_once_even_if_second_attempt_also_fails():
+    client = TLSClient("chrome_120", "", auto_retries=1)
+    # If _send retried more than once, StopIteration would fire
+    _patch_send(
+        client,
+        [_make_tls_response(401), _make_tls_response(401)],
+    )
+
+    client.authenticate = lambda kwargs: kwargs
+    handler_calls = []
+    client.on_auth_failure = lambda resp: (handler_calls.append(1) or True)
+
+    resp = client.get("https://example.com/x", authenticate=True)
+
+    assert resp.status_code == 401
+    assert len(handler_calls) == 1, "on_auth_failure must only be consulted once"

{spotapi-1.2.7 → spotapi-1.2.8}/spotapi/album.py

@@ -33,9 +33,10 @@ class PublicAlbum:
         album: str,
         /,
         *,
-        client: TLSClient = TLSClient("chrome_120", "", auto_retries=3),
+        client: TLSClient = TLSClient("chrome120", "", auto_retries=3),
+        language: str = "en",
     ) -> None:
-        self.base = BaseClient(client=client)
+        self.base = BaseClient(client=client, language=language)
         self.album_id = album.split("album/")[-1] if "album" in album else album
         self.album_link = f"https://open.spotify.com/album/{self.album_id}"
 

{spotapi-1.2.7 → spotapi-1.2.8}/spotapi/artist.py

@@ -37,13 +37,14 @@ class Artist:
         self,
         login: Login | None = None,
         *,
-        client: TLSClient = TLSClient("chrome_120", "", auto_retries=3),
+        client: TLSClient = TLSClient("chrome120", "", auto_retries=3),
+        language: str = "en",
     ) -> None:
         if login and not login.logged_in:
             raise ValueError("Must be logged in")
 
         self._login: bool = bool(login)
-        self.base = BaseClient(client=login.client if (login is not None) else client)
+        self.base = BaseClient(client=login.client if (login is not None) else client, language=language)
 
     def query_artists(
         self, query: str, /, limit: int = 10, *, offset: int = 0
@@ -144,6 +145,112 @@ class Artist:
             ]["artists"]["items"]
             offset += UPPER_LIMIT
 
+    def get_artist_discography(
+        self,
+        artist_id: str,
+        /,
+        *,
+        section: Literal["all", "albums", "singles", "compilations"] = "all",
+        offset: int = 0,
+        limit: int = 50,
+        order: Literal["DATE_DESC", "DATE_ASC"] = "DATE_DESC",
+    ) -> Mapping[str, Any]:
+        """Gets an artist's discography with pagination.
+
+        Unlike queryArtistOverview (capped per section), the discography operations
+        support proper offset/limit/order. Section 'all' merges albums + singles +
+        compilations sorted by date.
+        """
+        if "artist:" in artist_id:
+            artist_id = artist_id.split("artist:")[-1]
+
+        operation_name = {
+            "all": "queryArtistDiscographyAll",
+            "albums": "queryArtistDiscographyAlbums",
+            "singles": "queryArtistDiscographySingles",
+            "compilations": "queryArtistDiscographyCompilations",
+        }[section]
+        url = "https://api-partner.spotify.com/pathfinder/v2/query"
+        payload = {
+            "variables": {
+                "uri": f"spotify:artist:{artist_id}",
+                "offset": offset,
+                "limit": limit,
+                "order": order,
+            },
+            "operationName": operation_name,
+            "extensions": {
+                "persistedQuery": {
+                    "version": 1,
+                    "sha256Hash": self.base.part_hash(operation_name),
+                },
+            },
+        }
+
+        resp = self.base.client.post(url, json=payload, authenticate=True)
+
+        if resp.fail:
+            raise ArtistError(
+                "Could not get artist discography", error=resp.error.string
+            )
+
+        if not isinstance(resp.response, Mapping):
+            raise ArtistError("Invalid JSON response")
+
+        return resp.response
+
+    def paginate_artist_discography(
+        self,
+        artist_id: str,
+        /,
+        *,
+        section: Literal["all", "albums", "singles", "compilations"] = "all",
+        order: Literal["DATE_DESC", "DATE_ASC"] = "DATE_DESC",
+    ) -> Generator[Mapping[str, Any], None, None]:
+        """Generator that fetches an artist's discography in chunks.
+
+        Note: If total_count <= 50, then there is no need to paginate.
+        """
+        UPPER_LIMIT: int = 50
+
+        first = self.get_artist_discography(
+            artist_id, section=section, offset=0, limit=UPPER_LIMIT, order=order
+        )
+        section_data = (
+            first.get("data", {})
+            .get("artistUnion", {})
+            .get("discography", {})
+            .get(section, {})
+        )
+        items = section_data.get("items") or []
+        total_count: int = section_data.get("totalCount") or len(items)
+
+        yield items
+
+        if total_count <= UPPER_LIMIT:
+            return
+
+        offset = UPPER_LIMIT
+        while offset < total_count:
+            resp = self.get_artist_discography(
+                artist_id,
+                section=section,
+                offset=offset,
+                limit=UPPER_LIMIT,
+                order=order,
+            )
+            page_items = (
+                resp.get("data", {})
+                .get("artistUnion", {})
+                .get("discography", {})
+                .get(section, {})
+                .get("items")
+            ) or []
+            if not page_items:
+                break
+            yield page_items
+            offset += UPPER_LIMIT
+
     def _do_follow(
         self,
         artist_id: str,

{spotapi-1.2.7 → spotapi-1.2.8}/spotapi/client.py

@@ -1,3 +1,4 @@
+import re
 import time
 import json
 import base64
@@ -7,10 +8,10 @@ import requests
 from typing import Tuple, Literal
 from collections.abc import Mapping
 from spotapi.utils.logger import Logger
-from spotapi.utils.logger import Logger
 from spotapi.types.annotations import enforce
 from spotapi.types.alias import _UStr, _Undefined
 from spotapi.exceptions import BaseClientError
+from spotapi.http.data import Response
 from spotapi.http.request import TLSClient
 from spotapi.utils.strings import extract_js_links, extract_mappings, combine_chunks
 
@@ -18,9 +19,9 @@ from spotapi.utils.strings import extract_js_links, extract_mappings, combine_ch
 RECAPTCHA_SITE_KEY: str = "6LfCVLAUAAAAALFwwRnnCJ12DalriUGbj8FW_J39"
 # Fallback hardcoded secret (version 18)
 _FALLBACK_SECRET: Tuple[Literal[18], bytearray] = (
-    18,
+    61,
     bytearray(
-        [70, 60, 33, 57, 92, 120, 90, 33, 32, 62, 62, 55, 126, 93, 66, 35, 108, 68]
+        [44,55,47,42,70,40,34,114,76,74,50,111,120,97,75,76,94,102,43,69,49,120,118,80,64,78]
     ),
 )
 
@@ -77,16 +78,24 @@ class BaseClient:
     js_pack: _UStr = _Undefined
     client_version: _UStr = _Undefined
     access_token: _UStr = _Undefined
+    access_token_expires_at_ms: float = 0
     client_token: _UStr = _Undefined
     client_id: _UStr = _Undefined
     device_id: _UStr = _Undefined
     raw_hashes: _UStr = _Undefined
+    language: str = "en"
+
+    # Refresh a bit before real expiry to avoid skew-induced 401s
+    _REFRESH_SKEW_MS: float = 30_000
 
-    def __init__(self, client: TLSClient) -> None:
+    def __init__(self, client: TLSClient, language: str = "en") -> None:
         self.client = client
+        self.language = language
         self.client.authenticate = lambda kwargs: self._auth_rule(kwargs)
+        self.client.on_auth_failure = lambda resp: self._handle_auth_failure(resp)
 
-        self.browser_version = self.client.client_identifier.split("_")[1]
+        match = re.search(r"\d+", self.client.impersonate)
+        self.browser_version = match.group()
         self.client.headers.update(
             {
                 "Content-Type": "application/json;charset=UTF-8",
@@ -104,6 +113,14 @@ class BaseClient:
         if self.access_token is _Undefined:
             self.get_session()
 
+        if (
+            self.access_token_expires_at_ms
+            and time.time() * 1000 + self._REFRESH_SKEW_MS
+            >= self.access_token_expires_at_ms
+        ):
+            self.access_token = _Undefined
+            self._get_auth_vars()
+
         if "headers" not in kwargs:
             kwargs["headers"] = {}
 
@@ -112,11 +129,34 @@ class BaseClient:
                 "Authorization": "Bearer " + str(self.access_token),
                 "Client-Token": self.client_token,
                 "Spotify-App-Version": self.client_version,
+                "Accept-Language": self.language,
             }.items()
         )
 
         return kwargs
 
+    def _handle_auth_failure(self, resp: Response) -> bool:
+        if resp.status_code == 401:
+            self.access_token = _Undefined
+            self._get_auth_vars()
+            return True
+
+        if resp.status_code == 400:
+            try:
+                headers = {k.lower(): v for k, v in resp.raw.headers.items()}
+            except Exception:
+                headers = {}
+            if headers.get("client-token-error") == "INVALID_CLIENTTOKEN":
+                self.client_token = _Undefined
+                self.get_client_token()
+                return True
+
+        return False
+
+    def set_language(self, language: str) -> None:
+        """Set the language for API requests. Uses ISO 639-1 language codes (e.g., 'ko', 'en', 'ja')."""
+        self.language = language
+
     def _get_auth_vars(self) -> None:
         if self.access_token is _Undefined or self.client_id is _Undefined:
             totp, version = generate_totp()
@@ -137,6 +177,9 @@ class BaseClient:
 
             self.access_token = resp.response["accessToken"]
             self.client_id = resp.response["clientId"]
+            self.access_token_expires_at_ms = float(
+                resp.response.get("accessTokenExpirationTimestampMs") or 0
+            )
 
     def get_session(self) -> None:
         resp = self.client.get("https://open.spotify.com")

{spotapi-1.2.7 → spotapi-1.2.8}/spotapi/http/data.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from dataclasses import dataclass, field
 from typing import Any, Union
 from requests import Response as StdResponse
-from tls_client.response import Response as TLSResponse
+from curl_cffi.requests import Response as TLSResponse
 
 __all__ = ["Response", "Error", "StdResponse", "TLSResponse"]
 

{spotapi-1.2.7 → spotapi-1.2.8}/spotapi/http/request.py

@@ -1,15 +1,18 @@
 from __future__ import annotations
 
-from typing import Any, Callable, Type, Dict
-from tls_client.settings import ClientIdentifiers
-from tls_client.exceptions import TLSClientExeption
-from tls_client.response import Response as TLSResponse
-from spotapi.exceptions import ParentException, RequestError
-from spotapi.http.data import Response
-from tls_client import Session
-import requests
 import atexit
 import json
+from typing import Any, Callable, Dict, Type
+
+import requests
+from curl_cffi.requests import Response as TLSResponse
+from curl_cffi.requests import Session
+from curl_cffi.requests.exceptions import RequestException
+
+from spotapi.exceptions import ParentException, RequestError
+from spotapi.http.data import Response
+
+ClientIdentifiers = str
 
 __all__ = [
     "StdClient",
@@ -110,7 +113,7 @@ class StdClient:
 
 class TLSClient(Session):
     """
-    TLS-HTTP Client implementation wrapped around the tls_client library.
+    TLS-HTTP Client implementation wrapped around the curl_cffi library.
 
     This is fully undetected by Spotify.com.
     """
@@ -123,13 +126,14 @@ class TLSClient(Session):
         auto_retries: int = 0,
         auth_rule: Callable[[Dict[Any, Any]], Dict[Any, Any]] | None = None,
     ) -> None:
-        super().__init__(client_identifier=profile, random_tls_extension_order=True)
+        super().__init__(impersonate=profile)
 
         if proxy:
             self.proxies = {"http": f"http://{proxy}", "https": f"http://{proxy}"}
 
         self.auto_retries = auto_retries + 1
         self.authenticate = auth_rule
+        self.on_auth_failure: Callable[[Response], bool] | None = None
         self.fail_exception: Type[ParentException] | None = None
         atexit.register(self.close)
 
@@ -149,8 +153,8 @@ class TLSClient(Session):
         err = "Unknown"
         for _ in range(self.auto_retries):
             try:
-                response = self.execute_request(method.upper(), url, **kwargs)
-            except TLSClientExeption as e:
+                response = self.request(method.upper(), url, **kwargs)
+            except RequestException as e:
                 err = str(e)
                 continue
             else:
@@ -180,9 +184,6 @@ class TLSClient(Session):
         if not body:
             body = None
 
-        # Why is status_code a None type...
-        assert response.status_code is not None, "Status Code is None"
-
         resp = Response(
             status_code=int(response.status_code), response=body, raw=response
         )
@@ -195,19 +196,50 @@ class TLSClient(Session):
 
         return resp
 
-    def get(
-        self, url: str | bytes, *, authenticate: bool = False, **kwargs
+    def _send(
+        self,
+        method: str,
+        url: str | bytes,
+        *,
+        authenticate: bool,
+        danger: bool,
+        **kwargs,
     ) -> Response:
-        """Routes a GET Request"""
         if authenticate and self.authenticate is not None:
             kwargs = self.authenticate(kwargs)
 
-        response = self.build_request("GET", url, allow_redirects=True, **kwargs)
-
+        response = self.build_request(method, url, allow_redirects=True, **kwargs)
         if response is None:
-            raise TLSClientExeption("Request kept failing after retries.")
+            raise RequestError("Request kept failing after retries.")
+
+        parsed = self.parse_response(response, method, False)
 
-        return self.parse_response(response, "GET", True)
+        if (
+            authenticate
+            and self.on_auth_failure is not None
+            and self.authenticate is not None
+            and parsed.fail
+            and self.on_auth_failure(parsed)
+        ):
+            kwargs = self.authenticate(kwargs)
+            response = self.build_request(method, url, allow_redirects=True, **kwargs)
+            if response is None:
+                raise RequestError("Request kept failing after retries.")
+            parsed = self.parse_response(response, method, False)
+
+        if danger and self.fail_exception and parsed.fail:
+            raise self.fail_exception(
+                f"Could not {method} {str(response.url).split('?')[0]}. Status Code: {parsed.status_code}",
+                "Request Failed.",
+            )
+
+        return parsed
+
+    def get(
+        self, url: str | bytes, *, authenticate: bool = False, **kwargs
+    ) -> Response:
+        """Routes a GET Request"""
+        return self._send("GET", url, authenticate=authenticate, danger=True, **kwargs)
 
     def post(
         self,
@@ -218,15 +250,9 @@ class TLSClient(Session):
         **kwargs,
     ) -> Response:
         """Routes a POST Request"""
-        if authenticate and self.authenticate is not None:
-            kwargs = self.authenticate(kwargs)
-
-        response = self.build_request("POST", url, allow_redirects=True, **kwargs)
-
-        if response is None:
-            raise TLSClientExeption("Request kept failing after retries.")
-
-        return self.parse_response(response, "POST", danger)
+        return self._send(
+            "POST", url, authenticate=authenticate, danger=danger, **kwargs
+        )
 
     def put(
         self,
@@ -237,12 +263,6 @@ class TLSClient(Session):
         **kwargs,
     ) -> Response:
         """Routes a PUT Request"""
-        if authenticate and self.authenticate is not None:
-            kwargs = self.authenticate(kwargs)
-
-        response = self.build_request("PUT", url, allow_redirects=True, **kwargs)
-
-        if response is None:
-            raise TLSClientExeption("Request kept failing after retries.")
-
-        return self.parse_response(response, "PUT", danger)
+        return self._send(
+            "PUT", url, authenticate=authenticate, danger=danger, **kwargs
+        )

{spotapi-1.2.7 → spotapi-1.2.8}/spotapi/player.py

@@ -53,7 +53,7 @@ class Player(PlayerStatus):
 
         _origin_device_id = self.r_state.play_origin.device_identifier
         if _origin_device_id is None:
-            raise ValueError("Could not get origin device ID.")
+            _origin_device_id = "local"
 
         self.device_id = _origin_device_id
         self.transfer_player(self.device_id, self.active_id)

{spotapi-1.2.7 → spotapi-1.2.8}/spotapi/playlist.py

@@ -38,9 +38,10 @@ class PublicPlaylist:
         playlist: str,
         /,
         *,
-        client: TLSClient = TLSClient("chrome_120", "", auto_retries=3),
+        client: TLSClient = TLSClient("chrome120", "", auto_retries=3),
+        language: str = "en",
     ) -> None:
-        self.base = BaseClient(client=client)
+        self.base = BaseClient(client=client, language=language)
         self.playlist_id = (
             playlist.split("playlist/")[-1] if "playlist" in playlist else playlist
         )
@@ -131,6 +132,8 @@ class PrivatePlaylist:
         self,
         login: Login,
         playlist: str | None = None,
+        *,
+        language: str = "en",
     ) -> None:
         if not login.logged_in:
             raise ValueError("Must be logged in")
@@ -140,7 +143,7 @@ class PrivatePlaylist:
                 playlist.split("playlist/")[-1] if "playlist" in playlist else playlist
             )
 
-        self.base = BaseClient(login.client)
+        self.base = BaseClient(login.client, language=language)
         self.login = login
         self.user = User(login)
         # We need to check if a user can use a method
@@ -274,6 +277,63 @@ class PrivatePlaylist:
 
         return resp.response
 
+    def get_saved_tracks_info(
+        self,
+        limit: int = 25,
+        *,
+        offset: int = 0,
+    ) -> Mapping[str, Any]:
+        """Gets the playlist information of saved songs"""
+        url = "https://api-partner.spotify.com/pathfinder/v1/query"
+        params = {
+            "operationName": "fetchLibraryTracks",
+            "variables": json.dumps(
+                {
+                    "offset": offset,
+                    "limit": limit,
+                }
+            ),
+            "extensions": json.dumps(
+                {
+                    "persistedQuery": {
+                        "version": 1,
+                        "sha256Hash": self.base.part_hash("fetchLibraryTracks"),
+                    }
+                }
+            ),
+        }
+
+        resp = self.login.client.post(url, params=params, authenticate=True)
+
+        if resp.fail:
+            raise PlaylistError("Could not get library tracks info", error=resp.error.string)
+
+        if not isinstance(resp.response, Mapping):
+            raise PlaylistError("Invalid JSON")
+
+        return resp.response
+
+    def paginate_saved_tracks(self) -> Generator[Mapping[str, Any], None, None]:
+        """
+        Generator that fetches playlist information in chunks
+
+        NOTE: If total_tracks <= 343, then there is no need to paginate.
+        """
+        UPPER_LIMIT: int = 343
+        # We need to get the total playlists first
+        playlist = self.get_saved_tracks_info(limit=UPPER_LIMIT)
+        total_count: int = playlist["data"]["me"]["library"]["tracks"]["totalCount"]
+
+        yield playlist["data"]["me"]["library"]["tracks"]
+
+        if total_count <= UPPER_LIMIT:
+            return
+
+        offset = UPPER_LIMIT
+        while offset < total_count:
+            yield self.get_saved_tracks_info(limit=UPPER_LIMIT, offset=offset)["data"]["me"]["library"]["tracks"]
+            offset += UPPER_LIMIT
+
     def _stage_create_playlist(self, name: str) -> str:
         url = "https://spclient.wg.spotify.com/playlist/v2/playlist"
         payload = {

{spotapi-1.2.7 → spotapi-1.2.8}/spotapi/podcast.py

@@ -32,9 +32,10 @@ class Podcast:
         self,
         podcast: str | None = None,
         *,
-        client: TLSClient = TLSClient("chrome_120", "", auto_retries=3),
+        client: TLSClient = TLSClient("chrome120", "", auto_retries=3),
+        language: str = "en",
     ) -> None:
-        self.base = BaseClient(client=client)
+        self.base = BaseClient(client=client, language=language)
         if podcast:
             self.podcast_id = (
                 podcast.split("show/")[-1] if "show" in podcast else podcast

{spotapi-1.2.7 → spotapi-1.2.8}/spotapi/public.py

@@ -44,7 +44,7 @@ class Pooler(Generic[T]):
 
 
 client_pool: Pooler[TLSClient] = Pooler(
-    factory=lambda: TLSClient("chrome_120", "", auto_retries=3)
+    factory=lambda: TLSClient("chrome120", "", auto_retries=3)
 )
 GeneratorType: TypeAlias = Generator[Mapping[str, Any], None, None]
 

{spotapi-1.2.7 → spotapi-1.2.8}/spotapi/song.py

@@ -31,10 +31,11 @@ class Song:
         self,
         playlist: PrivatePlaylist | None = None,
         *,
-        client: TLSClient = TLSClient("chrome_120", "", auto_retries=3),
+        client: TLSClient = TLSClient("chrome120", "", auto_retries=3),
+        language: str = "en",
     ) -> None:
         self.playlist = playlist
-        self.base = BaseClient(client=playlist.login.client if playlist else client)
+        self.base = BaseClient(client=playlist.login.client if playlist else client, language=language)
 
     def get_track_info(self, track_id: str) -> Mapping[str, Any]:
         """
@@ -142,7 +143,7 @@ class Song:
         url = "https://api-partner.spotify.com/pathfinder/v1/query"
         payload = {
             "variables": {
-                "uris": [f"spotify:track:{song_id}" for song_id in song_ids],
+                "playlistItemUris": [f"spotify:track:{song_id}" for song_id in song_ids],
                 "playlistUri": f"spotify:playlist:{self.playlist.playlist_id}",
                 "newPosition": {"moveType": "BOTTOM_OF_PLAYLIST", "fromUid": None},
             },
@@ -274,7 +275,7 @@ class Song:
 
         url = "https://api-partner.spotify.com/pathfinder/v1/query"
         payload = {
-            "variables": {"uris": [f"spotify:track:{song_id}"]},
+            "variables": {"libraryItemUris": [f"spotify:track:{song_id}"]},
             "operationName": "addToLibrary",
             "extensions": {
                 "persistedQuery": {

{spotapi-1.2.7 → spotapi-1.2.8}/spotapi/types/data.py

@@ -30,7 +30,7 @@ __all__ = [
 class Config:
     logger: LoggerProtocol
     solver: CaptchaProtocol | None = field(default=None)
-    client: TLSClient = field(default=TLSClient("chrome_120", "", auto_retries=3))
+    client: TLSClient = field(default=TLSClient("chrome120", "", auto_retries=3))
 
     def __str__(self) -> str:
         return "Config()"

{spotapi-1.2.7 → spotapi-1.2.8/spotapi.egg-info}/PKG-INFO

@@ -1,17 +1,34 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: spotapi
-Version: 1.2.7
+Version: 1.2.8
 Summary: A sleek API wrapper for Spotify's private API
-Home-page: UNKNOWN
 Author: Aran
-License: UNKNOWN
 Keywords: Spotify,API,Spotify API,Spotify Private API,Follow,Like,Creator,Music,Music API,Streaming,Music Data,Track,Playlist,Album,Artist,Music Search,Music Metadata,SpotAPI,Python Spotify Wrapper,Music Automation,Web Scraping,Python Music API,Spotify Integration,Spotify Playlist,Spotify Tracks
-Platform: UNKNOWN
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: requests
+Requires-Dist: colorama
+Requires-Dist: Pillow
+Requires-Dist: readerwriterlock
+Requires-Dist: curl_cffi
+Requires-Dist: typing_extensions
+Requires-Dist: validators
+Requires-Dist: pyotp
+Requires-Dist: beautifulsoup4
 Provides-Extra: websocket
+Requires-Dist: websockets; extra == "websocket"
 Provides-Extra: redis
+Requires-Dist: redis; extra == "redis"
 Provides-Extra: pymongo
-License-File: LICENSE
+Requires-Dist: pymongo; extra == "pymongo"
+Dynamic: author
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: keywords
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 # Legal Notice
 
@@ -32,8 +49,8 @@ Welcome to SpotAPI! This Python library is designed to interact with the private
 5. [Quick Examples](#quick-examples)
 6. [Import Cookies](#import-cookies)
 7. [Contributing](#contributing)
-8. [Roadmap](#roadmap)
-9. [License](#license)
+8. [License](#license)
+9. **[Extended Functionality & Private Modules](#private-modules)**
 
 
 ## Features
@@ -41,8 +58,9 @@ Welcome to SpotAPI! This Python library is designed to interact with the private
 - **Public API Access**: Retrieve and manipulate public Spotify data such as playlists, albums, and tracks with ease.
 - **Private API Access**: Explore private Spotify endpoints to tailor your application to your needs.
 - **Ready to Use**: **SpotAPI** is designed for immediate integration, allowing you to accomplish tasks with just a few lines of code.
-- **No API Key Required**: Seamlessly use **SpotAPI** without needing a Spotify API key. It’s straightforward and hassle free!
+- **No API Key Required**: Seamlessly use **SpotAPI** without needing a Spotify API key. It's straightforward and hassle free!
 - **Browser-like Requests**: Accurately replicate the HTTP requests Spotify makes in the browser, providing a true to web experience while remaining undetected.
+- **Multi-Language Support**: Set your preferred language for API responses using ISO 639-1 language codes (e.g., 'ko', 'ja', 'zh', 'en').
 
 Everything you can do with Spotify, **SpotAPI** can do with just a user’s login credentials.
 
@@ -119,6 +137,21 @@ data = songs["data"]["searchV2"]["tracksV2"]["items"]
 for idx, item in enumerate(data):
     print(idx, item['item']['data']['name'])
 ```
+
+### With Language Support
+```py
+from spotapi import Artist, PublicPlaylist, Song
+
+# Initialize with Korean language
+artist = Artist(language="ko")
+playlist = PublicPlaylist("37i9dQZF1DXcBWIGoYBM5M", language="ko")
+
+# Change language at runtime
+song = Song(language="en")
+song.base.set_language("ja")  # Switch to Japanese
+
+# Supported languages: ko, ja, zh, en, and any ISO 639-1 code
+```
 ### Results
 ```
 0 Island In The Sun
@@ -152,17 +185,8 @@ If you prefer not to use a third party CAPTCHA solver, you can import cookies to
 ## Contributing
 Contributions are welcome! If you find any issues or have suggestions, please open an issue or submit a pull request.
 
-## Roadmap
-> I'll most likely do these if the project gains some traction
-
-- [ ] No Captcha For Login (**100 Stars**)
-- [x] In Depth Documentation
-- [x] Websocket Listener
-- [x] Player
-- [ ] More wrappers around this project
-
 ## License
 This project is licensed under the **GPL 3.0** License. See [LICENSE](https://choosealicense.com/licenses/gpl-3.0/) for details.
 
-
-
+## **Private Modules**
+For the full scale account generation and "engagement" modules that can't be posted here, reach out on Telegram: **@aran_xyz**

{spotapi-1.2.7 → spotapi-1.2.8}/spotapi.egg-info/SOURCES.txt

@@ -24,6 +24,7 @@ spotapi.egg-info/requires.txt
 spotapi.egg-info/top_level.txt
 spotapi/_tests/__init__.py
 spotapi/_tests/annotations_test.py
+spotapi/_tests/client_refresh_test.py
 spotapi/exceptions/__init__.py
 spotapi/exceptions/errors.py
 spotapi/http/__init__.py

{spotapi-1.2.7 → spotapi-1.2.8}/spotapi.egg-info/requires.txt

@@ -2,7 +2,7 @@ requests
 colorama
 Pillow
 readerwriterlock
-tls_client
+curl_cffi
 typing_extensions
 validators
 pyotp