python-httpfile 0.0.5.1__tar.gz → 0.0.5.3__tar.gz

{python_httpfile-0.0.5.1 → python_httpfile-0.0.5.3}/PKG-INFO

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-httpfile
-Version: 0.0.5.1
+Version: 0.0.5.3
 Summary: Python httpfile.
-Home-page: https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-httpfile
 License: MIT
+License-File: LICENSE
 Keywords: http,file,wrapper
 Author: ChenyangGao
 Author-email: wosiwujm@gmail.com
@@ -18,6 +18,7 @@ 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.14
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries
@@ -27,7 +28,8 @@ Requires-Dist: python-asynctools (>=0.0.5)
 Requires-Dist: python-filewrap (>=0.2.1)
 Requires-Dist: python-property (>=0.0.2)
 Requires-Dist: python-urlopen (>=0.0.7.1)
-Project-URL: Repository, https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-httpfile
+Project-URL: Homepage, https://github.com/ChenyangGao/python-modules/tree/main/python-httpfile
+Project-URL: Repository, https://github.com/ChenyangGao/python-modules/tree/main/python-httpfile
 Description-Content-Type: text/markdown
 
 # Python httpfile.

{python_httpfile-0.0.5.1 → python_httpfile-0.0.5.3}/httpfile/__init__.py

@@ -18,7 +18,6 @@ from io import (
 )
 from os import fstat, stat, PathLike
 from shutil import COPY_BUFSIZE # type: ignore
-from sys import exc_info
 from typing import cast, overload, Any, BinaryIO, Literal, Self
 from types import MappingProxyType
 from warnings import warn
@@ -27,7 +26,6 @@ from asynctools import ensure_async, run_async
 from filewrap import AsyncBufferedReader, AsyncTextIOWrapper
 from http_response import get_filename, get_length, get_range, get_total_length, is_chunked, is_range_request
 from property import funcproperty
-from urlopen import urlopen
 
 
 def get_filesize(
@@ -103,7 +101,7 @@ class HTTPFileReader(RawIOBase, BinaryIO):
         # NOTE: If the offset of the forward seek is not higher than this value, 
         #       it will be directly read and discarded, default to 1 MB
         seek_threshold: int = 1 << 20, 
-        urlopen = urlopen, 
+        urlopen = None, 
     ):
         if headers:
             headers = {**headers, "accept-encoding": "identity"}
@@ -114,7 +112,7 @@ class HTTPFileReader(RawIOBase, BinaryIO):
         elif start < 0:
             headers["range"] = f"bytes={start}"
         if urlopen is None:
-            urlopen = globals()["urlopen"]
+            from http_request.extension.request import urlopen
         if callable(url):
             geturl = url
             def url():
@@ -510,7 +508,7 @@ class HTTPFileReader(RawIOBase, BinaryIO):
         else:
             buffer_size = buffering
         raw = self
-        buffer = BufferedReader(raw, buffer_size)
+        buffer: BufferedReader = BufferedReader(raw, buffer_size)
         if text_mode:
             return TextIOWrapper(
                 buffer, 
@@ -580,7 +578,7 @@ class AsyncHTTPFileReader(HTTPFileReader):
         elif start < 0:
             headers["range"] = f"bytes={start}"
         if urlopen is None:
-            urlopen = globals()["urlopen"]
+            from http_request.extension.request import urlopen
         if callable(url):
             geturl = url
             async def url() -> str:
@@ -1050,8 +1048,6 @@ if find_spec("requests"):
 
 
 if find_spec("aiohttp"):
-    from types import MethodType
-
     _aiohttp_urlopen = None
 
     class AiohttpFileReader(AsyncHTTPFileReader):
@@ -1068,33 +1064,17 @@ if find_spec("aiohttp"):
             global _aiohttp_urlopen
             from aiohttp import request, ClientSession
 
-            close_session = True
             if isinstance(urlopen, ClientSession):
                 urlopen = urlopen.get
-                close_session = False
-            if urlopen is None:
+            elif urlopen is None:
                 if _aiohttp_urlopen is None:
                     urlopen = _aiohttp_urlopen = partial(request, "GET")
                 else:
                     urlopen = _aiohttp_urlopen
-            else:
-                func = urlopen
-                if isinstance(func, partial):
-                    func = func.func
-                close_session = not (
-                    isinstance(func, MethodType) and 
-                    isinstance(func.__self__, ClientSession)
-                )
             async def urlopen_wrapper(url: str, headers: None | Mapping = headers):
-                resp = await urlopen(url, headers=headers).__aenter__()
-                async def aclose():
-                    if close_session:
-                        try:
-                            await resp._session.close()
-                        except AttributeError:
-                            pass
-                    resp.close()
-                resp.aclose = aclose
+                ctx = urlopen(url, headers=headers)
+                resp = await ctx.__aenter__()
+                resp.aclose = lambda: ctx.__aexit__(None, None, None)
                 resp.raise_for_status()
                 return resp
             await super().__ainit__(
@@ -1133,7 +1113,7 @@ if find_spec("httpx"):
             if "__del__" not in Client.__dict__:
                 setattr(Client, "__del__", lambda self: self.close())
             session = Client()
-        return session.send(
+        resp = session.send(
             request=session.build_request(
                 method=method, 
                 url=url, 
@@ -1143,6 +1123,8 @@ if find_spec("httpx"):
             follow_redirects=follow_redirects, 
             stream=stream, 
         )
+        setattr(resp, "session", session)
+        return resp
 
     async def httpx_request_async(
         url, 
@@ -1158,7 +1140,7 @@ if find_spec("httpx"):
             if "__del__" not in AsyncClient.__dict__:
                 setattr(AsyncClient, "__del__", lambda self: run_async(self.aclose()))
             session = AsyncClient()
-        return await session.send(
+        resp = await session.send(
             request=session.build_request(
                 method=method, 
                 url=url, 
@@ -1168,6 +1150,8 @@ if find_spec("httpx"):
             follow_redirects=follow_redirects, 
             stream=stream, 
         )
+        setattr(resp, "session", session)
+        return resp
 
     class HttpxFileReader(HTTPFileReader):
 
@@ -1242,6 +1226,6 @@ if find_spec("httpx"):
     __all__.append("HttpxFileReader")
     __all__.append("AsyncHttpxFileReader")
 
-# TODO: 增加 blacksheep 的 HTTPFileReader
+# TODO: 实现任意请求模块的 HTTPFileReader，只要它支持流式读取即可（分成 2 种类型：要么支持 read，要么支持迭代器）
 # TODO: 设计实现一个 HTTPFileWriter，用于实现上传，关闭后视为上传完成
 # TODO: httpx 重新实现 stream 和 async_stream 方法，确保不需要用上下文管理器，如此才能真的简化

{python_httpfile-0.0.5.1 → python_httpfile-0.0.5.3}/pyproject.toml

@@ -1,12 +1,12 @@
 [tool.poetry]
 name = "python-httpfile"
-version = "0.0.5.1"
+version = "0.0.5.3"
 description = "Python httpfile."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"
 readme = "readme.md"
-homepage = "https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-httpfile"
-repository = "https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-httpfile"
+homepage = "https://github.com/ChenyangGao/python-modules/tree/main/python-httpfile"
+repository = "https://github.com/ChenyangGao/python-modules/tree/main/python-httpfile"
 keywords = ["http", "file", "wrapper"]
 classifiers = [
     "License :: OSI Approved :: MIT License",