reydb 1.1.51__py3-none-any.whl → 1.1.52__py3-none-any.whl

reydb/rconn.py

@@ -38,7 +38,7 @@ class DatabaseConnection(DatabaseBase):
         Parameters
         ----------
         db : `Database` instance.
-        autocommit: Whether automatic commit connection.
+        autocommit: Whether automatic commit execute.
         """
 
         # Import.

reydb/rdb.py

@@ -284,7 +284,7 @@ class Database(DatabaseBase):
 
         Parameters
         ----------
-        autocommit: Whether automatic commit connection.
+        autocommit: Whether automatic commit execute.
 
         Returns
         -------

reydb/rexec.py

@@ -9,7 +9,7 @@
 """
 
 
-from typing import Any, Literal
+from typing import Any, Literal, overload
 from collections.abc import Iterable, Generator, Container
 from enum import EnumType
 from sqlalchemy import text as sqlalchemy_text
@@ -17,6 +17,7 @@ from sqlalchemy.sql.elements import TextClause
 from reykit.rbase import throw, get_first_notnone
 from reykit.rdata import FunctionGenerator, to_json
 from reykit.rmonkey import monkey_sqlalchemy_result_more_fetch, monkey_sqlalchemy_row_index_field
+from reykit.rrand import randn
 from reykit.rre import findall
 from reykit.rstdout import echo
 from reykit.rtable import TableData, Table
@@ -891,6 +892,61 @@ class DatabaseExecute(DatabaseBase):
         return func_generator.generator
 
 
+    @overload
+    def sleep(self, report: bool | None = None) -> int: ...
+
+    @overload
+    def sleep(self, second: int, report: bool | None = None) -> int: ...
+
+    @overload
+    def sleep(self, low: int = 0, high: int = 10, report: bool | None = None) -> int: ...
+
+    @overload
+    def sleep(self, *thresholds: float, report: bool | None = None) -> float: ...
+
+    @overload
+    def sleep(self, *thresholds: float, precision: Literal[0], report: bool | None = None) -> int: ...
+
+    @overload
+    def sleep(self, *thresholds: float, precision: int, report: bool | None = None) -> float: ...
+
+    def sleep(self, *thresholds: float, precision: int | None = None, report: bool | None = None) -> float:
+        """
+        Let the database wait random seconds.
+
+        Parameters
+        ----------
+        thresholds : Low and high thresholds of random range, range contains thresholds.
+            - When `length is 0`, then low and high thresholds is `0` and `10`.
+            - When `length is 1`, then low and high thresholds is `0` and `thresholds[0]`.
+            - When `length is 2`, then low and high thresholds is `thresholds[0]` and `thresholds[1]`.
+        precision : Precision of random range, that is maximum decimal digits of return value.
+            - `None`: Set to Maximum decimal digits of element of parameter `thresholds`.
+            - `int`: Set to this value.
+        report : Whether report SQL execute information.
+            - `None`: Use attribute `default_report`.
+            - `bool`: Use this value.
+
+        Returns
+        -------
+        Random seconds.
+            - When parameters `precision` is `0`, then return int.
+            - When parameters `precision` is `greater than 0`, then return float.
+        """
+
+        # Handle parameter.
+        if len(thresholds) == 1:
+            second = thresholds[0]
+        else:
+            second = randn(*thresholds, precision=precision)
+
+        # Sleep.
+        sql = f'SELECT SLEEP({second})'
+        self.execute(sql, report=report)
+
+        return second
+
+
     def handle_sql(self, sql: str | TextClause) -> TextClause:
         """
         Handle SQL.

reydb/rinfo.py

@@ -9,7 +9,6 @@
 """
 
 
-from __future__ import annotations
 from typing import Any, Literal, overload
 
 from .rbase import DatabaseBase
@@ -32,21 +31,21 @@ class DatabaseInformation(DatabaseBase):
 
 
     @overload
-    def __call__(self: DatabaseInformationSchema | DatabaseInformationSchema | DatabaseInformationDatabase | DatabaseInformationTable) -> list[dict]: ...
+    def __call__(self: 'DatabaseInformationSchema | DatabaseInformationSchema | DatabaseInformationDatabase | DatabaseInformationTable') -> list[dict]: ...
 
     @overload
-    def __call__(self: DatabaseInformationSchema, name: str) -> DatabaseInformationDatabase: ...
+    def __call__(self: 'DatabaseInformationSchema', name: str) -> 'DatabaseInformationDatabase': ...
 
     @overload
-    def __call__(self: DatabaseInformationDatabase, name: str) -> DatabaseInformationTable: ...
+    def __call__(self: 'DatabaseInformationDatabase', name: str) -> 'DatabaseInformationTable': ...
 
     @overload
-    def __call__(self: DatabaseInformationTable, name: str) -> DatabaseInformationColumn: ...
+    def __call__(self: 'DatabaseInformationTable', name: str) -> 'DatabaseInformationColumn': ...
 
     @overload
-    def __call__(self: DatabaseInformationColumn) -> dict: ...
+    def __call__(self: 'DatabaseInformationColumn') -> dict: ...
 
-    def __call__(self, name: str | None = None) -> DatabaseInformationDatabase | DatabaseInformationTable | DatabaseInformationColumn | list[dict] | dict:
+    def __call__(self, name: str | None = None) -> 'DatabaseInformationDatabase | DatabaseInformationTable | DatabaseInformationColumn | list[dict] | dict':
         """
         Get information table or subclass instance.
 
@@ -125,15 +124,15 @@ class DatabaseInformation(DatabaseBase):
 
 
     @overload
-    def __getattr__(self: DatabaseInformationSchema, name: str) -> DatabaseInformationDatabase: ...
+    def __getattr__(self: 'DatabaseInformationSchema', name: str) -> 'DatabaseInformationDatabase': ...
 
     @overload
-    def __getattr__(self: DatabaseInformationDatabase, name: str) -> DatabaseInformationTable: ...
+    def __getattr__(self: 'DatabaseInformationDatabase', name: str) -> 'DatabaseInformationTable': ...
 
     @overload
-    def __getattr__(self: DatabaseInformationTable, name: str) -> DatabaseInformationColumn: ...
+    def __getattr__(self: 'DatabaseInformationTable', name: str) -> 'DatabaseInformationColumn': ...
 
-    def __getattr__(self, name: str) -> DatabaseInformationDatabase | DatabaseInformationTable | DatabaseInformationColumn:
+    def __getattr__(self, name: str) -> 'DatabaseInformationDatabase | DatabaseInformationTable | DatabaseInformationColumn':
         """
         Build subclass instance.
 

reydb/rorm.py

@@ -11,9 +11,10 @@
 
 from typing import Self, Any, Type, TypeVar, Generic, Final
 from functools import wraps as functools_wraps
+from pydantic import ConfigDict, field_validator as pydantic_field_validator, model_validator as pydantic_model_validator
 from sqlalchemy.orm import SessionTransaction
 from sqlalchemy.sql.dml import Insert, Update, Delete
-from sqlmodel import SQLModel, Session, Field as sqlmodel_Field
+from sqlmodel import SQLModel, Session, Table, Field as sqlmodel_Field
 from sqlmodel.sql._expression_select_cls import SelectOfScalar as Select
 from reykit.rbase import CallableT, is_instance
 
@@ -40,12 +41,42 @@ class DatabaseORMBase(DatabaseBase):
     """
 
 
+class DatabaseORMModelField(DatabaseBase):
+    """
+    Database ORM model filed type.
+    """
+
+
 class DatabaseORMModel(DatabaseORMBase, SQLModel):
     """
     Database ORM model type.
     """
 
 
+    def update(self, data: 'DatabaseORMModel | dict[dict, Any]') -> None:
+        """
+        Update attributes.
+
+        Parameters
+        ----------
+        data : `DatabaseORMModel` or `dict`.
+        """
+
+        # Update.
+        self.sqlmodel_update(data)
+
+
+    def validate(self) -> Self:
+        """
+        Validate all attributes, and copy self instance to new instance.
+        """
+
+        # Validate.
+        model = self.model_validate(self)
+
+        return model
+
+
     def copy(self) -> Self:
         """
         Copy self instance to new instance.
@@ -56,12 +87,76 @@ class DatabaseORMModel(DatabaseORMBase, SQLModel):
         """
 
         # Copy.
-        data = self.model_dump()
+        data = self.data
         instance = self.__class__(**data)
 
         return instance
 
 
+    @property
+    def data(self) -> dict[str, Any]:
+        """
+        All attributes data.
+
+        Returns
+        -------
+        data.
+        """
+
+        # Get.
+        data = self.model_dump()
+
+        return data
+
+
+    @classmethod
+    def table(cls_or_self) -> Table:
+        """
+        Mapping `Table` instance.
+
+        Returns
+        -------
+        Instance.
+        """
+
+        # Get.
+        table: Table = cls_or_self.__table__
+
+        return table
+
+
+    @classmethod
+    def comment(cls_or_self) -> str | None:
+        """
+        Table comment.
+
+        Returns
+        -------
+        Comment.
+        """
+
+        # Get.
+        table = cls_or_self.table()
+        comment = table.comment
+
+        return comment
+
+
+    @classmethod
+    def set_comment(cls_or_self, comment: str) -> None:
+        """
+        Set table comment.
+
+        Parameters
+        ----------
+        comment : Comment.
+        """
+
+        # Set.
+        table = cls_or_self.table()
+        table.comment = comment
+
+
 ModelT = TypeVar('ModelT', bound=DatabaseORMModel)
 
 
@@ -77,6 +172,9 @@ class DatabaseORM(DatabaseORMBase):
 
     Model = DatabaseORMModel
     Field = sqlmodel_Field
+    Config = ConfigDict
+    wrap_validate_filed = pydantic_field_validator
+    wrap_validate_model = pydantic_model_validator
 
 
     def __init__(self, db: Database) -> None:
@@ -90,27 +188,75 @@ class DatabaseORM(DatabaseORMBase):
 
         # Build.
         self.db = db
+        self._session = self.session(True)
+
+        ## Method.
+        self.get = self._session.get
+        self.gets = self._session.gets
+        self.all = self._session.all
+        self.add = self._session.add
 
         ## Avoid descriptor error.
         self.Field = sqlmodel_Field
 
 
-    def session(self):
+    def session(self, autocommit: bool = False):
         """
         Build `DataBaseORMSession` instance.
 
+        Parameters
+        ----------
+        autocommit: Whether automatic commit execute.
+
         Returns
         -------
         Instance.
         """
 
         # Build.
-        sess = DataBaseORMSession(self)
+        sess = DataBaseORMSession(self, autocommit)
 
         return sess
 
 
-    __call__ = session
+    def create(
+        self,
+        *models: Type[DatabaseORMModel] | DatabaseORMModel,
+        skip: bool = False
+    ) -> None:
+        """
+        Create table.
+
+        Parameters
+        ----------
+        models : ORM model instances.
+        check : Skip existing table.
+        """
+
+        # Create.
+        for model in models:
+            table = model.table()
+            table.create(self.db.engine, checkfirst=skip)
+
+
+    def drop(
+        self,
+        *models: Type[DatabaseORMModel] | DatabaseORMModel,
+        skip: bool = False
+    ) -> None:
+        """
+        Delete table.
+
+        Parameters
+        ----------
+        models : ORM model instances.
+        check : Skip not exist table.
+        """
+
+        # Create.
+        for model in models:
+            table = model.table()
+            table.drop(self.db.engine, checkfirst=skip)
 
 
 class DataBaseORMSession(DatabaseORMBase):
@@ -119,18 +265,24 @@ class DataBaseORMSession(DatabaseORMBase):
     """
 
 
-    def __init__(self, orm: DatabaseORM) -> None:
+    def __init__(
+        self,
+        orm: 'DatabaseORM',
+        autocommit: bool = False
+    ) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
         orm : `DatabaseORM` instance.
+        autocommit: Whether automatic commit execute.
         """
 
         # Build.
         self.orm = orm
-        self.session = Session(orm.db.engine)
+        self.autocommit = autocommit
+        self.session: Session | None = None
         self.begin: SessionTransaction | None = None
 
 
@@ -162,7 +314,9 @@ class DataBaseORMSession(DatabaseORMBase):
         """
 
         # Close.
-        self.session.close()
+        if self.session is not None:
+            self.session.close()
+            self.session = None
 
 
     def __enter__(self) -> Self:
@@ -202,9 +356,9 @@ class DataBaseORMSession(DatabaseORMBase):
     __del__ = close
 
 
-    def wrap_begin(method: CallableT) -> CallableT:
+    def wrap_transact(method: CallableT) -> CallableT:
         """
-        Decorator, create and store `SessionTransaction` instance.
+        Decorator, automated transaction.
 
         Parameters
         ----------
@@ -218,25 +372,76 @@ class DataBaseORMSession(DatabaseORMBase):
 
         # Define.
         @functools_wraps(method)
-        def wrap(self, *args, **kwargs):
+        def wrap(self: 'DataBaseORMSession', *args, **kwargs):
+
+            # Session.
+            if self.session is None:
+                self.session = Session(self.orm.db.engine)
 
-            # Create.
+            # Begin.
             if self.begin is None:
                 self.begin = self.session.begin()
 
             # Execute.
             result = method(self, *args, **kwargs)
 
+            # Autucommit.
+            if self.autocommit:
+                self.commit()
+                self.close()
+
             return result
 
 
         return wrap
 
 
-    @wrap_begin
+    @wrap_transact
+    def create(
+        self,
+        *models: Type[DatabaseORMModel] | DatabaseORMModel,
+        skip: bool = False
+    ) -> None:
+        """
+        Create table.
+
+        Parameters
+        ----------
+        models : ORM model instances.
+        check : Skip existing table.
+        """
+
+        # Create.
+        for model in models:
+            table = model.table()
+            table.create(self.session.connection(), checkfirst=skip)
+
+
+    @wrap_transact
+    def drop(
+        self,
+        *models: Type[DatabaseORMModel] | DatabaseORMModel,
+        skip: bool = False
+    ) -> None:
+        """
+        Delete table.
+
+        Parameters
+        ----------
+        models : ORM model instances.
+        check : Skip not exist table.
+        """
+
+        # Create.
+        for model in models:
+            table = model.table()
+            table.drop(self.session.connection(), checkfirst=skip)
+
+
+    @wrap_transact
     def get(self, model: Type[ModelT] | ModelT, key: Any | tuple[Any]) -> ModelT | None:
         """
-        select records by primary key.
+        Select records by primary key.
 
         Parameters
         ----------
@@ -257,10 +462,17 @@ class DataBaseORMSession(DatabaseORMBase):
         # Get.
         result = self.session.get(model, key)
 
+        # Autucommit.
+        if (
+            self.autocommit
+            and result is not None
+        ):
+            self.session.expunge(result)
+
         return result
 
 
-    @wrap_begin
+    @wrap_transact
     def gets(self, model: Type[ModelT] | ModelT, *keys: Any | tuple[Any]) -> list[ModelT]:
         """
         Select records by primary key sequence.
@@ -291,7 +503,7 @@ class DataBaseORMSession(DatabaseORMBase):
         return results
 
 
-    @wrap_begin
+    @wrap_transact
     def all(self, model: Type[ModelT] | ModelT) -> list[ModelT]:
         """
         Select all records.
@@ -305,13 +517,19 @@ class DataBaseORMSession(DatabaseORMBase):
         With records ORM model instance list.
         """
 
+        # Handle parameter.
+        if is_instance(model):
+            model = type(model)
+
         # Get.
-        models = self.select(model).execute()
+        select = Select(model)
+        models = self.session.exec(select)
+        models = list(models)
 
         return models
 
 
-    @wrap_begin
+    @wrap_transact
     def add(self, *models: DatabaseORMModel) -> None:
         """
         Insert records.
@@ -325,7 +543,7 @@ class DataBaseORMSession(DatabaseORMBase):
         self.session.add_all(models)
 
 
-    @wrap_begin
+    @wrap_transact
     def rm(self, *models: DatabaseORMModel) -> None:
         """
         Delete records.
@@ -340,7 +558,7 @@ class DataBaseORMSession(DatabaseORMBase):
             self.session.delete(model)
 
 
-    @wrap_begin
+    @wrap_transact
     def refresh(self, *models: DatabaseORMModel) -> None:
         """
         Refresh records.
@@ -355,7 +573,7 @@ class DataBaseORMSession(DatabaseORMBase):
             self.session.refresh(model)
 
 
-    @wrap_begin
+    @wrap_transact
     def expire(self, *models: DatabaseORMModel) -> None:
         """
         Mark records to expire, refresh on next call.
@@ -370,7 +588,7 @@ class DataBaseORMSession(DatabaseORMBase):
             self.session.expire(model)
 
 
-    @wrap_begin
+    @wrap_transact
     def select(self, model: Type[ModelT] | ModelT):
         """
         Build `DatabaseORMSelect` instance.
@@ -394,7 +612,7 @@ class DataBaseORMSession(DatabaseORMBase):
         return select
 
 
-    @wrap_begin
+    @wrap_transact
     def insert(self, model: Type[ModelT] | ModelT):
         """
         Build `DatabaseORMInsert` instance.
@@ -418,7 +636,7 @@ class DataBaseORMSession(DatabaseORMBase):
         return select
 
 
-    @wrap_begin
+    @wrap_transact
     def update(self, model: Type[ModelT] | ModelT):
         """
         Build `DatabaseORMUpdate` instance.
@@ -442,7 +660,7 @@ class DataBaseORMSession(DatabaseORMBase):
         return select
 
 
-    @wrap_begin
+    @wrap_transact
     def delete(self, model: Type[ModelT] | ModelT):
         """
         Build `DatabaseORMDelete` instance.

{reydb-1.1.51.dist-info → reydb-1.1.52.dist-info}/METADATA

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

{reydb-1.1.51.dist-info → reydb-1.1.52.dist-info}/RECORD

@@ -3,15 +3,15 @@ reydb/rall.py,sha256=GsXHqvT1k--U53HpDY4SALjIHN8rwgSxeXpJjH5gq2E,409
 reydb/rbase.py,sha256=A7or663TcrQyq56P813WsV4BlApZIzXOPdZLsT7KwWw,7040
 reydb/rbuild.py,sha256=6N8aLqCeX8JnOwQstVA2AuM0Rl5kUHx5Enrm2GGcGvo,31852
 reydb/rconfig.py,sha256=kkqJg68bGZTE3JqH9dF1n-c1shuPJ4O8Bqg7J9Pd2CM,12659
-reydb/rconn.py,sha256=48c9bkfMsC993RCBsa4Dvca_ysCwNhYU2d1xiULQ6g8,2813
-reydb/rdb.py,sha256=Ijxja3lb73YmJfzpJBT3bQrqz9rV3TC5w2shQfwj0gQ,12919
+reydb/rconn.py,sha256=AYGi_A4qMMHEAiH0lGtHpH2Q3PZylNFoBjGtXeDSNlA,2810
+reydb/rdb.py,sha256=ZtEb6LSL4yFw5pnolqL39fr7BgeGMMUk-OYotpx_Mrw,12916
 reydb/rerror.py,sha256=Lsl7UECYdIFYjd9t7RhvNcHdyGStI3gffm8zmkK1DEc,9943
-reydb/rexec.py,sha256=xROuWRjIj_j5Y2Iq41DhyyeQ7YNYCyv4pTih-7MxIoE,29073
+reydb/rexec.py,sha256=z82pYvtFQmYaKWeo26G7jT2f3f9IyxCPfF4n5Cf0LcM,31222
 reydb/rfile.py,sha256=8HSrlpuslSCcWzjeh2y4Fs7R_qnm3jS_c13CDrKxpaw,15182
-reydb/rinfo.py,sha256=cQe5AJmPT_OyaXcNHCmYip2NETAKRvvESateR2STcw4,12745
-reydb/rorm.py,sha256=miv5K73rJ_ut2hrwdX1HjJke8R94U3ns75NxhAig3_M,11605
+reydb/rinfo.py,sha256=4btKBBZzVXGuPsmswqXDxvjZQuAc9raQ0tpXvmft71s,12741
+reydb/rorm.py,sha256=DvRBRPdvfq019CZV21OJoTdcqicDZUBdSMzlikTFLXg,16563
 reydb/rparam.py,sha256=six7wwQRKycoscv-AGyQqsPjA4_TZgcGQ_jk7FZytQs,6803
-reydb-1.1.51.dist-info/METADATA,sha256=kmP4hYYegLCJrFtjs5V6pl5nBxI4fXSSjvlbYMBxXGI,1550
-reydb-1.1.51.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.1.51.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.1.51.dist-info/RECORD,,
+reydb-1.1.52.dist-info/METADATA,sha256=bNFHLGFuX0lblm5mSXi_Es8l0nHOLdt12-fSh54BaNU,1550
+reydb-1.1.52.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.1.52.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.1.52.dist-info/RECORD,,