python-http_request 0.1.6.3__tar.gz → 0.1.7__tar.gz

{python_http_request-0.1.6.3 → python_http_request-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-http_request
-Version: 0.1.6.3
+Version: 0.1.7
 Summary: Python http request utils.
 License: MIT
 License-File: LICENSE
@@ -23,14 +23,13 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: http_response (>=0.0.9)
 Requires-Dist: orjson
-Requires-Dist: python-argtools (>=0.0.2)
-Requires-Dist: python-asynctools (>=0.1.3)
+Requires-Dist: python-asynctools (>=0.1.3.4)
 Requires-Dist: python-cookietools (>=0.1.4)
-Requires-Dist: python-dicttools (>=0.0.4)
+Requires-Dist: python-dicttools (>=0.0.5)
 Requires-Dist: python-ensure (>=0.0.1)
-Requires-Dist: python-filewrap (>=0.2.8)
-Requires-Dist: python-texttools (>=0.0.5)
-Requires-Dist: python-undefined (>=0.0.3)
+Requires-Dist: python-filewrap (>=0.2.9)
+Requires-Dist: python-texttools (>=0.0.6)
+Requires-Dist: python-undefined (>=0.0.4)
 Requires-Dist: socket_keepalive (>=0.0.1)
 Requires-Dist: yarl
 Project-URL: Homepage, https://github.com/ChenyangGao/python-modules/tree/main/python-http_request

{python_http_request-0.1.6.3 → python_http_request-0.1.7}/http_request/__init__.py

@@ -2,7 +2,7 @@
 # encoding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 1, 6)
+__version__ = (0, 1, 7)
 __all__ = [
     "SupportsGeturl", "url_origin", "complete_url", "ensure_ascii_url", 
     "urlencode", "cookies_str_to_dict", "headers_str_to_dict_by_lines", 
@@ -253,16 +253,17 @@ def encode_multipart_data(
             match value:
                 case [value]:
                     pass
-                case [_, value]:
+                case [filename, value]:
                     pass
-                case [_, value, file_type]:
+                case [filename, value, file_type]:
                     if file_type:
                         headers[b"content-type"] = ensure_bytes_(file_type)
-                case [_, value, file_type, file_headers, *rest]:
+                case [filename, value, file_type, file_headers, *_]:
                     for k, v in iter_items(file_headers):
                         headers[ensure_bytes_(k).lower()] = ensure_bytes_(v)
                     if file_type:
                         headers[b"content-type"] = ensure_bytes_(file_type)
+            filename = ensure_bytes_(filename)
         if isinstance(value, (PathLike, SupportsRead)):
             is_file = True
             if isinstance(value, PathLike):
@@ -347,16 +348,17 @@ def encode_multipart_data_async(
             match value:
                 case [value]:
                     pass
-                case [_, value]:
+                case [filename, value]:
                     pass
-                case [_, value, file_type]:
+                case [filename, value, file_type]:
                     if file_type:
                         headers[b"content-type"] = ensure_bytes_(file_type)
-                case [_, value, file_type, file_headers, *rest]:
+                case [filename, value, file_type, file_headers, *_]:
                     for k, v in iter_items(file_headers):
                         headers[ensure_bytes_(k).lower()] = ensure_bytes_(v)
                     if file_type:
                         headers[b"content-type"] = ensure_bytes_(file_type)
+            filename = ensure_bytes_(filename)
         if isinstance(value, (PathLike, SupportsRead)):
             is_file = True
             if isinstance(value, PathLike):

{python_http_request-0.1.6.3 → python_http_request-0.1.7}/http_request/extension/request.py

@@ -21,13 +21,13 @@ from typing import cast, overload, Any, Literal
 from urllib.parse import urljoin, urlsplit, urlunsplit
 from warnings import warn
 
-from argtools import argcount
 from cookietools import update_cookies, cookies_to_str
 from ensure import ensure_bytes, ensure_str
 from dicttools import iter_items
 from filewrap import bio_chunk_iter, bio_chunk_async_iter, SupportsRead
 from http_response import (
     get_status_code, headers_get, decompress_response, parse_response, 
+    get_length, 
 )
 from socket_keepalive import socket_keepalive
 from yarl import URL
@@ -143,6 +143,28 @@ async def call_async_close(response, /):
         pass
 
 
+def finalize(resp, /, maxsize: int = 0, method="GET"):
+    try:
+        if (method == "HEAD" or 
+            maxsize <= 0 or
+            (length := get_length(resp)) is not None and length <= maxsize
+        ):
+            call_read(resp)
+    finally:
+        call_close(resp)
+
+
+async def async_finalize(resp, /, maxsize: int = 0, method="GET"):
+    try:
+        if (method == "HEAD" or 
+            maxsize <= 0 or
+            (length := get_length(resp)) is not None and length <= maxsize
+        ):
+            await call_async_read(resp)
+    finally:
+        await call_async_close(resp)
+
+
 def urlopen(
     url: str, 
     method: str = "GET", 
@@ -277,7 +299,7 @@ def request_sync[Response, T](
     urlopen: Callable[..., Response] = urlopen, # type: ignore
     dont_decompress: None | bool = None, 
     *, 
-    parse: Callable[[Response, bytes], T] | Callable[[Response], T], 
+    parse: Callable[[Response, bytes], T], 
     **request_kwargs, 
 ) -> T:
     ...
@@ -295,7 +317,7 @@ def request_sync[Response, T](
     urlopen: Callable[..., Response] = urlopen, # type: ignore
     dont_decompress: None | bool = None, 
     *, 
-    parse: None | EllipsisType| bool | Callable[[Response, bytes], T] | Callable[[Response], T] = None, 
+    parse: None | EllipsisType| bool | Callable[[Response, bytes], T] = None, 
     **request_kwargs, 
 ) -> Response | bytes | str | dict | list | int | float | bool | None | T:
     if isinstance(data, PathLike):
@@ -342,61 +364,57 @@ def request_sync[Response, T](
                     update_cookies(cookies, base_cookies) # type: ignore
                 update_cookies(response_cookies, base_cookies)
         status_code = get_status_code(response)
-        if status_code >= 400 and raise_for_status:
+        if 300 <= status_code < 400:
+            if follow_redirects:
+                location = headers_get(response, "location")
+                if location and not isinstance(location, (Buffer, UserString, str)):
+                    location = location[0]
+                if location:
+                    location = ensure_str(location)
+                    request_url = request_kwargs["url"] = urljoin(request_url, location)
+                    if body and status_code in (307, 308):
+                        if isinstance(body, SupportsRead):
+                            try:
+                                body.seek(0) # type: ignore
+                                request_kwargs["data"] = bio_chunk_iter(body)
+                            except Exception:
+                                warn(f"unseekable-stream: {body!r}")
+                        elif not isinstance(body, Buffer):
+                            warn(f"failed to resend request body: {body!r}, when {status_code} redirects")
+                    else:
+                        if status_code == 303:
+                            request_kwargs["method"] = "GET"
+                        body = None
+                        request_kwargs["data"] = None
+                    finalize(response)
+                    del response
+                    continue
+        elif raise_for_status and status_code >= 400:
+            finalize(response)
             raise HTTPError(
                 url=request_kwargs["url"], 
                 status=status_code, 
                 method=request_kwargs["method"], 
                 response=response, 
             )
-        elif 300 <= status_code < 400 and follow_redirects:
-            location = headers_get(response, "location")
-            if location and not isinstance(location, (Buffer, UserString, str)):
-                location = location[0]
-            if location:
-                location = ensure_str(location)
-                request_url = request_kwargs["url"] = urljoin(request_url, location)
-                if body and status_code in (307, 308):
-                    if isinstance(body, SupportsRead):
-                        try:
-                            body.seek(0) # type: ignore
-                            request_kwargs["data"] = bio_chunk_iter(body)
-                        except Exception:
-                            warn(f"unseekable-stream: {body!r}")
-                    elif not isinstance(body, Buffer):
-                        warn(f"failed to resend request body: {body!r}, when {status_code} redirects")
-                else:
-                    if status_code == 303:
-                        request_kwargs["method"] = "GET"
-                    body = None
-                    request_kwargs["data"] = None
-                if request_kwargs["method"] != "HEAD":
-                    call_read(response)
-                call_close(response)
-                del response
-                continue
         if parse is None:
+            if request_kwargs["method"] == "HEAD":
+                finalize(response)
+            return response
+        elif parse is ...:
+            finalize(response, 10485760, method=request_kwargs["method"])
             return response
         try:
-            if parse is ...:
-                return response
-            if isinstance(parse, bool):
-                ac = 2
-                if parse:
-                    parse = cast(Callable[[Response, bytes], T], parse_response)
-                else:
-                    parse = lambda _, content: content
-            else:
-                ac = argcount(parse)
-            if ac == 1:
-                return cast(Callable[[Response], T], parse)(response)
-            else:
-                content = call_read(response)
-                if not dont_decompress:
-                    content = decompress_response(content, response)
-                return cast(Callable[[Response, bytes], T], parse)(response, content)
+            content = call_read(response)
         finally:
             call_close(response)
+        if not dont_decompress:
+            content = decompress_response(content, response)
+        if isinstance(parse, bool):
+            if not parse:
+                return content
+            parse = cast(Callable, parse_response)    
+        return parse(response, content)
 
 
 @overload
@@ -471,7 +489,7 @@ async def request_async[Response, T](
     urlopen: Callable[..., Response] = urlopen_async, # type: ignore
     dont_decompress: None | bool = None, 
     *, 
-    parse: Callable[[Response, bytes], T] | Callable[[Response], T], 
+    parse: Callable[[Response, bytes], T], 
     **request_kwargs, 
 ) -> T:
     ...
@@ -489,7 +507,7 @@ async def request_async[Response, T](
     urlopen: Callable[..., Response] = urlopen_async, # type: ignore
     dont_decompress: None | bool = None, 
     *, 
-    parse: None | EllipsisType| bool | Callable[[Response, bytes], T] | Callable[[Response], T] = None, 
+    parse: None | EllipsisType| bool | Callable[[Response, bytes], T] = None, 
     **request_kwargs, 
 ) -> Response | bytes | str | dict | list | int | float | bool | None | T:
     if isinstance(data, PathLike):
@@ -539,62 +557,61 @@ async def request_async[Response, T](
                     update_cookies(cookies, base_cookies) # type: ignore
                 update_cookies(response_cookies, base_cookies)
         status_code = get_status_code(response)
-        if status_code >= 400 and raise_for_status:
+        if 300 <= status_code < 400:
+            if follow_redirects:
+                location = headers_get(response, "location")
+                if location and not isinstance(location, (Buffer, UserString, str)):
+                    location = location[0]
+                if location:
+                    location = ensure_str(location)
+                    request_url = request_kwargs["url"] = urljoin(request_url, location)
+                    if body and status_code in (307, 308):
+                        if isinstance(body, SupportsRead):
+                            try:
+                                from asynctools import ensure_async
+                                await ensure_async(body.seek)(0) # type: ignore
+                                request_kwargs["data"] = bio_chunk_async_iter(body)
+                            except Exception:
+                                warn(f"unseekable-stream: {body!r}")
+                        elif not isinstance(body, Buffer):
+                            warn(f"failed to resend request body: {body!r}, when {status_code} redirects")
+                    else:
+                        if status_code == 303:
+                            request_kwargs["method"] = "GET"
+                        body = None
+                        request_kwargs["data"] = None
+                    await async_finalize(response)
+                    del response
+                    continue
+        elif raise_for_status and status_code >= 400:
+            await async_finalize(response)
             raise HTTPError(
                 url=request_kwargs["url"], 
                 status=status_code, 
                 method=request_kwargs["method"], 
                 response=response, 
             )
-        elif 300 <= status_code < 400 and follow_redirects:
-            location = headers_get(response, "location")
-            if location and not isinstance(location, (Buffer, UserString, str)):
-                location = location[0]
-            if location:
-                location = ensure_str(location)
-                request_url = request_kwargs["url"] = urljoin(request_url, location)
-                if body and status_code in (307, 308):
-                    if isinstance(body, SupportsRead):
-                        try:
-                            from asynctools import ensure_async
-                            await ensure_async(body.seek)(0) # type: ignore
-                            request_kwargs["data"] = bio_chunk_async_iter(body)
-                        except Exception:
-                            warn(f"unseekable-stream: {body!r}")
-                    elif not isinstance(body, Buffer):
-                        warn(f"failed to resend request body: {body!r}, when {status_code} redirects")
-                else:
-                    if status_code == 303:
-                        request_kwargs["method"] = "GET"
-                    body = None
-                    request_kwargs["data"] = None
-                if request_kwargs["method"] != "HEAD":
-                    await call_async_read(response)
-                await call_async_close(response)
-                del response
-                continue
         if parse is None:
+            if request_kwargs["method"] == "HEAD":
+                await async_finalize(response)
+            return response
+        elif parse is ...:
+            await async_finalize(response, 10485760, method=request_kwargs["method"])
             return response
         try:
-            if parse is ...:
-                return response
-            if isinstance(parse, bool):
-                ac = 2
-                if parse:
-                    parse = cast(Callable[[Response, bytes], T], parse_response)
-                else:
-                    parse = lambda _, content: content
-            else:
-                ac = argcount(parse)
-            if ac == 1:
-                return cast(Callable[[Response], T], parse)(response)
-            else:
-                content = await call_async_read(response)
-                if not dont_decompress:
-                    content = decompress_response(content, response)
-                return cast(Callable[[Response, bytes], T], parse)(response, content)
+            content = await call_async_read(response)
         finally:
             await call_async_close(response)
+        if not dont_decompress:
+            content = decompress_response(content, response)
+        if isinstance(parse, bool):
+            if not parse:
+                return content
+            parse = cast(Callable, parse_response)
+        ret = parse(response, content)
+        if isawaitable(ret):
+            ret = await ret
+        return ret
 
 
 @overload
@@ -612,7 +629,7 @@ def request[Response, T](
     urlopen: None | Callable[..., Response] = None, 
     dont_decompress: None | bool = None, 
     *, 
-    parse: None | EllipsisType | bool | Callable[[Response, bytes], T] | Callable[[Response], T] = None, 
+    parse: None | EllipsisType | bool | Callable[[Response, bytes], T] = None, 
     async_: Literal[False] = False, 
     **request_kwargs, 
 ) -> Response | bytes | str | dict | list | int | float | bool | None | T:
@@ -632,7 +649,7 @@ def request[Response, T](
     urlopen: None | Callable[..., Response] = None, 
     dont_decompress: None | bool = None, 
     *, 
-    parse: None | EllipsisType | bool | Callable[[Response, bytes], T] | Callable[[Response, bytes], Awaitable[T]] | Callable[[Response], T] | Callable[[Response], Awaitable[T]] = None, 
+    parse: None | EllipsisType | bool | Callable[[Response, bytes], T] | Callable[[Response, bytes], Awaitable[T]] = None, 
     async_: Literal[True], 
     **request_kwargs, 
 ) -> Awaitable[Response | bytes | str | dict | list | int | float | bool | None | T]:
@@ -651,7 +668,7 @@ def request[Response, T](
     urlopen: None | Callable[..., Response] = None, 
     dont_decompress: None | bool = None, 
     *, 
-    parse: None | EllipsisType | bool | Callable[[Response, bytes], T] | Callable[[Response, bytes], Awaitable[T]] | Callable[[Response], T] | Callable[[Response], Awaitable[T]] = None, 
+    parse: None | EllipsisType | bool | Callable[[Response, bytes], T] | Callable[[Response, bytes], Awaitable[T]] = None, 
     async_: Literal[False, True] = False, 
     **request_kwargs, 
 ) -> Response | bytes | str | dict | list | int | float | bool | None | T | Awaitable[Response | bytes | str | dict | list | int | float | bool | None | T]:

{python_http_request-0.1.6.3 → python_http_request-0.1.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-http_request"
-version = "0.1.6.3"
+version = "0.1.7"
 description = "Python http request utils."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"
@@ -29,14 +29,13 @@ include = [
 python = "^3.12"
 http_response = ">=0.0.9"
 orjson = "*"
-python-argtools = ">=0.0.2"
-python-asynctools = ">=0.1.3"
+python-asynctools = ">=0.1.3.4"
 python-cookietools = ">=0.1.4"
-python-dicttools = ">=0.0.4"
+python-dicttools = ">=0.0.5"
 python-ensure = ">=0.0.1"
-python-filewrap = ">=0.2.8"
-python-texttools = ">=0.0.5"
-python-undefined = ">=0.0.3"
+python-filewrap = ">=0.2.9"
+python-texttools = ">=0.0.6"
+python-undefined = ">=0.0.4"
 socket_keepalive = ">=0.0.1"
 yarl = "*"