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

absfuyu/__init__.py

@@ -22,7 +22,7 @@ Using in cmd (`absfuyu[cli]` required):
 __title__ = "absfuyu"
 __author__ = "AbsoluteWinter"
 __license__ = "MIT License"
-__version__ = "3.3.3"
+__version__ = "4.0.0"
 __all__ = [
     "core",
     "config",

absfuyu/cli/__init__.py

@@ -26,7 +26,7 @@ colorama.init(autoreset=True)
 
 @click.command()
 def version() -> None:
-    """Check current version"""
+    """Show current version"""
     ver_msg = f"{__title__} v{__version__}"
     click.echo(
         f"{COLOR['green']}{ver_msg}{COLOR['reset']}\n"

absfuyu/cli/do_group.py

@@ -3,8 +3,8 @@ ABSFUYU CLI
 -----------
 Do
 
-Version: 1.0.0
-Date updated: 14/04/2024 (dd/mm/yyyy)
+Version: 1.2.0
+Date updated: 07/01/2025 (dd/mm/yyyy)
 """
 
 __all__ = ["do_group"]
@@ -16,6 +16,8 @@ import click
 from absfuyu import __title__
 from absfuyu.cli.color import COLOR
 from absfuyu.core import __package_feature__
+from absfuyu.general.human import Human2
+from absfuyu.util.zipped import Zipper
 from absfuyu.version import PkgVersion
 
 
@@ -65,6 +67,35 @@ def advice() -> None:
     click.echo(f"{COLOR['green']}{im_bored()}")
 
 
+@click.command(name="fs")
+@click.argument("date", type=str)
+@click.argument("number_string", type=str)
+def fs(date: str, number_string: str) -> None:
+    """Feng-shui W.I.P"""
+
+    instance = Human2(date)
+    print(instance.fs(number_string))
+
+
+@click.command(name="info")
+@click.argument("date", type=str)
+def info(date: str) -> None:
+    """Day info"""
+
+    instance = Human2(date)
+    print(instance.info())
+
+
+@click.command(name="unzip")
+@click.argument("dir", type=str)
+def unzip_files_in_dir(dir: str) -> None:
+    """Unzip every files in directory"""
+
+    engine = Zipper(dir)
+    engine.unzip()
+    print("Done")
+
+
 @click.group(name="do")
 def do_group() -> None:
     """Perform functionalities"""
@@ -74,3 +105,6 @@ def do_group() -> None:
 do_group.add_command(update)
 do_group.add_command(install)
 do_group.add_command(advice)
+do_group.add_command(fs)
+do_group.add_command(info)
+do_group.add_command(unzip_files_in_dir)

absfuyu/config/__init__.py

@@ -3,8 +3,8 @@ Absfuyu: Configuration
 ----------------------
 Package configuration module
 
-Version: 2.0.4
-Date updated: 06/04/2024 (dd/mm/yyyy)
+Version: 2.0.5
+Date updated: 14/11/2024 (dd/mm/yyyy)
 """
 
 # Module level
@@ -19,7 +19,7 @@ __all__ = [
 # Library
 ###########################################################################
 from pathlib import Path
-from typing import Any, Dict, List, Optional, TypedDict
+from typing import Any, TypedDict
 
 from absfuyu.core import CONFIG_PATH
 from absfuyu.util.json_method import JsonFile
@@ -55,7 +55,7 @@ class ConfigFormat(TypedDict):
     :type version: VersionDictFormat
     """
 
-    setting: Dict[str, SettingDictFormat]
+    setting: dict[str, SettingDictFormat]
 
 
 # Class
@@ -82,7 +82,7 @@ class Setting:
         return self.__str__()
 
     @classmethod
-    def from_dict(cls, dict_data: Dict[str, SettingDictFormat]):
+    def from_dict(cls, dict_data: dict[str, SettingDictFormat]):
         """
         Convert ``dict`` into ``Setting`` (``len==1`` only)
         """
@@ -104,11 +104,11 @@ class Setting:
         """Update current value"""
         self.value = value
 
-    def to_dict(self) -> Dict[str, SettingDictFormat]:
+    def to_dict(self) -> dict[str, SettingDictFormat]:
         """
         Convert ``Setting`` into ``dict``
         """
-        output: Dict[str, SettingDictFormat] = {
+        output: dict[str, SettingDictFormat] = {
             self.name: {"default": self.default, "help": self.help, "value": self.value}
         }
         return output
@@ -119,7 +119,7 @@ class Config:
     Config handling
     """
 
-    def __init__(self, config_file: Path, name: Optional[str] = None) -> None:
+    def __init__(self, config_file: Path, name: str | None = None) -> None:
         """
         config_file: Path to `.json` config file
         """
@@ -132,7 +132,7 @@ class Config:
             self.name = self.config_path.name
 
         # Data
-        self.settings: List[Setting] = None  # type: ignore
+        self.settings: list[Setting] = None  # type: ignore
         self._fetch_data()  # Load data
 
     def __str__(self) -> str:
@@ -145,7 +145,7 @@ class Config:
     def _fetch_data(self) -> None:
         """Load data from ``self.config_file`` file"""
         data: dict = self.json_engine.load_json()
-        settings: Dict[str, SettingDictFormat] = data.get("setting")  # type: ignore
+        settings: dict[str, SettingDictFormat] = data.get("setting")  # type: ignore
         self.settings = [Setting.from_dict({k: v}) for k, v in settings.items()]
 
     def _prepare_data(self) -> ConfigFormat:
@@ -164,7 +164,7 @@ class Config:
 
     # Setting method
     @property
-    def setting_list(self) -> List[str]:
+    def setting_list(self) -> list[str]:
         """List of name of available settings"""
         return [setting.name for setting in self.settings]
 
@@ -183,7 +183,7 @@ class Config:
         [setting.reset() for setting in self.settings]  # type: ignore
         self.save()
 
-    def show_settings(self) -> List[Setting]:
+    def show_settings(self) -> list[Setting]:
         """
         Returns a list of available settings
         (wrapper for ``Config.settings``)
@@ -276,7 +276,7 @@ class Config:
 
 # Init
 ###########################################################################
-ABSFUYU_CONFIG = Config(CONFIG_PATH)
+ABSFUYU_CONFIG = Config(CONFIG_PATH)  # type: ignore
 
 # TODO: Create a config file when not available [W.I.P]
 # _settings = [

absfuyu/core.py

@@ -3,8 +3,8 @@ Absfuyu: Core
 -------------
 Contain type hints and other stuffs
 
-Version: 2.2.0
-Date updated: 14/04/2024 (dd/mm/yyyy)
+Version: 2.2.1
+Date updated: 14/11/2024 (dd/mm/yyyy)
 """
 
 # Module Package
@@ -21,18 +21,7 @@ __all__ = [
 __package_feature__ = ["beautiful", "extra", "res", "full", "dev"]
 
 
-from pathlib import Path
-
-# import sys
-# from sys import version_info as _python_version
-
-# if sys.version_info.minor >= 10:
-#     from importlib.resources import files
-# else:
-#     try:
-#         from importlib_resources import files
-#     except:
-#         raise ImportError("Please install importlib-resources")
+from importlib.resources import files
 
 
 class CLITextColor:
@@ -50,7 +39,7 @@ class CLITextColor:
     RESET = "\x1b[39m"
 
 
-CORE_PATH = Path(__file__).parent.absolute()
-# CORE_PATH = files("absfuyu")
+# CORE_PATH = Path(__file__).parent.absolute()
+CORE_PATH = files("absfuyu")
 CONFIG_PATH = CORE_PATH.joinpath("config", "config.json")
 DATA_PATH = CORE_PATH.joinpath("pkg_data")

absfuyu/extensions/extra/data_analysis.py

@@ -3,8 +3,8 @@ Absfuyu: Data Analysis [W.I.P]
 ------------------------------
 Extension for ``pd.DataFrame``
 
-Version: 2.1.3
-Date updated: 20/03/2024 (dd/mm/yyyy)
+Version: 2.2.0
+Date updated: 29/11/2024 (dd/mm/yyyy)
 """
 
 # Module level
@@ -30,7 +30,7 @@ import string
 from collections import deque
 from datetime import datetime
 from itertools import chain, product
-from typing import Any, Dict, List, NamedTuple, Optional, Union
+from typing import Any, Literal, NamedTuple, Self
 
 # import matplotlib.pyplot as plt
 # from scipy import stats
@@ -49,7 +49,7 @@ from absfuyu.util import set_min, set_min_max
 ###########################################################################
 @deprecated(reason="Not needed", version="3.1.0")
 @sphinx_deprecated(reason="Not needed", version="3.1.0")
-def summary(data: Union[list, np.ndarray]):  # del this
+def summary(data: list | np.ndarray):  # del this
     """
     Quick summary of data
 
@@ -78,7 +78,7 @@ def summary(data: Union[list, np.ndarray]):  # del this
     return output
 
 
-def equalize_df(data: Dict[str, list], fillna=np.nan) -> Dict[str, list]:
+def equalize_df(data: dict[str, list], fillna=np.nan) -> dict[str, list]:
     """
     Make all list in dict have equal length to make pd.DataFrame
 
@@ -182,14 +182,14 @@ class CityData(NamedTuple):
     area: str
 
     @staticmethod
-    def _sample_city_data(size: int = 100) -> List["CityData"]:
+    def _sample_city_data(size: int = 100) -> list["CityData"]:
         """
         Generate sample city data (testing purpose)
         """
         sample_range = 10 ** len(str(size))
 
         # Serial list
-        serials: List[str] = []
+        serials: list[str] = []
         while len(serials) != size:  # Unique serial
             serial = random.randint(0, sample_range - 1)
             serial = str(serial).rjust(len(str(size)), "0")  # type: ignore
@@ -232,7 +232,9 @@ class SplittedDF(NamedTuple):
     df_na: pd.DataFrame
 
     @staticmethod
-    def concat_df(df_list: List[pd.DataFrame], join: str = "inner"):
+    def concat_df(
+        df_list: list[pd.DataFrame], join: Literal["inner", "outer"] = "inner"
+    ) -> pd.DataFrame:
         """
         Concat the list of DataFrame (static method)
 
@@ -254,7 +256,7 @@ class SplittedDF(NamedTuple):
         df.drop(columns=["index"], inplace=True)
         return df
 
-    def concat(self, join: str = "inner"):
+    def concat(self, join: Literal["inner", "outer"] = "inner") -> pd.DataFrame:
         """
         Concat the splitted DataFrame
 
@@ -272,7 +274,7 @@ class SplittedDF(NamedTuple):
         return self.concat_df(self, join=join)  # type: ignore
 
     @staticmethod
-    def divide_dataframe(df: pd.DataFrame, by_column: str) -> List[pd.DataFrame]:
+    def divide_dataframe(df: pd.DataFrame, by_column: str) -> list[pd.DataFrame]:
         """
         Divide DataFrame into a list of DataFrame
 
@@ -400,7 +402,7 @@ class MatplotlibFormatString:
     Color = _DictToAtrr(COLOR_LIST, key_as_atrribute=False)
 
     @staticmethod
-    def all_format_string() -> List[PLTFormatString]:
+    def all_format_string() -> list[PLTFormatString]:
         fmt_str = [
             __class__.MARKER_LIST,  # type: ignore
             __class__.LINE_STYLE_LIST,  # type: ignore
@@ -427,7 +429,7 @@ class DataAnalystDataFrame(pd.DataFrame):
     # Support
     # ================================================================
     # Rearrange column
-    def rearrange_column(self, insert_to_col: str, num_of_cols: int = 1):
+    def rearrange_column(self, insert_to_col: str, num_of_cols: int = 1) -> Self:
         """
         Move right-most columns to selected position
 
@@ -456,7 +458,7 @@ class DataAnalystDataFrame(pd.DataFrame):
         return self
 
     # Drop a list of column
-    def drop_columns(self, columns: List[str]):
+    def drop_columns(self, columns: list[str]) -> Self:
         """
         Drop columns in DataFrame
 
@@ -479,7 +481,7 @@ class DataAnalystDataFrame(pd.DataFrame):
         return self
 
     # Drop right-most columns
-    def drop_rightmost(self, num_of_cols: int = 1):
+    def drop_rightmost(self, num_of_cols: int = 1) -> Self:
         """
         Drop ``num_of_cols`` right-most columns
 
@@ -508,7 +510,7 @@ class DataAnalystDataFrame(pd.DataFrame):
         return self
 
     # Add blank column
-    def add_blank_column(self, column_name: str, fill: Any):
+    def add_blank_column(self, column_name: str, fill: Any) -> Self:
         """
         Add a blank column
 
@@ -534,10 +536,10 @@ class DataAnalystDataFrame(pd.DataFrame):
     def convert_city(
         self,
         city_column: str,
-        city_list: List[CityData],
+        city_list: list[CityData],
         *,
         mode: str = "ra",
-    ):
+    ) -> Self:
         """
         Get ``region`` and ``area`` of a city
 
@@ -588,7 +590,7 @@ class DataAnalystDataFrame(pd.DataFrame):
         return self.rearrange_column(city_column, col_counter)
 
     # Date related
-    def add_date_from_month(self, month_column: str, *, col_name: str = "date"):
+    def add_date_from_month(self, month_column: str, *, col_name: str = "date") -> Self:
         """
         Add dummy ``date`` column from ``month`` column
 
@@ -614,7 +616,7 @@ class DataAnalystDataFrame(pd.DataFrame):
         # Rearrange
         return self.rearrange_column(month_column)
 
-    def add_detail_date(self, date_column: str, mode: str = "dwmy"):
+    def add_detail_date(self, date_column: str, mode: str = "dwmy") -> Self:
         """
         Add these columns from ``date_column``:
             - ``date`` (won't add if ``date_column`` value is ``"date"``)
@@ -668,8 +670,12 @@ class DataAnalystDataFrame(pd.DataFrame):
         return self.rearrange_column(date_column, col_counter)
 
     def delta_date(
-        self, date_column: str, mode: str = "now", *, col_name: str = "delta_date"
-    ):
+        self,
+        date_column: str,
+        mode: Literal["now", "between_row"] = "now",
+        *,
+        col_name: str = "delta_date",
+    ) -> Self:
         """
         Calculate date interval
 
@@ -682,7 +688,7 @@ class DataAnalystDataFrame(pd.DataFrame):
             | Mode to calculate
             | ``"between_row"``: Calculate date interval between each row
             | ``"now"``: Calculate date interval to current date
-            | (Default: ``"between_row"``)
+            | (Default: ``"now"``)
 
         col_name : str
             | New delta date column name
@@ -714,7 +720,7 @@ class DataAnalystDataFrame(pd.DataFrame):
     # Fill missing value
     def fill_missing_values(
         self, column_name: str, fill: Any = np.nan, *, fill_when_not_exist: Any = np.nan
-    ):
+    ) -> Self:
         """
         Fill missing values in specified column
 
@@ -771,11 +777,11 @@ class DataAnalystDataFrame(pd.DataFrame):
     def threshold_filter(
         self,
         destination_column: str,
-        threshold: Union[int, float] = 10,
+        threshold: int | float = 10,
         *,
-        top: Optional[int] = None,
+        top: int | None = None,
         replace_with: Any = "Other",
-    ):
+    ) -> Self:
         """
         Filter out percentage of data that smaller than the ``threshold``,
         replace all of the smaller data to ``replace_with``.
@@ -972,7 +978,7 @@ class DataAnalystDataFrame(pd.DataFrame):
 
     # Help
     @staticmethod
-    def dadf_help() -> List[str]:
+    def dadf_help() -> list[str]:
         """
         Show all available method of DataAnalystDataFrame
         """
@@ -981,7 +987,7 @@ class DataAnalystDataFrame(pd.DataFrame):
 
     # Sample DataFrame
     @classmethod
-    def sample_df(cls, size: int = 100):
+    def sample_df(cls, size: int = 100) -> Self:
         """
         Create sample DataFrame
 
@@ -1057,6 +1063,46 @@ class DADF(DataAnalystDataFrame):
     pass
 
 
+class DADF_WIP(DADF):
+    """W.I.P"""
+
+    @versionadded(version="4.0.0")
+    def subtract_df(self, other: Self | pd.DataFrame) -> Self:
+        """
+        Subtract DF to find the different rows
+        """
+        temp = self.copy()
+        out = (
+            temp.merge(other, indicator=True, how="right")
+            .query("_merge=='right_only'")
+            .drop("_merge", axis=1)
+        )
+        return self.__class__(out)
+
+    @versionadded(version="4.0.0")
+    def merge_left(
+        self,
+        other: Self | pd.DataFrame,
+        on: str,
+        columns: list[str] | None = None,
+    ) -> Self:
+        """
+        Merge left of 2 dfs
+
+        :param columns: Columns to take from df2
+        """
+
+        if columns:
+            current_col = [on]
+            current_col.extend(columns)
+            col = other.columns.to_list()
+            cols = list(set(col) - set(current_col))
+            self.drop_columns(cols)
+
+        out = self.merge(other, how="left", on=on)
+        return self.__class__(out)
+
+
 # Run
 ###########################################################################
 if __name__ == "__main__":

absfuyu/fun/__init__.py

@@ -3,8 +3,8 @@ Absfuyu: Fun
 ------------
 Some fun or weird stuff
 
-Version: 1.0.6
-Date updated: 05/04/2023 (dd/mm/yyyy)
+Version: 1.0.7
+Date updated: 16/08/2024 (dd/mm/yyyy)
 """
 
 # Library
@@ -24,7 +24,7 @@ def zodiac_sign(
     day: int,
     month: int,
     zodiac13: bool = False,
-):
+) -> str:
     """
     Calculate zodiac sign
 
@@ -43,9 +43,6 @@ def zodiac_sign(
     -------
     str
         Zodiac sign
-
-    None
-        When failed
     """
 
     # Condition check
@@ -57,34 +54,40 @@ def zodiac_sign(
         raise ValueError("Value out of range")
 
     zodiac = {
-        "Aquarius": any(
+        "Aquarius (A)": any(
             [month == 1 and day >= 20, month == 2 and day <= 18]
         ),  # 20/1-18/2
-        "Pisces": any(
+        "Pisces (W)": 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(
+        "Aries (F)": any(
+            [month == 3 and day >= 21, month == 4 and day <= 19]
+        ),  # 21/3-19/4
+        "Taurus (E)": any(
             [month == 4 and day >= 20, month == 5 and day <= 20]
         ),  # 20/4-20/5
-        "Gemini": any(
+        "Gemini (A)": any(
             [month == 5 and day >= 21, month == 6 and day <= 20]
         ),  # 21/5-20/6
-        "Cancer": any(
+        "Cancer (W)": 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(
+        "Leo (F)": any(
+            [month == 7 and day >= 23, month == 8 and day <= 22]
+        ),  # 23/7-22/8
+        "Virgo (E)": any(
+            [month == 8 and day >= 23, month == 9 and day <= 22]
+        ),  # 23/8-22/9
+        "Libra (A)": any(
             [month == 9 and day >= 23, month == 10 and day <= 22]
         ),  # 23/9-22/10
-        "Scorpio": any(
+        "Scorpio (W)": any(
             [month == 10 and day >= 23, month == 11 and day <= 21]
         ),  # 23/10-21/11
-        "Sagittarius": any(
+        "Sagittarius (F)": any(
             [month == 11 and day >= 22, month == 12 and day <= 21]
         ),  # 22/11-21/12
-        "Capricorn": any(
+        "Capricorn (E)": any(
             [month == 12 and day >= 22, month == 1 and day <= 19]
         ),  # 22/12-19/1
     }
@@ -132,11 +135,9 @@ def zodiac_sign(
             ),  # 21/1-16/2
         }
 
-    logger.debug(zodiac)
-
-    for k, v in zodiac.items():
-        if v is True:
-            return k
+    # logger.debug(zodiac)
+    temp = dict(zip(zodiac.values(), zodiac.keys()))
+    return temp[True]
 
 
 def im_bored() -> str:

absfuyu/fun/tarot.py

@@ -4,8 +4,8 @@ Absfuyu: Tarot
 Tarot stuff
 
 
-Version: 1.0.3
-Date updated: 01/01/2024 (dd/mm/yyyy)
+Version: 1.0.4
+Date updated: 14/11/2024 (dd/mm/yyyy)
 
 Usage:
 ------
@@ -21,7 +21,6 @@ __all__ = ["Tarot", "TarotCard"]
 # Library
 ###########################################################################
 import random
-from typing import Dict, List
 
 from absfuyu.logger import logger
 from absfuyu.pkg_data import DataList
@@ -38,9 +37,9 @@ class TarotCard:
         name: str,
         rank: int,
         suit: str,
-        meanings: Dict[str, List[str]],
-        keywords: List[str],
-        fortune_telling: List[str],
+        meanings: dict[str, list[str]],
+        keywords: list[str],
+        fortune_telling: list[str],
     ) -> None:
         self.name = name.title()
         self.rank = rank
@@ -69,7 +68,7 @@ class Tarot:
         return self.__str__()
 
     @property
-    def tarot_deck(self) -> List[TarotCard]:
+    def tarot_deck(self) -> list[TarotCard]:
         """
         Load pickled tarot data
 

absfuyu/game/__init__.py

@@ -4,7 +4,7 @@ Absfuyu: Game
 Contain some game that can be played on terminal
 
 Version: 1.1.0
-Date updated: 14/04/2024 (mm/dd/yyyy)
+Date updated: 14/04/2024 (dd/mm/yyyy)
 """
 
 __all__ = [

absfuyu/game/sudoku.py

@@ -3,8 +3,8 @@ Game: Sudoku
 ------------
 Sudoku 9x9 Solver
 
-Version: 1.0.2
-Date updated: 24/11/2023 (mm/dd/yyyy)
+Version: 1.0.3
+Date updated: 15/11/2024 (dd/mm/yyyy)
 
 Credit:
 -------
@@ -15,11 +15,12 @@ Credit:
 __all__ = ["Sudoku"]
 
 
-from typing import List, Literal, Tuple
+from typing import Literal
 
 
 class Sudoku:
-    def __init__(self, sudoku_data: List[List[int]]) -> None:
+
+    def __init__(self, sudoku_data: list[list[int]]) -> None:
         self.data = sudoku_data
         # self._original = sudoku_data # Make backup
         self._row_len = len(self.data)
@@ -194,7 +195,7 @@ class Sudoku:
         # Return None when there is no empty cell
         return None
 
-    def _is_valid(self, number: int, position: Tuple[int, int]) -> bool:
+    def _is_valid(self, number: int, position: tuple[int, int]) -> bool:
         """
         Check valid number value in row, column, box
         """