reykit 1.1.95__py3-none-any.whl → 1.1.97__py3-none-any.whl

reykit/rbase.py

@@ -9,7 +9,7 @@
 """
 
 
-from typing import Any, Literal, Self, TypeVar, NoReturn, overload
+from typing import Any, Literal, Self, TypeVar, Type, NoReturn, overload, final
 from collections.abc import Callable, Iterable, Container, Mapping
 from sys import exc_info as sys_exc_info
 from os.path import exists as os_exists
@@ -35,6 +35,7 @@ __all__ = (
     'StaticMeta',
     'ConfigMeta',
     'Singleton',
+    'NullType',
     'Null',
     'ErrorBase',
     'Exit',
@@ -175,6 +176,28 @@ class ConfigMeta(StaticMeta):
         setattr(cls, name, value)
 
 
+type NullType = Type['Null']
+
+
+@final
+class Null(Base, metaclass=StaticMeta):
+    """
+    Null type.
+
+    Attributes
+    ----------
+    Type : Type hints of self.
+
+    Examples
+    --------
+    >>> def foo(arg: Any | Null.Type = Null):
+    ...     if arg == Null:
+    ...         ...
+    """
+
+    Type = NullType
+
+
 class Singleton(Base):
     """
     Singleton type.
@@ -185,7 +208,7 @@ class Singleton(Base):
     _instance : Global singleton instance.
     """
 
-    _instance: Self | None = None
+    __instance: Self
 
 
     def __new__(self, *arg: Any, **kwargs: Any) -> Self:
@@ -193,22 +216,19 @@ class Singleton(Base):
         Build `singleton` instance.
         """
 
-        # Build.
-        if self._instance is None:
-            self._instance = super().__new__(self)
-
-            ## Singleton method.
-            if hasattr(self, "__singleton__"):
-                __singleton__: Callable = getattr(self, "__singleton__")
-                __singleton__(self, *arg, **kwargs)
+        # Built.
+        if hasattr(self, '__instance'):
+            return self.__instance
 
-        return self._instance
+        # Build.
+        self.__instance = super().__new__(self)
 
+        ## Singleton method.
+        if hasattr(self, "__singleton__"):
+            __singleton__: Callable = getattr(self, "__singleton__")
+            __singleton__(self, *arg, **kwargs)
 
-class Null(Base, metaclass=StaticMeta):
-    """
-    Null type.
-    """
+        return self.__instance
 
 
 class ErrorBase(Base, BaseException):
@@ -588,7 +608,7 @@ def get_first_notnone(*values: None) -> NoReturn: ...
 @overload
 def get_first_notnone(*values: T) -> T: ...
 
-def get_first_notnone(*values: T, default: U | Null = Null) -> T | U:
+def get_first_notnone(*values: T, default: U | Null.Type = Null) -> T | U:
     """
     Get the first value that is not `None`.
 
@@ -597,7 +617,7 @@ def get_first_notnone(*values: T, default: U | Null = Null) -> T | U:
     values : Check values.
     default : When all are `None`, then return this is value, or throw exception.
         - `Any`: Return this is value.
-        - `Null`: Throw exception.
+        - `Null.Type`: Throw exception.
 
     Returns
     -------

reykit/rdata.py

@@ -337,14 +337,14 @@ def chain(*iterables: dict[KT, VT] | Iterable[T]) -> ChainMap[KT, VT] | IChain[T
     return data
 
 
-def default_dict(default: T | Null = Null, data: dict[KT, VT] | None = None) -> Defaultdict[KT, VT | T]:
+def default_dict(default: T | Null.Type = Null, data: dict[KT, VT] | None = None) -> Defaultdict[KT, VT | T]:
     """
     Set `dict` instance, default value when key does not exist.
 
     Parameters
     ----------
     default : Default value.
-        - `Null`: Nest function self.
+        - `Null.Type`: Nest function self.
         - `Callable`: Use call return value.
     data : `dict` instance.
         - `None`: Empty `dict`.

reykit/rlog.py

@@ -954,7 +954,7 @@ class Mark(Base):
         self.data: dict[Hashable, set[int]] = {}
 
 
-    def mark(self, obj: Any, group: Hashable | Null = Null) -> int:
+    def mark(self, obj: Any, group: Hashable | Null.Type = Null) -> int:
         """
         Mark object.
 
@@ -978,7 +978,7 @@ class Mark(Base):
         return obj_id
 
 
-    def remove(self, obj: Any, group: Hashable | Null = Null) -> None:
+    def remove(self, obj: Any, group: Hashable | Null.Type = Null) -> None:
         """
         Whether marked.
 
@@ -1017,7 +1017,7 @@ class Mark(Base):
         del self.data[group]
 
 
-    def is_marked(self, obj: Any, group: Hashable | Null = Null) -> bool:
+    def is_marked(self, obj: Any, group: Hashable | Null.Type = Null) -> bool:
         """
         Whether marked.
 

reykit/rschedule.py

@@ -33,6 +33,7 @@ class DatabaseTableSchedule(rorm.Model, table=True):
     Database `schedule` table model.
     """
 
+    __name__ = 'schedule'
     __comment__ = 'Schedule execute record table.'
     create_time: rorm.Datetime = rorm.Field(field_default=':create_time', not_null=True, index_n=True, comment='Record create time.')
     update_time: rorm.Datetime = rorm.Field(field_default=':update_time', index_n=True, comment='Record update time.')

reykit/rtable.py

@@ -9,8 +9,8 @@
 """
 
 
-from typing import Any, TypedDict, Literal, overload
-from collections.abc import Collection, MutableMapping
+from typing import Any, TypedDict, overload
+from collections.abc import Iterable, MutableMapping
 from os.path import abspath as os_abspath
 from sqlalchemy.engine.cursor import CursorResult, Row as CursorRow
 from pandas import DataFrame, Series, ExcelWriter
@@ -23,87 +23,20 @@ from .rtime import time_to
 
 
 __all__ = (
-    'is_row',
-    'is_table',
-    'Table'
+    'Table',
 )
 
 
-type RowData = MutableMapping | CursorRow | Series
-type TableData = Collection[MutableMapping] | RowData | CursorResult | DataFrame
 SheetSet = TypedDict('SheetsSet', {'name': str, 'index': int, 'fields': str | list[str]})
 
 
-@overload
-def is_row(obj: RowData) -> Literal[True]: ...
-
-@overload
-def is_row(obj: Any) -> Literal[False]: ...
-
-def is_row(obj: Any) -> bool:
-    """
-    Judge whether it is row format.
-
-    Parameters
-    ----------
-    obj : Ojbect.
-
-    Returns
-    -------
-    Judgment result.
-    """
-
-    # Judge.
-    result = isinstance(obj, (MutableMapping, CursorRow, Series))
-
-    return result
-
-
-@overload
-def is_table(obj: TableData) -> bool: ...
-
-@overload
-def is_table(obj: Any) -> Literal[False]: ...
-
-def is_table(obj: Any) -> bool:
-    """
-    Judge whether it is table format, and keys sort of the row are the same.
-
-    Parameters
-    ----------
-    obj : Ojbect.
-
-    Returns
-    -------
-    Judgment result.
-    """
-
-    # Judge.
-    if is_row(obj):
-        return True
-    if isinstance(obj, (CursorResult, DataFrame)):
-        return True
-    if isinstance(obj, Collection):
-        keys_strs = []
-        for row in obj:
-            if not isinstance(row, MutableMapping):
-                break
-            keys_str = ':'.join(row)
-            keys_strs.append(keys_str)
-        keys_strs = set(keys_strs)
-        if len(keys_strs) == 1:
-            return True
-
-    return False
-
-
 class Table(Base):
     """
     Table type.
     """
 
 
-    def __init__(self, data: TableData) -> None:
+    def __init__(self, data: Iterable) -> None:
         """
         Build instance attributes.
 
@@ -131,19 +64,16 @@ class Table(Base):
                 result = [dict(self.data)]
             case CursorRow():
                 result = [dict(self.data._mapping)]
-            case Series():
-                result = [dict(self.data.items())]
             case CursorResult():
                 result = [
                     dict(row)
                     for row in self.data.mappings()
                 ]
+            case Series():
+                result = [dict(self.data.items())]
             case DataFrame():
                 result = self.data.to_dict('records')
-            case Collection():
-                if not is_table(self.data):
-                    text = 'is not table format, or keys sort of the row are the not same'
-                    throw(TypeError, text=text)
+            case Iterable():
                 result = [
                     dict(row)
                     for row in self.data

{reykit-1.1.95.dist-info → reykit-1.1.97.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reykit
-Version: 1.1.95
+Version: 1.1.97
 Summary: Kit method set.
 Project-URL: homepage, https://github.com/reyxbo/reykit/
 Author-email: Rey <reyxbo@163.com>

{reykit-1.1.95.dist-info → reykit-1.1.97.dist-info}/RECORD

@@ -1,20 +1,20 @@
 reykit/__init__.py,sha256=V86CHqPAAVkooVx3_QIOKpDIFVneQCTTSwfJ-uWgBno,788
 reykit/rall.py,sha256=7Hip02YOkIDm3_xkoSDjvvYV2LhdBV2r4UKzWWnIfIo,628
-reykit/rbase.py,sha256=qGfR24p__cMth8Xs9mdzQNXPq9-SBWcXf5xan2rU5b4,21776
-reykit/rdata.py,sha256=ktNSXzWRO_iYiIL-Ro2K6p0ACbmZeu-y1BEEJHxc1Bg,11346
+reykit/rbase.py,sha256=SLnGRzNdHyFQhTW-SI9ncIMS0V7nTjlW9GJZZBT3LF0,22104
+reykit/rdata.py,sha256=oBp3G7OZwb4rLDU_f4qi80u93bCvZ41ZdSM_1FBsMIE,11356
 reykit/remail.py,sha256=5ImoIRX0pHG_c1kEoMPJdeEaqakgMVIXeWBl9Db5ul4,6714
 reykit/rimage.py,sha256=3fMGbDwTdbmnlsz1Q33zCw-ht-xOUpj8NXYl6CzvYq0,6145
-reykit/rlog.py,sha256=lg2EpsTuEp3-CgrIcFMJIoW7kX7JsIAjyJwHxeMdhhE,25747
+reykit/rlog.py,sha256=2-dStWPCHMmBpm-8J4HgTQ9B-pc9vDQ2bAF9R8XeanE,25762
 reykit/rmonkey.py,sha256=KBxUyiBlCu7RdVDL0mCuxLqycOItU3KeU6ZWXrKdvxc,7860
 reykit/rnet.py,sha256=jkFnXKyjgILK2A9CtBZwjOeuABdGwejFtwPV_YK1jNc,16862
 reykit/rnum.py,sha256=jEhPQatAAaIV6kPx2tVtfjuK0F09UCWU6BjfPRamqBE,3620
 reykit/ros.py,sha256=n9aqChdRQQFozOn_jXQns_UrKoEstCNRzFTgOBel4wM,47787
 reykit/rrand.py,sha256=kh9yWOW8zaj8bUU0H0RL_GiOs2K8JDviVzKSoPLEuls,8566
 reykit/rre.py,sha256=uqqved1_SWrJOQK-o5WYRoJf3JH0YpEktnxwA0x7TPU,6018
-reykit/rschedule.py,sha256=TMus57qhT3OPmRQaFLCZW5fT8bnR2c4hehQM1KVJaQ4,12580
+reykit/rschedule.py,sha256=dx2lDfRhxPm8hGgH3mVGPoUSKg35OYQ3UQiRFnPo4yI,12607
 reykit/rstdout.py,sha256=bLN_kXsWpgTrCrBJNgaEE27DUk-ojsBV-9YJtWH41b4,8188
 reykit/rsys.py,sha256=PEXUU_jyglEgIyN-URtnpUcrqKF5PFeAVAljEmaSqOs,24931
-reykit/rtable.py,sha256=ItsycFuN-gb3gYhHuMx_nbAluGc8tAIMOyD5DHPS-lU,12173
+reykit/rtable.py,sha256=OP8d3qX8xhoQ2pRwD-K4on4Pn7Mi7PZ5-sF8fYmOMAo,10555
 reykit/rtask.py,sha256=C-VySd7Gk_qtP7FigLckYUhDKsuWPVeGtoRlkdnpyDw,27099
 reykit/rtext.py,sha256=3wbnsvNX-ibPt7QCpv-CYDUgaFq48eZjCix8jcFPj_M,13248
 reykit/rtime.py,sha256=8GL2uycThxB-dODuD3D35v2RbSFO-LgTdl6U-ZhuSZc,17795
@@ -22,7 +22,7 @@ reykit/rwrap.py,sha256=8MqbOjq56DbDKuTix75wYGXcAykzLiAPKrgl13Gk4xQ,15086
 reykit/rzip.py,sha256=u-yyEFXY5iOysgzzqEbaaDTFfoHBj0L2sv5m4AQLt1c,3450
 reykit/rdll/__init__.py,sha256=TEVZjiW9Y1_VxbZgIygcwmRp5xFHM2wLgwZccZ6gjng,698
 reykit/rdll/rdll_core.py,sha256=o6-rKcTQgxZQe0kD3GnwyNb3KL9IogzgCQNOmYLMm7A,5086
-reykit-1.1.95.dist-info/METADATA,sha256=i8D3Rnu5vu9oR1nHeCNnpa06tKg_ja5B-prxHaFp88g,1872
-reykit-1.1.95.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reykit-1.1.95.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reykit-1.1.95.dist-info/RECORD,,
+reykit-1.1.97.dist-info/METADATA,sha256=uy793_GknFh-KXeWPUD1p2j97GqUKyau25c4N_-gPY0,1872
+reykit-1.1.97.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reykit-1.1.97.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reykit-1.1.97.dist-info/RECORD,,