http_client_request 0.1.1__tar.gz → 0.1.2__tar.gz

{http_client_request-0.1.1 → http_client_request-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: http_client_request
-Version: 0.1.1
+Version: 0.1.2
 Summary: http.client request extension.
 License: MIT
 Keywords: http.client,request
@@ -21,12 +21,11 @@ Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: http_response (>=0.0.9)
-Requires-Dist: python-argtools (>=0.0.2)
 Requires-Dist: python-cookietools (>=0.1.4)
-Requires-Dist: python-dicttools (>=0.0.4)
+Requires-Dist: python-dicttools (>=0.0.5)
 Requires-Dist: python-filewrap (>=0.2.9)
 Requires-Dist: python-http_request (>=0.1.6)
-Requires-Dist: python-undefined (>=0.0.3)
+Requires-Dist: python-undefined (>=0.0.4)
 Requires-Dist: socket_keepalive (>=0.0.1)
 Requires-Dist: urllib3
 Requires-Dist: yarl

{http_client_request-0.1.1 → http_client_request-0.1.2}/http_client_request/__init__.py

@@ -4,7 +4,7 @@
 from __future__ import annotations
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 1, 1)
+__version__ = (0, 1, 2)
 __all__ = [
     "CONNECTION_POOL", "HTTPConnection", "HTTPSConnection", "HTTPResponse", 
     "ConnectionPool", "request", 
@@ -29,12 +29,11 @@ from urllib.error import HTTPError
 from urllib.parse import urljoin, urlsplit, urlunsplit, ParseResult, SplitResult
 from warnings import warn
 
-from argtools import argcount
 from cookietools import cookies_to_str, extract_cookies
 from dicttools import get_all_items
 from filewrap import SupportsRead
 from http_request import normalize_request_args, SupportsGeturl
-from http_response import decompress_response, parse_response
+from http_response import decompress_response, parse_response, get_length
 from socket_keepalive import socket_keepalive
 from urllib3 import HTTPResponse as Urllib3HTTPResponse, HTTPHeaderDict
 from undefined import undefined, Undefined
@@ -364,7 +363,7 @@ def request[T](
     proxies: None | str | dict[str, str] = None, 
     pool: None | Undefined | ConnectionPool = undefined,  
     *, 
-    parse: Callable[[HTTPResponse, bytes], T] | Callable[[HTTPResponse], T], 
+    parse: Callable[[HTTPResponse, bytes], T], 
     **request_kwargs, 
 ) -> T:
     ...
@@ -382,7 +381,7 @@ def request[T](
     proxies: None | str | dict[str, str] = None, 
     pool: None | Undefined | ConnectionPool = undefined, 
     *, 
-    parse: None | EllipsisType| bool | Callable[[HTTPResponse, bytes], T] | Callable[[HTTPResponse], T] = None, 
+    parse: None | EllipsisType| bool | Callable[[HTTPResponse, bytes], T] = None, 
     **request_kwargs, 
 ) -> HTTPResponse | bytes | str | dict | list | int | float | bool | None | T:
     if pool is undefined:
@@ -485,8 +484,10 @@ def request[T](
                     if status_code == 303:
                         method = "GET"
                     body = None
+                response.read()
                 continue
         elif status_code >= 400 and raise_for_status:
+            setattr(response, "content", response.read())
             raise HTTPError(
                 url, 
                 status_code, 
@@ -495,21 +496,23 @@ def request[T](
                 response, 
             )
         if parse is None:
+            if method == "HEAD":
+                response.read()
             return response
         elif parse is ...:
-            response.close()
+            try:
+                if (method == "HEAD" or 
+                    (length := get_length(response)) is not None and length <= 10485760
+                ):
+                    response.read()
+            finally:
+                response.close()
             return response
+        content = decompress_response(response.read(), response)
         if isinstance(parse, bool):
-            content = decompress_response(response.read(), response)
-            if parse:
-                return parse_response(response, content)
-            return content
-        ac = argcount(parse)
-        if ac == 1:
-            return cast(Callable[[HTTPResponse], T], parse)(response)
-        else:
-            content = decompress_response(response.read(), response)
-            return cast(Callable[[HTTPResponse, bytes], T], parse)(
-                response, content)
+            if not parse:
+                return content
+            parse = cast(Callable, parse_response)
+        return parse(response, content)
 
 # TODO: 实现异步请求，非阻塞模式(sock.setblocking(False))，对于响应体的数据加载，使用 select 模块进行通知

{http_client_request-0.1.1 → http_client_request-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "http_client_request"
-version = "0.1.1"
+version = "0.1.2"
 description = "http.client request extension."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"
@@ -28,12 +28,11 @@ include = [
 [tool.poetry.dependencies]
 python = "^3.12"
 http_response = ">=0.0.9"
-python-argtools = ">=0.0.2"
 python-cookietools = ">=0.1.4"
-python-dicttools = ">=0.0.4"
+python-dicttools = ">=0.0.5"
 python-filewrap = ">=0.2.9"
 python-http_request = ">=0.1.6"
-python-undefined = ">=0.0.3"
+python-undefined = ">=0.0.4"
 socket_keepalive = ">=0.0.1"
 urllib3 = "*"
 yarl = "*"