http_client_request 0.0.3__tar.gz → 0.0.5__tar.gz

{http_client_request-0.0.3 → http_client_request-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: http_client_request
-Version: 0.0.3
+Version: 0.0.5
 Summary: http.client request extension.
 Home-page: https://github.com/ChenyangGao/python-modules/tree/main/http_client_request
 License: MIT

{http_client_request-0.0.3 → http_client_request-0.0.5}/http_client_request/__init__.py

@@ -2,7 +2,7 @@
 # coding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 0, 3)
+__version__ = (0, 0, 5)
 __all__ = ["ConnectionPool", "request"]
 
 from collections import defaultdict, deque, UserString
@@ -12,16 +12,17 @@ from http.cookiejar import CookieJar
 from http.cookies import SimpleCookie
 from inspect import signature
 from os import PathLike
-from socket import socket, MSG_DONTWAIT
+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 bio_chunk_iter, SupportsRead
+from filewrap import SupportsRead
 from http_request import normalize_request_args, SupportsGeturl
 from http_response import decompress_response, parse_response
 from undefined import undefined, Undefined
@@ -90,6 +91,10 @@ class ConnectionPool:
             for con in dq:
                 con.close()
 
+    def __repr__(self, /) -> str:
+        cls = type(self)
+        return f"{cls.__module__}.{cls.__qualname__}({self.pool!r})"
+
     def get_connection(
         self, 
         /, 
@@ -110,11 +115,18 @@ class ConnectionPool:
                 con = dq.popleft()
             except IndexError:
                 break
-            try:
-                if not con.sock or getattr(con.sock, "_closed") or socket.recv(con.sock, 1, MSG_DONTWAIT):
-                    con.connect()
-            except BlockingIOError:
-                pass
+            sock = con.sock
+            if not sock or getattr(sock, "_closed"):
+                con.connect()
+            else:
+                sock.setblocking(False)
+                try:
+                    if socket.recv(sock, 1):
+                        con.connect()
+                except BlockingIOError:
+                    pass
+                finally:
+                    sock.setblocking(True)
             con.timeout = timeout
             return con
         if url.scheme == "https":
@@ -248,23 +260,32 @@ def request[T](
         https_proxy = get_host_pair(proxies.get("https"))
     else:
         http_proxy = https_proxy = None
+    body: Any
     if isinstance(data, PathLike):
-        data = bio_chunk_iter(open(data, "rb"))
-    elif isinstance(data, SupportsRead):
-        data = bio_chunk_iter(data)
-    request_args = normalize_request_args(
-        method=method, 
-        url=url, 
-        params=params, 
-        data=data, 
-        json=json, 
-        files=files, 
-        headers=headers, 
-    )
+        data = open(data, "rb")
+    if isinstance(data, SupportsRead):
+        request_args = normalize_request_args(
+            method=method, 
+            url=url, 
+            params=params, 
+            headers=headers, 
+        )
+        body = data
+    else:
+        request_args = normalize_request_args(
+            method=method, 
+            url=url, 
+            params=params, 
+            data=data, 
+            files=files, 
+            json=json, 
+            headers=headers, 
+        )
+        body = request_args["data"]
     method   = request_args["method"]
     url      = request_args["url"]
-    body     = cast(None | Buffer | Iterable[Buffer], request_args["data"])
     headers_ = request_args["headers"]
+    headers_.setdefault("connection", "keep-alive")
     need_set_cookie = "cookie" not in headers_
     response_cookies = CookieJar()
     connection: HTTPConnection | HTTPSConnection
@@ -294,7 +315,7 @@ def request[T](
             headers_, 
         )
         response = connection.getresponse()
-        if pool:
+        if pool and headers_.get("connection") == "keep-alive":
             setattr(response, "pool", pool)
         setattr(response, "connection", connection)
         setattr(response, "url", url)
@@ -304,11 +325,21 @@ def request[T](
             extract_cookies(cookies, url, response) # type: ignore
         status_code = response.status
         if 300 <= status_code < 400 and follow_redirects:
-            url = request_args["url"] = urljoin(url, response.headers["location"])
-            if status_code == 303:
-                method = "GET"
-                body = None
-            continue
+            if location := response.headers.get("location"):
+                url = request_args["url"] = urljoin(url, location)
+                if body and status_code in (307, 308):
+                    if isinstance(body, SupportsRead):
+                        try:
+                            body.seek(0) # type: ignore
+                        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:
+                        method = "GET"
+                    body = None
+                continue
         elif status_code >= 400 and raise_for_status:
             raise HTTPError(
                 url, 
@@ -335,3 +366,4 @@ def request[T](
             return cast(Callable[[HTTPResponse, bytes], T], parse)(
                 response, content)
 
+# TODO: 实现异步请求，非阻塞模式(sock.setblocking(False))，对于响应体的数据加载，使用 select 模块进行通知

{http_client_request-0.0.3 → http_client_request-0.0.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "http_client_request"
-version = "0.0.3"
+version = "0.0.5"
 description = "http.client request extension."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"