absfuyu 2.8.1__py3-none-any.whl → 3.1.0__py3-none-any.whl

absfuyu/fun/__init__.py

@@ -3,8 +3,8 @@ Absfuyu: Fun
 ------------
 Some fun or weird stuff
 
-Version: 1.0.4
-Date updated: 24/11/2023 (dd/mm/yyyy)
+Version: 1.0.5
+Date updated: 27/11/2023 (dd/mm/yyyy)
 """
 
 
@@ -22,10 +22,10 @@ from absfuyu.util.lunar import LunarCalendar
 # Function
 ###########################################################################
 def zodiac_sign(
-        day: int,
-        month: int,
-        zodiac13: bool = False,
-    ):
+    day: int,
+    month: int,
+    zodiac13: bool = False,
+):
     """
     Calculate zodiac sign
 
@@ -33,10 +33,10 @@ def zodiac_sign(
     ----------
     day : int
         Day (in range [1, 31])
-    
+
     month : int
         Month (in range [1, 12])
-    
+
     zodiac13 : bool
         13 zodiacs mode (Default: ``False``)
 
@@ -44,7 +44,7 @@ def zodiac_sign(
     -------
     str
         Zodiac sign
-    
+
     None
         When failed
     """
@@ -58,122 +58,92 @@ def zodiac_sign(
         raise SystemExit("Value out of range")
 
     zodiac = {
-        "Aquarius": any([
-            month == 1 and day >= 20,
-            month == 2 and day <= 18
-        ]), # 20/1-18/2
-        "Pisces": any([
-            month == 2 and day >= 19,
-            month == 3 and day <= 20
-        ]), # 19/2-20/3
-        "Aries": any([
-            month == 3 and day >= 21,
-            month == 4 and day <= 19
-        ]), # 21/3-19/4
-        "Taurus": any([
-            month == 4 and day >= 20,
-            month == 5 and day <= 20
-        ]), # 20/4-20/5
-        "Gemini": any([
-            month == 5 and day >= 21,
-            month == 6 and day <= 20
-        ]), # 21/5-20/6
-        "Cancer": any([
-            month == 6 and day >= 21,
-            month == 7 and day <= 22
-        ]), # 21/6-22/7
-        "Leo": any([
-            month == 7 and day >= 23,
-            month == 8 and day <= 22
-        ]), # 23/7-22/8
-        "Virgo": any([
-            month == 8 and day >= 23,
-            month == 9 and day <= 22
-        ]), # 23/8-22/9
-        "Libra": any([
-            month == 9 and day >= 23,
-            month == 10 and day <= 22
-        ]), # 23/9-22/10
-        "Scorpio": any([
-            month == 10 and day >= 23,
-            month == 11 and day <= 21
-        ]), # 23/10-21/11
-        "Sagittarius":any([
-            month == 11 and day >= 22,
-            month == 12 and day <= 21
-        ]), # 22/11-21/12
-        "Capricorn": any([
-            month == 12 and day >= 22,
-            month == 1 and day <= 19
-        ]), # 22/12-19/1
+        "Aquarius": any(
+            [month == 1 and day >= 20, month == 2 and day <= 18]
+        ),  # 20/1-18/2
+        "Pisces": any(
+            [month == 2 and day >= 19, month == 3 and day <= 20]
+        ),  # 19/2-20/3
+        "Aries": any([month == 3 and day >= 21, month == 4 and day <= 19]),  # 21/3-19/4
+        "Taurus": any(
+            [month == 4 and day >= 20, month == 5 and day <= 20]
+        ),  # 20/4-20/5
+        "Gemini": any(
+            [month == 5 and day >= 21, month == 6 and day <= 20]
+        ),  # 21/5-20/6
+        "Cancer": any(
+            [month == 6 and day >= 21, month == 7 and day <= 22]
+        ),  # 21/6-22/7
+        "Leo": any([month == 7 and day >= 23, month == 8 and day <= 22]),  # 23/7-22/8
+        "Virgo": any([month == 8 and day >= 23, month == 9 and day <= 22]),  # 23/8-22/9
+        "Libra": any(
+            [month == 9 and day >= 23, month == 10 and day <= 22]
+        ),  # 23/9-22/10
+        "Scorpio": any(
+            [month == 10 and day >= 23, month == 11 and day <= 21]
+        ),  # 23/10-21/11
+        "Sagittarius": any(
+            [month == 11 and day >= 22, month == 12 and day <= 21]
+        ),  # 22/11-21/12
+        "Capricorn": any(
+            [month == 12 and day >= 22, month == 1 and day <= 19]
+        ),  # 22/12-19/1
     }
-    
-    if zodiac13: # 13 zodiac signs
+
+    if zodiac13:  # 13 zodiac signs
         zodiac = {
-            "Aquarius": any([
-                month == 2 and day >= 17,
-                month == 3 and day <= 11
-            ]), # 17/2-11/3
-            "Pisces": any([
-                month == 3 and day >= 12,
-                month == 4 and day <= 18
-            ]), # 12/3-18-4
-            "Aries": any([
-                month == 4 and day >= 19,
-                month == 5 and day <= 13
-            ]), # 19/4-13-5
-            "Taurus": any([
-                month == 5 and day >= 14,
-                month == 6 and day <= 21
-            ]), # 14/5-21/6
-            "Gemini": any([
-                month == 6 and day >= 22,
-                month == 7 and day <= 20
-            ]), # 22/6-20/7
-            "Cancer": any([
-                month == 7 and day >= 21,
-                month == 8 and day <= 10
-            ]), # 21/7-10/8
-            "Leo": any([
-                month == 8 and day >= 11,
-                month == 9 and day <= 16
-            ]), # 11/8-16/9
-            "Virgo": any([
-                month == 9 and day >= 17,
-                month == 10 and day <= 30
-            ]), # 17/9-30/10
-            "Libra": any([
-                month == 10 and day >= 31,
-                month == 11 and day <= 23
-            ]), # 31/10-23/11
-            "Scorpio": any([
-                month == 11 and day >= 24,
-                month == 11 and day <= 29
-            ]), # 24/11-29/11
-            "Ophiuchus": any([
-                month == 11 and day >= 30,
-                month == 12 and day <= 17
-            ]), # 30/11-17/12
-            "Sagittarius":any([
-                month == 12 and day >= 18,
-                month == 1 and day <= 20
-            ]), # 18/12-20/1
-            "Capricorn": any([
-                month == 1 and day >= 21,
-                month == 2 and day <= 16
-            ]), # 21/1-16/2
+            "Aquarius": any(
+                [month == 2 and day >= 17, month == 3 and day <= 11]
+            ),  # 17/2-11/3
+            "Pisces": any(
+                [month == 3 and day >= 12, month == 4 and day <= 18]
+            ),  # 12/3-18-4
+            "Aries": any(
+                [month == 4 and day >= 19, month == 5 and day <= 13]
+            ),  # 19/4-13-5
+            "Taurus": any(
+                [month == 5 and day >= 14, month == 6 and day <= 21]
+            ),  # 14/5-21/6
+            "Gemini": any(
+                [month == 6 and day >= 22, month == 7 and day <= 20]
+            ),  # 22/6-20/7
+            "Cancer": any(
+                [month == 7 and day >= 21, month == 8 and day <= 10]
+            ),  # 21/7-10/8
+            "Leo": any(
+                [month == 8 and day >= 11, month == 9 and day <= 16]
+            ),  # 11/8-16/9
+            "Virgo": any(
+                [month == 9 and day >= 17, month == 10 and day <= 30]
+            ),  # 17/9-30/10
+            "Libra": any(
+                [month == 10 and day >= 31, month == 11 and day <= 23]
+            ),  # 31/10-23/11
+            "Scorpio": any(
+                [month == 11 and day >= 24, month == 11 and day <= 29]
+            ),  # 24/11-29/11
+            "Ophiuchus": any(
+                [month == 11 and day >= 30, month == 12 and day <= 17]
+            ),  # 30/11-17/12
+            "Sagittarius": any(
+                [month == 12 and day >= 18, month == 1 and day <= 20]
+            ),  # 18/12-20/1
+            "Capricorn": any(
+                [month == 1 and day >= 21, month == 2 and day <= 16]
+            ),  # 21/1-16/2
         }
 
     logger.debug(zodiac)
-    
+
     for k, v in zodiac.items():
         if v is True:
             return k
 
+
 def im_bored() -> str:
     """
     Get random activity from ``boredapi`` website
-    
+
     :rtype: str
     """
     try:
@@ -209,12 +179,12 @@ def force_shutdown():
 def happy_new_year(forced: bool = False, include_lunar: bool = False):
     """
     Only occurs on 01/01 every year
-    
+
     Parameters
     ----------
     forced : bool
         Shutdown ASAP (Default: ``False``)
-    
+
     include_lunar : bool
         Include Lunar New Year (Default: ``False``)
     """
@@ -225,12 +195,12 @@ def happy_new_year(forced: bool = False, include_lunar: bool = False):
     today = date.today()
     m = today.month
     d = today.day
-    solar_new_year = m==1 and d==1
+    solar_new_year = m == 1 and d == 1
     logger.debug(f"Solar: {today}")
 
     if include_lunar:
         lunar = LunarCalendar.now().date
-        lunar_new_year = lunar.month==1 and lunar.day==1
+        lunar_new_year = lunar.month == 1 and lunar.day == 1
         logger.debug(f"Lunar: {lunar}")
     else:
         lunar_new_year = False
@@ -245,4 +215,4 @@ def happy_new_year(forced: bool = False, include_lunar: bool = False):
 # Run
 ###########################################################################
 if __name__ == "__main__":
-    logger.setLevel(10)
+    logger.setLevel(10)

absfuyu/fun/tarot.py

@@ -4,8 +4,8 @@ Absfuyu: Tarot
 Tarot stuff
 
 
-Version: 1.0.1
-Date updated: 24/11/2023 (dd/mm/yyyy)
+Version: 1.0.3
+Date updated: 01/01/2024 (dd/mm/yyyy)
 
 Usage:
 ------
@@ -15,10 +15,7 @@ Usage:
 
 # Module level
 ###########################################################################
-__all__ = [
-    "Tarot",
-    "TarotCard"
-]
+__all__ = ["Tarot", "TarotCard"]
 
 
 # Library
@@ -26,62 +23,60 @@ __all__ = [
 import random
 from typing import Dict, List
 
-from absfuyu.core import DATA_PATH
 from absfuyu.logger import logger
-from absfuyu.util.api import APIRequest
+from absfuyu.pkg_data import DataList
+from absfuyu.util.pkl import Pickler
 
 
 # Class
 ###########################################################################
 class TarotCard:
     """Tarot card"""
+
     def __init__(
-            self,
-            name: str,
-            rank: int,
-            suit: str,
-            meanings: Dict[str, List[str]],
-            keywords: List[str],
-            fortune_telling: List[str]
-        ) -> None:
+        self,
+        name: str,
+        rank: int,
+        suit: str,
+        meanings: Dict[str, List[str]],
+        keywords: List[str],
+        fortune_telling: List[str],
+    ) -> None:
         self.name = name.title()
         self.rank = rank
         self.suit = suit
         self.meanings = meanings
         self.keywords = keywords
         self.fortune_telling = fortune_telling
+
     def __str__(self) -> str:
         return f"{self.__class__.__name__}({self.name})"
+
     def __repr__(self) -> str:
         return self.__str__()
 
 
 class Tarot:
     """Tarot data"""
+
     def __init__(self) -> None:
-        self.data = APIRequest(
-            "https://raw.githubusercontent.com/dariusk/corpora/master/data/divination/tarot_interpretations.json",
-            encoding="utf-8"
-        )
-        self.data_location = DATA_PATH.joinpath("tarot.json")
+        self.data_location = DataList.TAROT
+
     def __str__(self) -> str:
         return f"{self.__class__.__name__}()"
+
     def __repr__(self) -> str:
         return self.__str__()
 
-    def _load(self, update: bool = False) -> List[TarotCard]:
+    @property
+    def tarot_deck(self) -> List[TarotCard]:
         """
-        Load tarot json data from API
+        Load pickled tarot data
 
-        update: refresh the cache
+        :rtype: list[TarotCard]
         """
-        json_data = self.data.fetch_data(
-            update=update,
-            json_cache=self.data_location
-        )
-        tarot_data = json_data["tarot_interpretations"]
+        tarot_data: list = Pickler.load(self.data_location)
         logger.debug(f"{len(tarot_data)} tarot cards loaded")
-        # return tarot_data
         return [
             TarotCard(
                 name=x["name"],
@@ -89,10 +84,11 @@ class Tarot:
                 suit=x["suit"],
                 meanings=x["meanings"],
                 keywords=x["keywords"],
-                fortune_telling=x["fortune_telling"]
-            ) for x in tarot_data
+                fortune_telling=x["fortune_telling"],
+            )
+            for x in tarot_data
         ]
-    
+
     def random_card(self) -> TarotCard:
         """
         Pick a random tarot card
@@ -102,9 +98,11 @@ class Tarot:
         TarotCard
             Random Tarot card
         """
-        return random.choice(self._load())
+        return random.choice(self.tarot_deck)
+
 
 # Run
 ###########################################################################
 if __name__ == "__main__":
+    logger.setLevel(10)
     pass