hishel 1.0.0.dev1__py3-none-any.whl → 1.0.0.dev3__py3-none-any.whl

hishel/__init__.py

@@ -1,8 +1,7 @@
-from hishel._core._async._storages._sqlite import AsyncSqliteStorage
-from hishel._core._base._storages._base import (
-    AsyncBaseStorage as AsyncBaseStorage,
-    SyncBaseStorage as SyncBaseStorage,
-)
+from hishel._core._storages._async_sqlite import AsyncSqliteStorage
+from hishel._core._storages._async_base import AsyncBaseStorage
+from hishel._core._storages._sync_sqlite import SyncSqliteStorage
+from hishel._core._storages._sync_base import SyncBaseStorage
 from hishel._core._headers import Headers as Headers
 from hishel._core._spec import (
     AnyState as AnyState,
@@ -11,21 +10,21 @@ from hishel._core._spec import (
     CouldNotBeStored as CouldNotBeStored,
     FromCache as FromCache,
     IdleClient as IdleClient,
+    InvalidateEntries,
     NeedRevalidation as NeedRevalidation,
     NeedToBeUpdated as NeedToBeUpdated,
     State as State,
     StoreAndUse as StoreAndUse,
     create_idle_state as create_idle_state,
 )
-from hishel._core._sync._storages._sqlite import SyncSqliteStorage
 from hishel._core.models import (
-    CompletePair as CompletePair,
-    IncompletePair as IncompletePair,
-    Pair as Pair,
-    PairMeta as PairMeta,
+    Entry as Entry,
+    EntryMeta as EntryMeta,
     Request as Request,
     Response,
 )
+from hishel._async_cache import AsyncCacheProxy as AsyncCacheProxy
+from hishel._sync_cache import SyncCacheProxy as SyncCacheProxy
 
 __all__ = (
     # New API
@@ -41,14 +40,13 @@ __all__ = (
     "State",
     "StoreAndUse",
     "CouldNotBeStored",
+    "InvalidateEntries",
     "create_idle_state",
     ## Models
     "Request",
     "Response",
-    "Pair",
-    "IncompletePair",
-    "CompletePair",
-    "PairMeta",
+    "Entry",
+    "EntryMeta",
     ## Headers
     "Headers",
     ## Storages
@@ -56,4 +54,7 @@ __all__ = (
     "AsyncBaseStorage",
     "SyncSqliteStorage",
     "AsyncSqliteStorage",
+    # Proxy
+    "AsyncCacheProxy",
+    "SyncCacheProxy",
 )

hishel/_async_cache.py

@@ -4,7 +4,7 @@ import hashlib
 import logging
 import time
 from dataclasses import replace
-from typing import AsyncIterator, Awaitable, Callable
+from typing import AsyncIterable, AsyncIterator, Awaitable, Callable
 
 from typing_extensions import assert_never
 
@@ -24,8 +24,9 @@ from hishel import (
     StoreAndUse,
     create_idle_state,
 )
-from hishel._core._spec import InvalidatePairs, vary_headers_match
-from hishel._core.models import CompletePair
+from hishel._core._spec import InvalidateEntries, vary_headers_match
+from hishel._core.models import Entry, ResponseMetadata
+from hishel._utils import make_async_iterator
 
 logger = logging.getLogger("hishel.integrations.clients")
 
@@ -42,12 +43,12 @@ class AsyncCacheProxy:
 
     def __init__(
         self,
-        send_request: Callable[[Request], Awaitable[Response]],
+        request_sender: Callable[[Request], Awaitable[Response]],
         storage: AsyncBaseStorage | None = None,
         cache_options: CacheOptions | None = None,
         ignore_specification: bool = False,
     ) -> None:
-        self.send_request = send_request
+        self.send_request = request_sender
         self.storage = storage if storage is not None else AsyncSqliteStorage()
         self.cache_options = cache_options if cache_options is not None else CacheOptions()
         self.ignore_specification = ignore_specification
@@ -59,26 +60,30 @@ class AsyncCacheProxy:
 
     async def _get_key_for_request(self, request: Request) -> str:
         if request.metadata.get("hishel_body_key"):
-            assert isinstance(request.stream, AsyncIterator)
+            assert isinstance(request.stream, (AsyncIterator, AsyncIterable))
             collected = b"".join([chunk async for chunk in request.stream])
             hash_ = hashlib.sha256(collected).hexdigest()
+            request.stream = make_async_iterator([collected])
             return f"{str(request.url)}-{hash_}"
-        return str(request.url)
+        return hashlib.sha256(str(request.url).encode("utf-8")).hexdigest()
 
-    async def _maybe_refresh_pair_ttl(self, pair: CompletePair) -> None:
+    async def _maybe_refresh_pair_ttl(self, pair: Entry) -> None:
         if pair.request.metadata.get("hishel_refresh_ttl_on_access"):
-            await self.storage.update_pair(
+            await self.storage.update_entry(
                 pair.id,
-                lambda complete_pair: replace(complete_pair, meta=replace(complete_pair.meta, created_at=time.time())),
+                lambda complete_pair: replace(
+                    complete_pair,
+                    meta=replace(complete_pair.meta, created_at=time.time()),
+                ),
             )
 
     async def _handle_request_ignoring_spec(self, request: Request) -> Response:
         logger.debug("Trying to get cached response ignoring specification")
-        pairs = await self.storage.get_pairs(await self._get_key_for_request(request))
+        entries = await self.storage.get_entries(await self._get_key_for_request(request))
 
-        logger.debug(f"Found {len(pairs)} cached pairs for the request")
+        logger.debug(f"Found {len(entries)} cached entries for the request")
 
-        for pair in pairs:
+        for pair in entries:
             if (
                 str(pair.request.url) == str(request.url)
                 and pair.request.method == request.method
@@ -90,20 +95,26 @@ class AsyncCacheProxy:
                 logger.debug(
                     "Found matching cached response for the request",
                 )
-                pair.response.metadata["hishel_from_cache"] = True  # type: ignore
+                response_meta = ResponseMetadata(
+                    hishel_spec_ignored=True,
+                    hishel_from_cache=True,
+                    hishel_created_at=pair.meta.created_at,
+                    hishel_revalidated=False,
+                    hishel_stored=False,
+                )
+                pair.response.metadata.update(response_meta)  # type: ignore
                 await self._maybe_refresh_pair_ttl(pair)
                 return pair.response
 
-        incomplete_pair = await self.storage.create_pair(
-            request,
-        )
-        response = await self.send_request(incomplete_pair.request)
+        response = await self.send_request(request)
 
         logger.debug("Storing response in cache ignoring specification")
-        complete_pair = await self.storage.add_response(
-            incomplete_pair.id, response, await self._get_key_for_request(request)
+        entry = await self.storage.create_entry(
+            request,
+            response,
+            await self._get_key_for_request(request),
         )
-        return complete_pair.response
+        return entry.response
 
     async def _handle_request_respecting_spec(self, request: Request) -> Response:
         state: AnyState = create_idle_state("client", self.cache_options)
@@ -125,25 +136,26 @@ class AsyncCacheProxy:
                 return state.pair.response
             elif isinstance(state, NeedToBeUpdated):
                 state = await self._handle_update(state)
-            elif isinstance(state, InvalidatePairs):
-                state = await self._handle_invalidate_pairs(state)
+            elif isinstance(state, InvalidateEntries):
+                state = await self._handle_invalidate_entries(state)
             else:
                 assert_never(state)
 
         raise RuntimeError("Unreachable")
 
     async def _handle_idle_state(self, state: IdleClient, request: Request) -> AnyState:
-        stored_pairs = await self.storage.get_pairs(await self._get_key_for_request(request))
-        return state.next(request, stored_pairs)
+        stored_entries = await self.storage.get_entries(await self._get_key_for_request(request))
+        return state.next(request, stored_entries)
 
     async def _handle_cache_miss(self, state: CacheMiss) -> AnyState:
-        incomplete_pair = await self.storage.create_pair(state.request)
-        response = await self.send_request(incomplete_pair.request)
-        return state.next(response, incomplete_pair.id)
+        response = await self.send_request(state.request)
+        return state.next(response)
 
     async def _handle_store_and_use(self, state: StoreAndUse, request: Request) -> Response:
-        complete_pair = await self.storage.add_response(
-            state.pair_id, state.response, await self._get_key_for_request(request)
+        complete_pair = await self.storage.create_entry(
+            request,
+            state.response,
+            await self._get_key_for_request(request),
         )
         return complete_pair.response
 
@@ -152,16 +164,17 @@ class AsyncCacheProxy:
         return state.next(revalidation_response)
 
     async def _handle_update(self, state: NeedToBeUpdated) -> AnyState:
-        for pair in state.updating_pairs:
-            await self.storage.update_pair(
-                pair.id,
+        for entry in state.updating_entries:
+            await self.storage.update_entry(
+                entry.id,
                 lambda complete_pair: replace(
-                    complete_pair, response=replace(pair.response, headers=pair.response.headers)
+                    complete_pair,
+                    response=replace(entry.response, headers=entry.response.headers),
                 ),
             )
         return state.next()
 
-    async def _handle_invalidate_pairs(self, state: InvalidatePairs) -> AnyState:
-        for pair_id in state.pair_ids:
-            await self.storage.remove(pair_id)
+    async def _handle_invalidate_entries(self, state: InvalidateEntries) -> AnyState:
+        for entry_id in state.entry_ids:
+            await self.storage.remove_entry(entry_id)
         return state.next()

hishel/_async_httpx.py

@@ -0,0 +1,243 @@
+from __future__ import annotations
+
+import ssl
+import typing as t
+from typing import (
+    AsyncIterable,
+    AsyncIterator,
+    Iterator,
+    Union,
+    cast,
+    overload,
+)
+
+from httpx import RequestNotRead
+
+from hishel import AsyncCacheProxy, Headers, Request, Response
+from hishel._core._spec import (
+    CacheOptions,
+)
+from hishel._core._storages._async_base import AsyncBaseStorage
+from hishel._core.models import RequestMetadata, extract_metadata_from_headers
+from hishel._utils import (
+    filter_mapping,
+    make_async_iterator,
+)
+
+try:
+    import httpx
+except ImportError as e:
+    raise ImportError(
+        "httpx is required to use hishel.httpx module. "
+        "Please install hishel with the 'httpx' extra, "
+        "e.g., 'pip install hishel[httpx]'."
+    ) from e
+
+SOCKET_OPTION = t.Union[
+    t.Tuple[int, int, int],
+    t.Tuple[int, int, t.Union[bytes, bytearray]],
+    t.Tuple[int, int, None, int],
+]
+
+# 128 KB
+CHUNK_SIZE = 131072
+
+
+@overload
+def _internal_to_httpx(
+    value: Request,
+) -> httpx.Request: ...
+@overload
+def _internal_to_httpx(
+    value: Response,
+) -> httpx.Response: ...
+def _internal_to_httpx(
+    value: Union[Request, Response],
+) -> Union[httpx.Request, httpx.Response]:
+    """
+    Convert internal Request/Response to httpx.Request/httpx.Response.
+    """
+    if isinstance(value, Request):
+        return httpx.Request(
+            method=value.method,
+            url=value.url,
+            headers=value.headers,
+            stream=_IteratorStream(value.aiter_stream()),
+            extensions=value.metadata,
+        )
+    elif isinstance(value, Response):
+        return httpx.Response(
+            status_code=value.status_code,
+            headers=value.headers,
+            stream=_IteratorStream(value.aiter_stream()),
+            extensions=value.metadata,
+        )
+
+
+@overload
+def _httpx_to_internal(
+    value: httpx.Request,
+) -> Request: ...
+@overload
+def _httpx_to_internal(
+    value: httpx.Response,
+) -> Response: ...
+def _httpx_to_internal(
+    value: Union[httpx.Request, httpx.Response],
+) -> Union[Request, Response]:
+    """
+    Convert httpx.Request/httpx.Response to internal Request/Response.
+    """
+    headers = Headers(
+        filter_mapping(
+            Headers({key: value for key, value in value.headers.items()}),
+            ["Transfer-Encoding"],
+        )
+    )
+    if isinstance(value, httpx.Request):
+        extension_metadata = RequestMetadata(
+            hishel_refresh_ttl_on_access=value.extensions.get("hishel_refresh_ttl_on_access"),
+            hishel_ttl=value.extensions.get("hishel_ttl"),
+            hishel_spec_ignore=value.extensions.get("hishel_spec_ignore"),
+            hishel_body_key=value.extensions.get("hishel_body_key"),
+        )
+        headers_metadata = extract_metadata_from_headers(value.headers)
+
+        for key, val in extension_metadata.items():
+            if key in value.extensions:
+                headers_metadata[key] = val  # type: ignore
+
+        try:
+            stream = make_async_iterator([value.content])
+        except RequestNotRead:
+            stream = cast(AsyncIterator[bytes], value.stream)
+
+        return Request(
+            method=value.method,
+            url=str(value.url),
+            headers=headers,
+            stream=stream,
+            metadata=headers_metadata,
+        )
+    elif isinstance(value, httpx.Response):
+        if value.is_stream_consumed and "content-encoding" in value.headers:
+            raise RuntimeError("Can't get the raw stream of a response with `Content-Encoding` header.")
+        stream = (
+            make_async_iterator([value.content]) if value.is_stream_consumed else value.aiter_raw(chunk_size=CHUNK_SIZE)
+        )
+
+        return Response(
+            status_code=value.status_code,
+            headers=headers,
+            stream=stream,
+            metadata={},
+        )
+
+
+class _IteratorStream(httpx.SyncByteStream, httpx.AsyncByteStream):
+    def __init__(self, iterator: Iterator[bytes] | AsyncIterator[bytes]) -> None:
+        self.iterator = iterator
+
+    async def __aiter__(self) -> AsyncIterator[bytes]:
+        assert isinstance(self.iterator, (AsyncIterator, AsyncIterable))
+        async for chunk in self.iterator:
+            yield chunk
+
+
+class AsyncCacheTransport(httpx.AsyncBaseTransport):
+    def __init__(
+        self,
+        next_transport: httpx.AsyncBaseTransport,
+        storage: AsyncBaseStorage | None = None,
+        cache_options: CacheOptions | None = None,
+        ignore_specification: bool = False,
+    ) -> None:
+        self.next_transport = next_transport
+        self._cache_proxy: AsyncCacheProxy = AsyncCacheProxy(
+            request_sender=self.request_sender,
+            storage=storage,
+            cache_options=cache_options,
+            ignore_specification=ignore_specification,
+        )
+        self.storage = self._cache_proxy.storage
+
+    async def handle_async_request(
+        self,
+        request: httpx.Request,
+    ) -> httpx.Response:
+        internal_request = _httpx_to_internal(request)
+        internal_response = await self._cache_proxy.handle_request(internal_request)
+        response = _internal_to_httpx(internal_response)
+        return response
+
+    async def aclose(self) -> None:
+        await self.next_transport.aclose()
+        await self.storage.close()
+        await super().aclose()
+
+    async def request_sender(self, request: Request) -> Response:
+        httpx_request = _internal_to_httpx(request)
+        httpx_response = await self.next_transport.handle_async_request(httpx_request)
+        return _httpx_to_internal(httpx_response)
+
+
+class AsyncCacheClient(httpx.AsyncClient):
+    def __init__(self, *args: t.Any, **kwargs: t.Any) -> None:
+        self.storage: AsyncBaseStorage | None = kwargs.pop("storage", None)
+        self.cache_options: CacheOptions | None = kwargs.pop("cache_options", None)
+        self.ignore_specification: bool = kwargs.pop("ignore_specification", False)
+        super().__init__(*args, **kwargs)
+
+    def _init_transport(
+        self,
+        verify: ssl.SSLContext | str | bool = True,
+        cert: t.Union[str, t.Tuple[str, str], t.Tuple[str, str, str], None] = None,
+        trust_env: bool = True,
+        http1: bool = True,
+        http2: bool = False,
+        limits: httpx.Limits = httpx.Limits(max_connections=100, max_keepalive_connections=20),
+        transport: httpx.AsyncBaseTransport | None = None,
+        **kwargs: t.Any,
+    ) -> httpx.AsyncBaseTransport:
+        if transport is not None:
+            return transport
+
+        return AsyncCacheTransport(
+            next_transport=httpx.AsyncHTTPTransport(
+                verify=verify,
+                cert=cert,
+                trust_env=trust_env,
+                http1=http1,
+                http2=http2,
+                limits=limits,
+            ),
+            storage=self.storage,
+            cache_options=self.cache_options,
+            ignore_specification=False,
+        )
+
+    def _init_proxy_transport(
+        self,
+        proxy: httpx.Proxy,
+        verify: ssl.SSLContext | str | bool = True,
+        cert: t.Union[str, t.Tuple[str, str], t.Tuple[str, str, str], None] = None,
+        trust_env: bool = True,
+        http1: bool = True,
+        http2: bool = False,
+        limits: httpx.Limits = httpx.Limits(max_connections=100, max_keepalive_connections=20),
+        **kwargs: t.Any,
+    ) -> httpx.AsyncBaseTransport:
+        return AsyncCacheTransport(
+            next_transport=httpx.AsyncHTTPTransport(
+                verify=verify,
+                cert=cert,
+                trust_env=trust_env,
+                http1=http1,
+                http2=http2,
+                limits=limits,
+                proxy=proxy,
+            ),
+            storage=self.storage,
+            cache_options=self.cache_options,
+            ignore_specification=self.ignore_specification,
+        )

hishel/_core/_headers.py

@@ -1,7 +1,17 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Any, Iterator, List, Literal, Mapping, MutableMapping, Optional, Union, cast
+from typing import (
+    Any,
+    Iterator,
+    List,
+    Literal,
+    Mapping,
+    MutableMapping,
+    Optional,
+    Union,
+    cast,
+)
 
 """
 HTTP token and quoted-string parsing utilities.