reykit 1.1.84__py3-none-any.whl → 1.1.86__py3-none-any.whl

reykit/rbase.py

@@ -35,7 +35,6 @@ __all__ = (
     'ConfigMeta',
     'Singleton',
     'Null',
-    'null',
     'ErrorBase',
     'Exit',
     'Error',
@@ -205,15 +204,12 @@ class Singleton(Base):
         return self._instance
 
 
-class Null(Singleton):
+class Null(Base, metaclass=StaticMeta):
     """
     Null type.
     """
 
 
-null = Null()
-
-
 class ErrorBase(Base, BaseException):
     """
     Base error type.
@@ -591,7 +587,7 @@ def get_first_notnone(*values: None) -> NoReturn: ...
 @overload
 def get_first_notnone(*values: T) -> T: ...
 
-def get_first_notnone(*values: T, default: U = null) -> T | U:
+def get_first_notnone(*values: T, default: U | Null = Null) -> T | U:
     """
     Get the first value that is not `None`.
 
@@ -600,7 +596,7 @@ def get_first_notnone(*values: T, default: U = null) -> T | U:
     values : Check values.
     default : When all are `None`, then return this is value, or throw exception.
         - `Any`: Return this is value.
-        - `Literal['exception']`: Throw exception.
+        - `Null`: Throw exception.
 
     Returns
     -------
@@ -613,7 +609,7 @@ def get_first_notnone(*values: T, default: U = null) -> T | U:
             return value
 
     # Throw exception.
-    if default == null:
+    if default == Null:
         vars_name: list[str] = get_varname('values')
         if vars_name is not None:
             vars_name_de_dup = list(set(vars_name))

reykit/rdata.py

@@ -11,12 +11,12 @@
 
 from typing import Any, TypedDict, Literal, overload
 from collections import Counter, defaultdict as Defaultdict, ChainMap
-from collections.abc import Callable, Iterable, Generator
+from collections.abc import Callable, Iterable, Generator, AsyncGenerator
 from itertools import chain as IChain
 from decimal import Decimal
 from json import dumps as json_dumps
 
-from .rbase import T, KT, VT, Base, null, check_least_one, check_most_one, is_iterable
+from .rbase import T, KT, VT, Base, Null, check_least_one, check_most_one, is_iterable
 
 
 __all__ = (
@@ -337,14 +337,14 @@ def chain(*iterables: dict[KT, VT] | Iterable[T]) -> ChainMap[KT, VT] | IChain[T
     return data
 
 
-def default_dict(default: T = null, data: dict[KT, VT] | None = None) -> Defaultdict[KT, VT | T]:
+def default_dict(default: T | Null = Null, data: dict[KT, VT] | None = None) -> Defaultdict[KT, VT | T]:
     """
     Set `dict` instance, default value when key does not exist.
 
     Parameters
     ----------
     default : Default value.
-        - `Literal[null]`: Nest function self.
+        - `Null`: Nest function self.
         - `Callable`: Use call return value.
     data : `dict` instance.
         - `None`: Empty `dict`.
@@ -353,7 +353,7 @@ def default_dict(default: T = null, data: dict[KT, VT] | None = None) -> Default
     # Handle parameter.
 
     ## Null.
-    if default == null:
+    if default == Null:
         default_factory = default_dict
 
     ## Callable.
@@ -408,10 +408,9 @@ class FunctionGenerator(Base):
         self.args = args
         self.kwargs = kwargs
         self.params: list[tuple[tuple, dict]] = []
-        self.generator = self.__generator()
 
 
-    def __generator(self) -> Generator[Any, Any, None]:
+    def generator(self) -> Generator[Any, Any, None]:
         """
         Create generator.
 
@@ -435,6 +434,30 @@ class FunctionGenerator(Base):
             yield result
 
 
+    async def agenerator(self) -> AsyncGenerator[Any, Any]:
+        """
+        Asynchronous create generator.
+
+        Parameters
+        ----------
+        Generator.
+        """
+
+        # Loop.
+        while True:
+
+            # Break.
+            if self.params == []:
+                break
+
+            # Generate.
+            args, kwargs = self.params.pop(0)
+            result = self.func(*args, **kwargs)
+
+            # Return.
+            yield result
+
+
     def add(
         self,
         *args: Any,
@@ -480,7 +503,8 @@ class FunctionGenerator(Base):
         """
 
         # Generate.
-        result = next(self.generator)
+        generator = self.generator()
+        result = next(generator)
 
         return result
 
@@ -491,4 +515,33 @@ class FunctionGenerator(Base):
         """
 
         # Iterating.
-        return self.generator
+        generator = self.generator()
+
+        return generator
+
+
+    async def __anext__(self) -> Any:
+        """
+        Asynchronous generate once from generator.
+
+        Returns
+        -------
+        Generate value.
+        """
+
+        # Generate.
+        agenerator = await self.agenerator()
+        result = anext(agenerator)
+
+        return result
+
+
+    async def __aiter__(self) -> AsyncGenerator[Any, Any]:
+        """
+        Asynchronous iterating generator.
+        """
+
+        # Iterating.
+        agenerator = await self.agenerator()
+
+        return agenerator

reykit/rlog.py

@@ -29,7 +29,7 @@ from logging import (
 from logging.handlers import QueueHandler
 from concurrent_log_handler import ConcurrentRotatingFileHandler, ConcurrentTimedRotatingFileHandler
 
-from .rbase import Base, ConfigMeta, null, throw, catch_exc, get_first_notnone, get_stack_param
+from .rbase import Base, ConfigMeta, Null, throw, catch_exc, get_first_notnone, get_stack_param
 from .rre import search, sub
 from .rstdout import ConfigStdout, modify_print, reset_print
 from .rtext import to_text
@@ -954,7 +954,7 @@ class Mark(Base):
         self.data: dict[Hashable, set[int]] = {}
 
 
-    def mark(self, obj: Any, group: Hashable = null) -> int:
+    def mark(self, obj: Any, group: Hashable | Null = Null) -> int:
         """
         Mark object.
 
@@ -978,7 +978,7 @@ class Mark(Base):
         return obj_id
 
 
-    def remove(self, obj: Any, group: Hashable = null) -> None:
+    def remove(self, obj: Any, group: Hashable | Null = Null) -> None:
         """
         Whether marked.
 
@@ -1017,7 +1017,7 @@ class Mark(Base):
         del self.data[group]
 
 
-    def is_marked(self, obj: Any, group: Hashable = null) -> bool:
+    def is_marked(self, obj: Any, group: Hashable | Null = Null) -> bool:
         """
         Whether marked.
 

reykit/rmonkey.py

@@ -54,7 +54,7 @@ def monkey_sqlalchemy_result_more_fetch():
 
     # Add.
     @property
-    def method_data(self: Result) -> Self:
+    def method_data(self: 'Result') -> Self:
         """
         Get Data.
 
@@ -79,7 +79,7 @@ def monkey_sqlalchemy_result_more_fetch():
     CursorResult.to_excel = Table.to_excel
 
 
-    def method_show(self: Result, limit: int | None = None) -> None:
+    def method_show(self: 'Result', limit: int | None = None) -> None:
         """
         Print result.
 
@@ -131,7 +131,7 @@ def monkey_sqlalchemy_result_more_fetch():
 
 
     @property
-    def method_exist(self: Result) -> bool:
+    def method_exist(self: 'Result') -> bool:
         """
         Judge whether is exist row.
 
@@ -150,7 +150,7 @@ def monkey_sqlalchemy_result_more_fetch():
 
 
     @property
-    def method_empty(self: Result) -> bool:
+    def method_empty(self: 'Result') -> bool:
         """
         Judge whether is empty row.
 

reykit/rschedule.py

@@ -165,7 +165,7 @@ class Schedule(Base):
                     (self.db_names['base'], self.db_names['base.schedule']),
                     data
                 )
-                id_ = conn.insert_id
+                id_ = conn.insert_id()
 
             # Try execute.
 

{reykit-1.1.84.dist-info → reykit-1.1.86.dist-info}/METADATA

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

{reykit-1.1.84.dist-info → reykit-1.1.86.dist-info}/RECORD

@@ -1,17 +1,17 @@
 reykit/__init__.py,sha256=V86CHqPAAVkooVx3_QIOKpDIFVneQCTTSwfJ-uWgBno,788
 reykit/rall.py,sha256=7Hip02YOkIDm3_xkoSDjvvYV2LhdBV2r4UKzWWnIfIo,628
-reykit/rbase.py,sha256=6JSyAzVWxh6UdJdEmD7a7DDfmjEfHkO66K-Uax2Fxv0,21782
-reykit/rdata.py,sha256=NmOY_h4w2PY5xBbYNmOnb55w7PGsvvCzOBnxPjQ08qw,10293
+reykit/rbase.py,sha256=PL0IngbmGm7luNTQh22hdV-TlVjH9EtXEzeRVGOYnAU,21758
+reykit/rdata.py,sha256=iOU2_9RCihxrdXswZKvonVMIM-X5-L89WhawGDLHt4w,11361
 reykit/remail.py,sha256=l4HGKXdfHNBxyBT3YxeZyQhfecbElqTqSAGInwWhap8,6723
 reykit/rimage.py,sha256=lNN2iMpvSMqh-nPTpxrA9yHy43EA5WoYdxKYhqPwMgk,6154
-reykit/rlog.py,sha256=_opEDQUQfhAuIoDg2iS7wFU3KqL-tdWMvtbnwhsuVk4,25747
-reykit/rmonkey.py,sha256=9AeZRVoPuagV8j6Z-f02zbQFAYUUxeoyqYl7cJZ7RAE,7855
+reykit/rlog.py,sha256=M4UgS2gxYJOWv66ItyOv7AUJHJc1CsSDVYr9J0y2MwU,25768
+reykit/rmonkey.py,sha256=MJ_levUBl_oqkx8UoWbNwrRBGPWGwpfAh0B25tESFUk,7863
 reykit/rnet.py,sha256=McW4fX-omkD4_2BpLISHt2hpwIxK7EfDA5c6j3gn3E4,16874
 reykit/rnum.py,sha256=VKICD64mEfiStAGWaxg3kzQjf7TTqiSBNe9LCpM9MLo,3623
 reykit/ros.py,sha256=J6YxNbOceMhHwVKDugx5Wd-KFliRtlhFEVVcCAaE_So,47847
 reykit/rrand.py,sha256=fiwxyUMaLtFjPanVwTOiwvEEucmf0t2WiZF9ul9o6pU,8572
 reykit/rre.py,sha256=1qva7xatKVE9qC2j7IujjXSM59qxHWwTYpiizFFQ8Xo,6024
-reykit/rschedule.py,sha256=Xh5J8_5js-8yRXqOq4cjIlJEKuVAB4qme65D0zvwpLw,14694
+reykit/rschedule.py,sha256=jy6hxaIugyjSpUdQhPgCuubAZmRzKxHu4Nz3xM8Gid8,14696
 reykit/rstdout.py,sha256=yesWo7wIGablpyAu-2J2Gw11Qp3GdQjGICTyIcvLyt4,8200
 reykit/rsys.py,sha256=AP62KyN40flCeQJBclfJq8shachSAFT0LkVjiKsXkrw,24946
 reykit/rtable.py,sha256=UQ-JlwjssMR3gY1iY-VGQEKQ5_BZabpJy6TL7Fx19c4,12200
@@ -22,7 +22,7 @@ reykit/rwrap.py,sha256=G4TL2GWUaW9DrCFRcsnDE1CwgdWeP2PnjQckheRx4p0,15095
 reykit/rzip.py,sha256=BGEONswuBZxQ-zcgd_xp2fcvYesC9AmKaaXWvnT3bTI,3456
 reykit/rdll/__init__.py,sha256=nLSb8onBm2ilyoxzpDzUeGfSCKwkLEesIhzK3LiJ8mk,701
 reykit/rdll/rdll_core.py,sha256=o6-rKcTQgxZQe0kD3GnwyNb3KL9IogzgCQNOmYLMm7A,5086
-reykit-1.1.84.dist-info/METADATA,sha256=a69BSp6U5sm36PR2oqivuytXGSteXkvT7Mem4yKHMFc,1872
-reykit-1.1.84.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reykit-1.1.84.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reykit-1.1.84.dist-info/RECORD,,
+reykit-1.1.86.dist-info/METADATA,sha256=ySyPHRKNXeVMRKVlPWBYBTtpmJdqfhOa4QiH0CHCZO0,1872
+reykit-1.1.86.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reykit-1.1.86.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reykit-1.1.86.dist-info/RECORD,,