reykit 1.1.90__py3-none-any.whl → 1.1.91__py3-none-any.whl

reykit/rschedule.py

@@ -17,7 +17,7 @@ from apscheduler.schedulers.background import BackgroundScheduler
 from apscheduler.schedulers.blocking import BlockingScheduler
 from apscheduler.job import Job
 from reydb import rorm
-from reydb.rdb import Database, DatabaseAsync
+from reydb.rdb import Database
 
 from .rbase import Base, throw
 
@@ -35,6 +35,7 @@ class Schedule(Base):
     Attributes
     ----------
     db_names : Database table name mapping dictionary.
+    Error : Database `schedule` table model.
     """
 
     db_names = {
@@ -43,13 +44,23 @@ class Schedule(Base):
     }
 
 
+    class Schedule(rorm.Model, table=True):
+        __comment__ = 'Schedule execute record table.'
+        create_time: rorm.Datetime = rorm.Field(field_default='CURRENT_TIMESTAMP', not_null=True, index_n=True, comment='Record create time.')
+        update_time: rorm.Datetime = rorm.Field(field_default='CURRENT_TIMESTAMP', index_n=True, comment='Record update time.')
+        id: int = rorm.Field(field_type=rorm.types_mysql.INTEGER(unsigned=True), key_auto=True, comment='ID.')
+        status: str = rorm.Field(field_type=rorm.types_mysql.TINYINT(unsigned=True), not_null=True, comment='Schedule status, 0 is executing, 1 is completed, 2 is occurred error.')
+        task: str = rorm.Field(field_type=rorm.types.VARCHAR(100), not_null=True, comment='Schedule task function name.')
+        note: str = rorm.Field(field_type=rorm.types.VARCHAR(500), comment='Schedule note.')
+
+
     def __init__(
         self,
         max_workers: int = 10,
         max_instances: int = 1,
         coalesce: bool = True,
         block: bool = False,
-        db: Database | DatabaseAsync | None = None
+        db: Database | None = None
     ) -> None:
         """
         Build instance attributes.
@@ -93,6 +104,103 @@ class Schedule(Base):
         self.db = db
 
 
+    def handle_build_db(self) -> tuple[list[type[Schedule]], list[dict[str, Any]]]:
+        """
+        Handle method of check and build database tables, by `self.db_names`.
+
+        Returns
+        -------
+        Build database parameter.
+        """
+
+        # Check.
+        if self.db is None:
+            throw(ValueError, self.db)
+
+        # Set parameter.
+        self.Schedule._name(self.db_names['schedule'])
+
+        ## Table.
+        tables = [self.Schedule]
+
+        ## View stats.
+        views_stats = [
+            {
+                'path': self.db_names['stats_schedule'],
+                'items': [
+                    {
+                        'name': 'count',
+                        'select': (
+                            'SELECT COUNT(1)\n'
+                            f'FROM `{self.db.database}`.`{self.db_names['schedule']}`'
+                        ),
+                        'comment': 'Schedule count.'
+                    },
+                    {
+                        'name': 'past_day_count',
+                        'select': (
+                            'SELECT COUNT(1)\n'
+                            f'FROM `{self.db.database}`.`{self.db_names['schedule']}`\n'
+                            'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) = 0'
+                        ),
+                        'comment': 'Schedule count in the past day.'
+                    },
+                    {
+                        'name': 'past_week_count',
+                        'select': (
+                            'SELECT COUNT(1)\n'
+                            f'FROM `{self.db.database}`.`{self.db_names['schedule']}`\n'
+                            'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) <= 6'
+                        ),
+                        'comment': 'Schedule count in the past week.'
+                    },
+                    {
+                        'name': 'past_month_count',
+                        'select': (
+                            'SELECT COUNT(1)\n'
+                            f'FROM `{self.db.database}`.`{self.db_names['schedule']}`\n'
+                            'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) <= 29'
+                        ),
+                        'comment': 'Schedule count in the past month.'
+                    },
+                    {
+                        'name': 'task_count',
+                        'select': (
+                            'SELECT COUNT(DISTINCT `task`)\n'
+                            f'FROM `{self.db.database}`.`{self.db_names['schedule']}`'
+                        ),
+                        'comment': 'Task count.'
+                    },
+                    {
+                        'name': 'last_time',
+                        'select': (
+                            'SELECT IFNULL(MAX(`update_time`), MAX(`create_time`))\n'
+                            f'FROM `{self.db.database}`.`{self.db_names['schedule']}`'
+                        ),
+                        'comment': 'Schedule last record time.'
+                    }
+                ]
+            }
+        ]
+
+        return tables, views_stats
+
+
+    def build_db(self) -> None:
+        """
+        Check and build database tables, by `self.db_names`.
+        """
+
+        # Get parameter.
+        tables, views_stats = self.handle_build_db()
+
+        # Build.
+        self.db.build.build(tables=tables, views_stats=views_stats, skip=True)
+
+        # ## Error.
+        self.db.error.build_db()
+
+
     def pause(self) -> None:
         """
         Pause scheduler.
@@ -126,6 +234,9 @@ class Schedule(Base):
         return jobs
 
 
+    __iter__ = tasks
+
+
     def wrap_record_db(
         self,
         task: Callable,
@@ -374,96 +485,3 @@ class Schedule(Base):
 
         # Resume.
         self.scheduler.resume_job(id_)
-
-
-    def build_db(self) -> None:
-        """
-        Check and build database tables, by `self.db_names`.
-        """
-
-        # Check.
-        if self.db is None:
-            throw(ValueError, self.db)
-
-        # Set parameter.
-
-        ## Table.
-        class Schedule(rorm.Model, table=True):
-            __name__ = self.db_names['schedule']
-            __comment__ = 'Schedule execute record table.'
-            create_time: rorm.Datetime = rorm.Field(field_default='CURRENT_TIMESTAMP', not_null=True, index_n=True, comment='Record create time.')
-            update_time: rorm.Datetime = rorm.Field(field_default='CURRENT_TIMESTAMP', index_n=True, comment='Record update time.')
-            id: int = rorm.Field(field_type=rorm.types_mysql.INTEGER(unsigned=True), key_auto=True, comment='ID.')
-            status: str = rorm.Field(field_type=rorm.types_mysql.TINYINT(unsigned=True), not_null=True, comment='Schedule status, 0 is executing, 1 is completed, 2 is occurred error.')
-            task: str = rorm.Field(field_type=rorm.types.VARCHAR(100), not_null=True, comment='Schedule task function name.')
-            note: str = rorm.Field(field_type=rorm.types.VARCHAR(500), comment='Schedule note.')
-        tables = [Schedule]
-
-        ## View stats.
-        views_stats = [
-            {
-                'path': self.db_names['stats_schedule'],
-                'items': [
-                    {
-                        'name': 'count',
-                        'select': (
-                            'SELECT COUNT(1)\n'
-                            f'FROM `{self.db.database}`.`{self.db_names['schedule']}`'
-                        ),
-                        'comment': 'Schedule count.'
-                    },
-                    {
-                        'name': 'past_day_count',
-                        'select': (
-                            'SELECT COUNT(1)\n'
-                            f'FROM `{self.db.database}`.`{self.db_names['schedule']}`\n'
-                            'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) = 0'
-                        ),
-                        'comment': 'Schedule count in the past day.'
-                    },
-                    {
-                        'name': 'past_week_count',
-                        'select': (
-                            'SELECT COUNT(1)\n'
-                            f'FROM `{self.db.database}`.`{self.db_names['schedule']}`\n'
-                            'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) <= 6'
-                        ),
-                        'comment': 'Schedule count in the past week.'
-                    },
-                    {
-                        'name': 'past_month_count',
-                        'select': (
-                            'SELECT COUNT(1)\n'
-                            f'FROM `{self.db.database}`.`{self.db_names['schedule']}`\n'
-                            'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) <= 29'
-                        ),
-                        'comment': 'Schedule count in the past month.'
-                    },
-                    {
-                        'name': 'task_count',
-                        'select': (
-                            'SELECT COUNT(DISTINCT `task`)\n'
-                            f'FROM `{self.db.database}`.`{self.db_names['schedule']}`'
-                        ),
-                        'comment': 'Task count.'
-                    },
-                    {
-                        'name': 'last_time',
-                        'select': (
-                            'SELECT IFNULL(MAX(`update_time`), MAX(`create_time`))\n'
-                            f'FROM `{self.db.database}`.`{self.db_names['schedule']}`'
-                        ),
-                        'comment': 'Schedule last record time.'
-                    }
-                ]
-            }
-        ]
-
-        # Build.
-        self.db.build.build(tables=tables, views_stats=views_stats, skip=True)
-
-        ## Error.
-        self.db.error.build_db()
-
-
-    __iter__ = tasks

{reykit-1.1.90.dist-info → reykit-1.1.91.dist-info}/METADATA

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

{reykit-1.1.90.dist-info → reykit-1.1.91.dist-info}/RECORD

@@ -11,7 +11,7 @@ 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=qYNmD0lGEysvQtIa6RBRi1xAG1Yv4ry0Hd8E4StYxho,12590
+reykit/rschedule.py,sha256=rXECyOjUUpOTO6gMsl5ehdFSLAQdSy7e7d2QPzDyEwY,12975
 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
@@ -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.90.dist-info/METADATA,sha256=4OArpOMbswgG_c51TvPq5X0iws7jVFrdGC3SWp8P9Po,1872
-reykit-1.1.90.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reykit-1.1.90.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reykit-1.1.90.dist-info/RECORD,,
+reykit-1.1.91.dist-info/METADATA,sha256=ZbSn5m-l-_BZPVeGZL2xMsKqoMOMh4zSDBma5FrGscI,1872
+reykit-1.1.91.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reykit-1.1.91.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reykit-1.1.91.dist-info/RECORD,,