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

reykit/rmonkey.py

@@ -9,9 +9,6 @@
 """
 
 
-from __future__ import annotations
-
-
 __all__ = (
     'monkey_sqlalchemy_result_more_fetch',
     'monkey_sqlalchemy_row_index_field',
@@ -47,7 +44,6 @@ def monkey_sqlalchemy_result_more_fetch():
 
     # Import.
     from typing import Self
-    from types import MethodType
     from sqlalchemy.engine.cursor import CursorResult
     from pandas import DataFrame, NA, concat
     from .rbase import Base

reykit/rnet.py

@@ -211,22 +211,8 @@ def get_content_type(file: str | bytes) -> str | None:
 def request(
     url: str,
     params: dict | None = None,
+    data: dict | str | bytes | None = None,
     *,
-    headers: dict[str, str] = {},
-    timeout: float | None = None,
-    proxies: dict[str, str] = {},
-    stream: bool = False,
-    verify: bool = False,
-    method: Literal['get', 'post', 'put', 'patch', 'delete', 'options', 'head'] = Literal['get'],
-    check: bool | int | Iterable[int] = False
-) -> Response: ...
-
-@overload
-def request(
-    url: str,
-    params: dict | None = None,
-    *,
-    data: dict | str | bytes,
     files: dict[str, str | bytes | tuple[str | bytes, dict]] | None = None,
     headers: dict[str, str] = {},
     timeout: float | None = None,
@@ -237,28 +223,13 @@ def request(
     check: bool | int | Iterable[int] = False
 ) -> Response: ...
 
-@overload
-def request(
-    url: str,
-    params: dict | None = None,
-    *,
-    data: dict | str | bytes | None = None,
-    files: dict[str, str | bytes | tuple[str | bytes, dict]],
-    headers: dict[str, str] = {},
-    timeout: float | None = None,
-    proxies: dict[str, str] = {},
-    stream: bool = False,
-    verify: bool = False,
-    method: Literal['get', 'post', 'put', 'patch', 'delete', 'options', 'head'] | None = Literal['post'],
-    check: bool | int | Iterable[int] = False
-) -> Response: ...
 
 @overload
 def request(
     url: str,
     params: dict | None = None,
     *,
-    json: dict,
+    json: dict | None = None,
     headers: dict[str, str] = {},
     timeout: float | None = None,
     proxies: dict[str, str] = {},
@@ -312,7 +283,7 @@ def request(
         - `None`: No setup.
         - `dict[str, str]`: Name and use IP of each protocol.
     stream : Whether use stream request.
-    verify : Whether verify certificate.
+    verify : Whether verify SSL certificate.
     method : Request method.
         - `None`: Automatic judge.
             When parameter `data` or `json` or `files` not has value, then request method is `get`.

reykit/ros.py

@@ -9,7 +9,6 @@
 """
 
 
-from __future__ import annotations
 from typing import Any, Literal, TextIO, BinaryIO, overload, TYPE_CHECKING
 if TYPE_CHECKING:
     from _typeshed import OpenTextMode, OpenBinaryMode
@@ -297,7 +296,7 @@ def read_file_bytes(source: FileSourceBytes) -> bytes:
     return file_bytes
 
 
-def read_toml(path: str | File) -> dict[str, Any]:
+def read_toml(path: 'str | File') -> dict[str, Any]:
     """
     Read and parse TOML file.
     Treat nan as a None or null value.
@@ -353,12 +352,12 @@ class File(Base):
 
 
     @overload
-    def open(self, mode: OpenBinaryMode = 'wb+') -> BinaryIO: ...
+    def open(self, mode: 'OpenBinaryMode' = 'wb+') -> BinaryIO: ...
 
     @overload
-    def open(self, mode: OpenTextMode, encode: str = 'utf-8') -> TextIO: ...
+    def open(self, mode: 'OpenTextMode', encode: str = 'utf-8') -> TextIO: ...
 
-    def open(self, mode: OpenTextMode | OpenBinaryMode = 'wb+', encode: str = 'utf-8') -> TextIO | BinaryIO:
+    def open(self, mode: 'OpenTextMode | OpenBinaryMode' = 'wb+', encode: str = 'utf-8') -> TextIO | BinaryIO:
         """
         Open file.
 
@@ -824,7 +823,7 @@ class File(Base):
         return file_bytes
 
 
-    def __contains__(self, value: str | bytes) -> bool:
+    def __contains__(self, value: 'str | bytes') -> bool:
         """
         Judge if file text contain value.
 

reykit/rrand.py

@@ -9,7 +9,6 @@
 """
 
 
-from __future__ import annotations
 from typing import Literal, Self, overload
 from collections.abc import Sequence
 from string import digits as string_digits, ascii_letters as string_ascii_letters, punctuation as string_punctuation
@@ -39,7 +38,7 @@ class ConfigRandom(Base, metaclass=ConfigMeta):
     """
 
     # RRandom.
-    _rrandom_dict: dict[int, RandomSeed] = {}
+    _rrandom_dict: dict[int, 'RandomSeed'] = {}
 
 
 class RandomSeed(Base):

reykit/rtask.py

@@ -45,6 +45,9 @@ __all__ = (
 )
 
 
+type CallableCoroutine = Coroutine | ATask | Callable[[], Coroutine]
+
+
 class ThreadPool(Base):
     """
     Thread pool type.
@@ -307,26 +310,51 @@ class ThreadPool(Base):
 def async_run(
     coroutine: Coroutine[Any, Any, T] | ATask[Any, Any, T] | Callable[[], Coroutine[Any, Any, T]],
     *,
-    return_exceptions: bool = False
+    before: CallableCoroutine | None = None,
+    after: CallableCoroutine | None = None,
+    return_exc: bool = False
 ) -> T: ...
 
 @overload
 def async_run(
-    *coroutines: Coroutine[Any, Any, T] | ATask[Any, Any, T] |  Callable[[], Coroutine[Any, Any, T]],
-    return_exceptions: bool = False
+    *coroutines: Coroutine[Any, Any, T] | ATask[Any, Any, T] | Callable[[], Coroutine[Any, Any, T]],
+    before: CallableCoroutine | None = None,
+    after: CallableCoroutine | None = None,
+    return_exc: bool = False
 ) -> list[T]: ...
 
+@overload
 def async_run(
-    *coroutines: Coroutine[Any, Any, T] | ATask[Any, Any, T] |  Callable[[], Coroutine[Any, Any, T]],
-    return_exceptions: bool = False
+    coroutine: Coroutine[Any, Any, T] | ATask[Any, Any, T] | Callable[[], Coroutine[Any, Any, T]],
+    *,
+    before: CallableCoroutine | None = None,
+    after: CallableCoroutine | None = None,
+    return_exc: Literal[True]
+) -> T | BaseException: ...
+
+@overload
+def async_run(
+    *coroutines: Coroutine[Any, Any, T] | ATask[Any, Any, T] | Callable[[], Coroutine[Any, Any, T]],
+    before: CallableCoroutine | None = None,
+    after: CallableCoroutine | None = None,
+    return_exc: Literal[True]
+) -> list[T] | BaseException: ...
+
+def async_run(
+    *coroutines: Coroutine[Any, Any, T] | ATask[Any, Any, T] | Callable[[], Coroutine[Any, Any, T]],
+    before: CallableCoroutine | None = None,
+    after: CallableCoroutine | None = None,
+    return_exc: bool = False
 ) -> T | list[T]:
     """
     Asynchronous run coroutines.
 
     Parameters
     ----------
-    coroutines : `Coroutine` instances or `ATask` instances or `Coroutine` function.
-    return_exceptions : Whether return exception instances, otherwise throw first exception.
+    coroutines : `Coroutine` instances or `ATask` instances or `Coroutine` functions.
+    before : `Coroutine` instance or `ATask` instance or `Coroutine` function of execute before execute.
+    after : `Coroutine` instance or `ATask` instance or `Coroutine` function of execute after execute.
+    return_exc : Whether return exception instances, otherwise throw first exception.
 
     Returns
     -------
@@ -340,9 +368,14 @@ def async_run(
         else coroutine
         for coroutine in coroutines
     ]
+    if asyncio_iscoroutinefunction(before):
+        before = before()
+    if asyncio_iscoroutinefunction(after):
+        after = after()
+
 
     # Define.
-    async def async_run_coroutine() -> list:
+    async def async_run_coroutine() -> list[T]:
         """
         Asynchronous run coroutines.
 
@@ -351,8 +384,16 @@ def async_run(
         Run result list.
         """
 
+        # Before.
+        if before is not None:
+            await before
+
         # Gather.
-        results = await asyncio_gather(*coroutines, return_exceptions=return_exceptions)
+        results: list[T] = await asyncio_gather(*coroutines, return_exceptions=return_exc)
+
+        # After.
+        if after is not None:
+            await after
 
         return results
 
@@ -488,6 +529,94 @@ async def async_wait(
     return tm.total_spend
 
 
+@overload
+async def async_request(
+    url: str,
+    params: dict | None = None,
+    data: dict | str | bytes | None = None,
+    *,
+    headers: dict[str, str] = {},
+    timeout: float | None = None,
+    proxy: str | None = None,
+    ssl: bool = False,
+    method: Literal['get', 'post', 'put', 'patch', 'delete', 'options', 'head'] | None = None,
+    check: bool | int | Iterable[int] = False
+) -> bytes: ...
+
+@overload
+async def async_request(
+    url: str,
+    params: dict | None = None,
+    *,
+    json: dict | None = None,
+    headers: dict[str, str] = {},
+    timeout: float | None = None,
+    proxy: str | None = None,
+    ssl: bool = False,
+    method: Literal['get', 'post', 'put', 'patch', 'delete', 'options', 'head'] | None = None,
+    check: bool | int | Iterable[int] = False
+) -> bytes: ...
+
+@overload
+async def async_request(
+    url: str,
+    params: dict | None = None,
+    data: dict | str | bytes | None = None,
+    *,
+    headers: dict[str, str] = {},
+    timeout: float | None = None,
+    proxy: str | None = None,
+    ssl: bool = False,
+    method: Literal['get', 'post', 'put', 'patch', 'delete', 'options', 'head'] | None = None,
+    check: bool | int | Iterable[int] = False,
+    handler: tuple[str]
+) -> list: ...
+
+@overload
+async def async_request(
+    url: str,
+    params: dict | None = None,
+    *,
+    json: dict | None = None,
+    headers: dict[str, str] = {},
+    timeout: float | None = None,
+    proxy: str | None = None,
+    ssl: bool = False,
+    method: Literal['get', 'post', 'put', 'patch', 'delete', 'options', 'head'] | None = None,
+    check: bool | int | Iterable[int] = False,
+    handler: tuple[str]
+) -> list: ...
+
+@overload
+async def async_request(
+    url: str,
+    params: dict | None = None,
+    data: dict | str | bytes | None = None,
+    *,
+    headers: dict[str, str] = {},
+    timeout: float | None = None,
+    proxy: str | None = None,
+    ssl: bool = False,
+    method: Literal['get', 'post', 'put', 'patch', 'delete', 'options', 'head'] | None = None,
+    check: bool | int | Iterable[int] = False,
+    handler: Callable[[ClientResponse], Coroutine[Any, Any, T] | T]
+) -> T: ...
+
+@overload
+async def async_request(
+    url: str,
+    params: dict | None = None,
+    *,
+    json: dict | None = None,
+    headers: dict[str, str] = {},
+    timeout: float | None = None,
+    proxy: str | None = None,
+    ssl: bool = False,
+    method: Literal['get', 'post', 'put', 'patch', 'delete', 'options', 'head'] | None = None,
+    check: bool | int | Iterable[int] = False,
+    handler: Callable[[ClientResponse], Coroutine[Any, Any, T] | T]
+) -> T: ...
+
 async def async_request(
     url: str,
     params: dict | None = None,
@@ -496,6 +625,7 @@ async def async_request(
     headers: dict[str, str] = {},
     timeout: float | None = None,
     proxy: str | None = None,
+    ssl: bool = False,
     method: Literal['get', 'post', 'put', 'patch', 'delete', 'options', 'head'] | None = None,
     check: bool | int | Iterable[int] = False,
     handler: str | tuple[str] | Callable[[ClientResponse], Coroutine | Any] | None = None
@@ -521,6 +651,7 @@ async def async_request(
     headers : Request header data.
     timeout : Request maximun waiting time.
     proxy : Proxy URL.
+    ssl : Whether verify SSL certificate.
     method : Request method.
         - `None`: Automatic judge.
             When parameter `data` or `json` not has value, then request method is `get`.
@@ -571,7 +702,8 @@ async def async_request(
             json=json,
             headers=headers,
             timeout=timeout,
-            proxy=proxy
+            proxy=proxy,
+            ssl=ssl
         ) as response:
 
             # Check code.

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

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

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

@@ -5,24 +5,24 @@ reykit/rdata.py,sha256=NmOY_h4w2PY5xBbYNmOnb55w7PGsvvCzOBnxPjQ08qw,10293
 reykit/remail.py,sha256=l4HGKXdfHNBxyBT3YxeZyQhfecbElqTqSAGInwWhap8,6723
 reykit/rimage.py,sha256=lNN2iMpvSMqh-nPTpxrA9yHy43EA5WoYdxKYhqPwMgk,6154
 reykit/rlog.py,sha256=_opEDQUQfhAuIoDg2iS7wFU3KqL-tdWMvtbnwhsuVk4,25747
-reykit/rmonkey.py,sha256=Dj2GBzBDFXbo0Z-5f8Zep4dfbaIw1bo1FUmC31xvDuk,7929
-reykit/rnet.py,sha256=YvoLffHcMK43GMoXKQXDTHFP9fiVTH5uzmN-glRBuFY,17772
+reykit/rmonkey.py,sha256=9AeZRVoPuagV8j6Z-f02zbQFAYUUxeoyqYl7cJZ7RAE,7855
+reykit/rnet.py,sha256=McW4fX-omkD4_2BpLISHt2hpwIxK7EfDA5c6j3gn3E4,16874
 reykit/rnum.py,sha256=VKICD64mEfiStAGWaxg3kzQjf7TTqiSBNe9LCpM9MLo,3623
-reykit/ros.py,sha256=O5xAqVR1S5pGU-ryKh6JFN9ztO-GNMl_83fWoh75zOY,47873
-reykit/rrand.py,sha256=4VwooITgox54_GonELcJfcIpStDi-UJchpnyWKnyeIA,8606
+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/rstdout.py,sha256=yesWo7wIGablpyAu-2J2Gw11Qp3GdQjGICTyIcvLyt4,8200
 reykit/rsys.py,sha256=AP62KyN40flCeQJBclfJq8shachSAFT0LkVjiKsXkrw,24946
 reykit/rtable.py,sha256=UQ-JlwjssMR3gY1iY-VGQEKQ5_BZabpJy6TL7Fx19c4,12200
-reykit/rtask.py,sha256=NUTngUUDUZy3TqEHiuiKy17FcE0F1zS118KnKTsBjng,22838
+reykit/rtask.py,sha256=TeuHE4BN978AlOu5pcOvem7KK-6L0B50ncxNuS32nBw,27024
 reykit/rtext.py,sha256=cWHy19lDcJvpX7LU95kmRVsDimpAUaz5TbKC1h83gB4,13254
 reykit/rtime.py,sha256=lsSKaYFmYXlDN18yj2fLVTKSruzgygl8icW6_Fl42Xk,17807
 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.82.dist-info/METADATA,sha256=nM6ORwzi2NppYsEg2PD0SPzDxuzXWC7tK-y6lxBhMDs,1872
-reykit-1.1.82.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reykit-1.1.82.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reykit-1.1.82.dist-info/RECORD,,
+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,,