yutipy 1.0.0__tar.gz → 1.2.0__tar.gz

yutipy-1.2.0/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: CheapNightbot
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

yutipy-1.2.0/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

{yutipy-1.0.0 → yutipy-1.2.0}/.github/workflows/release.yml

@@ -94,26 +94,3 @@ jobs:
         gh release upload
         "$GITHUB_REF_NAME" dist/**
         --repo "$GITHUB_REPOSITORY"
-  publish-to-testpypi:
-    name: Publish Python 🐍 distribution 📦 to TestPyPI
-    needs:
-    - build
-    runs-on: ubuntu-latest
-
-    environment:
-      name: testpypi-release
-      url: https://test.pypi.org/project/yutipy
-
-    permissions:
-      id-token: write  # IMPORTANT: mandatory for trusted publishing
-
-    steps:
-    - name: Download all the dists
-      uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
-      with:
-        name: python-package-distributions
-        path: dist/
-    - name: Publish distribution 📦 to TestPyPI
-      uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4
-      with:
-        repository-url: https://test.pypi.org/legacy/

{yutipy-1.0.0 → yutipy-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: yutipy
-Version: 1.0.0
+Version: 1.2.0
 Summary: A simple package for retrieving music information from various music platforms APIs.
 Author: Cheap Nightbot
 Author-email: Cheap Nightbot <hi@cheapnightbot.slmail.me>
@@ -85,6 +85,7 @@ A _**simple**_ Python package for searching and retrieving music information fro
 ## Table of Contents
 
 - [Features](#features)
+    - [Available Music Platforms](#available-music-platforms)
 - [Installation](#installation)
 - [Usage Example](#usage-example)
 - [Contributing](#contributing)
@@ -97,6 +98,17 @@ A _**simple**_ Python package for searching and retrieving music information fro
 - It uses `RapidFuzz` to compare & return the best match so that you can be sure you got what you asked for without having to worry and doing all that work by yourself.
 - Retrieve detailed music information, including album art, release dates, lyrics, ISRC, and UPC codes.
 
+### Available Music Platforms
+
+Right now, the following music platforms are available in yutipy for searching music. New platforms will be added in the future.
+Feel free to request any music platform you would like me to add by opening an issue on [GitHub](https://github.com/CheapNightbot/yutipy/issues) or by emailing me.
+
+- `Deezer`: https://www.deezer.com
+- `iTunes`: https://music.apple.com
+- `KKBOX`: https://www.kkbox.com
+- `Spotify`: https://spotify.com
+- `YouTube Music`: https://music.youtube.com
+
 ## Installation
 
 You can install the package using pip. Make sure you have Python 3.8 or higher installed.

{yutipy-1.0.0 → yutipy-1.2.0}/README.md

@@ -28,6 +28,7 @@ A _**simple**_ Python package for searching and retrieving music information fro
 ## Table of Contents
 
 - [Features](#features)
+    - [Available Music Platforms](#available-music-platforms)
 - [Installation](#installation)
 - [Usage Example](#usage-example)
 - [Contributing](#contributing)
@@ -40,6 +41,17 @@ A _**simple**_ Python package for searching and retrieving music information fro
 - It uses `RapidFuzz` to compare & return the best match so that you can be sure you got what you asked for without having to worry and doing all that work by yourself.
 - Retrieve detailed music information, including album art, release dates, lyrics, ISRC, and UPC codes.
 
+### Available Music Platforms
+
+Right now, the following music platforms are available in yutipy for searching music. New platforms will be added in the future.
+Feel free to request any music platform you would like me to add by opening an issue on [GitHub](https://github.com/CheapNightbot/yutipy/issues) or by emailing me.
+
+- `Deezer`: https://www.deezer.com
+- `iTunes`: https://music.apple.com
+- `KKBOX`: https://www.kkbox.com
+- `Spotify`: https://spotify.com
+- `YouTube Music`: https://music.youtube.com
+
 ## Installation
 
 You can install the package using pip. Make sure you have Python 3.8 or higher installed.

{yutipy-1.0.0 → yutipy-1.2.0}/docs/api_reference.rst

@@ -5,13 +5,6 @@ API Reference
 Main Classes
 =============
 
-The following classes are available for use, utilizing the APIs of their respective music streaming platforms:
-
-- ``Deezer``: https://www.deezer.com
-- ``iTunes``: https://music.apple.com
-- ``Spotify``: https://spotify.com
-- ``YouTube Music``: https://music.youtube.com
-
 Deezer
 ------
 
@@ -30,6 +23,15 @@ iTunes
     :noindex:
     :exclude-members: is_session_closed
 
+KKBox
+-------
+
+.. autoclass:: yutipy.kkbox.KKBox
+    :members:
+    :inherited-members:
+    :noindex:
+    :exclude-members: is_session_closed
+
 Spotify
 -------
 
@@ -114,3 +116,9 @@ Exceptions
     :inherited-members:
     :noindex:
     :exclude-members: add_note, args, with_traceback
+
+.. autoclass:: yutipy.exceptions.KKBoxException
+    :members:
+    :inherited-members:
+    :noindex:
+    :exclude-members: add_note, args, with_traceback

yutipy-1.2.0/docs/available_platforms.rst

@@ -0,0 +1,13 @@
+=========================
+Available Music Platforms
+=========================
+
+Right now, the following music platforms are available in yutipy for searching music. New platforms will be added in the future.
+Feel free to request any music platform you would like me to add by opening an issue on `GitHub <https://github.com/CheapNightbot/yutipy/issues>`_ or by emailing me.
+
+
+- ``Deezer``: https://www.deezer.com
+- ``iTunes``: https://music.apple.com
+- ``KKBOX``: https://www.kkbox.com
+- ``Spotify``: https://spotify.com
+- ``YouTube Music``: https://music.youtube.com

{yutipy-1.0.0 → yutipy-1.2.0}/docs/faq.rst

@@ -58,12 +58,18 @@ obtained from the Spotify for Developers website. To do this, follow these steps
 
         .. code-block:: bash
 
-            CLIENT_ID=<spotify_client_id>
-            CLIENT_SECRET=<spotify_client_secret>
+            SPOTIFY_CLIENT_ID=<spotify_client_id>
+            SPOTIFY_CLIENT_SECRET=<spotify_client_secret>
     - Ensure you replace ``<spotify_client_id>`` and ``<spotify_client_secret>`` with the values you copied in steps :ref:`5 <step_5>` and :ref:`6 <step_6>` respectively.
 
 After completing these steps, you should be able to use the ``Spotify`` class and its methods as expected.
 
+Why am I receiving a ``KKBoxException`` when trying to use the ``KKBox`` class?
+-------------------------------------------------------------------------------
+
+Unfortunately, it's the same case as with Spotify. You will need a ``Client ID`` and ``Client Secret``
+obtained from the KKBOX for Developers website. Please visit https://developer.kkbox.com/ for more information.
+
 ----
 
 .. [#] There may be additional features in the future.

{yutipy-1.0.0 → yutipy-1.2.0}/docs/index.rst

@@ -3,9 +3,8 @@
    :target: https://github.com/CheapNightbot/yutipy
    :align: center
 
-**yutipy** is a Python package for searching and retrieving music information from various music platforms,
-including Deezer, iTunes, Spotify, and YouTube Music. This documentation will help you get started with yutipy
-and provide detailed information about its features and usage.
+**yutipy** is a Python package for searching and retrieving music information from various music platforms (see list of :doc:`available muisc platforms <available_platforms>`).
+This documentation will help you get started with yutipy and provide detailed information about its features and usage.
 
 .. raw:: html
 
@@ -45,8 +44,9 @@ Get Started
    :maxdepth: 2
 
    installation
-   usage_examples
+   available_platforms
    api_reference
+   usage_examples
    faq
 
 .. toctree::

{yutipy-1.0.0 → yutipy-1.2.0}/docs/usage_examples.rst

@@ -32,17 +32,46 @@ iTunes
         result = itunes.search("Artist Name", "Song Title")
         print(result)
 
+
+KKBOX
+-------
+
+To use the KKBOX Open API, you need to set the ``KKBOX_CLIENT_ID`` and ``KKBOX_CLIENT_SECRET`` for KKBOX. You can do this by creating a ``.env`` file in the root directory of your project with the following content:
+
+.. admonition:: .env
+
+    .. code-block:: bash
+
+        KKBOX_CLIENT_ID=<your_kkbox_client_id>
+        KKBOX_CLIENT_SECRET=<your_kkbox_client_secret>
+
+Alternatively, you can manually provide these values when creating an object of the `KKBox` class:
+
+.. code-block:: python
+
+    from yutipy.kkbox import KKBox
+
+    kkbox = KKBox(client_id="your_kkbox_client_id", client_secret="your_kkbox_client_secret")
+
+.. code-block:: python
+
+    from yutipy.kkbox import KKBox
+
+    with KKBox() as kkbox:
+        result = kkbox.search("Artist Name", "Song Title")
+        print(result)
+
 Spotify
 -------
 
-To use the Spotify API, you need to set the ``CLIENT_ID`` and ``CLIENT_SECRET`` for Spotify. You can do this by creating a ``.env`` file in the root directory of your project with the following content:
+To use the Spotify API, you need to set the ``SPOTIFY_CLIENT_ID`` and ``SPOTIFY_CLIENT_SECRET`` for Spotify. You can do this by creating a ``.env`` file in the root directory of your project with the following content:
 
 .. admonition:: .env
 
     .. code-block:: bash
 
-        CLIENT_ID=your_spotify_client_id
-        CLIENT_SECRET=your_spotify_client_secret
+        SPOTIFY_CLIENT_ID=<your_spotify_client_id>
+        SPOTIFY_CLIENT_SECRET=<your_spotify_client_secret>
 
 Alternatively, you can manually provide these values when creating an object of the `Spotify` class:
 

yutipy-1.2.0/tests/test_kkbox.py

@@ -0,0 +1,45 @@
+import pytest
+from pytest import raises
+
+from yutipy.exceptions import KKBoxException, InvalidValueException
+from yutipy.models import MusicInfo
+from yutipy.kkbox import KKBox
+
+
+@pytest.fixture(scope="module")
+def kkbox():
+    try:
+        return KKBox()
+    except KKBoxException:
+        pytest.skip("KKBOX credentials not found")
+
+
+def test_search(kkbox):
+    artist = "Porter Robinson"
+    song = "Shelter"
+    result = kkbox.search(artist, song)
+    assert result is not None
+    assert isinstance(result, MusicInfo)
+    assert result.title == song
+    assert artist in result.artists
+
+
+def test_get_html_widget(kkbox):
+    html_widget = kkbox.get_html_widget(id="8rceGrek59bDS0HmQH", content_type="song")
+    assert html_widget is not None
+    assert isinstance(html_widget, str)
+    assert "https://widget.kkbox.com/" in html_widget
+
+    with raises(InvalidValueException):
+        kkbox.get_html_widget(id="8rceGrek59bDS0HmQH", content_type="track")
+
+    with raises(InvalidValueException):
+        kkbox.get_html_widget(id="8rceGrek59bDS0HmQH", content_type="song", territory="US")
+
+    with raises(InvalidValueException):
+        kkbox.get_html_widget(id="8rceGrek59bDS0HmQH", content_type="song", widget_lang="JP")
+
+
+def test_close_session(kkbox):
+    kkbox.close_session()
+    assert kkbox.is_session_closed

{yutipy-1.0.0 → yutipy-1.2.0}/yutipy/exceptions.py

@@ -50,3 +50,7 @@ class InvalidResponseException(YutipyException):
     """Exception raised for invalid responses from APIs."""
 
     pass
+
+
+class KKBoxException(YutipyException):
+    """Exception raised for erros related to the KKBOX Open API."""

yutipy-1.2.0/yutipy/kkbox.py

@@ -0,0 +1,373 @@
+import base64
+import os
+import time
+from pprint import pprint
+from typing import Optional, Union
+
+import requests
+from dotenv import load_dotenv
+
+from yutipy.exceptions import (
+    AuthenticationException,
+    InvalidResponseException,
+    InvalidValueException,
+    KKBoxException,
+    NetworkException,
+)
+from yutipy.models import MusicInfo
+from yutipy.utils.cheap_utils import are_strings_similar, is_valid_string
+
+load_dotenv()
+
+KKBOX_CLIENT_ID = os.getenv("KKBOX_CLIENT_ID")
+KKBOX_CLIENT_SECRET = os.getenv("KKBOX_CLIENT_SECRET")
+
+
+class KKBox:
+    """
+    A class to interact with KKBOX Open API.
+
+    This class reads the ``KKBOX_CLIENT_ID`` and ``KKBOX_CLIENT_SECRET`` from environment variables or the ``.env`` file by default.
+    Alternatively, you can manually provide these values when creating an object.
+    """
+
+    def __init__(
+        self, client_id: str = KKBOX_CLIENT_ID, client_secret: str = KKBOX_CLIENT_SECRET
+    ) -> None:
+        """
+        Initializes the KKBox class and sets up the session.
+
+        Parameters
+        ----------
+        client_id : str, optional
+            The Client ID for the KKBOX Open API. Defaults to ``KKBOX_CLIENT_ID`` from .env file.
+        client_secret : str, optional
+            The Client secret for the KKBOX Open API. Defaults to ``KKBOX_CLIENT_SECRET`` from .env file.
+        """
+        if not client_id or not client_secret:
+            raise KKBoxException(
+                "Failed to read `KKBOX_CLIENT_ID` and/or `KKBOX_CLIENT_SECRET` from environment variables. Client ID and Client Secret must be provided."
+            )
+
+        self.client_id = client_id
+        self.client_secret = client_secret
+        self._session = requests.Session()
+        self.api_url = "https://api.kkbox.com/v1.1"
+        self.__header, self.__expires_in = self.__authenticate()
+        self.__start_time = time.time()
+        self._is_session_closed = False
+        self.valid_territories = ["HK", "JP", "MY", "SG", "TW"]
+
+    def __enter__(self):
+        """Enters the runtime context related to this object."""
+        return self
+
+    def __exit__(self, exc_type, exc_value, exc_traceback):
+        """Exits the runtime context related to this object."""
+        self._close_session()
+
+    def close_session(self) -> None:
+        """Closes the current session."""
+        if not self.is_session_closed:
+            self._session.close()
+            self._is_session_closed = True
+
+    @property
+    def is_session_closed(self) -> bool:
+        """Checks if the session is closed."""
+        return self._is_session_closed
+
+    def __authenticate(self) -> tuple:
+        """
+        Authenticates with the KKBOX Open API and returns the authorization header.
+
+        Returns
+        -------
+        dict
+            The authorization header.
+        """
+        try:
+            token, expires_in = self.__get_access_token()
+            return {"Authorization": f"Bearer {token}"}, expires_in
+        except Exception as e:
+            raise AuthenticationException(
+                "Failed to authenticate with KKBOX Open API"
+            ) from e
+
+    def __get_access_token(self) -> tuple:
+        """
+        Gets the KKBOX Open API token.
+
+        Returns
+        -------
+        str
+            The KKBOX Open API token.
+        """
+        auth_string = f"{self.client_id}:{self.client_secret}"
+        auth_base64 = base64.b64encode(auth_string.encode("utf-8")).decode("utf-8")
+
+        url = " https://account.kkbox.com/oauth2/token"
+        headers = {
+            "Authorization": f"Basic {auth_base64}",
+            "Content-Type": "application/x-www-form-urlencoded",
+        }
+        data = {"grant_type": "client_credentials"}
+
+        try:
+            response = self._session.post(
+                url=url, headers=headers, data=data, timeout=30
+            )
+            response.raise_for_status()
+        except requests.RequestException as e:
+            raise NetworkException(f"Network error occurred: {e}")
+
+        try:
+            response_json = response.json()
+            return response_json.get("access_token"), response_json.get("expires_in")
+        except (KeyError, ValueError) as e:
+            raise InvalidResponseException(f"Invalid response received: {e}")
+
+    def __refresh_token_if_expired(self):
+        """Refreshes the token if it has expired."""
+        if time.time() - self.__start_time >= self.__expires_in:
+            self.__header, self.__expires_in = self.__authenticate()
+            self.__start_time = time.time()
+
+    def search(
+        self, artist: str, song: str, territory: str = "TW"
+    ) -> Optional[MusicInfo]:
+        """
+        Searches for a song by artist and title.
+
+        Parameters
+        ----------
+        artist : str
+            The name of the artist.
+        song : str
+            The title of the song.
+        territory : str
+            Two-letter country codes from ISO 3166-1 alpha-2.
+            Allowed values: ``HK``, ``JP``, ``MY``, ``SG``, ``TW``.
+
+        Returns
+        -------
+        Optional[MusicInfo_]
+            The music information if found, otherwise None.
+        """
+        if not is_valid_string(artist) or not is_valid_string(song):
+            raise InvalidValueException(
+                "Artist and song names must be valid strings and can't be empty."
+            )
+
+        self.__refresh_token_if_expired()
+
+        query = f"?q={artist} - {song}&type=track,album&territory={territory}&limit=10"
+        query_url = f"{self.api_url}/search{query}"
+
+        try:
+            response = self._session.get(query_url, headers=self.__header, timeout=30)
+            response.raise_for_status()
+        except requests.RequestException as e:
+            raise NetworkException(f"Network error occurred: {e}")
+
+        if response.status_code != 200:
+            raise KKBoxException(f"Failed to search for music: {response.json()}")
+
+        return self._find_music_info(artist, song, response.json())
+
+    def get_html_widget(
+        self,
+        id: str,
+        content_type: str,
+        territory: str = "TW",
+        widget_lang: str = "EN",
+        autoplay: bool = False,
+        loop: bool = False,
+    ) -> str:
+        """
+        Return KKBOX HTML widget for "Playlist", "Album" or "Song". It does not return actual HTML code,
+        the URL returned can be used in an HTML ``iframe`` with the help of ``src`` attribute.
+
+        Parameters
+        ----------
+        id : str
+             ``ID`` of playlist, album or track.
+        content_type : str
+            Content type can be ``playlist``, ``album`` or ``song``.
+        territory : str, optional
+            Territory code, i.e. "TW", "HK", "JP", "SG", "MY", by default "TW"
+        widget_lang : str, optional
+            The display language of the widget. Can be "TC", "SC", "JA", "EN", "MS", by default "EN"
+        autoplay : bool, optional
+            Whether to start playing music automatically in widget, by default False
+        loop : bool, optional
+            Repeat/loop song(s), by default False
+
+        Returns
+        -------
+        str
+            KKBOX HTML widget URL.
+        """
+        valid_content_types = ["playlist", "album", "song"]
+        valid_widget_langs = ["TC", "SC", "JA", "EN", "MS"]
+        if content_type not in valid_content_types:
+            raise InvalidValueException(
+                f"`content_type` must be one of these: {valid_content_types} !"
+            )
+
+        if territory not in self.valid_territories:
+            raise InvalidValueException(
+                f"`territory` must be one of these: {self.valid_territories} !"
+            )
+
+        if widget_lang not in valid_widget_langs:
+            raise InvalidValueException(
+                f"`widget_lang` must be one of these: {valid_widget_langs} !"
+            )
+
+        return f"https://widget.kkbox.com/v1/?id={id}&type={content_type}&terr={territory}&lang={widget_lang}&autoplay={autoplay}&loop={loop}"
+
+    def _find_music_info(
+        self, artist: str, song: str, response_json: dict
+    ) -> Optional[MusicInfo]:
+        """
+        Finds the music information from the search results.
+
+        Parameters
+        ----------
+        artist : str
+            The name of the artist.
+        song : str
+            The title of the song.
+        response_json : dict
+            The JSON response from the API.
+
+        Returns
+        -------
+        Optional[MusicInfo]
+            The music information if found, otherwise None.
+        """
+        try:
+            for track in response_json["tracks"]["data"]:
+                music_info = self._find_track(song, artist, track)
+                if music_info:
+                    return music_info
+        except KeyError:
+            pass
+
+        try:
+            for album in response_json["albums"]["data"]:
+                music_info = self._find_album(song, artist, album)
+                if music_info:
+                    return music_info
+        except KeyError:
+            pass
+
+        return None
+
+    def _find_track(self, song: str, artist: str, track: dict) -> Optional[MusicInfo]:
+        """
+        Finds the track information from the search results.
+
+        Parameters
+        ----------
+        song : str
+            The title of the song.
+        artist : str
+            The name of the artist.
+        track : dict
+            A single track from the search results.
+        artist_ids : list
+            A list of artist IDs.
+
+        Returns
+        -------
+        Optional[MusicInfo]
+            The music information if found, otherwise None.
+        """
+        if not are_strings_similar(track["name"], song):
+            return None
+
+        artists_name = track["album"]["artist"]["name"]
+        matching_artists = (
+            artists_name if are_strings_similar(artists_name, artist) else None
+        )
+
+        if matching_artists:
+            return MusicInfo(
+                album_art=track["album"]["images"][2]["url"],
+                album_title=track["album"]["name"],
+                album_type=None,
+                artists=artists_name,
+                genre=None,
+                id=track["id"],
+                isrc=track["isrc"],
+                lyrics=None,
+                release_date=track["album"]["release_date"],
+                tempo=None,
+                title=track["name"],
+                type="track",
+                upc=None,
+                url=track["url"],
+            )
+
+        return None
+
+    def _find_album(self, song: str, artist: str, album: dict) -> Optional[MusicInfo]:
+        """
+        Finds the album information from the search results.
+
+        Parameters
+        ----------
+        song : str
+            The title of the song.
+        artist : str
+            The name of the artist.
+        album : dict
+            A single album from the search results.
+        artist_ids : list
+            A list of artist IDs.
+
+        Returns
+        -------
+        Optional[MusicInfo]
+            The music information if found, otherwise None.
+        """
+        if not are_strings_similar(album["name"], song):
+            return None
+
+        artists_name = album["artist"]["name"]
+        matching_artists = (
+            artists_name if are_strings_similar(artists_name, artist) else None
+        )
+
+        if matching_artists:
+            return MusicInfo(
+                album_art=album["images"][2]["url"],
+                album_title=album["name"],
+                album_type=None,
+                artists=artists_name,
+                genre=None,
+                id=album["id"],
+                isrc=None,
+                lyrics=None,
+                release_date=album["release_date"],
+                tempo=None,
+                title=album["name"],
+                type="album",
+                upc=None,
+                url=album["url"],
+            )
+
+        return None
+
+
+if __name__ == "__main__":
+    kkbox = KKBox(KKBOX_CLIENT_ID, KKBOX_CLIENT_SECRET)
+
+    try:
+        artist_name = input("Artist Name: ")
+        song_name = input("Song Name: ")
+        pprint(kkbox.search(artist_name, song_name))
+    finally:
+        kkbox.close_session()

{yutipy-1.0.0 → yutipy-1.2.0}/yutipy/spotify.py

@@ -36,7 +36,9 @@ class Spotify:
     """
 
     def __init__(
-        self, client_id: str = SPOTIFY_CLIENT_ID, client_secret: str = SPOTIFY_CLIENT_SECRET
+        self,
+        client_id: str = SPOTIFY_CLIENT_ID,
+        client_secret: str = SPOTIFY_CLIENT_SECRET,
     ) -> None:
         """
         Initializes the Spotify class and sets up the session.
@@ -50,7 +52,7 @@ class Spotify:
         """
         if not client_id or not client_secret:
             raise SpotifyException(
-                "Failed to read `SPOTIFY_CLIENT_ID` and `SPOTIFY_CLIENT_SECRET` from environment variables. Client ID and Client Secret must be provided."
+                "Failed to read `SPOTIFY_CLIENT_ID` and/or `SPOTIFY_CLIENT_SECRET` from environment variables. Client ID and Client Secret must be provided."
             )
 
         self.client_id = client_id
@@ -157,22 +159,37 @@ class Spotify:
                 "Artist and song names must be valid strings and can't be empty."
             )
 
-        self.__refresh_token_if_expired()
+        music_info = None
+        queries = [
+            f"?q=artist:{artist} track:{song}&type=track&limit=10",
+            f"?q=artist:{artist} album:{song}&type=album&limit=10",
+        ]
 
-        query = f"?q=artist:{artist} track:{song}&type=track&limit=10"
-        query_url = f"{self.api_url}/search{query}"
+        for query in queries:
+            if music_info:
+                return music_info
 
-        try:
-            response = self._session.get(query_url, headers=self.__header, timeout=30)
-            response.raise_for_status()
-        except requests.RequestException as e:
-            raise NetworkException(f"Network error occurred: {e}")
+            self.__refresh_token_if_expired()
 
-        if response.status_code != 200:
-            raise SpotifyException(f"Failed to search for music: {response.json()}")
+            query_url = f"{self.api_url}/search{query}"
 
-        artist_ids = self._get_artists_ids(artist)
-        return self._find_music_info(artist, song, response.json(), artist_ids)
+            try:
+                response = self._session.get(
+                    query_url, headers=self.__header, timeout=30
+                )
+                response.raise_for_status()
+            except requests.RequestException as e:
+                raise NetworkException(f"Network error occurred: {e}")
+
+            if response.status_code != 200:
+                raise SpotifyException(f"Failed to search for music: {response.json()}")
+
+            artist_ids = self._get_artists_ids(artist)
+            music_info = self._find_music_info(
+                artist, song, response.json(), artist_ids
+            )
+
+        return music_info
 
     def search_advanced(
         self, artist: str, song: str, isrc: str = None, upc: str = None
@@ -282,7 +299,7 @@ class Spotify:
         """
         try:
             for track in response_json["tracks"]["items"]:
-                music_info = self._find_tracks(song, artist, track, artist_ids)
+                music_info = self._find_track(song, artist, track, artist_ids)
                 if music_info:
                     return music_info
         except KeyError:
@@ -298,7 +315,7 @@ class Spotify:
 
         return None
 
-    def _find_tracks(
+    def _find_track(
         self, song: str, artist: str, track: dict, artist_ids: list
     ) -> Optional[MusicInfo]:
         """
@@ -404,11 +421,11 @@ class Spotify:
 
 
 if __name__ == "__main__":
-    Spotify = Spotify(SPOTIFY_CLIENT_ID, SPOTIFY_CLIENT_SECRET)
+    spotify = Spotify(SPOTIFY_CLIENT_ID, SPOTIFY_CLIENT_SECRET)
 
     try:
         artist_name = input("Artist Name: ")
         song_name = input("Song Name: ")
-        pprint(Spotify.search(artist_name, song_name))
+        pprint(spotify.search(artist_name, song_name))
     finally:
-        Spotify.close_session()
+        spotify.close_session()

{yutipy-1.0.0 → yutipy-1.2.0}/yutipy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: yutipy
-Version: 1.0.0
+Version: 1.2.0
 Summary: A simple package for retrieving music information from various music platforms APIs.
 Author: Cheap Nightbot
 Author-email: Cheap Nightbot <hi@cheapnightbot.slmail.me>
@@ -85,6 +85,7 @@ A _**simple**_ Python package for searching and retrieving music information fro
 ## Table of Contents
 
 - [Features](#features)
+    - [Available Music Platforms](#available-music-platforms)
 - [Installation](#installation)
 - [Usage Example](#usage-example)
 - [Contributing](#contributing)
@@ -97,6 +98,17 @@ A _**simple**_ Python package for searching and retrieving music information fro
 - It uses `RapidFuzz` to compare & return the best match so that you can be sure you got what you asked for without having to worry and doing all that work by yourself.
 - Retrieve detailed music information, including album art, release dates, lyrics, ISRC, and UPC codes.
 
+### Available Music Platforms
+
+Right now, the following music platforms are available in yutipy for searching music. New platforms will be added in the future.
+Feel free to request any music platform you would like me to add by opening an issue on [GitHub](https://github.com/CheapNightbot/yutipy/issues) or by emailing me.
+
+- `Deezer`: https://www.deezer.com
+- `iTunes`: https://music.apple.com
+- `KKBOX`: https://www.kkbox.com
+- `Spotify`: https://spotify.com
+- `YouTube Music`: https://music.youtube.com
+
 ## Installation
 
 You can install the package using pip. Make sure you have Python 3.8 or higher installed.

{yutipy-1.0.0 → yutipy-1.2.0}/yutipy.egg-info/SOURCES.txt

@@ -8,10 +8,13 @@ pyproject.toml
 requirements-dev.txt
 requirements.txt
 .github/FUNDING.yml
+.github/ISSUE_TEMPLATE/bug_report.md
+.github/ISSUE_TEMPLATE/feature_request.md
 .github/workflows/pytest-unit-testing.yml
 .github/workflows/release.yml
 docs/Makefile
 docs/api_reference.rst
+docs/available_platforms.rst
 docs/conf.py
 docs/faq.rst
 docs/index.rst
@@ -24,6 +27,7 @@ docs/_static/yutipy_logo.png
 tests/__init__.py
 tests/test_deezer.py
 tests/test_itunes.py
+tests/test_kkbox.py
 tests/test_models.py
 tests/test_musicyt.py
 tests/test_spotify.py
@@ -32,6 +36,7 @@ yutipy/__init__.py
 yutipy/deezer.py
 yutipy/exceptions.py
 yutipy/itunes.py
+yutipy/kkbox.py
 yutipy/models.py
 yutipy/musicyt.py
 yutipy/spotify.py