reykit 1.1.101__py3-none-any.whl → 1.1.102__py3-none-any.whl

reykit/rbase.py

@@ -9,7 +9,8 @@
 """
 
 
-from typing import Any, Literal, Self, TypeVar, Type, NoReturn, overload, final
+from typing import Any, Literal, Callable, Self, TypeVar, Type, NoReturn, overload, final
+from types import CoroutineType
 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
@@ -30,6 +31,9 @@ __all__ = (
     'KT',
     'VT',
     'CallableT',
+    'CallableSimple',
+    'CoroutineFunction',
+    'CoroutineFunctionSimple',
     'Base',
     'StaticMeta',
     'ConfigMeta',
@@ -70,6 +74,10 @@ KT = TypeVar('KT') # Dictionary key.
 VT = TypeVar('VT') # Dictionary value.
 CallableT = TypeVar('CallableT', bound=Callable) # Callable.
 
+type CallableSimple = Callable[[], Any]
+type CoroutineFunction = Callable[..., CoroutineType]
+type CoroutineFunctionSimple = Callable[[], CoroutineType]
+
 
 class Base(object):
     """

reykit/rschedule.py

@@ -47,17 +47,8 @@ class Schedule(Base):
     """
     Schedule type.
     Can create database used `self.build_db` method.
-
-    Attributes
-    ----------
-    db_names : Database table name mapping dictionary.
     """
 
-    db_names = {
-        'schedule': 'schedule',
-        'stats_schedule': 'stats_schedule'
-    }
-
 
     def __init__(
         self,
@@ -111,7 +102,7 @@ class Schedule(Base):
 
     def build_db(self) -> None:
         """
-        Check and build database tables, by `self.db_names`.
+        Check and build database tables.
         """
 
         # Check.
@@ -119,21 +110,21 @@ class Schedule(Base):
             throw(ValueError, self.db)
 
         # Parameter.
+        database = self.db.database
 
         ## Table.
-        DatabaseTableSchedule._set_name(self.db_names['schedule'])
         tables = [DatabaseTableSchedule]
 
         ## View stats.
         views_stats = [
             {
-                'path': self.db_names['stats_schedule'],
+                'path': 'stats_schedule',
                 'items': [
                     {
                         'name': 'count',
                         'select': (
                             'SELECT COUNT(1)\n'
-                            f'FROM `{self.db.database}`.`{self.db_names['schedule']}`'
+                            f'FROM `{database}`.`schedule`'
                         ),
                         'comment': 'Schedule count.'
                     },
@@ -141,7 +132,7 @@ class Schedule(Base):
                         'name': 'past_day_count',
                         'select': (
                             'SELECT COUNT(1)\n'
-                            f'FROM `{self.db.database}`.`{self.db_names['schedule']}`\n'
+                            f'FROM `{database}`.`schedule`\n'
                             'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) = 0'
                         ),
                         'comment': 'Schedule count in the past day.'
@@ -150,7 +141,7 @@ class Schedule(Base):
                         'name': 'past_week_count',
                         'select': (
                             'SELECT COUNT(1)\n'
-                            f'FROM `{self.db.database}`.`{self.db_names['schedule']}`\n'
+                            f'FROM `{database}`.`schedule`\n'
                             'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) <= 6'
                         ),
                         'comment': 'Schedule count in the past week.'
@@ -159,7 +150,7 @@ class Schedule(Base):
                         'name': 'past_month_count',
                         'select': (
                             'SELECT COUNT(1)\n'
-                            f'FROM `{self.db.database}`.`{self.db_names['schedule']}`\n'
+                            f'FROM `{database}`.`schedule`\n'
                             'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) <= 29'
                         ),
                         'comment': 'Schedule count in the past month.'
@@ -168,7 +159,7 @@ class Schedule(Base):
                         'name': 'task_count',
                         'select': (
                             'SELECT COUNT(DISTINCT `task`)\n'
-                            f'FROM `{self.db.database}`.`{self.db_names['schedule']}`'
+                            f'FROM `{database}`.`schedule`'
                         ),
                         'comment': 'Task count.'
                     },
@@ -176,7 +167,7 @@ class Schedule(Base):
                         'name': 'last_time',
                         'select': (
                             'SELECT IFNULL(MAX(`update_time`), MAX(`create_time`))\n'
-                            f'FROM `{self.db.database}`.`{self.db_names['schedule']}`'
+                            f'FROM `{database}`.`schedule`'
                         ),
                         'comment': 'Schedule last record time.'
                     }
@@ -266,7 +257,7 @@ class Schedule(Base):
             with self.db.connect() as conn:
                 conn = self.db.connect()
                 conn.execute.insert(
-                    self.db_names['schedule'],
+                    'schedule',
                     data
                 )
                 id_ = conn.insert_id()
@@ -286,7 +277,7 @@ class Schedule(Base):
                     'status': 2
                 }
                 self.db.execute.update(
-                    self.db_names['schedule'],
+                    'schedule',
                     data
                 )
                 raise
@@ -298,7 +289,7 @@ class Schedule(Base):
                     'status': 1
                 }
                 self.db.execute.update(
-                    self.db_names['schedule'],
+                    'schedule',
                     data
                 )
 

{reykit-1.1.101.dist-info → reykit-1.1.102.dist-info}/METADATA

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

{reykit-1.1.101.dist-info → reykit-1.1.102.dist-info}/RECORD

@@ -1,6 +1,6 @@
 reykit/__init__.py,sha256=V86CHqPAAVkooVx3_QIOKpDIFVneQCTTSwfJ-uWgBno,788
 reykit/rall.py,sha256=7Hip02YOkIDm3_xkoSDjvvYV2LhdBV2r4UKzWWnIfIo,628
-reykit/rbase.py,sha256=zUjiwedMGAMRUWRV8HCvWPrjSxwkqtXmIImjTd8UT2c,22053
+reykit/rbase.py,sha256=UCBNQb19cX4Hvy4zQHhi2Dm5q9qFFnJY5ZyQmGCTBlU,22335
 reykit/rdata.py,sha256=JLdq6vAaHsMIV59GifWqb9J5WSuWJr313WtcKI_XvJY,11332
 reykit/remail.py,sha256=ybWJ2mXSgtIzr-p_OYyrijxjNxQXt5wEMtUUMbhQfLg,6702
 reykit/rimage.py,sha256=onM8cdkIY2L84nocvSyBoY9-JieIAJn0eWBh30WRPeg,6133
@@ -11,7 +11,7 @@ reykit/rnum.py,sha256=O8tFLAbDIGG25SvC3i_d9Jq8lRaR1JrzZe5WN0pqIiU,3612
 reykit/ros.py,sha256=0QIBlhDUv3BCeiuVRBZQbhS6wHLF1RWrLHW1Uq9nUw8,47723
 reykit/rrand.py,sha256=dcBVVzlRDmSsdWs9MH4SSNMZ_ORhnIBwLzLzX2yvKDk,8558
 reykit/rre.py,sha256=gNRM94qXWWdyha5kaXeDj03WFs4BGFirq_Orhgi18wY,6010
-reykit/rschedule.py,sha256=MlcA1F9wW9bIgCXL01XBZypEDvOieLUy52egKHledeU,12579
+reykit/rschedule.py,sha256=mbAEjnpA7hrVIP1JTRB0SWrHhvEDZHENR3HjfS2e5CQ,12112
 reykit/rstdout.py,sha256=ZGddn5w87jy5vI5RvnMvXravtp8sB7qdrsz4wdOnbYc,8172
 reykit/rsys.py,sha256=kmk20RozJxSFgqPuUOk7mo7YcKEF1u6irTULpVW4ZLA,24903
 reykit/rtable.py,sha256=e4Eh06p4XFXLDcIfKPVvFd56nMklvPpaff_pe6NhEIM,10596
@@ -22,7 +22,7 @@ reykit/rwrap.py,sha256=noJ_tNqAH95ZgXcFtyiLzKr4MCLkGXFPZvREM-4J068,15074
 reykit/rzip.py,sha256=kPSjz1hCgPFqmINn3qw_8yVCb6wAPbSq4-VIcan98z8,3442
 reykit/rdll/__init__.py,sha256=DUYGZzREGzhis36rKYGzI5JYCZJlUoKb80mkoXFfsV4,694
 reykit/rdll/rdll_core.py,sha256=o6-rKcTQgxZQe0kD3GnwyNb3KL9IogzgCQNOmYLMm7A,5086
-reykit-1.1.101.dist-info/METADATA,sha256=L8RkF8uhB70kX75HMucTyj72kwgGQBvH3jJx5G-s42I,1861
-reykit-1.1.101.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reykit-1.1.101.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reykit-1.1.101.dist-info/RECORD,,
+reykit-1.1.102.dist-info/METADATA,sha256=ZrIzzpTfR-CUdYPWAjGNcMBIV63dLyTYnpgIavy4aRk,1861
+reykit-1.1.102.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reykit-1.1.102.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reykit-1.1.102.dist-info/RECORD,,