reykit 1.1.108__py3-none-any.whl → 1.1.109__py3-none-any.whl

reykit/rbase.py

@@ -50,7 +50,6 @@ __all__ = (
     'check_most_one',
     'check_file_found',
     'check_file_exist',
-    'check_response_code',
     'is_class',
     'is_instance',
     'is_iterable',
@@ -489,44 +488,6 @@ def check_file_exist(path: str) -> None:
         throw(FileExistsError, path)
 
 
-def check_response_code(
-    code: int,
-    range_: int | Iterable[int] | None = None
-) -> bool:
-    """
-    Check if the response code is in range.
-
-    Parameters
-    ----------
-    code : Response code.
-    range\\_ : Pass the code range.
-        - `None`: Check if is between 200 and 299.
-        - `int`: Check if is this value.
-        - `Iterable`: Check if is in sequence.
-
-    Returns
-    -------
-    Check result.
-    """
-
-    # Check.
-    match range_:
-        case None:
-            result = code // 100 == 2
-        case int():
-            result = code == range_
-        case _ if hasattr(range_, '__contains__'):
-            result = code in range_
-        case _:
-            throw(TypeError, range_)
-
-    # Throw exception.
-    if not result:
-        throw(AssertionError, code)
-
-    return result
-
-
 def is_class(obj: Any) -> bool:
     """
     Judge whether it is class.

reykit/rnet.py

@@ -14,7 +14,11 @@ from collections.abc import Callable, Iterable
 from warnings import filterwarnings
 from os.path import abspath as os_abspath, isfile as os_isfile
 from socket import socket as  Socket
-from urllib.parse import urlsplit as urllib_urlsplit, quote as urllib_quote, unquote as urllib_unquote
+from urllib.parse import (
+    urlsplit as urllib_urlsplit,
+    quote as urllib_quote,
+    unquote as urllib_unquote
+)
 from requests.api import request as requests_request
 from requests.models import Response
 from requests_cache import (
@@ -32,7 +36,7 @@ from datetime import datetime
 
 from .rbase import Base, throw, check_response_code
 from .ros import File, get_md5
-from .rre import search, split
+from .rre import search, split, sub
 
 
 __all__ = (
@@ -63,34 +67,45 @@ RequestCacheParameters = TypedDict(
 )
 
 
-def join_url(url: str, params: dict) -> str:
+def join_url(*urls: str, **params: dict) -> str:
     """
     Join URL and parameters.
 
     Parameters
     ----------
-    url : URL.
-    params : Parameters of URL.
+    urls : URL.
+    params : URL parameters.
 
     Returns
     -------
     Joined URL.
     """
 
-    # Join parameter.
-    params_str = '&'.join(
-        [
-            f'{key}={urllib_quote(value)}'
-            for key, value in params.items()
-        ]
-    )
+    # Check.
+    if len(urls) == 0:
+        throw(ValueError, urls)
 
     # Join URL.
-    if '?' not in url:
-        url += '?'
-    elif url[-1] != '?':
-        url += '&'
-    url += params_str
+    url: str = '/'.join(urls)
+    url = url.replace('\\', '/')
+    pattern = '(?<!:)//+'
+    url = sub(pattern, url, '/')
+    if url[-1] == '/':
+        url = url[:-1]
+
+    # Join parameter.
+    if params != {}:
+        params_str = '&'.join(
+            [
+                f'{key}={urllib_quote(str(value))}'
+                for key, value in params.items()
+            ]
+        )
+        if '?' not in url:
+            url += '?'
+        elif url[-1] != '?':
+            url += '&'
+        url += params_str
 
     return url
 
@@ -369,7 +384,24 @@ def request(
             range_ = None
         else:
             range_ = check
-        check_response_code(response.status_code, range_)
+        match range_:
+            case None:
+                result = response.status_code // 100 == 2
+            case int():
+                result = response.status_code == range_
+            case _ if hasattr(range_, '__contains__'):
+                result = response.status_code in range_
+            case _:
+                throw(TypeError, range_)
+
+        ## Throw exception.
+        if not result:
+            response_text = response.text[:100]
+            if len(response.text) > 100:
+                response_text += '...'
+            response_text = repr(response_text)
+            text = f"response code is '{response.status_code}', response content is {response_text}"
+            throw(AssertionError, text=text)
 
     return response
 

reykit/rtask.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """
-@Time    : 2022-12-19
+@Time    : 2022-12-19 20:06:20
 @Author  : Rey
 @Contact : reyxbo@163.com
 @Explain : Multi task methods.
@@ -715,7 +715,25 @@ async def async_request(
                     range_ = None
                 else:
                     range_ = check
-                check_response_code(response.status, range_)
+                match range_:
+                    case None:
+                        result = response.status // 100 == 2
+                    case int():
+                        result = response.status == range_
+                    case _ if hasattr(range_, '__contains__'):
+                        result = response.status in range_
+                    case _:
+                        throw(TypeError, range_)
+
+                ## Throw exception.
+                if not result:
+                    response_text = await response.text()
+                    response_text = response_text[:100]
+                    if len(response_text) > 100:
+                        response_text += '...'
+                    response_text = repr(response_text)
+                    text = f"response code is '{response.status_code}', response content is {response_text}"
+                    throw(AssertionError, text=text)
 
             # Receive.
             match handler:

{reykit-1.1.108.dist-info → reykit-1.1.109.dist-info}/METADATA

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

{reykit-1.1.108.dist-info → reykit-1.1.109.dist-info}/RECORD

@@ -1,12 +1,12 @@
 reykit/__init__.py,sha256=5oKzVHvTmotJB08LhrMFQO3tFVFy7JuqXMn9PqnJEH8,779
 reykit/rall.py,sha256=-gxGRcEcK7zTcA66DgGLw46QuDsJcdda6NQA_Xuyq8w,619
-reykit/rbase.py,sha256=pmfsU5GyAUQkMxsk2-g8Zf-dELb4ixAO4uG5DWzKrQE,22596
+reykit/rbase.py,sha256=w1hnRw0pOSj2Ws_DA206-QGrc5BzNryeZ9wx0BY6AxA,21713
 reykit/rdata.py,sha256=j3BBeWKMIwowjC-W_5wkJxIWvVlZsqt1mYMKuQbaPG0,11323
 reykit/remail.py,sha256=DE4sxfJEXNu6MiBJKUsWXqvBrIOJNmnm_1lnGL0tZec,6693
 reykit/rimage.py,sha256=z-cjI_MgEbUhuKgIbvDS_e2fy2CrnBhr_FS6D8XuAg0,6124
 reykit/rlog.py,sha256=yBArs48wl509v4q7e1vHbE3E_Bqi3VHEV-Iuw2Y58f8,25649
 reykit/rmonkey.py,sha256=PBA19EqlJHI9FxT8C4-t59RlyAfwfhX7xV9ZJ3PegWo,7894
-reykit/rnet.py,sha256=gL7doDgzEE-AwBPgz3LUFvgG8MmPpX-JU0sA9dm9C1Q,16837
+reykit/rnet.py,sha256=FmmI1wB0chBnMdCmeVVVOsD4K0iHio8vNgF_q8bX6E8,17870
 reykit/rnum.py,sha256=WNtvKSS-MkgmudIqDR8Xv4WIdNLyEPIO0jz5ukL3cXg,3603
 reykit/ros.py,sha256=quDCZfqpYtZRgyK2wtscm92oPm3PaKoBqDBAaM29HV8,47714
 reykit/rrand.py,sha256=nH0e4wRiLba7Tg6pRyn7qnPrzIXdlJxm7e4S1EqsBLQ,8549
@@ -15,14 +15,14 @@ reykit/rschedule.py,sha256=H7JQbX3kVFetmGS2EZ_216NnZj-ilGl6h1MusIx8ZWk,12288
 reykit/rstdout.py,sha256=YEKP8-OcCSk8TTtChgqTkO7NSnJ5LOb77d2qiE_3vLI,8081
 reykit/rsys.py,sha256=zxHeahRwCNonyprHfw6yFT9qMkITBwInOlWuvaXgnhQ,24894
 reykit/rtable.py,sha256=fTeuiZNGelSfAT-BIjT2u-wgkh9WpphgdD7gj_TcFw0,10587
-reykit/rtask.py,sha256=mnCl-LV23ccK6EvD4ZXInjPpMjRuq6lq2DYwTjYtYnw,27519
+reykit/rtask.py,sha256=78b1zlDAqqKb0XHbbYi8NhUjIJnslPMjTwksKY-RB1c,28393
 reykit/rtext.py,sha256=cf3a0uGmdr2ucKjGzYkQFkUPdixKJW1c82FPDdmRzwM,13227
 reykit/rtime.py,sha256=3UPpUK027TY1Wgf5bzwCQo1N4ZceZ2YtcZzM9I8Q9Qg,17766
 reykit/rwrap.py,sha256=lOKBhSqx8V_PcsdipPP4SaiGXXcpfaEhO_qEGSySEkw,15065
 reykit/rzip.py,sha256=vYw17toqg-DbMjvycluohU9zVX73uYYqQGAp_b21pA8,3433
 reykit/rdll/__init__.py,sha256=mewj06HHIzzW6oreQAz-6in2zYwNJ4-d1eWWL7CPQgc,685
 reykit/rdll/rdll_core.py,sha256=zBmOyxD6LkbNIadXmFHLJinj-6UFko8D6w5d7hYA7vU,5077
-reykit-1.1.108.dist-info/METADATA,sha256=-l4-TfoQ-xENjRaQF3fVABA1VOVvPzIVku289w1az7w,1882
-reykit-1.1.108.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reykit-1.1.108.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reykit-1.1.108.dist-info/RECORD,,
+reykit-1.1.109.dist-info/METADATA,sha256=uMdDhtS8qzYWPsPVAcXyljysE-PrkNEkSpPdq9p90SU,1882
+reykit-1.1.109.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reykit-1.1.109.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reykit-1.1.109.dist-info/RECORD,,