yutipy 2.1.1__tar.gz → 2.2.1__tar.gz

{yutipy-2.1.1 → yutipy-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yutipy
-Version: 2.1.1
+Version: 2.2.1
 Summary: A simple package for retrieving music information from various music platforms APIs.
 Author: Cheap Nightbot
 Author-email: Cheap Nightbot <hi@cheapnightbot.slmail.me>
@@ -90,6 +90,7 @@ Feel free to request any music platform you would like me to add by opening an i
 - `Deezer`: https://www.deezer.com
 - `iTunes`: https://music.apple.com
 - `KKBOX`: https://www.kkbox.com
+- `Lastfm`: https://last.fm
 - `Spotify`: https://spotify.com
 - `YouTube Music`: https://music.youtube.com
 

{yutipy-2.1.1 → yutipy-2.2.1}/README.md

@@ -54,6 +54,7 @@ Feel free to request any music platform you would like me to add by opening an i
 - `Deezer`: https://www.deezer.com
 - `iTunes`: https://music.apple.com
 - `KKBOX`: https://www.kkbox.com
+- `Lastfm`: https://last.fm
 - `Spotify`: https://spotify.com
 - `YouTube Music`: https://music.youtube.com
 

{yutipy-2.1.1 → yutipy-2.2.1}/docs/api_reference.rst

@@ -24,7 +24,7 @@ iTunes
     :exclude-members: is_session_closed
 
 KKBox
--------
+-----
 
 .. autoclass:: yutipy.kkbox.KKBox
     :members:
@@ -32,6 +32,15 @@ KKBox
     :noindex:
     :exclude-members: is_session_closed
 
+Lastfm
+------
+
+.. autoclass:: yutipy.lastfm.LastFm
+    :members:
+    :inherited-members:
+    :noindex:
+    :exclude-members: is_session_closed
+
 Spotify
 -------
 
@@ -150,6 +159,12 @@ Service Exceptions
     :noindex:
     :exclude-members: add_note, args, with_traceback
 
+.. autoclass:: yutipy.exceptions.LastFmException
+    :members:
+    :inherited-members:
+    :noindex:
+    :exclude-members: add_note, args, with_traceback
+
 .. autoclass:: yutipy.exceptions.MusicYTException
     :members:
     :inherited-members:

{yutipy-2.1.1 → yutipy-2.2.1}/docs/available_platforms.rst

@@ -9,5 +9,6 @@ Feel free to request any music platform you would like me to add by opening an i
 - ``Deezer``: https://www.deezer.com
 - ``iTunes``: https://music.apple.com
 - ``KKBOX``: https://www.kkbox.com
+- ``Lastfm``: https://last.fm
 - ``Spotify``: https://spotify.com
 - ``YouTube Music``: https://music.youtube.com

{yutipy-2.1.1 → yutipy-2.2.1}/docs/cli.rst

@@ -35,4 +35,4 @@ Set up API keys interactively:
 
     yutipy-config
 
-The wizard will guide you through obtaining and setting up API keys for supported services like Spotify and KKBOX.
+The wizard will guide you through obtaining and setting up API keys for supported services like KKBOX, Lastfm and Spotify.

{yutipy-2.1.1 → yutipy-2.2.1}/docs/usage_examples.rst

@@ -5,10 +5,14 @@ Usage Examples
 Here's a quick example of how to use the **yutipy** package to search for a song:
 
 .. important::
-    All examples here use the ``with`` context manager to initialize an instance of the respective class,
-    as those classes internally use ``requests.Session()`` for making requests to APIs.
-    This approach ensures that the session is automatically closed once you exit the context. Although using ``with`` is not mandatory,
-    if you instantiate an object without it, you are responsible for closing the session after use by calling the ``close_session()`` method on that object.
+    - All examples here use the ``with`` context manager to initialize an instance of the respective class,
+      as those classes internally use ``requests.Session()`` for making requests to APIs.
+      This approach ensures that the session is automatically closed once you exit the context. Although using ``with`` is not mandatory,
+      if you instantiate an object without it, you are responsible for closing the session after use by calling the ``close_session()`` method on that object.
+
+    - Following examples suggest to create ``.env`` file for storing, for example api keys. However, when hosting or deplyoing your application on production,
+      it is suggested and you may store them in environment variable(s) provided by your hosting provider.
+
 
 CLI Tool
 --------
@@ -41,11 +45,11 @@ 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:
+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
 
@@ -54,7 +58,7 @@ To use the KKBOX Open API, you need to set the ``KKBOX_CLIENT_ID`` and ``KKBOX_C
         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:
+Alternatively, you can manually provide these values when creating an object of the ``KKBox`` class:
 
 .. code-block:: python
 
@@ -70,6 +74,34 @@ Alternatively, you can manually provide these values when creating an object of
         result = kkbox.search("Artist Name", "Song Title")
         print(result)
 
+Lastfm
+------
+
+To use and retreive information from Lastfm, you need Lastfm API Key and need to set ``LASTFM_API_KEY``.
+You can do this by creating a ``.env`` file int the root directory of your project with the following content:
+
+.. admonition:: .env
+
+    .. code-block:: bash
+
+        LASTFM_API_KEY=<your_lastfm_api_key>
+
+Alternatively, you can manually provide these values when creating an object of the ``LastFm`` class:
+
+.. code-block:: python
+
+    from yutipy.lastfm import LastFm
+
+    lastfm = LastFm(api_key="your_lastfm_api_key")
+
+.. code-block:: python
+
+    from yutipy.lastfm import LastFm
+
+    with LastFm() as lastfm:
+        result = lastfm.get_currently_playing(username="username")
+        print(result)
+
 Spotify
 -------
 

yutipy-2.2.1/tests/__init__.py

@@ -0,0 +1,21 @@
+# This file is intentionally left blank. /ᐠ｡ꞈ｡ᐟ\ 喵~ not anymore !
+
+
+class BaseResponse:
+    """
+    A base mock response class for simulating HTTP responses in tests.
+
+    Attributes:
+        status_code (int): The HTTP status code of the response. Defaults to 200.
+
+    Methods:
+        raise_for_status(): Simulates the behavior of `requests.Response.raise_for_status()`
+            by doing nothing, indicating a successful response with no exceptions raised.
+    """
+
+    status_code = 200
+
+    @staticmethod
+    def raise_for_status():
+        """Simulates a successful response with no exceptions raised."""
+        pass

{yutipy-2.1.1 → yutipy-2.2.1}/tests/test_deezer.py

@@ -1,5 +1,6 @@
 import pytest
 
+from tests import BaseResponse
 from yutipy.deezer import Deezer
 from yutipy.models import MusicInfo
 
@@ -9,13 +10,8 @@ def deezer():
     return Deezer()
 
 
-class MockSearchResponse:
-    status_code = 200
-
-    @staticmethod
-    def raise_for_status():
-        pass
-
+# Mock response only for the search endpoint
+class MockSearchResponse(BaseResponse):
     @staticmethod
     def json():
         return {
@@ -46,13 +42,8 @@ class MockSearchResponse:
         }
 
 
-class MockResponse:
-    status_code = 200
-
-    @staticmethod
-    def raise_for_status():
-        pass
-
+# Mock response for requesting individual track or album
+class MockResponse(BaseResponse):
     @staticmethod
     def json():
         return {

{yutipy-2.1.1 → yutipy-2.2.1}/tests/test_itunes.py

@@ -1,9 +1,10 @@
 import pytest
 from pytest import raises
 
+from tests import BaseResponse
+from yutipy.exceptions import InvalidValueException
 from yutipy.itunes import Itunes
 from yutipy.models import MusicInfo
-from yutipy.exceptions import InvalidValueException
 
 
 @pytest.fixture
@@ -11,13 +12,7 @@ def itunes():
     return Itunes()
 
 
-class MockResponse:
-    status_code = 200
-
-    @staticmethod
-    def raise_for_status():
-        pass
-
+class MockResponse(BaseResponse):
     @staticmethod
     def json():
         return {

{yutipy-2.1.1 → yutipy-2.2.1}/tests/test_kkbox.py

@@ -1,9 +1,10 @@
 import pytest
 from pytest import raises
 
+from tests import BaseResponse
 from yutipy.exceptions import InvalidValueException
-from yutipy.models import MusicInfo
 from yutipy.kkbox import KKBox
+from yutipy.models import MusicInfo
 
 
 @pytest.fixture(scope="module")
@@ -24,13 +25,7 @@ def kkbox():
     return kkbox_instance
 
 
-class MockResponse:
-    status_code = 200
-
-    @staticmethod
-    def raise_for_status():
-        pass
-
+class MockResponse(BaseResponse):
     @staticmethod
     def json():
         return {

yutipy-2.2.1/tests/test_lastfm.py

@@ -0,0 +1,60 @@
+import pytest
+
+from yutipy.lastfm import LastFm
+from yutipy.models import UserPlaying
+from tests import BaseResponse
+
+
+@pytest.fixture
+def lastfm():
+    return LastFm(api_key="test_api_key")
+
+
+class MockResponse(BaseResponse):
+    @staticmethod
+    def json():
+        return {
+            "recenttracks": {
+                "track": [
+                    {
+                        "artist": {"mbid": "", "#text": "Test Artist"},
+                        "image": [
+                            {
+                                "size": "small",
+                                "#text": "https://example.com/image/small.jpg",
+                            },
+                            {
+                                "size": "extralarge",
+                                "#text": "https://example.com/image/extralarge.jpg",
+                            },
+                        ],
+                        "mbid": "",
+                        "album": {
+                            "mbid": "",
+                            "#text": "Test Album",
+                        },
+                        "name": "Test Track",
+                        "url": "https://www.last.fm/music/test+track",
+                    }
+                ]
+            }
+        }
+
+
+@pytest.fixture
+def mock_response(lastfm, monkeypatch):
+    def mock_get(*args, **kwargs):
+        return MockResponse()
+
+    monkeypatch.setattr(lastfm._LastFm__session, "get", mock_get)
+
+
+def test_get_currently_playing(lastfm, mock_response):
+    username = "bob"
+    currently_playing = lastfm.get_currently_playing(username=username)
+    assert currently_playing is not None
+    assert isinstance(currently_playing, UserPlaying)
+    assert currently_playing.title == "Test Track"
+    assert currently_playing.album_title == "Test Album"
+    assert "extralarge" in currently_playing.album_art
+    assert currently_playing.is_playing is False

{yutipy-2.1.1 → yutipy-2.2.1}/tests/test_models.py

@@ -1,4 +1,4 @@
-from yutipy.models import MusicInfo
+from yutipy.models import MusicInfo, MusicInfos, UserPlaying
 
 
 def test_music_info():
@@ -33,3 +33,17 @@ def test_music_info():
     assert music_info.type == "track"
     assert music_info.upc == "123456789012"
     assert music_info.url == "https://example.com/song"
+
+
+def test_music_infos():
+    music_infos = MusicInfos(album_art_source="Example Source")
+
+    assert music_infos.album_art_source == "Example Source"
+    assert isinstance(music_infos.album_art_source, str)
+
+
+def test_user_playing():
+    user_playing = UserPlaying(is_playing=False)
+
+    assert user_playing.is_playing is False
+    assert isinstance(user_playing.is_playing, bool)

{yutipy-2.1.1 → yutipy-2.2.1}/tests/test_musicyt.py

@@ -1,8 +1,9 @@
 import pytest
 from pytest import raises
-from yutipy.musicyt import MusicYT
-from yutipy.models import MusicInfo
+
 from yutipy.exceptions import InvalidValueException
+from yutipy.models import MusicInfo
+from yutipy.musicyt import MusicYT
 
 
 @pytest.fixture

{yutipy-2.1.1 → yutipy-2.2.1}/tests/test_spotify.py

@@ -1,5 +1,6 @@
 import pytest
 
+from tests import BaseResponse
 from yutipy.models import MusicInfo, UserPlaying
 from yutipy.spotify import Spotify, SpotifyAuth
 
@@ -45,13 +46,7 @@ def spotify_auth():
 
 # Custom class to be the mock return value of requests.get()
 # for `Spotify` class only ~
-class MockResponse:
-    status_code = 200
-
-    @staticmethod
-    def raise_for_status():
-        pass
-
+class MockResponse(BaseResponse):
     @staticmethod
     def json():
         return {
@@ -184,13 +179,7 @@ def test_get_currently_playing(spotify_auth, monkeypatch):
         return {"Authorization": "Bearer test_token"}
 
     def mock_get(*args, **kwargs):
-        class MockResponse:
-            status_code = 200
-
-            @staticmethod
-            def raise_for_status():
-                pass
-
+        class MockResponse(BaseResponse):
             @staticmethod
             def json():
                 return {
@@ -242,13 +231,7 @@ def test_get_user_profile(spotify_auth, monkeypatch):
         return {"Authorization": "Bearer test_token"}
 
     def mock_get(*args, **kwargs):
-        class MockResponse:
-            status_code = 200
-
-            @staticmethod
-            def raise_for_status():
-                pass  # Simulates a successful response with no exceptions raised
-
+        class MockResponse(BaseResponse):
             @staticmethod
             def json():
                 return {

{yutipy-2.1.1 → yutipy-2.2.1}/tests/test_utils.py

@@ -7,7 +7,30 @@ def test_are_strings_similar():
     assert are_strings_similar("Hello World", "Hello", use_translation=False) is True
 
 
-def test_are_strings_similar_translation():
+def test_are_strings_similar_translation(monkeypatch):
+    # Mock responses for translate_text
+    mock_responses = {
+        "ポーター": {
+            "source-text": "ポーター",
+            "source-language": "ja",
+            "destination-text": "Porter",
+            "destination-language": "en",
+        },
+        "Porter": {
+            "source-text": "Porter",
+            "source-language": "en",
+            "destination-text": "Porter",
+            "destination-language": "en",
+        },
+    }
+
+    def mock_translate_text(text, *args, **kwargs):
+        return mock_responses[text]
+
+    # Use monkeypatch to replace translate_text with the mock function
+    monkeypatch.setattr("yutipy.utils.helpers.translate_text", mock_translate_text)
+
+    # Run the test with the mocked translate_text
     assert are_strings_similar("ポーター", "Porter") is True
 
 

{yutipy-2.1.1 → yutipy-2.2.1}/yutipy/__init__.py

@@ -3,6 +3,7 @@ from yutipy import (
     exceptions,
     itunes,
     kkbox,
+    lastfm,
     logger,
     musicyt,
     spotify,
@@ -14,6 +15,7 @@ __all__ = [
     "exceptions",
     "itunes",
     "kkbox",
+    "lastfm",
     "logger",
     "musicyt",
     "spotify",

yutipy-2.2.1/yutipy/cli/config.py

@@ -0,0 +1,122 @@
+import os
+import webbrowser
+
+from dotenv import load_dotenv, set_key
+
+
+def run_config_wizard():
+    """Interactive configuration wizard for setting up API keys."""
+    print("Welcome to the yutipy Configuration Wizard!")
+    print("This wizard will help you set up your API keys for various services.\n")
+
+    # Load existing .env file if it exists
+    env_file = ".env"
+    load_dotenv(env_file)
+
+    # List of available services and their required environment variables
+    services = {
+        "Spotify": {
+            "SPOTIFY_CLIENT_ID": {
+                "description": "Spotify Client ID",
+                "url": "https://developer.spotify.com/dashboard",
+                "instructions": """
+1. Go to your Spotify Developer Dashboard: https://developer.spotify.com/dashboard
+2. Create a new app and fill in the required details.
+3. Copy the "Client ID" and "Client Secret" from the app's settings.
+4. Paste them here when prompted.
+                """,
+            },
+            "SPOTIFY_CLIENT_SECRET": {
+                "description": "Spotify Client Secret",
+                "url": "https://developer.spotify.com/dashboard",
+                "instructions": "See the steps above for Spotify Client ID.",
+            },
+        },
+        "KKBox": {
+            "KKBOX_CLIENT_ID": {
+                "description": "KKBox Client ID",
+                "url": "https://developer.kkbox.com/",
+                "instructions": """
+1. Go to the KKBOX Developer Portal: https://developer.kkbox.com/
+2. Log in and create a new application.
+3. Copy the "Client ID" and "Client Secret" from the app's settings.
+4. Paste them here when prompted.
+                """,
+            },
+            "KKBOX_CLIENT_SECRET": {
+                "description": "KKBox Client Secret",
+                "url": "https://developer.kkbox.com/",
+                "instructions": "See the steps above for KKBox Client ID.",
+            },
+        },
+        "Last.fm": {
+            "LASTFM_API_KEY": {
+                "description": "Last.fm API Key",
+                "url": "https://www.last.fm/api/account/create",
+                "instructions": """
+1. Go to the Last.fm API account creation page: https://www.last.fm/api/account/create
+2. Log in with your Last.fm account.
+3. Create a new application and fill in the required details.
+4. Copy the "API Key" from the application settings.
+5. Paste it here when prompted.
+                """,
+            },
+        },
+    }
+
+    # Display available services
+    print("Available services:")
+    for i, service in enumerate(services.keys(), start=1):
+        print(f"{i}. {service}")
+
+    # Prompt the user to select a service
+    choice = input("\nEnter the number of the service you want to configure: ").strip()
+    try:
+        service_name = list(services.keys())[int(choice) - 1]
+    except (IndexError, ValueError):
+        print("Invalid choice. Exiting configuration wizard.")
+        return
+
+    print(f"\nYou selected: {service_name}")
+
+    # Get the selected service's variables
+    selected_service = services[service_name]
+
+    # Track whether the browser has already been opened for a service
+    browser_opened = set()
+
+    # Prompt the user for each variable in the selected service
+    for var, details in selected_service.items():
+        current_value = os.getenv(var)
+        if current_value:
+            print(f"{details['description']} is already set.")
+            continue
+
+        print(f"\n{details['description']} is missing.")
+        print(details["instructions"])
+
+        # Check if the browser has already been opened for this service
+        if details["url"] not in browser_opened:
+            open_browser = (
+                input(
+                    f"Do you want to open the website to get your {details['description']}? (y/N): "
+                )
+                .strip()
+                .lower()
+            )
+            if open_browser == "y":
+                webbrowser.open(details["url"])
+                print(f"The website has been opened in your browser: {details['url']}")
+                browser_opened.add(details["url"])  # Mark this URL as opened
+
+        # Prompt the user to enter the value
+        new_value = input(f"Enter your {details['description']}: ").strip()
+        if new_value:
+            set_key(env_file, var, new_value)
+            print(f"{details['description']} has been saved to the .env file.")
+
+    print("\nConfiguration complete! Your API keys have been saved to the .env file.")
+
+
+if __name__ == "__main__":
+    run_config_wizard()

{yutipy-2.1.1 → yutipy-2.2.1}/yutipy/exceptions.py

@@ -39,7 +39,11 @@ class ItunesException(YutipyException):
 
 
 class KKBoxException(YutipyException):
-    """Exception raised for erros related to the KKBOX Open API."""
+    """Exception raised for errors related to the KKBOX Open API."""
+
+
+class LastFmException(YutipyException):
+    """Exception raised for errors related to the LastFm API."""
 
 
 class MusicYTException(YutipyException):

yutipy-2.2.1/yutipy/lastfm.py

@@ -0,0 +1,127 @@
+__all__ = ["LastFm", "LastFmException"]
+
+import os
+from dataclasses import asdict
+from pprint import pprint
+from typing import Optional
+
+import requests
+from dotenv import load_dotenv
+
+from yutipy.exceptions import LastFmException
+from yutipy.logger import logger
+from yutipy.models import UserPlaying
+from yutipy.utils.helpers import separate_artists
+
+load_dotenv()
+
+LASTFM_API_KEY = os.getenv("LASTFM_API_KEY")
+
+
+class LastFm:
+    """
+    A class to interact with the Last.fm API for fetching user music data.
+
+    This class reads the ``LASTFM_API_KEY`` from environment variables or the ``.env`` file by default.
+    Alternatively, you can manually provide this values when creating an object.
+    """
+
+    def __init__(self, api_key: str = None):
+        """
+        Initializes the LastFm class.
+
+        Args:
+            lastfm_api_key (str, optional): The Last.fm API key. If not provided,
+                it will be fetched from the environment variable `LASTFM_API_KEY`.
+
+        Parameters
+        ----------
+        lastfm_api_key : str, optional
+            The Lastfm API Key (<https://www.last.fm/api>). Defaults to ``LASTFM_API_KEY`` from environment variable or the ``.env`` file.
+
+        Raises:
+            LastFmException: If the API key is not provided or found in the environment.
+        """
+        self.api_key = api_key or LASTFM_API_KEY
+
+        if not self.api_key:
+            raise LastFmException(
+                "Lastfm API key was not found. Set it in environment variable or directly pass it when creating object."
+            )
+
+        self._is_session_closed = False
+
+        self.__api_url = "https://ws.audioscrobbler.com/2.0"
+        self.__session = requests.Session()
+
+    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(s)."""
+        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 get_currently_playing(self, username: str) -> Optional[UserPlaying]:
+        """
+        Fetches information about the currently playing or most recent track for a user.
+
+        Parameters
+        ----------
+        username : str
+            The Last.fm username to fetch data for.
+
+        Returns
+        -------
+        Optional[UserPlaying_]
+            An instance of the ``UserPlaying`` model containing details about the currently
+            playing track if available, or ``None`` if the request fails or no data is available.
+        """
+        query = f"?method=user.getrecenttracks&user={username}&limit=1&api_key={self.api_key}&format=json"
+        query_url = self.__api_url + query
+
+        try:
+            response = self.__session.get(query_url, timeout=30)
+            response.raise_for_status()
+        except requests.RequestException as e:
+            logger.error(f"Failed to fetch user profile: {e}")
+            return None
+
+        response_json = response.json()
+        result = response_json.get("recenttracks", {}).get("track", [])[0]
+        album_art = [
+            img.get("#text")
+            for img in result.get("image", [])
+            if img.get("size") == "extralarge"
+        ]
+        return UserPlaying(
+            album_art="".join(album_art),
+            album_title=result.get("album", {}).get("#text"),
+            artists=", ".join(separate_artists(result.get("artist", {}).get("#text"))),
+            id=result.get("mbid"),
+            title=result.get("name"),
+            url=result.get("url"),
+            is_playing=result.get("@attr", {}).get("nowplaying", False),
+        )
+
+
+if __name__ == "__main__":
+    with LastFm() as lastfm:
+        username = input("Enter Lasfm Username: ").strip()
+        result = lastfm.get_currently_playing(username=username, limit=5)
+
+        if result:
+            pprint(asdict(result))
+        else:
+            print("No result was found. Make sure the username is correct!")

{yutipy-2.1.1 → yutipy-2.2.1}/yutipy/spotify.py

@@ -192,7 +192,7 @@ class Spotify:
             response_json["requested_at"] = time()
             return response_json
         else:
-            raise InvalidResponseException(
+            raise AuthenticationException(
                 f"Invalid response received: {response.json()}"
             )
 
@@ -814,6 +814,9 @@ class SpotifyAuth:
 
     def __refresh_access_token(self):
         """Refreshes the token if it has expired."""
+        if not self.__access_token:
+            raise SpotifyAuthException("No access token was found.")
+
         if time() - self.__token_requested_at >= self.__token_expires_in:
             token_info = self.__get_access_token(refresh_token=self.__refresh_token)
 
@@ -844,7 +847,7 @@ class SpotifyAuth:
         """
         return secrets.token_urlsafe(16)
 
-    def get_authorization_url(self, state: str = None):
+    def get_authorization_url(self, state: str = None, show_dialog: bool = False):
         """
         Constructs the Spotify authorization URL for user authentication.
 
@@ -858,6 +861,11 @@ class SpotifyAuth:
             If not provided, no state parameter is included.
 
             You may use :meth:`SpotifyAuth.generate_state` method to generate one.
+        show_dialog : bool, optional
+            Whether or not to force the user to approve the app again if they’ve already done so.
+            If ``False`` (default), a user who has already approved the application may be automatically
+            redirected to the URI specified by redirect_uri. If ``True``, the user will not be automatically
+            redirected and will have to approve the app again.
 
         Returns
         -------
@@ -869,6 +877,7 @@ class SpotifyAuth:
             "response_type": "code",
             "client_id": self.client_id,
             "redirect_uri": self.redirect_uri,
+            "show_dialog": show_dialog,
         }
 
         if self.scope:
@@ -1012,7 +1021,14 @@ class SpotifyAuth:
         dict
             A dictionary containing the user's display name and profile images.
         """
-        self.__refresh_access_token()
+        try:
+            self.__refresh_access_token()
+        except SpotifyAuthException:
+            logger.warning(
+                "No access token was found. You may authenticate the user again."
+            )
+            return None
+
         query_url = self.__api_url
         header = self.__authorization_header()
 
@@ -1054,7 +1070,14 @@ class SpotifyAuth:
         - If the API response does not contain the expected data, the method will return `None`.
 
         """
-        self.__refresh_access_token()
+        try:
+            self.__refresh_access_token()
+        except SpotifyAuthException:
+            logger.warning(
+                "No access token was found. You may authenticate the user again."
+            )
+            return None
+
         query_url = f"{self.__api_url}/player/currently-playing"
         header = self.__authorization_header()
 
@@ -1064,8 +1087,16 @@ class SpotifyAuth:
         except requests.RequestException as e:
             raise NetworkException(f"Network error occurred: {e}")
 
+        if response.status_code == 204:
+            logger.info("Requested user is currently not listening to any music.")
+            return None
         if response.status_code != 200:
-            logger.error(f"Unexpected response: {response.json()}")
+            try:
+                logger.error(f"Unexpected response: {response.json()}")
+            except requests.exceptions.JSONDecodeError:
+                logger.error(
+                    f"Response Code: {response.status_code}, Reason: {response.reason}"
+                )
             return None
 
         response_json = response.json()
@@ -1099,6 +1130,8 @@ class SpotifyAuth:
                 url=result.get("external_urls", {}).get("spotify"),
             )
 
+        return None
+
 
 if __name__ == "__main__":
     import logging

{yutipy-2.1.1 → yutipy-2.2.1}/yutipy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yutipy
-Version: 2.1.1
+Version: 2.2.1
 Summary: A simple package for retrieving music information from various music platforms APIs.
 Author: Cheap Nightbot
 Author-email: Cheap Nightbot <hi@cheapnightbot.slmail.me>
@@ -90,6 +90,7 @@ Feel free to request any music platform you would like me to add by opening an i
 - `Deezer`: https://www.deezer.com
 - `iTunes`: https://music.apple.com
 - `KKBOX`: https://www.kkbox.com
+- `Lastfm`: https://last.fm
 - `Spotify`: https://spotify.com
 - `YouTube Music`: https://music.youtube.com
 

{yutipy-2.1.1 → yutipy-2.2.1}/yutipy.egg-info/SOURCES.txt

@@ -30,6 +30,7 @@ tests/__init__.py
 tests/test_deezer.py
 tests/test_itunes.py
 tests/test_kkbox.py
+tests/test_lastfm.py
 tests/test_models.py
 tests/test_musicyt.py
 tests/test_spotify.py
@@ -39,6 +40,7 @@ yutipy/deezer.py
 yutipy/exceptions.py
 yutipy/itunes.py
 yutipy/kkbox.py
+yutipy/lastfm.py
 yutipy/logger.py
 yutipy/models.py
 yutipy/musicyt.py

yutipy-2.1.1/tests/__init__.py

@@ -1 +0,0 @@
-# This file is intentionally left blank. /ᐠ｡ꞈ｡ᐟ\ 喵~

yutipy-2.1.1/yutipy/cli/config.py

@@ -1,86 +0,0 @@
-import os
-import webbrowser
-from dotenv import load_dotenv, set_key
-
-
-def run_config_wizard():
-    """Interactive configuration wizard for setting up API keys."""
-    print("Welcome to the yutipy Configuration Wizard!")
-    print("This wizard will help you set up your API keys for various services.\n")
-
-    # Load existing .env file if it exists
-    env_file = ".env"
-    load_dotenv(env_file)
-
-    # List of required environment variables and their instructions
-    required_vars = {
-        "SPOTIFY_CLIENT_ID": {
-            "description": "Spotify Client ID",
-            "url": "https://developer.spotify.com/dashboard",
-            "instructions": """
-1. Go to your Spotify Developer Dashboard: https://developer.spotify.com/dashboard
-2. Create a new app and fill in the required details.
-3. Copy the "Client ID" and "Client Secret" from the app's settings.
-4. Paste them here when prompted.
-            """,
-        },
-        "SPOTIFY_CLIENT_SECRET": {
-            "description": "Spotify Client Secret",
-            "url": "https://developer.spotify.com/dashboard",
-            "instructions": "See the steps above for Spotify Client ID.",
-        },
-        "KKBOX_CLIENT_ID": {
-            "description": "KKBox Client ID",
-            "url": "https://developer.kkbox.com/",
-            "instructions": """
-1. Go to the KKBOX Developer Portal: https://developer.kkbox.com/
-2. Log in and create a new application.
-3. Copy the "Client ID" and "Client Secret" from the app's settings.
-4. Paste them here when prompted.
-            """,
-        },
-        "KKBOX_CLIENT_SECRET": {
-            "description": "KKBox Client Secret",
-            "url": "https://developer.kkbox.com/",
-            "instructions": "See the steps above for KKBox Client ID.",
-        },
-    }
-
-    # Track whether the browser has already been opened for a service
-    browser_opened = set()
-
-    # Prompt the user for each variable
-    for var, details in required_vars.items():
-        current_value = os.getenv(var)
-        if current_value:
-            print(f"{details['description']} is already set.")
-            continue
-
-        print(f"\n{details['description']} is missing.")
-        print(details["instructions"])
-
-        # Check if the browser has already been opened for this service
-        if details["url"] not in browser_opened:
-            open_browser = (
-                input(
-                    f"Do you want to open the website to get your {details['description']}? (y/N): "
-                )
-                .strip()
-                .lower()
-            )
-            if open_browser == "y":
-                webbrowser.open(details["url"])
-                print(f"The website has been opened in your browser: {details['url']}")
-                browser_opened.add(details["url"])  # Mark this URL as opened
-
-        # Prompt the user to enter the value
-        new_value = input(f"Enter your {details['description']}: ").strip()
-        if new_value:
-            set_key(env_file, var, new_value)
-            print(f"{details['description']} has been saved to the .env file.")
-
-    print("\nConfiguration complete! Your API keys have been saved to the .env file.")
-
-
-if __name__ == "__main__":
-    run_config_wizard()