http_client_request 0.1.0__tar.gz → 0.1.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: http_client_request
-Version: 0.1.0
+Version: 0.1.2
 Summary: http.client request extension.
 License: MIT
 Keywords: http.client,request
@@ -21,13 +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-property (>=0.0.3)
-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.0 → http_client_request-0.1.2}/http_client_request/__init__.py

@@ -4,14 +4,12 @@
 from __future__ import annotations
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 1, 0)
+__version__ = (0, 1, 2)
 __all__ = [
     "CONNECTION_POOL", "HTTPConnection", "HTTPSConnection", "HTTPResponse", 
     "ConnectionPool", "request", 
 ]
 
-import socket
-
 from array import array
 from collections import defaultdict, deque, UserString
 from collections.abc import Buffer, Callable, Iterable, Mapping
@@ -21,25 +19,21 @@ from http.client import (
 )
 from http.cookiejar import CookieJar
 from http.cookies import BaseCookie
-from io import BufferedReader
 from inspect import signature
 from os import PathLike
 from select import select
-from socket import socket as Socket
-from ssl import SSLWantReadError
+from socket import socket
 from types import EllipsisType
 from typing import cast, overload, Any, Final, Literal
 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 property import funcproperty
+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
@@ -70,7 +64,7 @@ def is_ipv6(host: str, /) -> bool:
         return False
 
 
-def sock_buf_readable(sock: Socket, /) -> bool:
+def sock_buf_readable(sock: socket, /) -> bool:
     rlist, *_ = select([sock], (), (), 0)
     return bool(rlist)
 
@@ -80,6 +74,8 @@ try:
     from termios import FIONREAD
 
     def sock_bufsize(sock, /) -> int:
+        if sock is None:
+            return 0
         sock_size = array("i", [0])
         ioctl(sock, FIONREAD, sock_size)
         return sock_size[0]
@@ -87,6 +83,8 @@ except ImportError:
     from ctypes import byref, c_ulong, WinDLL # type: ignore
     ws2_32 = WinDLL("ws2_32")
     def sock_bufsize(sock, /) -> int:
+        if sock is None:
+            return 0
         FIONREAD = 0x4004667f
         b = c_ulong(0)
         ws2_32.ioctlsocket(sock.fileno(), FIONREAD, byref(b))
@@ -102,70 +100,22 @@ class HTTPResponse(BaseHTTPResponse):
     def __del__(self, /):
         self.close()
 
-    @funcproperty
-    def _fp(self, /) -> BufferedReader:
-        return self.fp
-
-    @property
-    def buffer_size(self, /) -> int:
-        fp = self._fp
-        sock = fp.raw._sock
-        sock.setblocking(False)            
-        try:
-            cache_size = len(fp.peek() or b"")
-            while True:
-                buffer_size = cache_size + sock_bufsize(sock)
-                if cache_size == (cache_size := len(fp.peek() or b"")):
-                    return buffer_size
-        except (BlockingIOError, SSLWantReadError):
-            return 0
-        finally:
-            sock.setblocking(True)
-
-    @property
-    def unbuffer_size(self, /) -> int:
-        method = self.__dict__.get("method", "").upper()
-        content_length = self.length
-        if method == "HEAD" or content_length == 0:
-            return 0
-        if content_length:
-            return content_length - self.tell() - self.buffer_size
-        sock = self._fp.raw._sock
-        if sock_bufsize(sock) == sock.getsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF):
-            return -1
-        else:
-            return 0
-
-    @property
-    def unread_size(self, /) -> int:
-        method = self.__dict__.get("method", "").upper()
-        content_length = self.length
-        if method == "HEAD" or content_length == 0:
-            return 0
-        sock = self._fp.raw._sock
-        if content_length:
-            return content_length - self.tell()
-        elif sock_bufsize(sock) == sock.getsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF):
-            return -1
-        else:
-            return self.buffer_size
-
     def _close_conn(self, /):
-        fp = self._fp = self.fp
+        fp = self.fp
         setattr(self, "fp", None)
-        try:
-            pool = self.pool
-            connection = self.connection
-            if pool and connection:
-                if not 200 <= self.status < 300:
-                    try:
-                        self.read()
-                    except OSError:
-                        pass
-                pool.return_connection(connection)
-            else:
-                fp.close()
-        except AttributeError:
+        pool = getattr(self, "pool", None)
+        connection = getattr(self, "connection", None)
+        if pool and connection and not (
+            200 <= self.status < 300 and 
+            (length := self.length) and 
+            length - self._pos - len(fp.peek()) - sock_bufsize(connection.sock) > 1024 * 1024 * 10
+        ):
+            try:
+                self.read()
+            except OSError:
+                pass
+            pool.return_connection(connection)
+        else:
             fp.close()
 
     def get_urllib3_response(self, /) -> Urllib3HTTPResponse:
@@ -311,35 +261,8 @@ class ConnectionPool:
             except IndexError:
                 break
             con.timeout = timeout
-            sock = con.sock
-            resp = con.response
-            if con.state == "Idle" or not sock:
-                pass
-            elif con.state == "Request-sent" or getattr(sock, "_closed"):
+            if con.state != "Idle" or getattr(con.sock, "_closed"):
                 con.close()
-            elif resp and 0 < resp.unbuffer_size <= 1024 * 1024:
-                try:
-                    resp.read()
-                except (ConnectionResetError, BrokenPipeError):
-                    con.close()
-            else:
-                try:
-                    sock.setblocking(False)
-                except OSError:
-                    con.close()
-                else:
-                    try:
-                        if Socket.recv(sock, 1):
-                            con.close()
-                    except BlockingIOError:
-                        pass
-                    except (ConnectionResetError, BrokenPipeError):
-                        con.close()
-                    try:
-                        if not getattr(sock, "_closed"):
-                            sock.setblocking(True)
-                    except OSError:
-                        pass
             return con
         if url.scheme == "https":
             return HTTPSConnection(url.hostname or "localhost", url.port, timeout=timeout)
@@ -440,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:
     ...
@@ -458,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:
@@ -561,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, 
@@ -571,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.0 → http_client_request-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "http_client_request"
-version = "0.1.0"
+version = "0.1.2"
 description = "http.client request extension."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"
@@ -28,13 +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-property = ">=0.0.3"
-python-undefined = ">=0.0.3"
+python-undefined = ">=0.0.4"
 socket_keepalive = ">=0.0.1"
 urllib3 = "*"
 yarl = "*"