python-httpfile 0.0.2.1__py3-none-any.whl → 0.0.4__py3-none-any.whl

httpfile/__init__.py

@@ -1,30 +1,40 @@
 #!/usr/bin/env python3
 # encoding: utf-8
 
+from __future__ import annotations
+
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
-__version__ = (0, 0, 2)
+__version__ = (0, 0, 4)
 __all__ = ["HTTPFileReader", "AsyncHTTPFileReader"]
 
 import errno
 
-from collections.abc import Callable, Iterator, Mapping
+from collections.abc import Awaitable, Callable, Mapping
 from functools import cached_property, partial
-from http.client import HTTPResponse
+from importlib.util import find_spec
+from inspect import isawaitable
 from io import (
     BufferedReader, RawIOBase, TextIOWrapper, UnsupportedOperation, DEFAULT_BUFFER_SIZE, 
 )
 from os import fstat, stat, PathLike
 from shutil import COPY_BUFSIZE # type: ignore
-from typing import Any, BinaryIO, IO, Optional, Protocol, Self, TypeVar
+from sys import exc_info
+from typing import cast, overload, Any, BinaryIO, Literal, Self
 from types import MappingProxyType
 from warnings import warn
 
+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(file, /, dont_read: bool = True) -> int:
+def get_filesize(
+    file, 
+    /, 
+    dont_read: bool = True, 
+) -> int:
     if isinstance(file, (bytes, str, PathLike)):
         return stat(file).st_size
     curpos = 0
@@ -88,12 +98,12 @@ class HTTPFileReader(RawIOBase, BinaryIO):
         self, 
         /, 
         url: str | Callable[[], str], 
-        headers: Optional[Mapping] = None, 
+        headers: None | Mapping = None, 
         start: int = 0, 
         # 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: Callable[..., HTTPResponse] = urlopen, 
+        urlopen = urlopen, 
     ):
         if headers:
             headers = {**headers, "Accept-Encoding": "identity"}
@@ -103,6 +113,8 @@ class HTTPFileReader(RawIOBase, BinaryIO):
             headers["Range"] = f"bytes={start}-"
         elif start < 0:
             headers["Range"] = f"bytes={start}"
+        if urlopen is None:
+            urlopen = globals()["urlopen"]
         if callable(url):
             geturl = url
             def url():
@@ -146,7 +158,7 @@ class HTTPFileReader(RawIOBase, BinaryIO):
     def __exit__(self, /, *exc_info):
         self.close()
 
-    def __iter__(self, /):
+    def __iter__(self, /) -> Self:
         return self
 
     def __len__(self, /) -> int:
@@ -165,23 +177,36 @@ class HTTPFileReader(RawIOBase, BinaryIO):
         name = cls.__qualname__
         if module != "__main__":
             name = module + "." + name
-        return f"{name}({self.url!r}, urlopen={self.urlopen!r}, headers={self.headers!r})"
+        return f"{name}(url={self.url!r}, headers={self.headers!r}, start={self.tell()}, seek_threshold={self.seek_threshold}, urlopen={self.urlopen!r})"
 
     def __setattr__(self, attr, val, /):
         raise TypeError("can't set attribute")
 
     def _add_start(self, delta: int, /):
-        self.__dict__["start"] += delta
+        if not self.file_can_tell:
+            self.__dict__["start"] += delta
+
+    @cached_property
+    def file_can_tell(self, /) -> bool:
+        try:
+            self.file.tell()
+            return True
+        except (AttributeError, TypeError, OSError):
+            return False
+
+    @funcproperty
+    def file_closed(self, /) -> bool:
+        return self.file.closed
+
+    @property
+    def closed(self, /) -> bool:
+        return self.__dict__["closed"]
 
     def close(self, /):
         if not self.closed:
             self.response.close()
             self.__dict__["closed"] = True
 
-    @funcproperty
-    def closed(self, /):
-        return self.__dict__["closed"]
-
     @funcproperty
     def file(self, /) -> BinaryIO:
         return self.response
@@ -208,7 +233,7 @@ class HTTPFileReader(RawIOBase, BinaryIO):
             raise ValueError("I/O operation on closed file.")
         if size == 0 or not self.chunked and self.tell() >= self.length:
             return b""
-        if self.file.closed:
+        if self.file_closed:
             self.reconnect()
         if size is None or size < 0:
             data = self.file.read()
@@ -226,19 +251,19 @@ class HTTPFileReader(RawIOBase, BinaryIO):
             raise ValueError("I/O operation on closed file.")
         if not buffer or not self.chunked and self.tell() >= self.length:
             return 0
-        if self.file.closed:
+        if self.file_closed:
             self.reconnect()
         size = self.file.readinto(buffer)
         if size:
             self._add_start(size)
         return size
 
-    def readline(self, size: Optional[int] = -1, /) -> bytes:
+    def readline(self, size: None | int = -1, /) -> bytes:
         if self.closed:
             raise ValueError("I/O operation on closed file.")
         if size == 0 or not self.chunked and self.tell() >= self.length:
             return b""
-        if self.file.closed:
+        if self.file_closed:
             self.reconnect()
         if size is None or size < 0:
             data = self.file.readline()
@@ -253,14 +278,14 @@ class HTTPFileReader(RawIOBase, BinaryIO):
             raise ValueError("I/O operation on closed file.")
         if not self.chunked and self.tell() >= self.length:
             return []
-        if self.file.closed:
+        if self.file_closed:
             self.reconnect()
         ls = self.file.readlines(hint)
         if ls:
             self._add_start(sum(map(len, ls)))
         return ls
 
-    def reconnect(self, /, start: Optional[int] = None) -> int:
+    def reconnect(self, /, start: None | int = None) -> int:
         if not self._seekable:
             if start is None and self.tell() or start:
                 raise OSError(errno.EOPNOTSUPP, "Unsupport for reconnection of non-seekable streams.")
@@ -327,9 +352,15 @@ class HTTPFileReader(RawIOBase, BinaryIO):
         return self._seekable
 
     def tell(self, /) -> int:
-        return self.start
+        if self.file_can_tell:
+            start = self.start
+            if start >= self.length:
+                return start
+            return start + self.file.tell()
+        else:
+            return self.start
 
-    def truncate(self, size: Optional[int] = None, /):
+    def truncate(self, size: None | int = None, /):
         raise UnsupportedOperation(errno.ENOTSUP, "truncate")
 
     def writable(self, /) -> bool:
@@ -341,15 +372,109 @@ class HTTPFileReader(RawIOBase, BinaryIO):
     def writelines(self, lines, /):
         raise UnsupportedOperation(errno.ENOTSUP, "writelines")
 
+    @overload
+    @classmethod
+    def open(
+        cls, 
+        /, 
+        url: str | Callable[[], str], 
+        mode: Literal["br", "rb"], 
+        *, 
+        buffering: None | int = None, 
+        encoding: None | str = None, 
+        errors: None | str = None, 
+        newline: None | str = None, 
+        headers: None | Mapping = None, 
+        start: int = 0, 
+        seek_threshold: int = 1 << 20, 
+        urlopen = None, 
+    ) -> Self | BufferedReader:
+        ...
+    @overload
+    @classmethod
+    def open(
+        cls, 
+        /, 
+        url: str | Callable[[], str], 
+        mode: Literal["r", "rt", "tr"] = "r", 
+        *, 
+        buffering: None | int = None, 
+        encoding: None | str = None, 
+        errors: None | str = None, 
+        newline: None | str = None, 
+        headers: None | Mapping = None, 
+        start: int = 0, 
+        seek_threshold: int = 1 << 20, 
+        urlopen = None, 
+    ) -> TextIOWrapper:
+        ...
+    @classmethod
+    def open(
+        cls, 
+        /, 
+        url: str | Callable[[], str], 
+        mode: Literal["r", "rt", "tr", "br", "rb"] = "r", 
+        *, 
+        buffering: None | int = None, 
+        encoding: None | str = None, 
+        errors: None | str = None, 
+        newline: None | str = None, 
+        headers: None | Mapping = None, 
+        start: int = 0, 
+        seek_threshold: int = 1 << 20, 
+        urlopen = None, 
+    ) -> Self | BufferedReader | TextIOWrapper:
+        file = cls(
+            url=url, 
+            headers=headers, 
+            start=start, 
+            seek_threshold=seek_threshold, 
+            urlopen=urlopen, 
+        )
+        if mode not in ("r", "rt", "tr", "rb", "br"):
+            raise OSError(errno.EINVAL, f"invalid (or unsupported) mode: {mode!r}")
+        return file.wrap(
+            text_mode="b" not in mode, # type: ignore
+            buffering=buffering, 
+            encoding=encoding, 
+            errors=errors, 
+            newline=newline, 
+        )
+
+    @overload
     def wrap(
         self, 
         /, 
-        text_mode: bool = False, 
-        buffering: Optional[int] = None, 
-        encoding: Optional[str] = None, 
-        errors: Optional[str] = None, 
-        newline: Optional[str] = None, 
-    ) -> Self | IO:
+        text_mode: Literal[False] = False, 
+        *, 
+        buffering: None | int = None, 
+        encoding: None | str = None, 
+        errors: None | str = None, 
+        newline: None | str = None, 
+    ) -> Self | BufferedReader:
+        ...
+    @overload
+    def wrap(
+        self, 
+        /, 
+        text_mode: Literal[True], 
+        *, 
+        buffering: None | int = None, 
+        encoding: None | str = None, 
+        errors: None | str = None, 
+        newline: None | str = None, 
+    ) -> TextIOWrapper:
+        ...
+    def wrap(
+        self, 
+        /, 
+        text_mode: Literal[False, True] = False, 
+        *, 
+        buffering: None | int = None, 
+        encoding: None | str = None, 
+        errors: None | str = None, 
+        newline: None | str = None, 
+    ) -> Self | BufferedReader | TextIOWrapper:
         if buffering is None:
             if text_mode:
                 buffering = DEFAULT_BUFFER_SIZE
@@ -385,8 +510,443 @@ class HTTPFileReader(RawIOBase, BinaryIO):
             return buffer
 
 
-try:
-    from requests import Session
+class AsyncHTTPFileReader(HTTPFileReader):
+    url: str | Callable[[], Awaitable[str]] # type: ignore
+
+    def __init__(
+        self, 
+        /, 
+        url: str | Callable[[], str] | Callable[[], Awaitable[str]], 
+        headers: None | Mapping = None, 
+        start: int = 0, 
+        seek_threshold: int = 1 << 20, 
+        urlopen = urlopen, 
+    ):
+        run_async(self.__ainit__(
+            url=url, 
+            headers=headers, 
+            start=start, 
+            seek_threshold=seek_threshold, 
+            urlopen=urlopen, 
+        ))
+
+    async def __aenter__(self, /) -> Self:
+        return self
+
+    async def __aexit__(self, /, *exc_info):
+        await self.aclose()
+
+    def __aiter__(self, /) -> Self:
+        return self
+
+    async def __anext__(self, /) -> bytes:
+        if line := await self.readline():
+            return line
+        else:
+            raise StopAsyncIteration
+
+    async def __ainit__(
+        self, 
+        /, 
+        url: str | Callable[[], str] | Callable[[], Awaitable[str]], 
+        headers: None | Mapping = None, 
+        start: int = 0, 
+        seek_threshold: int = 1 << 20, 
+        urlopen = None, 
+    ):
+        if headers:
+            headers = {**headers, "Accept-Encoding": "identity"}
+        else:
+            headers = {"Accept-Encoding": "identity"}
+        if start > 0:
+            headers["Range"] = f"bytes={start}-"
+        elif start < 0:
+            headers["Range"] = f"bytes={start}"
+        if urlopen is None:
+            urlopen = globals()["urlopen"]
+        if callable(url):
+            geturl = url
+            async def url() -> str:
+                url = geturl()
+                if isawaitable(url):
+                    url = await url
+                headers_extra = getattr(url, "headers")
+                if headers_extra:
+                    headers.update(headers_extra)
+                return cast(str, url)
+        elif hasattr(url, "headers"):
+            headers_extra = getattr(url, "headers")
+            if headers_extra:
+                headers.update(headers_extra)
+        urlopen = ensure_async(urlopen, threaded=True)
+        response = await urlopen((await url()) if callable(url) else url, headers=headers)
+        if start:
+            rng = get_range(response)
+            if not rng:
+                raise OSError(errno.ESPIPE, "non-seekable")
+            start = rng[0]
+        self.__dict__.update(
+            url = url, 
+            response = response, 
+            length = get_total_length(response) or 0, 
+            chunked = is_chunked(response), 
+            start = start, 
+            closed = False, 
+            urlopen = urlopen, 
+            headers = MappingProxyType(headers), 
+            seek_threshold = max(seek_threshold, 0), 
+            _seekable = is_range_request(response), 
+        )
+
+    async def aclose(self, /):
+        if not self.closed:
+            self.__dict__["closed"] = True
+            await self.close_response()
+
+    def close(self, /):
+        if not self.closed:
+            self.__dict__["closed"] = True
+            try:
+                ret = self.response.aclose()
+            except (AttributeError, TypeError):
+                ret = self.response.close()
+            if isawaitable(ret):
+                run_async(ret)
+
+    async def close_response(self, /):
+        try:
+            ret = self.response.aclose()
+        except (AttributeError, TypeError):
+            ret = self.response.close()
+        if isawaitable(ret):
+            await ret
+
+    async def flush(self, /):
+        return await ensure_async(self.file.flush, threaded=True)()
+
+    async def read(self, size: int = -1, /) -> bytes: # type: ignore
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
+        if size == 0 or not self.chunked and self.tell() >= self.length:
+            return b""
+        if self.file_closed:
+            await self.reconnect()
+        if size is None or size < 0:
+            data = await ensure_async(self.file.read, threaded=True)()
+        else:
+            data = await ensure_async(self.file.read, threaded=True)(size)
+        if data:
+            self._add_start(len(data))
+        return data
+
+    async def readinto(self, buffer, /) -> int: # type: ignore
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
+        if not buffer or not self.chunked and self.tell() >= self.length:
+            return 0
+        if self.file_closed:
+            await self.reconnect()
+        size = await ensure_async(self.file.readinto, threaded=True)(buffer)
+        if size:
+            self._add_start(size)
+        return size
+
+    async def readline(self, size: None | int = -1, /) -> bytes: # type: ignore
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
+        if size == 0 or not self.chunked and self.tell() >= self.length:
+            return b""
+        if self.file_closed:
+            await self.reconnect()
+        if size is None or size < 0:
+            data = await ensure_async(self.file.readline, threaded=True)()
+        else:
+            data = await ensure_async(self.file.readline, threaded=True)(size)
+        if data:
+            self._add_start(len(data))
+        return data
+
+    async def readlines(self, hint: int = -1, /) -> list[bytes]: # type: ignore
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
+        if not self.chunked and self.tell() >= self.length:
+            return []
+        if self.file_closed:
+            await self.reconnect()
+        ls = await ensure_async(self.file.readlines, threaded=True)(hint)
+        if ls:
+            self._add_start(sum(map(len, ls)))
+        return ls
+
+    async def reconnect(self, /, start: None | int = None) -> int: # type: ignore
+        if not self._seekable:
+            if start is None and self.tell() or start:
+                raise OSError(errno.EOPNOTSUPP, "Unsupport for reconnection of non-seekable streams.")
+            start = 0
+        if start is None:
+            start = self.tell()
+        elif start < 0:
+            start = self.length + start
+            if start < 0:
+                start = 0
+        if start >= self.length:
+            self.__dict__.update(start=start)
+            return start
+        await self.close_response()
+        url = self.url
+        response = await self.urlopen(
+            (await url()) if callable(url) else url, 
+            headers={**self.headers, "Range": f"bytes={start}-"}
+        )
+        length_new = get_total_length(response)
+        if self.length != length_new:
+            raise OSError(errno.EIO, f"file size changed: {self.length} -> {length_new}")
+        self.__dict__.update(
+            response=response, 
+            start=start, 
+            closed=False, 
+        )
+        return start
+
+    async def seek(self, pos: int, whence: int = 0, /) -> int: # type: ignore
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
+        if not self._seekable:
+            raise OSError(errno.EINVAL, "not a seekable stream")
+        if whence == 0:
+            if pos < 0:
+                raise OSError(errno.EINVAL, f"negative seek start: {pos!r}")
+            old_pos = self.tell()
+            if old_pos == pos:
+                return pos
+            if pos > old_pos and (size := pos - old_pos) <= self.seek_threshold:
+                if size <= COPY_BUFSIZE:
+                    await self.read(size)
+                else:
+                    buf = bytearray(COPY_BUFSIZE)
+                    readinto = self.readinto
+                    while size > COPY_BUFSIZE:
+                        await readinto(buf)
+                        size -= COPY_BUFSIZE
+                    await self.read(size)
+            else:
+                await self.reconnect(pos)
+            return pos
+        elif whence == 1:
+            if pos == 0:
+                return self.tell()
+            return await self.seek(self.tell() + pos)
+        elif whence == 2:
+            return await self.seek(self.length + pos)
+        else:
+            raise OSError(errno.EINVAL, f"whence value unsupported: {whence!r}")
+
+    @classmethod
+    async def new(
+        cls, 
+        /, 
+        url: str | Callable[[], str], 
+        headers: None | Mapping = None, 
+        start: int = 0, 
+        seek_threshold: int = 1 << 20, 
+        urlopen = None, 
+    ) -> Self: # type: ignore
+        self = cls.__new__(cls)
+        await self.__ainit__(
+            url=url, 
+            headers=headers, 
+            start=start, 
+            seek_threshold=seek_threshold, 
+            urlopen=urlopen, 
+        )
+        return self
+
+    @overload # type: ignore
+    @classmethod
+    async def open(
+        cls, 
+        /, 
+        url: str | Callable[[], str], 
+        mode: Literal["br", "rb"], 
+        *, 
+        buffering: None | int = None, 
+        encoding: None | str = None, 
+        errors: None | str = None, 
+        newline: None | str = None, 
+        headers: None | Mapping = None, 
+        start: int = 0, 
+        seek_threshold: int = 1 << 20, 
+        urlopen = None, 
+    ) -> Self | AsyncBufferedReader:
+        ...
+    @overload
+    @classmethod
+    async def open(
+        cls, 
+        /, 
+        url: str | Callable[[], str], 
+        mode: Literal["r", "rt", "tr"] = "r", 
+        *, 
+        buffering: None | int = None, 
+        encoding: None | str = None, 
+        errors: None | str = None, 
+        newline: None | str = None, 
+        headers: None | Mapping = None, 
+        start: int = 0, 
+        seek_threshold: int = 1 << 20, 
+        urlopen = None, 
+    ) -> AsyncTextIOWrapper:
+        ...
+    @classmethod
+    async def open(
+        cls, 
+        /, 
+        url: str | Callable[[], str], 
+        mode: Literal["r", "rt", "tr", "br", "rb"] = "r", 
+        buffering: None | int = None, 
+        encoding: None | str = None, 
+        errors: None | str = None, 
+        newline: None | str = None, 
+        headers: None | Mapping = None, 
+        start: int = 0, 
+        seek_threshold: int = 1 << 20, 
+        urlopen = None, 
+    ) -> Self | AsyncBufferedReader | AsyncTextIOWrapper:
+        file = await cls.new(
+            url=url, 
+            headers=headers, 
+            start=start, 
+            seek_threshold=seek_threshold, 
+            urlopen=urlopen, 
+        )
+        if mode not in ("r", "rt", "tr", "rb", "br"):
+            raise OSError(errno.EINVAL, f"invalid (or unsupported) mode: {mode!r}")
+        return file.wrap(
+            text_mode="b" not in mode, # type: ignore
+            buffering=buffering, 
+            encoding=encoding, 
+            errors=errors, 
+            newline=newline, 
+        )
+
+    @overload
+    def wrap(
+        self, 
+        /, 
+        text_mode: Literal[False] = False, 
+        *, 
+        buffering: None | int = None, 
+        encoding: None | str = None, 
+        errors: None | str = None, 
+        newline: None | str = None, 
+    ) -> Self | AsyncBufferedReader:
+        ...
+    @overload
+    def wrap(
+        self, 
+        /, 
+        text_mode: Literal[True], 
+        *, 
+        buffering: None | int = None, 
+        encoding: None | str = None, 
+        errors: None | str = None, 
+        newline: None | str = None, 
+    ) -> AsyncTextIOWrapper:
+        ...
+    def wrap(
+        self, 
+        /, 
+        text_mode: bool = False, 
+        *, 
+        buffering: None | int = None, 
+        encoding: None | str = None, 
+        errors: None | str = None, 
+        newline: None | str = None, 
+    ) -> Self | AsyncBufferedReader | AsyncTextIOWrapper:
+        if buffering is None:
+            if text_mode:
+                buffering = DEFAULT_BUFFER_SIZE
+            else:
+                buffering = 0
+        if buffering == 0:
+            if text_mode:
+                raise OSError(errno.EINVAL, "can't have unbuffered text I/O")
+            return self
+        line_buffering = False
+        buffer_size: int
+        if buffering < 0:
+            buffer_size = DEFAULT_BUFFER_SIZE
+        elif buffering == 1:
+            if not text_mode:
+                warn("line buffering (buffering=1) isn't supported in binary mode, "
+                     "the default buffer size will be used", RuntimeWarning)
+            buffer_size = DEFAULT_BUFFER_SIZE
+            line_buffering = True
+        else:
+            buffer_size = buffering
+        raw = self
+        buffer = AsyncBufferedReader(raw, buffer_size)
+        if text_mode:
+            return AsyncTextIOWrapper(
+                buffer, 
+                encoding=encoding, 
+                errors=errors, 
+                newline=newline, 
+                line_buffering=line_buffering, 
+            )
+        else:
+            return buffer
+
+
+if find_spec("urllib3"):
+    from urllib.error import HTTPError
+
+    _urllib3_urlopen = None
+
+    class Urllib3FileReader(HTTPFileReader):
+
+        def __init__(
+            self, 
+            /, 
+            url: str | Callable[[], str], 
+            headers: None | Mapping = None, 
+            start: int = 0, 
+            seek_threshold: int = 1 << 20, 
+            urlopen = None, 
+        ):
+            global _urllib3_urlopen
+            from urllib3 import request
+            from urllib3.poolmanager import PoolManager
+
+            if isinstance(urlopen, PoolManager):
+                urlopen = partial(urlopen.request, "GET", preload_content=False)
+            elif urlopen is None:
+                if _urllib3_urlopen is None:
+                    urlopen = _urllib3_urlopen = partial(cast(Callable, request), "GET", preload_content=False)
+                else:
+                    urlopen = _urllib3_urlopen
+            else:
+                urlopen = partial(urlopen, preload_content=False)
+
+            def urlopen_wrapper(url: str, headers: None | Mapping = headers):
+                resp = urlopen(url, headers=headers)
+                if resp.status >= 400:
+                    raise HTTPError(resp.url, resp.status, resp.reason, resp.headers, resp)
+                return resp
+
+            super().__init__(
+                url, 
+                headers=headers, 
+                start=start, 
+                seek_threshold=seek_threshold, 
+                urlopen=urlopen_wrapper, 
+            )
+
+    __all__.append("Urllib3FileReader")
+
+
+if find_spec("requests"):
+    _requests_urlopen = None
 
     class RequestsFileReader(HTTPFileReader):
 
@@ -394,13 +954,26 @@ try:
             self, 
             /, 
             url: str | Callable[[], str], 
-            headers: Optional[Mapping] = None, 
+            headers: None | Mapping = None, 
             start: int = 0, 
             seek_threshold: int = 1 << 20, 
-            urlopen: Callable = Session().get, 
+            urlopen = None, 
         ):
-            def urlopen_wrapper(url: str, headers: Optional[Mapping] = headers):
-                resp = urlopen(url, headers=headers, stream=True)
+            global _requests_urlopen
+            from requests import request, Session
+            if isinstance(urlopen, Session):
+                urlopen = partial(urlopen.request, "GET", stream=True)
+            elif urlopen is None:
+                if _requests_urlopen is None:
+                    if "__del__" not in Session.__dict__:
+                        setattr(Session, "__del__", lambda self, /: self.close())
+                    urlopen = _requests_urlopen = partial(request, "GET", stream=True)
+                else:
+                    urlopen = _requests_urlopen
+            else:
+                urlopen = partial(urlopen, stream=True)
+            def urlopen_wrapper(url: str, headers: None | Mapping = headers):
+                resp = urlopen(url, headers=headers)
                 resp.raise_for_status()
                 return resp
             super().__init__(
@@ -411,41 +984,217 @@ try:
                 urlopen=urlopen_wrapper, 
             )
 
-        def _add_start(self, delta: int, /):
-            pass
-
         @funcproperty
         def file(self, /) -> BinaryIO:
             return self.response.raw
 
-        def tell(self, /) -> int:
-            start = self.start
-            if start >= self.length:
-                return start
-            return start + self.file.tell()
-
     __all__.append("RequestsFileReader")
-except ImportError:
-    pass
 
 
-try:
-    from aiohttp import ClientSession
+if find_spec("aiohttp"):
+    from types import MethodType
 
-    ...
-except ImportError:
-    pass
+    _aiohttp_urlopen = None
 
+    class AiohttpFileReader(AsyncHTTPFileReader):
 
-try:
-    from httpx import Client, AsyncClient
+        async def __ainit__(
+            self, 
+            /, 
+            url: str | Callable[[], str] | Callable[[], Awaitable[str]], 
+            headers: None | Mapping = None, 
+            start: int = 0, 
+            seek_threshold: int = 1 << 20, 
+            urlopen = None, 
+        ):
+            global _aiohttp_urlopen
+            from aiohttp import request, ClientSession
 
-    ...
-except ImportError:
-    pass
+            close_session = True
+            if isinstance(urlopen, ClientSession):
+                urlopen = urlopen.get
+                close_session = False
+            if 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
+                resp.raise_for_status()
+                return resp
+            await super().__ainit__(
+                url=url, 
+                headers=headers, 
+                start=start, 
+                seek_threshold=seek_threshold, 
+                urlopen=urlopen_wrapper, 
+            )
 
+        @funcproperty
+        def file(self, /) -> BinaryIO:
+            return self.response.content
 
-# TODO: 实现 AsyncHTTPFileReader
-# TODO: 支持异步文件，使用 aiohttp，参考 aiofiles 的接口实现
-# TODO: 设计实现一个 HTTPFileWriter，用于实现上传，关闭后视为上传完成
+        @funcproperty
+        def file_closed(self, /) -> bool:
+            return self.response.closed
+
+    __all__.append("AiohttpFileReader")
+
+
+if find_spec("httpx"):
+    from filewrap import bytes_iter_to_reader, bytes_iter_to_async_reader
+
+    _httpx_urlopen = None
+    _httpx_urlopen_async = None
+
+    class HttpxFileReader(HTTPFileReader):
 
+        def __init__(
+            self, 
+            /, 
+            url: str | Callable[[], str], 
+            headers: None | Mapping = None, 
+            start: int = 0, 
+            seek_threshold: int = 1 << 20, 
+            urlopen = None, 
+        ):
+            global _httpx_urlopen
+            from httpx import stream, Client
+
+            if isinstance(urlopen, Client):
+                urlopen = partial(urlopen.stream, "GET")
+            elif urlopen is None:
+                if _httpx_urlopen is None:
+                    if "__del__" not in Client.__dict__:
+                        setattr(Client, "__del__", lambda self: self.close())
+                    urlopen = _httpx_urlopen = partial(stream, "GET")
+                else:
+                    urlopen = _httpx_urlopen
+
+            def urlopen_wrapper(url: str, headers: None | Mapping = headers):
+                context = urlopen(url, headers=headers)
+                resp = context.__enter__()
+                resp.raise_for_status()
+                resp.context = context
+                file = bytes_iter_to_reader(resp.iter_raw())
+                self.__dict__["file"] = file
+                return resp
+
+            super().__init__(
+                url, 
+                headers=headers, 
+                start=start, 
+                seek_threshold=seek_threshold, 
+                urlopen=urlopen_wrapper, 
+            )
+
+        @funcproperty
+        def file_closed(self, /) -> bool:
+            return self.response.is_closed
+
+    class AsyncHttpxFileReader(AsyncHTTPFileReader):
+
+        async def __ainit__(
+            self, 
+            /, 
+            url: str | Callable[[], str] | Callable[[], Awaitable[str]], 
+            headers: None | Mapping = None, 
+            start: int = 0, 
+            seek_threshold: int = 1 << 20, 
+            urlopen = None, 
+        ):
+            global _httpx_urlopen_async
+            from httpx import AsyncClient
+
+            if isinstance(urlopen, AsyncClient):
+                urlopen = partial(urlopen.stream, "GET")
+            elif urlopen is None:
+                if _httpx_urlopen_async is None:
+                    if "__del__" not in AsyncClient.__dict__:
+                        setattr(AsyncClient, "__del__", lambda self: run_async(self.aclose()))
+                    def async_stream(
+                        method, 
+                        url, 
+                        params = None, 
+                        content = None, 
+                        data = None, 
+                        files = None, 
+                        json = None, 
+                        headers = None, 
+                        cookies = None, 
+                        auth = None, 
+                        proxy = None, 
+                        proxies = None, 
+                        timeout = 5.0, 
+                        follow_redirects = False, 
+                        verify = True, 
+                        cert = None, 
+                        trust_env = True, 
+                    ):
+                        client = AsyncClient(
+                            cookies=cookies,
+                            proxy=proxy,
+                            proxies=proxies,
+                            cert=cert,
+                            verify=verify,
+                            timeout=timeout,
+                            trust_env=trust_env,
+                        )
+                        return client.stream(
+                            method=method,
+                            url=url,
+                            content=content,
+                            data=data,
+                            files=files,
+                            json=json,
+                            params=params,
+                            headers=headers,
+                            auth=auth,
+                            follow_redirects=follow_redirects,
+                        )
+                    urlopen = _httpx_urlopen_async = partial(async_stream, "GET")
+                else:
+                    urlopen = _httpx_urlopen_async
+
+            async def urlopen_wrapper(url: str, headers: None | Mapping = headers):
+                context = urlopen(url, headers=headers)
+                resp = await context.__aenter__()
+                resp.raise_for_status()
+                resp.context = context
+                file = bytes_iter_to_async_reader(resp.aiter_raw())
+                self.__dict__["file"] = file
+                return resp
+
+            await super().__ainit__(
+                url=url, 
+                headers=headers, 
+                start=start, 
+                seek_threshold=seek_threshold, 
+                urlopen=urlopen_wrapper, 
+            )
+
+        @funcproperty
+        def file_closed(self, /) -> bool:
+            return self.response.is_closed
+
+    __all__.append("HttpxFileReader")
+    __all__.append("AsyncHttpxFileReader")
+
+# TODO: 设计实现一个 HTTPFileWriter，用于实现上传，关闭后视为上传完成

{python_httpfile-0.0.2.1.dist-info → python_httpfile-0.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-httpfile
-Version: 0.0.2.1
+Version: 0.0.4
 Summary: Python httpfile.
 Home-page: https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-httpfile
 License: MIT
@@ -22,8 +22,10 @@ Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: http_response
-Requires-Dist: python-property
-Requires-Dist: python-urlopen
+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
 Description-Content-Type: text/markdown
 

python_httpfile-0.0.4.dist-info/RECORD

@@ -0,0 +1,7 @@
+LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+httpfile/__init__.py,sha256=PAqvhrEAfTEzVSZ7wbLrPplYX-8G1epkW7MZt2sWWaw,38657
+httpfile/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+python_httpfile-0.0.4.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+python_httpfile-0.0.4.dist-info/METADATA,sha256=1CtTQ_EoeIP9eVYlevzlEBdA9D26S9pHfZmdTOnXB0Q,1520
+python_httpfile-0.0.4.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+python_httpfile-0.0.4.dist-info/RECORD,,

python_httpfile-0.0.2.1.dist-info/RECORD

@@ -1,7 +0,0 @@
-LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-httpfile/__init__.py,sha256=9qTmQOShcWtnLtIsqL3NbIeH9M2tAWE9NquEjyFs9ZM,13416
-httpfile/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_httpfile-0.0.2.1.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-python_httpfile-0.0.2.1.dist-info/METADATA,sha256=tKxwg73IETWHCmf-F7--YKrQtlgn15r4iUxA7BzDkqQ,1416
-python_httpfile-0.0.2.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-python_httpfile-0.0.2.1.dist-info/RECORD,,