python-http_request 0.0.6__py3-none-any.whl → 0.0.7.1__py3-none-any.whl

http_request/__init__.py

@@ -2,13 +2,13 @@
 # encoding: utf-8
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 0, 6)
+__version__ = (0, 0, 7)
 __all__ = [
     "SupportsGeturl", "url_origin", "complete_url", "cookies_str_to_dict", "headers_str_to_dict", 
     "encode_multipart_data", "encode_multipart_data_async", 
 ]
 
-from collections.abc import AsyncIterable, AsyncIterator, ItemsView, Iterable, Iterator, Mapping
+from collections.abc import AsyncIterable, AsyncIterator, Buffer, ItemsView, Iterable, Iterator, Mapping
 from itertools import chain
 from mimetypes import guess_type
 from os import fsdecode
@@ -19,14 +19,14 @@ 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, Buffer, SupportsRead
+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.+-]*)://")
+CRE_URL_SCHEME_match: Final = re_compile(r"(?i:[a-z][a-z0-9.+-]*)://").match
 
 
 @runtime_checkable
@@ -34,27 +34,41 @@ class SupportsGeturl(Protocol[AnyStr]):
     def geturl(self) -> AnyStr: ...
 
 
-def url_origin(url: str, /) -> str:
-    if url.startswith("://"):
+def url_origin(url: str, /, default_port: int = 0) -> str:
+    if url.startswith("/"):
+        url = "http://localhost" + url
+    elif url.startswith("//"):
+        url = "http:" + url
+    elif url.startswith("://"):
         url = "http" + url
-    elif CRE_URL_SCHEME.match(url) is None:
+    elif not CRE_URL_SCHEME_match(url):
         url = "http://" + url
     urlp = urlsplit(url)
-    scheme, netloc = urlp.scheme, urlp.netloc
-    if not netloc:
-        netloc = "localhost"
+    scheme, netloc = urlp.scheme or "http", urlp.netloc or "localhost"
+    if default_port and not urlp.port:
+        netloc = netloc.removesuffix(":") + f":{default_port}"
     return f"{scheme}://{netloc}"
 
 
-def complete_url(url: str, /) -> str:
-    if url.startswith("://"):
+def complete_url(url: str, /, default_port: int = 0) -> str:
+    if url.startswith("/"):
+        url = "http://localhost" + url
+    elif url.startswith("//"):
+        url = "http:" + url
+    elif url.startswith("://"):
         url = "http" + url
-    elif CRE_URL_SCHEME.match(url) is None:
+    elif not CRE_URL_SCHEME_match(url):
         url = "http://" + url
     urlp = urlsplit(url)
     repl = {"query": "", "fragment": ""}
-    if not urlp.netloc:
-        repl["path"] = "localhost"
+    if not urlp.scheme:
+        repl["scheme"] = "http"
+    netloc = urlp.netloc
+    if not netloc:
+        netloc = "localhost"
+    if default_port and not urlp.port:
+        netloc = netloc.removesuffix(":") + f":{default_port}"
+    repl["netloc"] = netloc
     return urlunsplit(urlp._replace(**repl)).rstrip("/")
 
 
@@ -76,9 +90,13 @@ def headers_str_to_dict(
     return text_to_dict(headers.strip(), kv_sep, entry_sep)
 
 
-def ensure_bytes(s, /) -> Buffer:
-    if isinstance(s, Buffer):
+def ensure_bytes(s, /) -> bytes:
+    if isinstance(s, bytes):
         return s
+    elif isinstance(s, memoryview):
+        return s.tobytes()
+    elif isinstance(s, Buffer):
+        return bytes(s)
     if isinstance(s, int):
         return int_to_bytes(s)
     elif isinstance(s, str):
@@ -93,9 +111,13 @@ def encode_multipart_data(
     data: None | Mapping[str, Any] = None, 
     files: None | Mapping[str, Buffer | SupportsRead[Buffer] | Iterable[Buffer]] = None, 
     boundary: None | str = None, 
+    file_suffix: str = "", 
 ) -> tuple[dict, Iterator[Buffer]]:
     if not boundary:
         boundary = uuid4().hex
+    suffix = bytes(file_suffix, "ascii")
+    if suffix and not suffix.startswith(b"."):
+        suffix = b"." + suffix
     headers = {"Content-Type": f"multipart/form-data; boundary={boundary}"}
 
     def encode_data(data) -> Iterator[Buffer]:
@@ -140,15 +162,18 @@ def encode_multipart_data(
             elif hasattr(file, "read"):
                 file = bio_chunk_iter(file)
                 if not filename:
-                    path = getattr(file, name, None)
+                    path = getattr(file, "name", None)
                     if path:
                         filename = basename(path)
                         if b"Content-Type" not in headers:
                             headers[b"Content-Type"] = ensure_bytes(guess_type(fsdecode(filename))[0] or b"application/octet-stream")
             if filename:
-                headers[b"Content-Disposition"] += b'; filename="%s"' % quote(filename).encode("ascii")
+                name = bytes(quote(filename), "ascii")
+                if not name.endswith(suffix):
+                    name += suffix
+                headers[b"Content-Disposition"] += b'; filename="%s"' % name
             else:
-                headers[b"Content-Disposition"] += b'; filename="%032x"' % uuid4().int
+                headers[b"Content-Disposition"] += b'; filename="%032x%s"' % (uuid4().int, suffix)
             yield boundary_line
             for entry in headers.items():
                 yield b"%s: %s\r\n" % entry
@@ -167,9 +192,13 @@ def encode_multipart_data_async(
     data: None | Mapping[str, Any] = None, 
     files: None | Mapping[str, Buffer | SupportsRead[Buffer] | Iterable[Buffer] | AsyncIterable[Buffer]] = None, 
     boundary: None | str = None, 
+    file_suffix: str = "", 
 ) -> tuple[dict, AsyncIterator[Buffer]]:
     if not boundary:
         boundary = uuid4().hex
+    suffix = bytes(file_suffix, "ascii")
+    if suffix and not suffix.startswith(b"."):
+        suffix = b"." + suffix
     headers = {"Content-Type": f"multipart/form-data; boundary={boundary}"}
 
     async def encode_data(data) -> AsyncIterator[Buffer]:
@@ -214,7 +243,7 @@ def encode_multipart_data_async(
             elif hasattr(file, "read"):
                 file = bio_chunk_async_iter(file)
                 if not filename:
-                    path = getattr(file, name, None)
+                    path = getattr(file, "name", None)
                     if path:
                         filename = basename(path)
                         if b"Content-Type" not in headers:
@@ -222,9 +251,12 @@ def encode_multipart_data_async(
             else:
                 file = ensure_aiter(file)
             if filename:
-                headers[b"Content-Disposition"] += b'; filename="%s"' % quote(filename).encode("ascii")
+                name = bytes(quote(filename), "ascii")
+                if not name.endswith(suffix):
+                    name += suffix
+                headers[b"Content-Disposition"] += b'; filename="%s"' % name
             else:
-                headers[b"Content-Disposition"] += b'; filename="%032x"' % uuid4().int
+                headers[b"Content-Disposition"] += b'; filename="%032x%s"' % (uuid4().int, suffix)
             yield boundary_line
             for entry in headers.items():
                 yield b"%s: %s\r\n" % entry

{python_http_request-0.0.6.dist-info → python_http_request-0.0.7.1.dist-info}/METADATA

@@ -1,30 +1,29 @@
 Metadata-Version: 2.1
 Name: python-http_request
-Version: 0.0.6
+Version: 0.0.7.1
 Summary: Python http response utils.
 Home-page: https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-http_request
 License: MIT
 Keywords: http,request
 Author: ChenyangGao
 Author-email: wosiwujm@gmail.com
-Requires-Python: >=3.10,<4.0
+Requires-Python: >=3.12,<4.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: integer_tool
-Requires-Dist: python-asynctools
-Requires-Dist: python-filewrap (>=0.1)
-Requires-Dist: python-texttools
+Requires-Dist: integer_tool (>=0.0.2)
+Requires-Dist: python-asynctools (>=0.0.10)
+Requires-Dist: python-filewrap (>=0.2.6)
+Requires-Dist: python-texttools (>=0.0.3)
 Project-URL: Repository, https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-http_request
 Description-Content-Type: text/markdown
 

python_http_request-0.0.7.1.dist-info/RECORD

@@ -0,0 +1,7 @@
+LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+http_request/__init__.py,sha256=kF6myD_k_IErV9JaoDT9dNaJO5Kd72EjDbwYDswohxk,10464
+http_request/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+python_http_request-0.0.7.1.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+python_http_request-0.0.7.1.dist-info/METADATA,sha256=jHqEf5N1uINz6-kK3_qgq2_PyzVfbhFL6t9BmSFGE8Q,1481
+python_http_request-0.0.7.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+python_http_request-0.0.7.1.dist-info/RECORD,,

{python_http_request-0.0.6.dist-info → python_http_request-0.0.7.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.8.1
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any

python_http_request-0.0.6.dist-info/RECORD

@@ -1,7 +0,0 @@
-LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-http_request/__init__.py,sha256=pfKYsbd6y5B3HYkGwbIzLi5dN5RTEqTKZE5qLGnVPoM,9223
-http_request/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_http_request-0.0.6.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-python_http_request-0.0.6.dist-info/METADATA,sha256=v7O-Y-qv1lb4xvO_vN7uaT1DFLfv4zfUiAJze73hG_o,1497
-python_http_request-0.0.6.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-python_http_request-0.0.6.dist-info/RECORD,,