reykit 1.1.33__py3-none-any.whl → 1.1.34__py3-none-any.whl

reykit/rbase.py

@@ -50,7 +50,6 @@ __all__ = (
     'is_class',
     'is_instance',
     'is_iterable',
-    'is_table',
     'is_num_str',
     'get_first_notnone',
     'get_stack_text',
@@ -514,7 +513,7 @@ def is_class(obj: Any) -> bool:
 
     Parameters
     ----------
-    obj : Judge object.
+    obj : Ojbect.
 
     Returns
     -------
@@ -533,7 +532,7 @@ def is_instance(obj: Any) -> bool:
 
     Parameters
     ----------
-    obj : Judge object.
+    obj : Ojbect.
 
     Returns
     -------
@@ -555,7 +554,7 @@ def is_iterable(
 
     Parameters
     ----------
-    obj : Judge object.
+    obj : Ojbect.
     exclude_types : Exclude types.
 
     Returns
@@ -576,43 +575,6 @@ def is_iterable(
     return False
 
 
-def is_table(
-    obj: Any,
-    check_fields: bool = True
-) -> bool:
-    """
-    Judge whether it is `list[dict]` table format and keys and keys sort of the dict are the same.
-
-    Parameters
-    ----------
-    obj : Judge object.
-    check_fields : Do you want to check the keys and keys sort of the dict are the same.
-
-    Returns
-    -------
-    Judgment result.
-    """
-
-    # Judge.
-    if type(obj) != list:
-        return False
-    for elem in obj:
-        if type(elem) != dict:
-            return False
-
-    ## Check fields of table.
-    if check_fields:
-        keys_strs = [
-            ':'.join([str(key) for key in elem.keys()])
-            for elem in obj
-        ]
-        keys_strs_only = set(keys_strs)
-        if len(keys_strs_only) != 1:
-            return False
-
-    return True
-
-
 def is_num_str(
     string: str
 ) -> bool:

reykit/rdata.py

@@ -13,11 +13,14 @@ from typing import Any, TypedDict, Literal, overload
 from collections import Counter, defaultdict as Defaultdict, ChainMap
 from collections.abc import Callable, Iterable, Generator
 from itertools import chain as IChain
+from decimal import Decimal
+from json import dumps as json_dumps
 
 from .rbase import T, KT, VT, Base, null, check_least_one, check_most_one, is_iterable
 
 
 __all__ = (
+    'to_json',
     'count',
     'flatten',
     'split',
@@ -33,6 +36,48 @@ __all__ = (
 CountResult = TypedDict('CountResult', {'element': Any, 'number': int})
 
 
+def to_json(
+    data: Any,
+    compact: bool = True
+) -> str:
+    """
+    Convert data to JSON format string.
+
+    Parameters
+    ----------
+    data : Data.
+    compact : Whether compact content.
+
+    Returns
+    -------
+    JSON format string.
+    """
+
+    # Get parameter.
+    if compact:
+        indent = None
+        separators = (',', ':')
+    else:
+        indent = 4
+        separators = None
+
+    # Convert.
+    default = lambda value: (
+        value.__float__()
+        if type(value) == Decimal
+        else repr(value)
+    )
+    string = json_dumps(
+        data,
+        ensure_ascii=False,
+        indent=indent,
+        separators=separators,
+        default=default
+    )
+
+    return string
+
+
 def count(data: Iterable) -> list[CountResult]:
     """
     Group count data element value.

reykit/rlog.py

@@ -230,12 +230,14 @@ class Log(Base):
         # Break.
 
         ## Switch.
-        if not self.print_colour: return
+        if not self.print_colour:
+            return
 
         ## Added.
         pattern = '\033\\[[\\d;]+?m'
         result = search(pattern, format_)
-        if result is not None: return
+        if result is not None:
+            return
 
         # 'format_time'.
         if '%(format_time)s' in format_:
@@ -733,7 +735,8 @@ class Log(Base):
         """
 
         # Break.
-        if not self.print_replaced: return
+        if not self.print_replaced:
+            return
 
         # Reset.
         reset_print()

reykit/rmonkey.py

@@ -30,72 +30,59 @@ def monkey_patch_sqlalchemy_result_more_fetch():
     Examples
     --------
     >>> result = connection.execute(sql)
-    >>> result.fetch_table()
-    >>> result.fetch_dict()
-    >>> result.fetch_list()
-    >>> result.fetch_df()
-    >>> result.fetch_json()
-    >>> result.fetch_text()
-    >>> result.fetch_sql()
-    >>> result.fetch_html()
-    >>> result.fetch_csv()
-    >>> result.fetch_excel()
+    >>> result.to_table()
+    >>> result.to_dict()
+    >>> result.to_list()
+    >>> result.to_df()
+    >>> result.to_json()
+    >>> result.to_text()
+    >>> result.to_sql()
+    >>> result.to_html()
+    >>> result.to_csv()
+    >>> result.to_excel()
     >>> result.show()
     >>> result.exist
     >>> result.empty
     """
 
     # Import.
+    from typing import Self
+    from types import MethodType
     from sqlalchemy.engine.cursor import CursorResult
     from pandas import DataFrame, NA, concat
     from .rbase import Base
     from .rstdout import echo
-    from .rtable import (
-        to_table,
-        to_dict,
-        to_list,
-        to_df,
-        to_json,
-        to_text,
-        to_sql,
-        to_html,
-        to_csv,
-        to_excel
-    )
+    from .rtable import Table
     from .rtime import time_to
 
-    # Fetch result as table in 'list[dict]' format.
-    CursorResult.fetch_table = to_table
 
-    # Fetch result as dictionary.
-    CursorResult.fetch_dict = to_dict
-
-    # Fetch result as list.
-    CursorResult.fetch_list = to_list
-
-    # Fetch result as DataFrame object.
-    CursorResult.fetch_df = to_df
-
-    # Fetch result as JSON string.
-    CursorResult.fetch_json = to_json
-
-    # Fetch result as text.
-    CursorResult.fetch_text = to_text
+    # Add.
+    @property
+    def method_data(self: Result) -> Self:
+        """
+        Get Data.
 
-    # Fetch result as SQL string.
-    CursorResult.fetch_sql = to_sql
+        Returns
+        -------
+        Self.
+        """
 
-    # Fetch result as HTML string.
-    CursorResult.fetch_html = to_html
+        return self
 
-    # Fetch result as save csv format file.
-    CursorResult.fetch_csv = to_csv
 
-    # Fetch result as save excel file.
-    CursorResult.fetch_excel = to_excel
+    CursorResult.data = method_data
+    CursorResult.to_table = Table.to_table
+    CursorResult.to_dict = Table.to_dict
+    CursorResult.to_list = Table.to_list
+    CursorResult.to_text = Table.to_text
+    CursorResult.to_json = Table.to_json
+    CursorResult.to_sql = Table.to_sql
+    CursorResult.to_df = Table.to_df
+    CursorResult.to_html = Table.to_html
+    CursorResult.to_csv = Table.to_csv
+    CursorResult.to_excel = Table.to_excel
 
 
-    # Print result.
     def method_show(self: Result, limit: int | None = None) -> None:
         """
         Print result.
@@ -112,7 +99,7 @@ def monkey_patch_sqlalchemy_result_more_fetch():
             limit = 0
 
         # Convert.
-        df: DataFrame = self.fetch_df()
+        df: DataFrame = self.to_df()
         df = df.map(time_to, raising=False)
         df = df.astype(str)
         df.replace(['NaT', '<NA>'], 'None', inplace=True)
@@ -148,7 +135,6 @@ def monkey_patch_sqlalchemy_result_more_fetch():
     CursorResult.show = method_show
 
 
-    # Whether is exist.
     @property
     def method_exist(self: Result) -> bool:
         """
@@ -168,7 +154,6 @@ def monkey_patch_sqlalchemy_result_more_fetch():
     CursorResult.exist = method_exist
 
 
-    # Whether is empty.
     @property
     def method_empty(self: Result) -> bool:
         """
@@ -198,19 +183,19 @@ def monkey_patch_sqlalchemy_result_more_fetch():
         __doc__ = CursorResult.__doc__
 
         # Add method.
-        fetch_table = to_table
-        fetch_dict = to_dict
-        fetch_list = to_list
-        fetch_df = to_df
-        fetch_json = to_json
-        fetch_text = to_text
-        fetch_sql = to_sql
-        fetch_html = to_html
-        fetch_csv = to_csv
-        fetch_excel = to_excel
-        show = method_show
-        exist = method_exist
-        empty = method_empty
+        to_table: MethodType = Table.to_table
+        to_dict: MethodType = Table.to_dict
+        to_list: MethodType = Table.to_list
+        to_text: MethodType = Table.to_text
+        to_json: MethodType = Table.to_json
+        to_sql: MethodType = Table.to_sql
+        to_df: MethodType = Table.to_df
+        to_html: MethodType = Table.to_html
+        to_csv: MethodType = Table.to_csv
+        to_excel: MethodType = Table.to_excel
+        show: MethodType = method_show
+        exist: MethodType = method_exist
+        empty: MethodType = method_empty
 
 
     return Result

reykit/ros.py

@@ -52,9 +52,9 @@ from lxml.etree import ElementChildIterator
 from pdfplumber import open as pdfplumber_open
 
 from .rbase import Base, throw
+from .rdata import to_json
 from .rre import search, sub
 from .rsys import run_cmd
-from .rtext import to_json
 
 
 __all__ = (

reykit/rstdout.py

@@ -232,7 +232,8 @@ def start_print() -> None:
     """
 
     # Check.
-    if not ConfigStdout._stoped: return
+    if not ConfigStdout._stoped:
+        return
 
     # Start.
     sys.stdout = ConfigStdout._io_stdout
@@ -289,7 +290,8 @@ def reset_print() -> None:
     """
 
     # Check.
-    if not ConfigStdout._modified: return
+    if not ConfigStdout._modified:
+        return
 
     # Reset.
     ConfigStdout._io_stdout.write = ConfigStdout._io_stdout_write