absfuyu 3.2.0__py3-none-any.whl → 3.3.3__py3-none-any.whl

absfuyu/general/generator.py

@@ -3,8 +3,8 @@ Absfuyu: Generator
 ------------------
 This generate stuff (Not python's ``generator``)
 
-Version: 1.1.0
-Date updated: 06/03/2024 (dd/mm/yyyy)
+Version: 1.1.1
+Date updated: 05/04/2024 (dd/mm/yyyy)
 
 Features:
 ---------
@@ -14,20 +14,17 @@ Features:
 - Generate combinations of list in range
 """
 
-
 # Module level
 ###########################################################################
-__all__ = [
-    "Charset",
-    "Generator"
-]
+__all__ = ["Charset", "Generator"]
 
 
 # Library
 ###########################################################################
+import string
 from itertools import chain, combinations
 from random import choice
-import string
+
 # from string import (
 #     ascii_letters as _ascii_letters,
 #     ascii_uppercase as _ascii_uppercase,
@@ -48,6 +45,7 @@ class Charset:
     """
     Character set data class
     """
+
     DEFAULT = string.ascii_letters + string.digits
     ALPHABET = string.ascii_letters
     FULL = string.ascii_letters + string.digits + string.punctuation
@@ -56,7 +54,7 @@ class Charset:
     DIGIT = string.digits
     SPECIAL = string.punctuation
     ALL = string.printable
-    PRODUCT_KEY = "BCDFGHJKMNPQRTVWXY2346789" # Charset that various key makers use
+    PRODUCT_KEY = "BCDFGHJKMNPQRTVWXY2346789"  # Charset that various key makers use
     # DEFAULT = _ascii_letters + _digits
     # ALPHABET = _ascii_letters
     # FULL = _ascii_letters + _digits + _punctuation
@@ -67,7 +65,7 @@ class Charset:
     # ALL = _printable
 
     def __str__(self) -> str:
-        charset = [x for x in __class__.__dict__.keys() if not x.startswith("__")]
+        charset = [x for x in self.__class__.__dict__.keys() if not x.startswith("__")]
         return f"List of Character set: {charset}"
 
     def __repr__(self) -> str:
@@ -78,24 +76,27 @@ class Generator:
     """
     Generator that generate stuffs
     """
+
     def __init__(self) -> None:
         logger.debug("Class initiated!")
+
     def __str__(self) -> str:
         return f"{self.__class__.__name__}()"
+
     def __repr__(self) -> str:
         return self.__str__()
 
     @staticmethod
     def generate_string(
-            charset: str = Charset.DEFAULT,
-            size: int = 8,
-            times: int = 1,
-            unique: bool = False,
-            string_type_if_1: bool = False
-        ):
+        charset: str = Charset.DEFAULT,
+        size: int = 8,
+        times: int = 1,
+        unique: bool = False,
+        string_type_if_1: bool = False,
+    ):
         """
         Generate a list of random string from character set (Random string generator)
-        
+
         Parameters
         ----------
         charset : str
@@ -108,31 +109,31 @@ class Generator:
             - ``Charset.DIGIT``: character in [0-9]
             - ``Charset.SPECIAL``: character in [!@#$%^&*()_+=-]
             - ``Charset.ALL``: character in every printable character
-        
+
         size : int
-            Length of each string in list 
+            Length of each string in list
             (Default: ``8``)
-        
+
         times : int
-            How many random string generated 
+            How many random string generated
             (Default: ``1``)
-        
+
         unique : bool
-            Each generated text is unique 
+            Each generated text is unique
             (Default: ``False``)
-        
+
         string_type_if_1 : bool
-            Return a ``str`` type result if ``times == 1`` 
+            Return a ``str`` type result if ``times == 1``
             (Default: ``False``)
-        
+
         Returns
         -------
         list
             List of random string generated
-        
+
         str
             When ``string_type_if_1`` is ``True``
-        
+
         None
             When invalid option
 
@@ -145,15 +146,15 @@ class Generator:
 
         try:
             char_lst = list(charset)
-        except:
-            char_lst = charset
+        except Exception:
+            char_lst = charset  # type: ignore # ! review this sometime
         # logger.debug(char_lst)
 
         unique_string = []
         count = 0
         logger.debug(f"Unique generated text: {unique}")
 
-        while (count < times):
+        while count < times:
             s = "".join(choice(char_lst) for _ in range(size))
             logger.debug(f"Time generated: {count+1}. Remaining: {times-count-1}. {s}")
             if not unique:
@@ -163,39 +164,39 @@ class Generator:
                 if s not in unique_string:
                     unique_string.append(s)
                     count += 1
-        
+
         logger.debug(unique_string)
         if string_type_if_1 and times == 1:
             return unique_string[0]
         else:
             return unique_string
-    
+
     @staticmethod
     def generate_key(
-            charset: str = Charset.PRODUCT_KEY,
-            letter_per_block: int = 5,
-            number_of_block: int = 5,
-            sep: str = "-"
-        ) -> str:
+        charset: str = Charset.PRODUCT_KEY,
+        letter_per_block: int = 5,
+        number_of_block: int = 5,
+        sep: str = "-",
+    ) -> str:
         """
         Generate custom key
 
         Parameters
         ----------
         charset : str
-            Character set 
+            Character set
             (Default: ``Charset.PRODUCT_KEY``)
-        
+
         letter_per_block : int
-            Number of letter per key block 
+            Number of letter per key block
             (Default: ``5``)
-        
+
         number_of_block : int
-            Number of key block 
+            Number of key block
             (Default: ``5``)
-        
+
         sep : str
-            Key block separator 
+            Key block separator
             (Default: ``-``)
 
         Returns
@@ -210,12 +211,12 @@ class Generator:
         'VKKPJVYD2H-M7R687QCV2'
         """
         out = sep.join(
-            __class__.generate_string(
+            __class__.generate_string(  # type: ignore
                 charset,
                 size=letter_per_block,
                 times=number_of_block,
                 unique=False,
-                string_type_if_1=False
+                string_type_if_1=False,
             )
         )
         logger.debug(out)
@@ -225,7 +226,7 @@ class Generator:
     def generate_check_digit(number: int) -> int:
         """
         Check digit generator
-        
+
             "A check digit is a form of redundancy check used for
             error detection on identification numbers, such as
             bank account numbers, which are used in an application
@@ -238,20 +239,20 @@ class Generator:
             the input of a series of characters (usually digits)
             such as a single mistyped digit or some permutations
             of two successive digits." (Wikipedia)
-            
+
             This function use Luhn's algorithm to calculate
-        
+
         Parameters
         ----------
         number : int
             Number to calculate check digit
-        
+
         Returns
         -------
         int
             Check digit
-        
-            
+
+
         Example:
         --------
         >>> Generator.generate_check_digit("4129984562545")
@@ -265,22 +266,24 @@ class Generator:
         logger.debug(f"Reversed: {''.join(num)}")
         for i in range(len(num)):
             # convert back into integer
-            num[i] = int(num[i])
-            if i%2 == 0:
+            num[i] = int(num[i])  # type: ignore
+            if i % 2 == 0:
                 # double value of the even-th digit
                 num[i] *= 2
                 # sum the character of digit if it's >= 10
-                if num[i] >= 10:
-                    num[i] -= 9
-            sum += num[i]
+                if num[i] >= 10:  # type: ignore
+                    num[i] -= 9  # type: ignore
+            sum += num[i]  # type: ignore
             logger.debug(f"Loop {i+1}: {num[i]}, {sum}")
-        
+
         out = (10 - (sum % 10)) % 10
         logger.debug(f"Output: {out}")
         return out
 
     @staticmethod
-    def combinations_range(sequence: list, *, min_len: int = 1, max_len: int = 0) -> List[tuple]:
+    def combinations_range(
+        sequence: list, *, min_len: int = 1, max_len: int = 0
+    ) -> List[tuple]:
         """
         Generate all combinations of a ``sequence`` from ``min_len`` to ``max_len``
 
@@ -305,17 +308,14 @@ class Generator:
         # Restrain
         if max_len < 1:
             max_len = len(sequence)
-        max_len = set_max(max_len, max_value=len(sequence))
-        min_len = set_min_max(min_len, min_value=1, max_value=max_len)
+        max_len = int(set_max(max_len, max_value=len(sequence)))
+        min_len = int(set_min_max(min_len, min_value=1, max_value=max_len))
         logger.debug(f"Combination range: [{min_len}, {max_len}]")
 
         # Return
         return list(
             chain.from_iterable(
-                [
-                    list(combinations(sequence, i))
-                    for i in range(min_len, max_len + 1)
-                ]
+                [list(combinations(sequence, i)) for i in range(min_len, max_len + 1)]
             )
         )
 
@@ -323,4 +323,4 @@ class Generator:
 # Run
 ###########################################################################
 if __name__ == "__main__":
-    logger.setLevel(10) # DEBUG
+    logger.setLevel(10)  # DEBUG

absfuyu/general/human.py

@@ -3,16 +3,13 @@ Absfuyu: Human
 --------------
 Human related stuff
 
-Version: 1.3.0
-Date updated: 08/12/2023 (dd/mm/yyyy)
+Version: 1.3.1
+Date updated: 05/04/2024 (dd/mm/yyyy)
 """
 
-
 # Module level
 ###########################################################################
-__all__ = [
-    "Human", "Person"
-]
+__all__ = ["Human", "Person"]
 
 
 # Library
@@ -22,10 +19,9 @@ from typing import Optional, Union
 
 from dateutil.relativedelta import relativedelta
 
-from absfuyu.general.data_extension import IntNumber
 from absfuyu.fun import zodiac_sign
-# from absfuyu.util import set_min_max
-from absfuyu.version import Version
+from absfuyu.general.data_extension import IntNumber
+from absfuyu.version import Version  # type: ignore
 
 
 # Sub-Class
@@ -77,17 +73,17 @@ class Human:
     Basic human data
     """
 
-    __MEASUREMENT = "m|kg" # Metric system
-    __VERSION = Version(1, 1, 1) # Internal version class check
+    __MEASUREMENT = "m|kg"  # Metric system
+    __VERSION = Version(1, 1, 1)  # Internal version class check
 
     def __init__(
-            self,
-            first_name: str,
-            last_name: Optional[str] = None,
-            birthday: Union[str, datetime, None] = None,
-            birth_time: Optional[str] = None,
-            gender: Union[bool, None] = None
-        ) -> None:
+        self,
+        first_name: str,
+        last_name: Optional[str] = None,
+        birthday: Union[str, datetime, None] = None,
+        birth_time: Optional[str] = None,
+        gender: Union[bool, None] = None,
+    ) -> None:
         """
         :param first_name: First name
         :param last_name: Last name
@@ -98,16 +94,22 @@ class Human:
         # Name
         self.first_name = first_name
         self.last_name = last_name
-        self.name = f"{self.last_name}, {self.first_name}" if self.last_name is not None else self.first_name
+        self.name = (
+            f"{self.last_name}, {self.first_name}"
+            if self.last_name is not None
+            else self.first_name
+        )
 
         # Birthday
         now = datetime.now()
         if birthday is None:
             modified_birthday = now.date()
-        else:
+        elif isinstance(birthday, str):
             for x in ["/", "-"]:
                 birthday = birthday.replace(x, "/")
             modified_birthday = datetime.strptime(birthday, "%Y/%m/%d")
+        else:
+            modified_birthday = birthday
             # birthday = list(map(int, birthday.split("/")))
             # modified_birthday = date(*birthday)
             # modified_birthday = date(birthday[0], birthday[1], birthday[2])
@@ -115,11 +117,11 @@ class Human:
         if birth_time is None:
             modified_birthtime = now.time()
         else:
-            birth_time = list(map(int, birth_time.split(":")))
+            birth_time = list(map(int, birth_time.split(":")))  # type: ignore
             modified_birthtime = time(*birth_time)
             # modified_birthtime = time(birth_time[0], birth_time[1])
-        
-        self.birthday = modified_birthday.date()
+
+        self.birthday = modified_birthday.date()  # type: ignore
         self.birth_time = modified_birthtime
 
         self.birth = datetime(
@@ -127,15 +129,15 @@ class Human:
             modified_birthday.month,
             modified_birthday.day,
             modified_birthtime.hour,
-            modified_birthtime.minute
+            modified_birthtime.minute,
         )
 
         # Others
-        self.gender: bool = gender # True: Male; False: Female
-        self.height: float = None # centimeter
-        self.weight: float = None # kilogram
-        self.blood_type: Union[str, BloodType] = BloodType.OTHER
-    
+        self.gender: bool = gender  # type: ignore # True: Male; False: Female
+        self.height: float = None  # type: ignore # centimeter
+        self.weight: float = None  # type: ignore # kilogram
+        self.blood_type: Union[str, BloodType] = BloodType.OTHER  # type: ignore
+
     def __str__(self) -> str:
         class_name = self.__class__.__name__
         return f"{class_name}({str(self.name)})"
@@ -145,7 +147,7 @@ class Human:
         name = str(self.name)
         gender = "M" if self.is_male else "F"
         return f"{class_name}({name} ({self.age}|{gender}))"
-    
+
     @classmethod
     def JohnDoe(cls):
         """
@@ -159,7 +161,7 @@ class Human:
         temp = cls("John", "Doe", "1980/01/01", "00:00")
         temp.update({"gender": True, "height": 180, "weight": 80, "blood_type": "O+"})
         return temp
-    
+
     @property
     def is_male(self) -> bool:
         """
@@ -172,7 +174,7 @@ class Human:
             | ``False``: Female
         """
         return self.gender
-    
+
     @property
     def age(self):
         """
@@ -182,7 +184,7 @@ class Human:
         -------
         float
             Age
-        
+
         None
             When unable to get ``self.birthday``
         """
@@ -191,7 +193,7 @@ class Human:
             # age = now - self.birthday
             try:
                 rdelta = relativedelta(now, self.birthday)
-            except:
+            except Exception:
                 date_str = self.birthday
                 if date_str is None:
                     self.birthday = datetime.now().date()
@@ -201,19 +203,19 @@ class Human:
                     date = datetime.strptime(date_str, "%Y/%m/%d")
                     self.birthday = date
                 rdelta = relativedelta(now, self.birthday)
-            return round(rdelta.years + rdelta.months/12, 2)
+            return round(rdelta.years + rdelta.months / 12, 2)
         else:
             return None
-    
+
     @property
     def is_adult(self):
         """
         Check if ``self.age`` >= ``18``
-        
+
         :rtype: bool
         """
         return self.age >= 18
-    
+
     @property
     def bmi(self):
         r"""
@@ -229,7 +231,7 @@ class Human:
         -------
         float
             BMI value
-        
+
         None
             When unable to get ``self.height`` and ``self.weight``
         """
@@ -237,9 +239,9 @@ class Human:
             temp = self.height / 100
             bmi = self.weight / (temp * temp)
             return round(bmi, 2)
-        except:
+        except Exception:
             return None
-    
+
     # @property
     def dir_(self) -> list:
         """
@@ -251,7 +253,7 @@ class Human:
             List of available properties
         """
         return [x for x in self.__dir__() if not x.startswith("_")]
-    
+
     def update(self, data: dict) -> None:
         """
         Update Human data
@@ -260,7 +262,7 @@ class Human:
         ----------
         data : dict
             Data
-        
+
         Returns
         -------
         None
@@ -274,29 +276,29 @@ class Person(Human):
     More detailed ``Human`` data
     """
 
-    __VERSION = Version(1, 1, 1) # Internal version class check
+    __VERSION = Version(1, 1, 1)  # Internal version class check
 
     def __init__(
-            self,
-            first_name: str,
-            last_name: Optional[str] = None,
-            birthday: Union[str, datetime, None] = None,
-            birth_time: Optional[str] = None,
-            gender: Union[bool, None] = None
-        ) -> None:
+        self,
+        first_name: str,
+        last_name: Optional[str] = None,
+        birthday: Union[str, datetime, None] = None,
+        birth_time: Optional[str] = None,
+        gender: Union[bool, None] = None,
+    ) -> None:
         super().__init__(first_name, last_name, birthday, birth_time, gender)
-        self.address: str = None
-        self.hometown: str = None
-        self.email: str = None
-        self.phone_number: str = None
-        self.nationality = None
-        self.likes: list = None
-        self.hates: list = None
-        self.education = None
-        self.occupation: str = None
-        self.personality = None
-        self.note: str = None
-    
+        self.address: str = None  # type: ignore
+        self.hometown: str = None  # type: ignore
+        self.email: str = None  # type: ignore
+        self.phone_number: str = None  # type: ignore
+        self.nationality = None  # type: ignore
+        self.likes: list = None  # type: ignore
+        self.hates: list = None  # type: ignore
+        self.education = None  # type: ignore
+        self.occupation: str = None  # type: ignore
+        self.personality = None  # type: ignore
+        self.note: str = None  # type: ignore
+
     @property
     def zodiac_sign(self):
         """
@@ -306,15 +308,15 @@ class Person(Human):
         -------
         str
             Zodiac sign
-        
+
         None
             When unable to get ``self.birthday``
         """
         try:
             return zodiac_sign(self.birthday.day, self.birthday.month)
-        except:
+        except Exception:
             return None
-    
+
     @property
     def zodiac_sign_13(self):
         """
@@ -324,15 +326,15 @@ class Person(Human):
         -------
         str
             Zodiac sign
-        
+
         None
             When unable to get ``self.birthday``
         """
         try:
             return zodiac_sign(self.birthday.day, self.birthday.month, zodiac13=True)
-        except:
+        except Exception:
             return None
-    
+
     @property
     def numerology(self) -> int:
         """
@@ -342,18 +344,12 @@ class Person(Human):
         -------
         int
             Numerology number
-        
-        None
-            When unable to get ``self.birthday``
         """
-        try:
-            temp = f"{self.birthday.year}{self.birthday.month}{self.birthday.day}"
-            return IntNumber(temp).add_to_one_digit(master_number=True)
-        except:
-            return None
+        temp = f"{self.birthday.year}{self.birthday.month}{self.birthday.day}"
+        return IntNumber(temp).add_to_one_digit(master_number=True)
 
 
 # Run
 ###########################################################################
 if __name__ == "__main__":
-    print(Person.JohnDoe().__dict__)
+    print(Person.JohnDoe().__dict__)