reydb 1.1.32__py3-none-any.whl → 1.1.34__py3-none-any.whl

reydb/__init__.py

@@ -12,11 +12,12 @@ Modules
 rall : All methods.
 rbase : Base methods.
 rbuild : Database build methods.
+rconfig : Database config methods.
 rconn : Database connection methods.
 rdb : Database methods.
+rerror : Database error methods.
 rexec : Database execute methods.
 rfile : Database file methods.
 rinfo : Database information methods.
-rlog : Database log methods.
 rparam : Database parameter methods.
 """

reydb/rall.py

@@ -11,10 +11,11 @@
 
 from .rbase import *
 from .rbuild import *
+from .rconfig import *
 from .rconn import *
 from .rdb import *
+from .rerror import *
 from .rexec import *
 from .rfile import *
 from .rinfo import *
-from .rlog import *
 from .rparam import *

reydb/rconfig.py

@@ -0,0 +1,360 @@
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+@Time    : 2025-08-22 13:45:58
+@Author  : Rey
+@Contact : reyxbo@163.com
+@Explain : Database config methods.
+"""
+
+
+from typing import Any
+from reykit.rbase import T, throw
+
+from .rconn import DatabaseConnection
+from .rdb import Database
+
+
+__all__ = (
+    'DatabaseConfig',
+)
+
+
+class DatabaseConfig(object):
+    """
+    Database config type.
+    Can create database used `self.build` method.
+    """
+
+
+    def __init__(self, database: Database | DatabaseConnection) -> None:
+        """
+        Build instance attributes.
+        """
+
+        # SQLite.
+        if database.backend == 'sqlite':
+            text='not suitable for SQLite databases'
+            throw(AssertionError, text=text)
+
+        # Build.
+        self.database = database
+
+        ## Database path name.
+        self.db_names = {
+            'base': 'base',
+            'base.config': 'config',
+            'base.stats_config': 'stats_config'
+        }
+
+
+    def build_db(self) -> None:
+        """
+        Check and build all standard databases and tables, by `self.db_names`.
+        """
+
+        # Set parameter.
+
+        ## Database.
+        databases = [
+            {
+                'name': self.db_names['base']
+            }
+        ]
+
+        ## Table.
+        tables = [
+
+            ### 'config'.
+            {
+                'path': (self.db_names['base'], self.db_names['base.config']),
+                'fields': [
+                    {
+                        'name': 'create_time',
+                        'type': 'datetime',
+                        'constraint': 'NOT NULL DEFAULT CURRENT_TIMESTAMP',
+                        'comment': 'Config create time.'
+                    },
+                    {
+                        'name': 'update_time',
+                        'type': 'datetime',
+                        'constraint': 'DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP',
+                        'comment': 'Config update time.'
+                    },
+                    {
+                        'name': 'key',
+                        'type': 'varchar(50)',
+                        'constraint': 'NOT NULL',
+                        'comment': 'Config key.'
+                    },
+                    {
+                        'name': 'value',
+                        'type': 'json',
+                        'constraint': 'NOT NULL',
+                        'comment': 'Config value.'
+                    },
+                    {
+                        'name': 'note',
+                        'type': 'varchar(500)',
+                        'comment': 'Config note.'
+                    }
+                ]
+            }
+
+        ]
+
+        ## View stats.
+        views_stats = [
+
+            ### 'stats_config'.
+            {
+                'path': (self.db_names['base'], self.db_names['base.stats_config']),
+                'items': [
+                    {
+                        'name': 'count',
+                        'select': (
+                            'SELECT COUNT(1)\n'
+                            f'FROM `{self.db_names['base']}`.`{self.db_names['base.stats_config']}`'
+                        ),
+                        'comment': 'Config count.'
+                    },
+                    {
+                        'name': 'last_create_time',
+                        'select': (
+                            'SELECT MAX(`create_time`)\n'
+                            f'FROM `{self.db_names['base']}`.`{self.db_names['base.stats_config']}`'
+                        ),
+                        'comment': 'Config last record create time.'
+                    },
+                    {
+                        'name': 'last_update_time',
+                        'select': (
+                            'SELECT MAX(`update_time`)\n'
+                            f'FROM `{self.db_names['base']}`.`{self.db_names['base.stats_config']}`'
+                        ),
+                        'comment': 'Config last record update time.'
+                    }
+                ]
+
+            }
+
+        ]
+
+        # Build.
+        self.database.build.build(databases, tables, views_stats)
+
+
+    def get(self, key: str, default: T | None = None) -> Any | T:
+        """
+        Get config value, when not exist, then return default value.
+
+        Parameters
+        ----------
+        key : Config key.
+        default : Config default value.
+
+        Returns
+        -------
+        Config value.
+        """
+
+        # Get.
+        where = '`key` = :key'
+        result = self.database.execute_select(
+            (self.db_names['base'], self.db_names['base.config']),
+            'value',
+            where,
+            limit=1,
+            key=key
+        )
+        value = result.scalar()
+
+        # Default.
+        if value is None:
+            value = default
+
+        return value
+
+
+    def setdefault(self, key: str, default: T | None = None) -> Any | T:
+        """
+        Set config value.
+
+        Parameters
+        ----------
+        key : Config key.
+        default : Config default value.
+
+        Returns
+        -------
+        Config value.
+        """
+
+        # Set.
+        data = {'key': key, 'value': default}
+        result = self.database.execute_insert(
+            (self.db_names['base'], self.db_names['base.config']),
+            data,
+            'ignore'
+        )
+
+        # Get.
+        if result.rowcount == 0:
+            result = self[key]
+        else:
+            result = default
+
+        return result
+
+
+    def update(self, data: dict[str, Any]) -> None:
+        """
+        Update config values.
+
+        Parameters
+        ----------
+        data : Config update data.
+        """
+
+        # Update.
+        data = [
+            {
+                'key': key,
+                'value': value
+            }
+            for key, value in data.items
+        ]
+        self.database.execute_insert(
+            (self.db_names['base'], self.db_names['base.config']),
+            data,
+            'update'
+        )
+
+
+    def remove(self, key: str) -> None:
+        """
+        Remove config.
+
+        Parameters
+        ----------
+        key : Config key.
+        """
+
+        # Remove.
+        where = '`key` = :key'
+        result = self.database.execute_delete(
+            (self.db_names['base'], self.db_names['base.config']),
+            where,
+            limit=1,
+            key=key
+        )
+
+        # Check.
+        if result.rowcount == 0:
+            throw(KeyError, key)
+
+
+    def items(self) -> dict:
+        """
+        Get all config keys and values.
+
+        Returns
+        -------
+        All config keys and values.
+        """
+
+        # Get.
+        result = self.database.execute_select(
+            (self.db_names['base'], self.db_names['base.config']),
+            ['key', 'value']
+        )
+
+        # Convert.
+        result = result.to_dict('key', 'value')
+
+        return result
+
+
+    def keys(self) -> list[str]:
+        """
+        Get all config keys.
+
+        Returns
+        -------
+        All config keys.
+        """
+
+        # Get.
+        result = self.database.execute_select(
+            (self.db_names['base'], self.db_names['base.config']),
+            'key'
+        )
+
+        # Convert.
+        result = result.to_list()
+
+        return result
+
+
+    def values(self) -> list[Any]:
+        """
+        Get all config value.
+
+        Returns
+        -------
+        All config values.
+        """
+
+        # Get.
+        result = self.database.execute_select(
+            (self.db_names['base'], self.db_names['base.config']),
+            'value'
+        )
+
+        # Convert.
+        result = result.to_list()
+
+        return result
+
+
+    def __getitem__(self, key: str) -> Any:
+        """
+        Get config value.
+
+        Parameters
+        ----------
+        key : Config key.
+
+        Returns
+        -------
+        Config value.
+        """
+
+        # Get.
+        value = self.get(key)
+
+        # Check.
+        if value is None:
+            throw(KeyError, key)
+
+        return value
+
+
+    def __setitem__(self, key: str, value: Any) -> None:
+        """
+        Set config value.
+
+        Parameters
+        ----------
+        key : Config key.
+        value : Config value.
+        """
+
+        # Set.
+        data = {'key': key, 'value': value}
+        self.database.execute_insert(
+            (self.db_names['base'], self.db_names['base.config']),
+            data,
+            'update'
+        )

reydb/rdb.py

@@ -1932,9 +1932,9 @@ class Database(DatabaseBase):
 
 
     @property
-    def log(self):
+    def error(self):
         """
-        Build `DatabaseLog` instance.
+        Build `DatabaseError` instance.
 
         Returns
         -------
@@ -1942,14 +1942,33 @@ class Database(DatabaseBase):
         """
 
         # Import.
-        from .rlog import DatabaseLog
+        from .rerror import DatabaseError
 
         # Build.
-        dbfile = DatabaseLog(self)
+        dbfile = DatabaseError(self)
 
         return dbfile
 
 
+    @property
+    def config(self):
+        """
+        Build `DatabaseConfig` instance.
+
+        Returns
+        -------
+        Database file instance.
+        """
+
+        # Import.
+        from .rconfig import DatabaseConfig
+
+        # Build.
+        dbconfig = DatabaseConfig(self)
+
+        return dbconfig
+
+
     @property
     def status(self):
         """

reydb/{rlog.py → rerror.py}

@@ -5,7 +5,7 @@
 @Time    : 2025-08-20 16:57:19
 @Author  : Rey
 @Contact : reyxbo@163.com
-@Explain : Database log methods.
+@Explain : Database error methods.
 """
 
 
@@ -21,13 +21,13 @@ from .rdb import Database
 
 
 __all__ = (
-    'DatabaseLog',
+    'DatabaseError',
 )
 
 
-class DatabaseLog(DatabaseBase):
+class DatabaseError(DatabaseBase):
     """
-    Database log type.
+    Database error type.
     Can create database used `self.build` method.
     """
 
@@ -51,9 +51,9 @@ class DatabaseLog(DatabaseBase):
 
         ## Database path name.
         self.db_names = {
-            'log': 'log',
-            'log.error': 'error',
-            'log.error_stats': 'error_stats'
+            'base': 'base',
+            'base.error': 'error',
+            'base.error_stats': 'error_stats'
         }
 
 
@@ -67,7 +67,7 @@ class DatabaseLog(DatabaseBase):
         ## Database.
         databases = [
             {
-                'name': self.db_names['log']
+                'name': self.db_names['base']
             }
         ]
 
@@ -76,7 +76,7 @@ class DatabaseLog(DatabaseBase):
 
             ### 'error'.
             {
-                'path': (self.db_names['log'], self.db_names['log.error']),
+                'path': (self.db_names['base'], self.db_names['base.error']),
                 'fields': [
                     {
                         'name': 'create_time',
@@ -131,13 +131,13 @@ class DatabaseLog(DatabaseBase):
 
             ### 'error_stats'.
             {
-                'path': (self.db_names['log'], self.db_names['log.error_stats']),
+                'path': (self.db_names['base'], self.db_names['base.error_stats']),
                 'items': [
                     {
                         'name': 'count',
                         'select': (
                             'SELECT COUNT(1)\n'
-                            f'FROM `{self.db_names['log']}`.`{self.db_names['log.error']}`'
+                            f'FROM `{self.db_names['base']}`.`{self.db_names['base.error']}`'
                         ),
                         'comment': 'Error log count.'
                     },
@@ -145,7 +145,7 @@ class DatabaseLog(DatabaseBase):
                         'name': 'past_day_count',
                         'select': (
                             'SELECT COUNT(1)\n'
-                            f'FROM `{self.db_names['log']}`.`{self.db_names['log.error']}`\n'
+                            f'FROM `{self.db_names['base']}`.`{self.db_names['base.error']}`\n'
                             'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) = 0'
                         ),
                         'comment': 'Error log count in the past day.'
@@ -154,7 +154,7 @@ class DatabaseLog(DatabaseBase):
                         'name': 'past_week_count',
                         'select': (
                             'SELECT COUNT(1)\n'
-                            f'FROM `{self.db_names['log']}`.`{self.db_names['log.error']}`\n'
+                            f'FROM `{self.db_names['base']}`.`{self.db_names['base.error']}`\n'
                             'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) <= 6'
                         ),
                         'comment': 'Error log count in the past week.'
@@ -163,7 +163,7 @@ class DatabaseLog(DatabaseBase):
                         'name': 'past_month_count',
                         'select': (
                             'SELECT COUNT(1)\n'
-                            f'FROM `{self.db_names['log']}`.`{self.db_names['log.error']}`\n'
+                            f'FROM `{self.db_names['base']}`.`{self.db_names['base.error']}`\n'
                             'WHERE TIMESTAMPDIFF(DAY, `create_time`, NOW()) <= 29'
                         ),
                         'comment': 'Error log count in the past month.'
@@ -172,7 +172,7 @@ class DatabaseLog(DatabaseBase):
                         'name': 'last_time',
                         'select': (
                             'SELECT MAX(`create_time`)\n'
-                            f'FROM `{self.db_names['log']}`.`{self.db_names['log.error']}`'
+                            f'FROM `{self.db_names['base']}`.`{self.db_names['base.error']}`'
                         ),
                         'comment': 'Error log last record create time.'
                     }
@@ -186,7 +186,7 @@ class DatabaseLog(DatabaseBase):
         self.database.build.build(databases, tables, views_stats=views_stats)
 
 
-    def error(
+    def record(
         self,
         exc: BaseException,
         stack: StackSummary,
@@ -223,17 +223,17 @@ class DatabaseLog(DatabaseBase):
 
         # Insert.
         self.database.execute_insert(
-            (self.db_names['log'], self.db_names['log.error']),
+            (self.db_names['base'], self.db_names['base.error']),
             data=data
         )
 
 
-    def wrap_error(
+    def wrap(
         self,
         func: Callable[..., T] | None = None,
         *,
         note: str | None = None,
-        filter_exc : BaseException | tuple[BaseException, ...] = Exit
+        filter_type : BaseException | tuple[BaseException, ...] = Exit
     ) -> T | Callable[[Callable[..., T]], Callable[..., T]]:
         """
         Decorator, insert exception information into the table of database, throw exception.
@@ -242,7 +242,7 @@ class DatabaseLog(DatabaseBase):
         ----------
         func : Function.
         note : Exception note.
-        filter_exc : Exception type of not inserted, but still throw exception.
+        filter_type : Exception type of not inserted, but still throw exception.
 
         Returns
         -------
@@ -271,8 +271,8 @@ class DatabaseLog(DatabaseBase):
         """
 
         # Handle parameter.
-        if issubclass(filter_exc, BaseException):
-            filter_exc = (filter_exc,)
+        if issubclass(filter_type, BaseException):
+            filter_type = (filter_type,)
 
 
         def _wrap(func_: Callable[..., T]) -> Callable[..., T]:
@@ -313,8 +313,11 @@ class DatabaseLog(DatabaseBase):
                     _, exc, stack = catch_exc()
 
                     ## Filter.
-                    if type(exc) not in filter_exc:
-                        self.error(exc, stack, note)
+                    for type_ in filter_type:
+                        if isinstance(exc, type_):
+                            break
+                    else:
+                        self.record(exc, stack, note)
 
                     raise
 
@@ -332,3 +335,5 @@ class DatabaseLog(DatabaseBase):
         else:
             _func = _wrap(func)
             return _func
+
+    __call__ = record

{reydb-1.1.32.dist-info → reydb-1.1.34.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reydb
-Version: 1.1.32
+Version: 1.1.34
 Summary: Database method set.
 Project-URL: homepage, https://github.com/reyxbo/reydb/
 Author-email: Rey <reyxbo@163.com>

reydb-1.1.34.dist-info/RECORD

@@ -0,0 +1,16 @@
+reydb/__init__.py,sha256=SqjJEBMiUMnKkNfmOvw_jprZcj9Edi0jyBKt67xeYUE,544
+reydb/rall.py,sha256=UWnbtl4oG4YqXyqTMN_5uqE-QqD5nb_-dvarotlTUeU,388
+reydb/rbase.py,sha256=X8bDBmKyIiLXGvOVnTh5nD0ltkhOPWU6g4BebifOZYY,312
+reydb/rbuild.py,sha256=s4lLVQONfL5a9B6mw5D7bfbPyJoYNIqBxlas9rCM1Y8,32458
+reydb/rconfig.py,sha256=ZNshCC4S9swFpdW1e-uU79MBKsDUjIrsRZTzJHJjJVk,8807
+reydb/rconn.py,sha256=kdw2xQb0JqSUXM-BD7XfJ-ZqaWHxYkeT8psRhOK43mA,6211
+reydb/rdb.py,sha256=OQ3ztC4G53usAbocqGwTqo1ry1AIGjoWTN7pn8Pn3Uk,62184
+reydb/rerror.py,sha256=xHLvRxu8KBvUdfVS7mD906jx9XTQPGwEl7psBLGEZ5w,9966
+reydb/rexec.py,sha256=dGdRkG1XR0Z66T0r4nPCSdQzSRWc_Q3t6TPSSrDTIxY,9042
+reydb/rfile.py,sha256=7g6hPBz33p-mkGFc6LEmL2hpFes-LM-AWQ0SxgJe2BI,15254
+reydb/rinfo.py,sha256=KXTkcpTGAD3p9RVKKcnmc_FjJtiKRPk-K5ZepPOnphQ,15253
+reydb/rparam.py,sha256=3BGDBD8QshOf2J70ZJ6LJ9PiH-1ZU3ruZwoE0bN6OOw,7017
+reydb-1.1.34.dist-info/METADATA,sha256=1QjlwWVDBihsWcl1ba4OzAdfAlwPrgKlxZFlBtrJqE0,1550
+reydb-1.1.34.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.1.34.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.1.34.dist-info/RECORD,,

reydb-1.1.32.dist-info/RECORD

@@ -1,15 +0,0 @@
-reydb/__init__.py,sha256=U7zk2fbM2FbAWHdLDgXPX2wVc-NJKNeBGht09vVS5L4,504
-reydb/rall.py,sha256=iSjkt2aqJtKVio8jAghc7-V-7rWdjYu-2rR2vPUpaDE,362
-reydb/rbase.py,sha256=X8bDBmKyIiLXGvOVnTh5nD0ltkhOPWU6g4BebifOZYY,312
-reydb/rbuild.py,sha256=s4lLVQONfL5a9B6mw5D7bfbPyJoYNIqBxlas9rCM1Y8,32458
-reydb/rconn.py,sha256=kdw2xQb0JqSUXM-BD7XfJ-ZqaWHxYkeT8psRhOK43mA,6211
-reydb/rdb.py,sha256=hjWwB778jxBoTgx2lgs6n1NZMJA0Hbg4HHdXE57hZiY,61841
-reydb/rexec.py,sha256=dGdRkG1XR0Z66T0r4nPCSdQzSRWc_Q3t6TPSSrDTIxY,9042
-reydb/rfile.py,sha256=7g6hPBz33p-mkGFc6LEmL2hpFes-LM-AWQ0SxgJe2BI,15254
-reydb/rinfo.py,sha256=KXTkcpTGAD3p9RVKKcnmc_FjJtiKRPk-K5ZepPOnphQ,15253
-reydb/rlog.py,sha256=ckdxNTUmpYEyETOoTTk6BeK7_ZlFnWzRD8BevaRfkn8,9803
-reydb/rparam.py,sha256=3BGDBD8QshOf2J70ZJ6LJ9PiH-1ZU3ruZwoE0bN6OOw,7017
-reydb-1.1.32.dist-info/METADATA,sha256=CcgVFLdAR7PmtZjbqpBv4X_IP_dSF7RkORhUCD4GjkU,1550
-reydb-1.1.32.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.1.32.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.1.32.dist-info/RECORD,,