yutipy 2.2.10__py3-none-any.whl → 2.2.12__py3-none-any.whl

yutipy/base_clients.py

@@ -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}"
@@ -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/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/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}")
@@ -183,17 +183,14 @@ class Itunes:
         tuple
             The extracted album title and type.
         """
-        try:
-            album_title, album_type = result["collectionName"].split("-")
-            return album_title.strip(), album_type.strip()
-        except ValueError:
-            guess = guess_album_type(result.get("trackCount", 1))
-            guessed_right = are_strings_similar(
-                result.get("wrapperType", "x"), guess, use_translation=False
-            )
-            return result["collectionName"], (
-                result["wrapperType"] if guessed_right else guess
-            )
+
+        guess = guess_album_type(result.get("trackCount", 1))
+        guessed_right = are_strings_similar(
+            result.get("wrapperType", "x"), guess, use_translation=False
+        )
+        return result["collectionName"], (
+            result["wrapperType"] if guessed_right else guess
+        )
 
     def _format_release_date(self, release_date: str) -> str:
         """

yutipy/lastfm.py

@@ -154,7 +154,7 @@ class LastFm:
                 artists=", ".join(
                     separate_artists(result.get("artist", {}).get("#text"))
                 ),
-                id=result.get("mbid"),
+                id=result.get("mbid") if result.get("mbid") else None,
                 timestamp=result.get("date", {}).get("uts") or time(),
                 title=result.get("name"),
                 url=result.get("url"),

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.10.dist-info → yutipy-2.2.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yutipy
-Version: 2.2.10
+Version: 2.2.12
 Summary: A simple Python package to interact with various music platforms APIs.
 Author: Cheap Nightbot
 Author-email: Cheap Nightbot <hi@cheapnightbot.slmail.me>
@@ -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">

{yutipy-2.2.10.dist-info → yutipy-2.2.12.dist-info}/RECORD

@@ -1,10 +1,10 @@
 yutipy/__init__.py,sha256=Zrw3cr_6khXp1IgQdZxGcUM9A64GYgPs-6rlqSukW5Q,294
-yutipy/base_clients.py,sha256=mnDRbSAxrsGHT4SxFNFJ31RnmBz-eyaDHE7umK_suGo,21685
-yutipy/deezer.py,sha256=egsaR-4fQP1V8eOPi1UcxvnLB5495FjbtNs8si6XZbE,10491
+yutipy/base_clients.py,sha256=FHCyCUQ-qE2Jo5JH-DZCxupoZTlb5ADs8XKDbHDVHwA,21687
+yutipy/deezer.py,sha256=ZI1C5gam8NiNznyyagn5r0Potpg25MXja8UXg-9i9ug,10463
 yutipy/exceptions.py,sha256=zz0XyyZr5xRcmRyw3hdTGaVRcwRn_RSYZdmwmuO0sEM,1379
-yutipy/itunes.py,sha256=pGAAQ0nlyIx5Ustbp4T27GMsH5C9VIQ8tTTEOMQViQc,7535
+yutipy/itunes.py,sha256=FAHZDUn6Mvk2t5Ws5rF0hQMzIKZAIflR49lhEPIUyLs,7317
 yutipy/kkbox.py,sha256=Pfx-ZgAI9F1cbxjr7MCsMi-QulNt67t60L7y9lNmo5g,11503
-yutipy/lastfm.py,sha256=RP8OeWZnCCDENhtEc-JvypJCDsnM9aBLx77C2gmnd5Y,5938
+yutipy/lastfm.py,sha256=hOFQOZdf51Gp2m02b4NjKRmQ9yQZ9Yas6MaM78c-oCg,5970
 yutipy/logger.py,sha256=GyLBlfQZ6pLNJ5MbyQSvcD_PkxmFdX41DPq5aeG1z68,1316
 yutipy/models.py,sha256=45M-bNHusaAan_Ta_E9DyvsWujsT-ivbJqIfy2-i3R8,2343
 yutipy/musicyt.py,sha256=n3yaH9qyGlsW2HKPAmqYQNGzhuDH4s5Gh0R5v4JPoeg,9472
@@ -14,10 +14,10 @@ yutipy/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 yutipy/cli/config.py,sha256=e5RIq6RxVxxzx30nKVMa06gwyQ258s7U0WA1xvJuR_0,4543
 yutipy/cli/search.py,sha256=8SQw0bjRzRqAg-FuVz9aWjB2KBZqmCf38SyKAQ3rx5E,3025
 yutipy/utils/__init__.py,sha256=AZaqvs6AJwnqwJuodbGnHu702WSUqc8plVC16SppOcU,239
-yutipy/utils/helpers.py,sha256=W3g9iqoSygcFFCKCp2sk0NQrZOEG26wI2XuNi9pgAXE,5207
-yutipy-2.2.10.dist-info/licenses/LICENSE,sha256=_89JsS2QnBG8tAb5-VWbJDj_uJ002zPJAYBJJdh3DPY,1071
-yutipy-2.2.10.dist-info/METADATA,sha256=aUKkNEJvrDrsnHj57ZOxy61Y3kygPdV0a7duFOw8tY4,6427
-yutipy-2.2.10.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-yutipy-2.2.10.dist-info/entry_points.txt,sha256=BrgmanaPjQqKQ3Ip76JLcsPgGANtrBSURf5CNIxl1HA,106
-yutipy-2.2.10.dist-info/top_level.txt,sha256=t2A5V2_mUcfnHkbCy6tAQlb3909jDYU5GQgXtA4756I,7
-yutipy-2.2.10.dist-info/RECORD,,
+yutipy/utils/helpers.py,sha256=-iH0bx_sxW3Y3jjl6eTbY6QOBoG5t4obRcp7GGyw3ro,7476
+yutipy-2.2.12.dist-info/licenses/LICENSE,sha256=_89JsS2QnBG8tAb5-VWbJDj_uJ002zPJAYBJJdh3DPY,1071
+yutipy-2.2.12.dist-info/METADATA,sha256=OY5NoPGtT3vZZGs_5oleKfzPlwFQuTlk1SH5c2zbFJI,6369
+yutipy-2.2.12.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+yutipy-2.2.12.dist-info/entry_points.txt,sha256=BrgmanaPjQqKQ3Ip76JLcsPgGANtrBSURf5CNIxl1HA,106
+yutipy-2.2.12.dist-info/top_level.txt,sha256=t2A5V2_mUcfnHkbCy6tAQlb3909jDYU5GQgXtA4756I,7
+yutipy-2.2.12.dist-info/RECORD,,

{yutipy-2.2.10.dist-info → yutipy-2.2.12.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any