yutipy 2.2.9__tar.gz → 2.2.11__tar.gz

{yutipy-2.2.9 → yutipy-2.2.11}/MANIFEST.in

@@ -1,6 +1,4 @@
 include LICENSE
 include README.md
 include requirements.txt
-include requirements-dev.txt
 recursive-include yutipy *
-recursive-include tests *

{yutipy-2.2.9 → yutipy-2.2.11}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: yutipy
-Version: 2.2.9
-Summary: A simple package for retrieving music information from various music platforms APIs.
+Version: 2.2.11
+Summary: A simple Python package to interact with various music platforms APIs.
 Author: Cheap Nightbot
 Author-email: Cheap Nightbot <hi@cheapnightbot.slmail.me>
 Maintainer-email: Cheap Nightbot <hi@cheapnightbot.slmail.me>
@@ -12,7 +12,7 @@ Project-URL: Repository, https://github.com/CheapNightbot/yutipy.git
 Project-URL: Issues, https://github.com/CheapNightbot/yutipy/issues
 Project-URL: Changelog, https://github.com/CheapNightbot/yutipy/blob/master/CHANGELOG.md
 Project-URL: funding, https://ko-fi.com/cheapnightbot
-Keywords: music,API,Deezer,iTunes,KKBox,Spotify,YouTube Music,search,retrieve,information,yutify
+Keywords: music,API,Deezer,iTunes,KKBox,Lastfm,Spotify,YouTube Music,search,retrieve,information,yutify
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries
@@ -30,8 +30,6 @@ Requires-Dist: python-dotenv==1.1.0
 Requires-Dist: rapidfuzz==3.13.0
 Requires-Dist: requests==2.32.3
 Requires-Dist: ytmusicapi==1.10.3
-Provides-Extra: dev
-Requires-Dist: pytest; extra == "dev"
 Dynamic: license-file
 
 <p align="center">
@@ -59,7 +57,7 @@ Dynamic: license-file
 </a>
 </p>
 
-A _**simple**_ Python package for searching and retrieving music information from various music platforms APIs, including Deezer, iTunes, Spotify, and YouTube Music.
+A _**simple**_ Python package to interact with various music platforms APIs.
 
 ## Table of Contents
 

{yutipy-2.2.9 → yutipy-2.2.11}/README.md

@@ -23,7 +23,7 @@
 </a>
 </p>
 
-A _**simple**_ Python package for searching and retrieving music information from various music platforms APIs, including Deezer, iTunes, Spotify, and YouTube Music.
+A _**simple**_ Python package to interact with various music platforms APIs.
 
 ## Table of Contents
 

{yutipy-2.2.9 → yutipy-2.2.11}/docs/index.rst

@@ -3,7 +3,7 @@
    :target: https://github.com/CheapNightbot/yutipy
    :align: center
 
-**yutipy** is a Python package for searching and retrieving music information from various music platforms (see list of :doc:`available muisc platforms <available_platforms>`).
+**yutipy** is a Python package to interact 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

{yutipy-2.2.9 → yutipy-2.2.11}/pyproject.toml

@@ -20,10 +20,10 @@ authors = [
 maintainers = [
   {name = "Cheap Nightbot", email = "hi@cheapnightbot.slmail.me"}
 ]
-description = "A simple package for retrieving music information from various music platforms APIs."
+description = "A simple Python package to interact with various music platforms APIs."
 readme = "README.md"
 license = "MIT"
-keywords = ["music", "API", "Deezer", "iTunes", "KKBox", "Spotify", "YouTube Music", "search", "retrieve", "information", "yutify"]
+keywords = ["music", "API", "Deezer", "iTunes", "KKBox", "Lastfm", "Spotify", "YouTube Music", "search", "retrieve", "information", "yutify"]
 classifiers = [
   "Development Status :: 4 - Beta",
   "Intended Audience :: Developers",
@@ -36,11 +36,6 @@ classifiers = [
   "Operating System :: OS Independent",
 ]
 
-[project.optional-dependencies]
-dev =  [
-    "pytest",
-]
-
 [project.urls]
 Homepage = "https://github.com/CheapNightbot/yutipy"
 Documentation = "https://yutipy.readthedocs.io/"

{yutipy-2.2.9 → yutipy-2.2.11}/yutipy/base_clients.py

@@ -87,7 +87,7 @@ class BaseClient:
         token_info = None
         try:
             token_info = self.load_access_token()
-            if not isinstance(token_info, dict):
+            if token_info and not isinstance(token_info, dict):
                 raise InvalidValueException(
                     "`load_access_token()` should return a dict."
                 )
@@ -172,7 +172,7 @@ class BaseClient:
                 self._token_expires_in = token_info.get("expires_in")
                 self._token_requested_at = token_info.get("requested_at")
             else:
-                logger.info("The access token is still valid, no need to refresh.")
+                logger.debug("The access token is still valid, no need to refresh.")
         except TypeError:
             logger.debug(
                 f"token requested at: {self._token_requested_at} | token expires in: {self._token_expires_in}"
@@ -316,7 +316,7 @@ class BaseAuthClient:
         token_info = None
         try:
             token_info = self.load_access_token()
-            if not isinstance(token_info, dict):
+            if token_info and not isinstance(token_info, dict):
                 raise InvalidValueException(
                     "`load_access_token()` should return a dict."
                 )
@@ -419,7 +419,7 @@ class BaseAuthClient:
                 self._token_requested_at = token_info.get("requested_at")
 
             else:
-                logger.info("The access token is still valid, no need to refresh.")
+                logger.debug("The access token is still valid, no need to refresh.")
         except TypeError:
             logger.debug(
                 f"token requested at: {self._token_requested_at} | token expires in: {self._token_expires_in}"

{yutipy-2.2.9 → yutipy-2.2.11}/yutipy/deezer.py

@@ -95,7 +95,7 @@ class Deezer:
                 return None
 
             try:
-                logger.debug(f"Parsing response JSON: {response.json()}")
+                logger.debug(f"Parsing response JSON.")
                 result = response.json()["data"]
             except (IndexError, KeyError, ValueError) as e:
                 logger.warning(f"Invalid response structure from Deezer: {e}")
@@ -159,7 +159,7 @@ class Deezer:
             return None
 
         try:
-            logger.debug(f"Response JSON: {response.json()}")
+            logger.debug(f"Parsing Response JSON.")
             result = response.json()
         except ValueError as e:
             logger.warning(f"Invalid response received from Deezer: {e}")

{yutipy-2.2.9 → yutipy-2.2.11}/yutipy/itunes.py

@@ -95,7 +95,7 @@ class Itunes:
                 return None
 
             try:
-                logger.debug(f"Parsing response JSON: {response.json()}")
+                logger.debug(f"Parsing response JSON.")
                 result = response.json()["results"]
             except (IndexError, KeyError, ValueError) as e:
                 logger.warning(f"Invalid response structure from iTunes: {e}")

{yutipy-2.2.9 → yutipy-2.2.11}/yutipy/utils/helpers.py

@@ -5,6 +5,13 @@ from rapidfuzz.utils import default_process
 
 kakasi = pykakasi.kakasi()
 
+TRANSLATION_CACHE = {}
+
+
+def similarity(str1: str, str2: str, threshold: int = 80):
+    similarity_score = fuzz.WRatio(str1, str2, processor=default_process)
+    return similarity_score > threshold
+
 
 def translate_text(
     text: str,
@@ -76,30 +83,90 @@ def are_strings_similar(
         bool: True if the strings are similar, otherwise False.
     """
 
+    """
+    note for myself so that it make sense later ~ _(:з)∠)_
+    0. Check cached strings for comparision
+        a. if found and same, return True.
+    1. normalize original strings.
+        a. if both same, return True.
+    2. translate original string.
+        a. if both same, return True.
+    3. translate normalized string.
+        a. if both same, return True.
+    4. return False.
+    """
+
+    # ### Step 0 ####
+    cached_str1 = TRANSLATION_CACHE.get(str1, str1)
+    cached_str2 = TRANSLATION_CACHE.get(str2, str2)
+    similar = similarity(cached_str1, cached_str2, threshold=threshold)
+    if similar:
+        return True
+    # ###############
+
+    # ### Step 1 ####
+    # Transliterate / Normalize Strings
+    normalized_str1 = (
+        TRANSLATION_CACHE.get(str1)
+        or "".join(item["hepburn"] for item in kakasi.convert(str1))
+        or str1
+    )
+    normalized_str2 = (
+        TRANSLATION_CACHE.get(str2)
+        or "".join(item["hepburn"] for item in kakasi.convert(str2))
+        or str2
+    )
+    similar = similarity(normalized_str1, normalized_str2, threshold=threshold)
+    if similar:
+        TRANSLATION_CACHE[str1] = normalized_str1
+        TRANSLATION_CACHE[str2] = normalized_str2
+        return True
+    # ###############
+
     if use_translation:
-        translated_str1 = (
-            translate_text(str1, session=translation_session)["destination-text"]
+        # ### Step 2 ####
+        original_translated_str1 = (
+            TRANSLATION_CACHE.get(str1)
+            or translate_text(str1, session=translation_session)["destination-text"]
             if translation_session
             else translate_text(str1)["destination-text"]
         )
-        translated_str2 = (
-            translate_text(str2, session=translation_session)["destination-text"]
+        original_translated_str2 = (
+            TRANSLATION_CACHE.get(str2)
+            or translate_text(str2, session=translation_session)["destination-text"]
             if translation_session
             else translate_text(str2)["destination-text"]
         )
-
-        similarity_score = fuzz.WRatio(
-            translated_str1, translated_str2, processor=default_process
+        similar = similarity(
+            original_translated_str1, original_translated_str2, threshold=threshold
         )
-        if similarity_score > threshold:
+        if similar:
+            TRANSLATION_CACHE[str1] = original_translated_str1
+            TRANSLATION_CACHE[str2] = original_translated_str2
             return True
+        # ###############
 
-    # Use transliterated strings for comparison
-    str1 = "".join(item["hepburn"] for item in kakasi.convert(str1)) or str1
-    str2 = "".join(item["hepburn"] for item in kakasi.convert(str2)) or str2
+        normalized_translated_str1 = (
+            TRANSLATION_CACHE.get(str1)
+            or translate_text(str1, session=translation_session)["destination-text"]
+            if translation_session
+            else translation_session(str1)["destination-text"]
+        )
+        normalized_translated_str2 = (
+            TRANSLATION_CACHE.get(str2)
+            or translate_text(str2, session=translation_session)["destination-text"]
+            if translation_session
+            else translate_text(str2)["destination-text"]
+        )
+        similar = similarity(
+            normalized_translated_str1, normalized_translated_str2, threshold=threshold
+        )
+        if similar:
+            TRANSLATION_CACHE[str1] = normalized_translated_str1
+            TRANSLATION_CACHE[str2] = normalized_translated_str2
+            return True
 
-    similarity_score = fuzz.WRatio(str1, str2, processor=default_process)
-    return similarity_score > threshold
+    return False
 
 
 def separate_artists(artists: str, custom_separator: str = None) -> list[str]:

{yutipy-2.2.9 → yutipy-2.2.11}/yutipy.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: yutipy
-Version: 2.2.9
-Summary: A simple package for retrieving music information from various music platforms APIs.
+Version: 2.2.11
+Summary: A simple Python package to interact with various music platforms APIs.
 Author: Cheap Nightbot
 Author-email: Cheap Nightbot <hi@cheapnightbot.slmail.me>
 Maintainer-email: Cheap Nightbot <hi@cheapnightbot.slmail.me>
@@ -12,7 +12,7 @@ Project-URL: Repository, https://github.com/CheapNightbot/yutipy.git
 Project-URL: Issues, https://github.com/CheapNightbot/yutipy/issues
 Project-URL: Changelog, https://github.com/CheapNightbot/yutipy/blob/master/CHANGELOG.md
 Project-URL: funding, https://ko-fi.com/cheapnightbot
-Keywords: music,API,Deezer,iTunes,KKBox,Spotify,YouTube Music,search,retrieve,information,yutify
+Keywords: music,API,Deezer,iTunes,KKBox,Lastfm,Spotify,YouTube Music,search,retrieve,information,yutify
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries
@@ -30,8 +30,6 @@ Requires-Dist: python-dotenv==1.1.0
 Requires-Dist: rapidfuzz==3.13.0
 Requires-Dist: requests==2.32.3
 Requires-Dist: ytmusicapi==1.10.3
-Provides-Extra: dev
-Requires-Dist: pytest; extra == "dev"
 Dynamic: license-file
 
 <p align="center">
@@ -59,7 +57,7 @@ Dynamic: license-file
 </a>
 </p>
 
-A _**simple**_ Python package for searching and retrieving music information from various music platforms APIs, including Deezer, iTunes, Spotify, and YouTube Music.
+A _**simple**_ Python package to interact with various music platforms APIs.
 
 ## Table of Contents
 

{yutipy-2.2.9 → yutipy-2.2.11}/yutipy.egg-info/requires.txt

@@ -3,6 +3,3 @@ python-dotenv==1.1.0
 rapidfuzz==3.13.0
 requests==2.32.3
 ytmusicapi==1.10.3
-
-[dev]
-pytest