yutipy 1.2.0__py3-none-any.whl → 1.3.0__py3-none-any.whl

yutipy/__init__.py

@@ -3,6 +3,7 @@ from .itunes import Itunes
 from .models import MusicInfo
 from .musicyt import MusicYT
 from .spotify import Spotify
+from .yutipy_music import YutipyMusic
 
 __all__ = [
     "Deezer",
@@ -10,4 +11,5 @@ __all__ = [
     "MusicInfo",
     "MusicYT",
     "Spotify",
+    "YutipyMusic",
 ]

yutipy/deezer.py

@@ -28,7 +28,7 @@ class Deezer:
 
     def __exit__(self, exc_type, exc_value, exc_traceback) -> None:
         """Exits the runtime context related to this object."""
-        self._close_session()
+        self.close_session()
 
     def close_session(self) -> None:
         """Closes the current session."""
@@ -238,7 +238,7 @@ class Deezer:
             album_title=(
                 result["album"]["title"] if music_type == "track" else result["title"]
             ),
-            album_type=result.get("record_type", music_type),
+            album_type=result.get("record_type", music_type.replace("track", "single")),
             artists=result["artist"]["name"],
             genre=None,
             id=result["id"],
@@ -273,4 +273,4 @@ if __name__ == "__main__":
         song_name = input("Song Name: ")
         pprint(deezer.search(artist_name, song_name))
     finally:
-        deezer._close_session()
+        deezer.close_session()

yutipy/itunes.py

@@ -29,7 +29,7 @@ class Itunes:
 
     def __exit__(self, exc_type, exc_value, exc_traceback) -> None:
         """Exits the runtime context related to this object."""
-        self._close_session()
+        self.close_session()
 
     def close_session(self) -> None:
         """Closes the current session."""
@@ -186,4 +186,4 @@ if __name__ == "__main__":
         song_name = input("Song Name: ")
         pprint(itunes.search(artist_name, song_name))
     finally:
-        itunes._close_session()
+        itunes.close_session()

yutipy/kkbox.py

@@ -64,7 +64,7 @@ class KKBox:
 
     def __exit__(self, exc_type, exc_value, exc_traceback):
         """Exits the runtime context related to this object."""
-        self._close_session()
+        self.close_session()
 
     def close_session(self) -> None:
         """Closes the current session."""

yutipy/models.py

@@ -1,5 +1,5 @@
-from dataclasses import dataclass
-from typing import Optional
+from dataclasses import dataclass, field
+from typing import Optional, Dict, Union
 
 
 @dataclass
@@ -19,8 +19,8 @@ class MusicInfo:
         Name(s) of the artist(s).
     genre : Optional[str]
         Genre of the music.
-    id : str
-        Unique identifier for the music.
+    id : Union[int, str, Dict[str, str]]
+        Unique identifier(s) for the music from different platforms.
     isrc : Optional[str]
         International Standard Recording Code.
     lyrics : Optional[str]
@@ -35,21 +35,34 @@ class MusicInfo:
         Type of the music (e.g., track, album).
     upc : Optional[str]
         Universal Product Code.
-    url : str
-        URL to the music on the platform.
+    url : Union[str, Dict[str, str]]
+        URL(s) to the music on different platforms.
     """
 
-    album_art: Optional[str]
-    album_title: Optional[str]
-    album_type: Optional[str]
-    artists: str
-    genre: Optional[str]
-    id: str
-    isrc: Optional[str]
-    lyrics: Optional[str]
-    release_date: Optional[str]
-    tempo: Optional[float]
-    title: str
-    type: Optional[str]
-    upc: Optional[str]
-    url: str
+    album_art: Optional[str] = None
+    album_title: Optional[str] = None
+    album_type: Optional[str] = None
+    artists: str = ""
+    genre: Optional[str] = None
+    id: Union[int, str, Dict[str, int]] = field(default_factory=dict)
+    isrc: Optional[str] = None
+    lyrics: Optional[str] = None
+    release_date: Optional[str] = None
+    tempo: Optional[float] = None
+    title: str = ""
+    type: Optional[str] = None
+    upc: Optional[str] = None
+    url: Union[str, Dict[str, str]] = field(default_factory=dict)
+
+
+@dataclass
+class MusicInfos(MusicInfo):
+    """A data class to store music information from different services.
+
+    Attributes
+    ----------
+    album_art_source : Optional[str]
+        The source of the album art.
+    """
+
+    album_art_source: Optional[str] = None

yutipy/spotify.py

@@ -69,7 +69,7 @@ class Spotify:
 
     def __exit__(self, exc_type, exc_value, exc_traceback):
         """Exits the runtime context related to this object."""
-        self._close_session()
+        self.close_session()
 
     def close_session(self) -> None:
         """Closes the current session."""

yutipy/utils/cheap_utils.py

@@ -1,3 +1,45 @@
+import requests
+from rapidfuzz import fuzz
+from rapidfuzz.utils import default_process
+
+
+def translate_text(
+    text: str,
+    sl: str = None,
+    dl: str = "en",
+) -> dict:
+    """
+    Translate text from one language to another.
+
+    Args:
+        text (str): The text to be translated.
+        sl (str, optional): The source language code (e.g., 'en' for English, 'es' for Spanish). If not provided, the API will attempt to detect the source language.
+        dl (str, optional): The destination language code (default is 'en' for English).
+
+
+     Returns:
+        dict: A dictionary containing the following keys:
+            - 'source-text': The original text.
+            - 'source-language': The detected or provided source language code.
+            - 'destination-text': The translated text.
+            - 'destination-language': The destination language code.
+    """
+    if sl:
+        url = f"https://ftapi.pythonanywhere.com/translate?sl={sl}&dl={dl}&text={text}"
+    else:
+        url = f"https://ftapi.pythonanywhere.com/translate?dl={dl}&text={text}"
+
+    response = requests.get(url)
+    response_json = response.json()
+    result = {
+        "source-text": response_json["source-text"],
+        "source-language": response_json["source-language"],
+        "destination-text": response_json["destination-text"],
+        "destination-language": response_json["destination-language"],
+    }
+    return result
+
+
 def are_strings_similar(str1: str, str2: str, threshold: int = 80) -> bool:
     """
     Determine if two strings are similar based on a given threshold.
@@ -10,8 +52,8 @@ def are_strings_similar(str1: str, str2: str, threshold: int = 80) -> bool:
     Returns:
         bool: True if the strings are similar, otherwise False.
     """
-    from rapidfuzz import fuzz
-    from rapidfuzz.utils import default_process
+    str1 = translate_text(str1)["destination-text"]
+    str2 = translate_text(str2)["destination-text"]
 
     similarity_score = fuzz.WRatio(str1, str2, processor=default_process)
     return similarity_score > threshold

yutipy/yutipy_music.py

@@ -0,0 +1,122 @@
+from concurrent.futures import ThreadPoolExecutor, as_completed
+from pprint import pprint
+from typing import Optional
+
+from yutipy.deezer import Deezer
+from yutipy.exceptions import InvalidValueException
+from yutipy.itunes import Itunes
+from yutipy.kkbox import KKBox
+from yutipy.models import MusicInfo, MusicInfos
+from yutipy.musicyt import MusicYT
+from yutipy.spotify import Spotify
+from yutipy.utils.cheap_utils import is_valid_string
+
+
+class YutipyMusic:
+    """A class that can be used to retrieve music information from all music platforms available in ``yutipy``.
+
+    This is useful when you want to get music information (especially streaming link) from all available platforms.
+    Instead of calling each service separately, you can use this class to get the information from all services at once.
+    """
+
+    def __init__(self) -> None:
+        """Initializes the YutipyMusic class."""
+        self.music_info = MusicInfos()
+        self.album_art_priority = ["deezer", "kkbox", "spotify", "musicyt", "itunes"]
+
+    def search(self, artist: str, song: str) -> Optional[MusicInfos]:
+        """
+        Searches for a song by artist and title.
+
+        Parameters
+        ----------
+        artist : str
+            The name of the artist.
+        song : str
+            The title of the song.
+
+        Returns
+        -------
+        Optional[MusicInfos_]
+            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."
+            )
+
+        services = [
+            (Deezer, "deezer"),
+            (Itunes, "itunes"),
+            (KKBox, "kkbox"),
+            (MusicYT, "musicyt"),
+            (Spotify, "spotify"),
+        ]
+
+        with ThreadPoolExecutor() as executor:
+            futures = {
+                executor.submit(service().search, artist, song): name
+                for service, name in services
+            }
+
+            for future in as_completed(futures):
+                service_name = futures[future]
+                result = future.result()
+                self._combine_results(result, service_name)
+
+        return self.music_info if self.music_info else None
+
+    def _combine_results(self, result: Optional[MusicInfo], service_name: str) -> None:
+        """
+        Combines the results from different services.
+
+        Parameters
+        ----------
+        result : Optional[MusicInfo]
+            The music information from a service.
+        service_name : str
+            The name of the streaming service.
+        """
+        if not result:
+            return
+
+        attributes = [
+            "album_title",
+            "album_type",
+            "artists",
+            "genre",
+            "isrc",
+            "lyrics",
+            "release_date",
+            "tempo",
+            "title",
+            "type",
+            "upc",
+        ]
+
+        for attr in attributes:
+            if getattr(result, attr) and (
+                not getattr(self.music_info, attr) or service_name == "spotify"
+            ):
+                setattr(self.music_info, attr, getattr(result, attr))
+
+        if result.album_art:
+            current_priority = self.album_art_priority.index(service_name)
+            existing_priority = (
+                self.album_art_priority.index(self.music_info.album_art_source)
+                if self.music_info.album_art_source
+                else len(self.album_art_priority)
+            )
+            if current_priority < existing_priority:
+                self.music_info.album_art = result.album_art
+                self.music_info.album_art_source = service_name
+
+        self.music_info.id[service_name] = result.id
+        self.music_info.url[service_name] = result.url
+
+
+if __name__ == "__main__":
+    yutipy_music = YutipyMusic()
+    artist_name = input("Artist Name: ")
+    song_name = input("Song Name: ")
+    pprint(yutipy_music.search(artist_name, song_name))

{yutipy-1.2.0.dist-info → yutipy-1.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: yutipy
-Version: 1.2.0
+Version: 1.3.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>
@@ -54,6 +54,7 @@ Requires-Dist: requests==2.32.3
 Requires-Dist: ytmusicapi==1.10.1
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
+Dynamic: license-file
 
 <p align="center">
 <img src="https://raw.githubusercontent.com/CheapNightbot/yutipy/main/docs/_static/yutipy_header.png" alt="yutipy" />

yutipy-1.3.0.dist-info/RECORD

@@ -0,0 +1,16 @@
+yutipy/__init__.py,sha256=UIymi9iT8s1nGuqcQcFudZYNsJDR4RzXe6LUaN9V8l0,289
+yutipy/deezer.py,sha256=eLaDNBnpdFpvdxEQrgTZiLl-FBjSs1R0CKEgpgRi0Us,8666
+yutipy/exceptions.py,sha256=4L0Oe1PwFP34LoFTy-Fruipk7uB-JkaackRmkjlaZJU,1138
+yutipy/itunes.py,sha256=SmW6bCGKB9ADG2FxggGDmEOvqAIvuRi7aOkBSyHm2HQ,5841
+yutipy/kkbox.py,sha256=9sz8eb-pu-47DTP_4kgackX1ZLijnCnz7q_1M8BqLWo,12185
+yutipy/models.py,sha256=si_qgaApAYDfSyE8cl_Yg4IfWOtxk1I5JCT8bZsmV4U,1931
+yutipy/musicyt.py,sha256=kvRYuhlNVuvy-WahJq895T3JAzmGTTiKB89r_uTMTAI,7155
+yutipy/spotify.py,sha256=Oaktvdz7gLe2_PaktOmjlc8QpfhZWkmQnIZDmwoXlRE,13608
+yutipy/yutipy_music.py,sha256=YZ_5iIjHr_QA3YAm2usR7hUqJMevu2ZVSQ59Q82Axj0,4053
+yutipy/utils/__init__.py,sha256=7UFcFZ7fBtNXOTngjnRD3MeobT3x5UT2Gag94TXVgLk,169
+yutipy/utils/cheap_utils.py,sha256=Yl0ssVbyvrdVeSPF7PqpGJpwTYLVa4CMgLtr6uk67v0,3104
+yutipy-1.3.0.dist-info/licenses/LICENSE,sha256=_89JsS2QnBG8tAb5-VWbJDj_uJ002zPJAYBJJdh3DPY,1071
+yutipy-1.3.0.dist-info/METADATA,sha256=p76rSDWegRztp7pl8eZ8LQh5FQsYi3aIH2eun9raX-A,6489
+yutipy-1.3.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+yutipy-1.3.0.dist-info/top_level.txt,sha256=t2A5V2_mUcfnHkbCy6tAQlb3909jDYU5GQgXtA4756I,7
+yutipy-1.3.0.dist-info/RECORD,,

{yutipy-1.2.0.dist-info → yutipy-1.3.0.dist-info}/WHEEL

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

yutipy-1.2.0.dist-info/RECORD

@@ -1,15 +0,0 @@
-yutipy/__init__.py,sha256=t0w-pRLjIGD3UtDyd-JpeL-RrMona7YTV_0lZCpGLEc,232
-yutipy/deezer.py,sha256=TbPk6f1ytrtk9GHXOoRZ948fcgOi0619-rQC9xfTYu0,8641
-yutipy/exceptions.py,sha256=4L0Oe1PwFP34LoFTy-Fruipk7uB-JkaackRmkjlaZJU,1138
-yutipy/itunes.py,sha256=NhrllA3U0PUY3dNoMyiG1oZuyvdMQKYRBHzYSkt8ikM,5843
-yutipy/kkbox.py,sha256=yuyEanxxOXsiL2ZTtJMraETQxDetWfUu9K8IULSKQrQ,12186
-yutipy/models.py,sha256=RnfWjoNO1UoNsRvNRYd-4TpkU-4jHKu5t394vIqOOgw,1360
-yutipy/musicyt.py,sha256=kvRYuhlNVuvy-WahJq895T3JAzmGTTiKB89r_uTMTAI,7155
-yutipy/spotify.py,sha256=CZA9XF0EV5wSrLrN9cURtiFKSEHsIvqVlXLKkvb4JEM,13609
-yutipy/utils/__init__.py,sha256=7UFcFZ7fBtNXOTngjnRD3MeobT3x5UT2Gag94TXVgLk,169
-yutipy/utils/cheap_utils.py,sha256=LIuEHib_97NuLahXxdHJUD9v-ccXNUc3NrLYk8EQ52A,1652
-yutipy-1.2.0.dist-info/LICENSE,sha256=_89JsS2QnBG8tAb5-VWbJDj_uJ002zPJAYBJJdh3DPY,1071
-yutipy-1.2.0.dist-info/METADATA,sha256=GZOfBMev_zfoZ2JWhFM60t85GkOU2rerxowo1CFqR4c,6467
-yutipy-1.2.0.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-yutipy-1.2.0.dist-info/top_level.txt,sha256=t2A5V2_mUcfnHkbCy6tAQlb3909jDYU5GQgXtA4756I,7
-yutipy-1.2.0.dist-info/RECORD,,