python-http_request 0.0.1__tar.gz → 0.0.3__tar.gz

{python_http_request-0.0.1 → python_http_request-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-http_request
-Version: 0.0.1
+Version: 0.0.3
 Summary: Python http response utils.
 Home-page: https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-http_request
 License: MIT

{python_http_request-0.0.1 → python_http_request-0.0.3}/http_request/__init__.py

@@ -2,18 +2,74 @@
 # encoding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 0, 1)
-__all__ = ["encode_multipart_data", "encode_multipart_data_async"]
+__version__ = (0, 0, 3)
+__all__ = [
+    "SupportsGeturl", "url_origin", "complete_url", "cookies_str_to_dict", "headers_str_to_dict", 
+    "encode_multipart_data", "encode_multipart_data_async", 
+]
 
 from itertools import chain
 from collections.abc import AsyncIterable, AsyncIterator, ItemsView, Iterable, Iterator, Mapping
-from typing import Any
-from urllib.parse import quote
+from re import compile as re_compile, Pattern
+from typing import Any, Final, Protocol, TypeVar
+from urllib.parse import quote, urlsplit, urlunsplit
 from uuid import uuid4
 
 from asynctools import ensure_aiter, async_chain
 from filewrap import bio_chunk_iter, bio_chunk_async_iter, SupportsRead
 from integer_tool import int_to_bytes
+from texttools import text_to_dict
+
+
+AnyStr = TypeVar("AnyStr", bytes, str, covariant=True)
+
+CRE_URL_SCHEME: Final = re_compile(r"^(?i:[a-z][a-z0-9.+-]*)://")
+
+
+class SupportsGeturl(Protocol[AnyStr]):
+    def geturl(self) -> AnyStr: ...
+
+
+def url_origin(url: str, /) -> str:
+    if url.startswith("://"):
+        url = "http" + url
+    elif CRE_URL_SCHEME.match(url) is None:
+        url = "http://" + url
+    urlp = urlsplit(url)
+    scheme, netloc = urlp.scheme, urlp.netloc
+    if not netloc:
+        netloc = "localhost"
+    return f"{scheme}://{netloc}"
+
+
+def complete_url(url: str, /) -> str:
+    if url.startswith("://"):
+        url = "http" + url
+    elif CRE_URL_SCHEME.match(url) is None:
+        url = "http://" + url
+    urlp = urlsplit(url)
+    repl = {"query": "", "fragment": ""}
+    if not urlp.netloc:
+        repl["path"] = "localhost"
+    return urlunsplit(urlp._replace(**repl)).rstrip("/")
+
+
+def cookies_str_to_dict(
+    cookies: str, 
+    /, 
+    kv_sep: str | Pattern[str] = re_compile(r"\s*=\s*"), 
+    entry_sep: str | Pattern[str] = re_compile(r"\s*;\s*"), 
+) -> dict[str, str]:
+    return text_to_dict(cookies.strip(), kv_sep, entry_sep)
+
+
+def headers_str_to_dict(
+    headers: str, 
+    /, 
+    kv_sep: str | Pattern[str] = re_compile(r":\s+"), 
+    entry_sep: str | Pattern[str] = re_compile("\n+"), 
+) -> dict[str, str]:
+    return text_to_dict(headers.strip(), kv_sep, entry_sep)
 
 
 def ensure_bytes(s, /) -> bytes | bytearray | memoryview:
@@ -31,14 +87,16 @@ def ensure_bytes(s, /) -> bytes | bytearray | memoryview:
 
 def encode_multipart_data(
     data: Mapping[str, Any], 
-    files: Mapping[str, bytes | bytearray | memoryview | SupportsRead[bytes] | Iterable[bytes]], 
+    files: Mapping[str, bytes | bytearray | memoryview | 
+                        SupportsRead[bytes] | SupportsRead[bytearray] | SupportsRead[memoryview] | 
+                        Iterable[bytes] | Iterable[bytearray] | Iterable[memoryview]], 
     boundary: None | str = None, 
-) -> tuple[dict, Iterator[bytes]]:
+) -> tuple[dict, Iterator[bytes | bytearray | memoryview]]:
     if not boundary:
         boundary = uuid4().bytes.hex()
     headers = {"Content-Type": f"multipart/form-data; boundary={boundary}"}
 
-    def encode_data(data) -> Iterator[bytes]:
+    def encode_data(data) -> Iterator[bytes | bytearray | memoryview]:
         if isinstance(data, Mapping):
             data = ItemsView(data)
         for name, value in data:
@@ -47,7 +105,7 @@ def encode_multipart_data(
             yield ensure_bytes(value)
             yield b"\r\n"
 
-    def encode_files(files) -> Iterator[bytes]:
+    def encode_files(files) -> Iterator[bytes | bytearray | memoryview]:
         if isinstance(files, Mapping):
             files = ItemsView(files)
         for name, file in files:
@@ -67,14 +125,17 @@ def encode_multipart_data(
 
 def encode_multipart_data_async(
     data: Mapping[str, Any], 
-    files: Mapping[str, bytes | bytearray | memoryview | SupportsRead[bytes] | Iterable[bytes] | AsyncIterable[bytes]], 
+    files: Mapping[str, bytes | bytearray | memoryview | 
+                        SupportsRead[bytes] | SupportsRead[bytearray] | SupportsRead[memoryview] | 
+                        Iterable[bytes] | Iterable[bytearray] | Iterable[memoryview] | 
+                        AsyncIterable[bytes] | AsyncIterable[bytearray] | AsyncIterable[memoryview]], 
     boundary: None | str = None, 
-) -> tuple[dict, AsyncIterator[bytes]]:
+) -> tuple[dict, AsyncIterator[bytes | bytearray | memoryview]]:
     if not boundary:
         boundary = uuid4().bytes.hex()
     headers = {"Content-Type": f"multipart/form-data; boundary={boundary}"}
 
-    async def encode_data(data) -> AsyncIterator[bytes]:
+    async def encode_data(data) -> AsyncIterator[bytes | bytearray | memoryview]:
         if isinstance(data, Mapping):
             data = ItemsView(data)
         for name, value in data:
@@ -83,7 +144,7 @@ def encode_multipart_data_async(
             yield ensure_bytes(value)
             yield b"\r\n"
 
-    async def encode_files(files) -> AsyncIterator[bytes]:
+    async def encode_files(files) -> AsyncIterator[bytes | bytearray | memoryview]:
         if isinstance(files, Mapping):
             files = ItemsView(files)
         for name, file in files:

{python_http_request-0.0.1 → python_http_request-0.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-http_request"
-version = "0.0.1"
+version = "0.0.3"
 description = "Python http response utils."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"