reykit 1.1.96__py3-none-any.whl → 1.1.98__py3-none-any.whl

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, Mapping
 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,24 @@ from .rtime import time_to
 
 
 __all__ = (
-    'is_row',
-    'is_table',
+    'RowData',
+    'TableData',
     'Table'
 )
 
 
-type RowData = MutableMapping | CursorRow | Series
-type TableData = Collection[MutableMapping] | RowData | CursorResult | DataFrame
+RowData = Iterable | Mapping
+TableData = Iterable[RowData]
 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.
 
@@ -127,23 +64,20 @@ class Table(Base):
 
         # Convert.
         match self.data:
-            case MutableMapping():
+            case Mapping():
                 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.96.dist-info → reykit-1.1.98.dist-info}/METADATA

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

{reykit-1.1.96.dist-info → reykit-1.1.98.dist-info}/RECORD

@@ -11,10 +11,10 @@ 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=qZL5Zq_zpjib-CcgPFyfH16iD2woLCT3b2ABPb-h0-g,10635
 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.96.dist-info/METADATA,sha256=z9LDeiyKn8ElRPyoh3LO6KtSOzo-EuPnm775N6bOsWU,1872
-reykit-1.1.96.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reykit-1.1.96.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reykit-1.1.96.dist-info/RECORD,,
+reykit-1.1.98.dist-info/METADATA,sha256=z0kX5lsPHZVXID8MNJJQr7XwRLl2ULO_lXRs5XlAVr4,1872
+reykit-1.1.98.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reykit-1.1.98.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reykit-1.1.98.dist-info/RECORD,,