reydb 1.1.60__py3-none-any.whl → 1.1.61__py3-none-any.whl

reydb/__init__.py

@@ -18,7 +18,6 @@ rdb : Database methods.
 rerror : Database error methods.
 rexec : Database execute methods.
 rfile : Database file methods.
-rinfo : Database information methods.
 rorm : Database ORM methods.
 rparam : Database parameter methods.
 """

reydb/rall.py

@@ -17,6 +17,5 @@ from .rdb import *
 from .rerror import *
 from .rexec import *
 from .rfile import *
-from .rinfo import *
 from .rorm import *
 from .rparam import *

reydb/rbuild.py

@@ -20,7 +20,9 @@ from .rorm import DatabaseORMModel
 
 
 __all__ = (
+    'DatabaseBuildSuper',
     'DatabaseBuild',
+    'DatabaseBuildAsync'
 )
 
 
@@ -1283,7 +1285,6 @@ class DatabaseBuild(DatabaseBuildSuper['rdb.Database']):
         # Handle parameter.
         databases = databases or []
         tables = tables or []
-        tables_orm = tables_orm or []
         views = views or []
         views_stats = views_stats or []
 
@@ -1320,6 +1321,7 @@ class DatabaseBuild(DatabaseBuildSuper['rdb.Database']):
                 issubclass(params, DatabaseORMModel)
                 or isinstance(params, DatabaseORMModel)
             ):
+                database = self.db.database
                 table = params.table().name
 
                 ## Exist.
@@ -1565,7 +1567,11 @@ class DatabaseBuildAsync(DatabaseBuildSuper['rdb.DatabaseAsync']):
                 params_type = type(params)
 
             ## ORM.
-            if issubclass(params_type, DatabaseORMModel):
+            if (
+                is_instance(params)
+                and isinstance(params, DatabaseORMModel)
+                or issubclass(params, DatabaseORMModel)
+            ):
                 database = self.db.database
                 table = params.table().name
 

reydb/rconfig.py

@@ -9,8 +9,7 @@
 """
 
 
-from typing import TypedDict, TypeVar
-import datetime
+from typing import TypedDict, TypeVar, Generic
 from datetime import (
     datetime as Datetime,
     date as Date,
@@ -24,7 +23,9 @@ from .rbase import DatabaseBase
 
 
 __all__ = (
+    'DatabaseConfigSuper',
     'DatabaseConfig',
+    'DatabaseConfigAsync'
 )
 
 
@@ -32,11 +33,12 @@ type ConfigValue = bool | str | int | float | list | tuple | dict | set | Dateti
 ConfigRow = TypedDict('ConfigRow', {'key': str, 'value': ConfigValue, 'type': str, 'note': str | None})
 type ConfigTable = list[ConfigRow]
 ConfigValueT = TypeVar('T', bound=ConfigValue) # Any.
+DatabaseT = TypeVar('DatabaseT', 'rdb.Database', 'rdb.DatabaseAsync')
 
 
-class DatabaseConfig(DatabaseBase):
+class DatabaseConfigSuper(DatabaseBase, Generic[DatabaseT]):
     """
-    Database config type.
+    Database config super type.
     Can create database used `self.build_db` method.
 
     Examples
@@ -51,7 +53,7 @@ class DatabaseConfig(DatabaseBase):
 
     def __init__(
         self,
-        db: 'rdb.Database',
+        db: DatabaseT,
         db_names: dict[str, str] | None = None
     ) -> None:
         """
@@ -73,6 +75,21 @@ class DatabaseConfig(DatabaseBase):
             self.db_names.update(db_names)
 
 
+class DatabaseConfig(DatabaseConfigSuper['rdb.Database']):
+    """
+    Database config type.
+    Can create database used `self.build_db` method.
+
+    Examples
+    --------
+    >>> config = DatabaseConfig()
+    >>> config['key1'] = 1
+    >>> config['key2', 'note'] = 2
+    >>> config['key1'], config['key2']
+    (1, 2)
+    """
+
+
     def build_db(self) -> None:
         """
         Check and build database tables, by `self.db_names`.
@@ -83,26 +100,26 @@ class DatabaseConfig(DatabaseBase):
         ## Table.
         class Config(self.db.orm.Model, table=True):
             __name__ = self.db_names['config']
-            __commment__ = 'Config data table.'
-            create_time: datetime = self.db.orm.Field(not_null=True, field_default='CURRENT_TIMESTAMP', index_n=True, comment='Config create time.')
-            update_time: datetime = self.db.orm.Field(field_default='CURRENT_TIMESTAMP', index_n=True, comment='Config update time.')
-            key = self.db.orm.Field(type=self.db.orm.types.VARCHAR(50), key=True, not_null=True, comment='Config key.')
-            value = self.db.orm.Field(type=self.db.orm.types.TEXT, not_null=True, comment='Config value.')
-            type = self.db.orm.Field(type=self.db.orm.types.VARCHAR(50), not_null=True, comment='Config value type.')
-            note = self.db.orm.Field(type=self.db.orm.types.VARCHAR(500), comment='Config note.')
+            __comment__ = 'Config data table.'
+            create_time: Datetime = self.db.orm.Field(not_null=True, field_default='CURRENT_TIMESTAMP', index_n=True, comment='Config create time.')
+            update_time: Datetime = self.db.orm.Field(field_default='CURRENT_TIMESTAMP', index_n=True, comment='Config update time.')
+            key: str = self.db.orm.Field(type=self.db.orm.types.VARCHAR(50), key=True, not_null=True, comment='Config key.')
+            value: str = self.db.orm.Field(type=self.db.orm.types.TEXT, not_null=True, comment='Config value.')
+            type: str = self.db.orm.Field(type=self.db.orm.types.VARCHAR(50), not_null=True, comment='Config value type.')
+            note: str = self.db.orm.Field(type=self.db.orm.types.VARCHAR(500), comment='Config note.')
 
         tables = [Config]
 
         ## View stats.
         views_stats = [
             {
-                'path': self.db_names['stats_config'],
+                'path': (self.db.database, self.db_names['stats_config']),
                 'items': [
                     {
                         'name': 'count',
                         'select': (
                             'SELECT COUNT(1)\n'
-                            f'FROM `{self.db_names['base']}`.`{self.db_names['base.config']}`'
+                            f'FROM `{self.db_names['config']}`'
                         ),
                         'comment': 'Config count.'
                     },
@@ -110,7 +127,7 @@ class DatabaseConfig(DatabaseBase):
                         'name': 'last_create_time',
                         'select': (
                             'SELECT MAX(`create_time`)\n'
-                            f'FROM `{self.db_names['base']}`.`{self.db_names['base.config']}`'
+                            f'FROM `{self.db_names['config']}`'
                         ),
                         'comment': 'Config last record create time.'
                     },
@@ -118,7 +135,7 @@ class DatabaseConfig(DatabaseBase):
                         'name': 'last_update_time',
                         'select': (
                             'SELECT MAX(`update_time`)\n'
-                            f'FROM `{self.db_names['base']}`.`{self.db_names['base.config']}`'
+                            f'FROM `{self.db_names['config']}`'
                         ),
                         'comment': 'Config last record update time.'
                     }
@@ -128,10 +145,9 @@ class DatabaseConfig(DatabaseBase):
         ]
 
         # Build.
-        self.db.build.build(tables=tables, views_stats=views_stats)
+        self.db.build.build(tables=tables, views_stats=views_stats, skip=True)
 
 
-    @property
     def data(self) -> ConfigTable:
         """
         Get config data table.
@@ -149,7 +165,7 @@ class DatabaseConfig(DatabaseBase):
         )
 
         # Convert.
-        global_dict = {'datetime': datetime}
+        global_dict = {'datetime': Datetime}
         result = [
             {
                 'key': row['key'],
@@ -191,7 +207,7 @@ class DatabaseConfig(DatabaseBase):
         if value is None:
             value = default
         else:
-            global_dict = {'datetime': datetime}
+            global_dict = {'datetime': Datetime}
             value = eval(value, global_dict)
 
         return value
@@ -204,7 +220,7 @@ class DatabaseConfig(DatabaseBase):
         default_note: str | None = None
     ) -> ConfigValue | ConfigValueT:
         """
-        Set config value.
+        Set config default value.
 
         Parameters
         ----------
@@ -316,7 +332,7 @@ class DatabaseConfig(DatabaseBase):
         )
 
         # Convert.
-        global_dict = {'datetime': datetime}
+        global_dict = {'datetime': Datetime}
         result = result.to_dict('key', 'value')
         result = {
             key: eval(value, global_dict)
@@ -342,7 +358,7 @@ class DatabaseConfig(DatabaseBase):
         )
 
         # Convert.
-        global_dict = {'datetime': datetime}
+        global_dict = {'datetime': Datetime}
         result = [
             eval(value, global_dict)
             for value in result
@@ -367,7 +383,7 @@ class DatabaseConfig(DatabaseBase):
         )
 
         # Convert.
-        global_dict = {'datetime': datetime}
+        global_dict = {'datetime': Datetime}
         result = [
             eval(value, global_dict)
             for value in result
@@ -428,3 +444,374 @@ class DatabaseConfig(DatabaseBase):
             data,
             'update'
         )
+
+
+class DatabaseConfigAsync(DatabaseConfigSuper['rdb.DatabaseAsync']):
+    """
+    Asynchronous database config type.
+    Can create database used `self.build_db` method.
+
+    Examples
+    --------
+    >>> config = DatabaseConfig()
+    >>> config['key1'] = 1
+    >>> config['key2', 'note'] = 2
+    >>> config['key1'], config['key2']
+    (1, 2)
+    """
+
+
+    async def build_db(self) -> None:
+        """
+        Asynchronous check and build database tables, by `self.db_names`.
+        """
+
+        # Handle parameter.
+
+        ## Table.
+        class Config(self.db.orm.Model, table=True):
+            __name__ = self.db_names['config']
+            __comment__ = 'Config data table.'
+            create_time: Datetime = self.db.orm.Field(not_null=True, field_default='CURRENT_TIMESTAMP', index_n=True, comment='Config create time.')
+            update_time: Datetime = self.db.orm.Field(field_default='CURRENT_TIMESTAMP', index_n=True, comment='Config update time.')
+            key: str = self.db.orm.Field(type=self.db.orm.types.VARCHAR(50), key=True, not_null=True, comment='Config key.')
+            value: str = self.db.orm.Field(type=self.db.orm.types.TEXT, not_null=True, comment='Config value.')
+            type: str = self.db.orm.Field(type=self.db.orm.types.VARCHAR(50), not_null=True, comment='Config value type.')
+            note: str = self.db.orm.Field(type=self.db.orm.types.VARCHAR(500), comment='Config note.')
+
+        tables = [Config]
+
+        ## View stats.
+        views_stats = [
+            {
+                'path': (self.db.database, self.db_names['stats_config']),
+                'items': [
+                    {
+                        'name': 'count',
+                        'select': (
+                            'SELECT COUNT(1)\n'
+                            f'FROM `{self.db_names['config']}`'
+                        ),
+                        'comment': 'Config count.'
+                    },
+                    {
+                        'name': 'last_create_time',
+                        'select': (
+                            'SELECT MAX(`create_time`)\n'
+                            f'FROM `{self.db_names['config']}`'
+                        ),
+                        'comment': 'Config last record create time.'
+                    },
+                    {
+                        'name': 'last_update_time',
+                        'select': (
+                            'SELECT MAX(`update_time`)\n'
+                            f'FROM `{self.db_names['config']}`'
+                        ),
+                        'comment': 'Config last record update time.'
+                    }
+                ]
+            }
+
+        ]
+
+        # Build.
+        await self.db.build.build(tables=tables, views_stats=views_stats, skip=True)
+
+
+    async def data(self) -> ConfigTable:
+        """
+        Asynchronous get config data table.
+
+        Returns
+        -------
+        Config data table.
+        """
+
+        # Get.
+        result = await self.db.execute.select(
+            self.db_names['config'],
+            ['key', 'value', 'type', 'note'],
+            order='IFNULL(`update_time`, `create_time`) DESC'
+        )
+
+        # Convert.
+        global_dict = {'datetime': Datetime}
+        result = [
+            {
+                'key': row['key'],
+                'value': eval(row['value'], global_dict),
+                'note': row['note']
+            }
+            for row in result
+        ]
+
+        return result
+
+
+    async def get(self, key: str, default: ConfigValueT | None = None) -> ConfigValue | ConfigValueT:
+        """
+        Asynchronous 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 = await self.db.execute.select(
+            self.db_names['config'],
+            '`value`',
+            where,
+            limit=1,
+            key=key
+        )
+        value = result.scalar()
+
+        # Default.
+        if value is None:
+            value = default
+        else:
+            global_dict = {'datetime': Datetime}
+            value = eval(value, global_dict)
+
+        return value
+
+
+    async def setdefault(
+        self,
+        key: str,
+        default: ConfigValueT | None = None,
+        default_note: str | None = None
+    ) -> ConfigValue | ConfigValueT:
+        """
+        Asynchronous set config default value.
+
+        Parameters
+        ----------
+        key : Config key.
+        default : Config default value.
+        default_note : Config default note.
+
+        Returns
+        -------
+        Config value.
+        """
+
+        # Set.
+        data = {
+            'key': key,
+            'value': repr(default),
+            'type': type(default).__name__,
+            'note': default_note
+        }
+        result = await self.db.execute.insert(
+            self.db_names['config'],
+            data,
+            'ignore'
+        )
+
+        # Get.
+        if result.rowcount == 0:
+            default = await self.get(key)
+
+        return default
+
+
+    async def update(self, data: dict[str, ConfigValue] | ConfigTable) -> None:
+        """
+        Asynchronous update config values.
+
+        Parameters
+        ----------
+        data : Config update data.
+            - `dict[str, Any]`: Config key and value.
+            - `ConfigTable`: Config key and value and note.
+        """
+
+        # Handle parameter.
+        if type(data) == dict:
+            data = [
+                {
+                    'key': key,
+                    'value': repr(value),
+                    'type': type(value).__name__
+                }
+                for key, value in data.items()
+            ]
+        else:
+            data = data.copy()
+            for row in data:
+                row['value'] = repr(row['value'])
+                row['type'] = type(row['value']).__name__
+
+        # Update.
+        await self.db.execute.insert(
+            self.db_names['config'],
+            data,
+            'update'
+        )
+
+
+    async def remove(self, key: str | list[str]) -> None:
+        """
+        Asynchronous remove config.
+
+        Parameters
+        ----------
+        key : Config key or key list.
+        """
+
+        # Remove.
+        if type(key) == str:
+            where = '`key` = :key'
+            limit = 1
+        else:
+            where = '`key` in :key'
+            limit = None
+        result = await self.db.execute.delete(
+            self.db_names['base.config'],
+            where,
+            limit=limit,
+            key=key
+        )
+
+        # Check.
+        if result.rowcount == 0:
+            throw(KeyError, key)
+
+
+    async def items(self) -> dict[str, ConfigValue]:
+        """
+        Asynchronous get all config keys and values.
+
+        Returns
+        -------
+        All config keys and values.
+        """
+
+        # Get.
+        result = await self.db.execute.select(
+            self.db_names['config'],
+            ['key', 'value']
+        )
+
+        # Convert.
+        global_dict = {'datetime': Datetime}
+        result = result.to_dict('key', 'value')
+        result = {
+            key: eval(value, global_dict)
+            for key, value in result.items()
+        }
+
+        return result
+
+
+    async def keys(self) -> list[str]:
+        """
+        Asynchronous get all config keys.
+
+        Returns
+        -------
+        All config keys.
+        """
+
+        # Get.
+        result = await self.db.execute.select(
+            self.db_names['config'],
+            '`key`'
+        )
+
+        # Convert.
+        global_dict = {'datetime': Datetime}
+        result = [
+            eval(value, global_dict)
+            for value in result
+        ]
+
+        return result
+
+
+    async def values(self) -> list[ConfigValue]:
+        """
+        Asynchronous get all config value.
+
+        Returns
+        -------
+        All config values.
+        """
+
+        # Get.
+        result = await self.db.execute.select(
+            self.db_names['config'],
+            '`value`'
+        )
+
+        # Convert.
+        global_dict = {'datetime': Datetime}
+        result = [
+            eval(value, global_dict)
+            for value in result
+        ]
+
+        return result
+
+
+    async def __getitem__(self, key: str) -> ConfigValue:
+        """
+        Asynchronous get config value.
+
+        Parameters
+        ----------
+        key : Config key.
+
+        Returns
+        -------
+        Config value.
+        """
+
+        # Get.
+        value = await self.get(key, Null)
+
+        # Check.
+        if value == Null:
+            throw(KeyError, key)
+
+        return value
+
+
+    async def __setitem__(self, key_note: str | tuple[str, str], value: ConfigValue) -> None:
+        """
+        Asynchronous set config value.
+
+        Parameters
+        ----------
+        key_note : Config key and note.
+        value : Config value.
+        """
+
+        # Handle parameter.
+        if type(key_note) != str:
+            key, note = key_note
+        else:
+            key = key_note
+            note = None
+
+        # Set.
+        data = {
+            'key': key,
+            'value': repr(value),
+            'type': type(value).__name__,
+            'note': note
+        }
+        await self.db.execute.insert(
+            self.db_names['config'],
+            data,
+            'update'
+        )