hishel 0.1.4__py3-none-any.whl → 1.0.0.dev0__py3-none-any.whl

hishel/__init__.py

@@ -1,57 +1,59 @@
-import httpx
-
-from ._async import *
-from ._controller import *
-from ._exceptions import *
-from ._headers import *
-from ._serializers import *
-from ._sync import *
-from ._lfu_cache import *
+from hishel._core._async._storages._sqlite import AsyncSqliteStorage
+from hishel._core._base._storages._base import (
+    AsyncBaseStorage as AsyncBaseStorage,
+    SyncBaseStorage as SyncBaseStorage,
+)
+from hishel._core._headers import Headers as Headers
+from hishel._core._spec import (
+    AnyState as AnyState,
+    CacheMiss as CacheMiss,
+    CacheOptions as CacheOptions,
+    CouldNotBeStored as CouldNotBeStored,
+    FromCache as FromCache,
+    IdleClient as IdleClient,
+    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,
+    Request as Request,
+    Response,
+)
 
 __all__ = (
-    # Old API
-    "AsyncCacheClient",
-    "MockAsyncConnectionPool",
-    "MockAsyncTransport",
-    "AsyncCacheConnectionPool",
+    # New API
+    ## States
+    "AnyState",
+    "IdleClient",
+    "CacheMiss",
+    "FromCache",
+    "NeedRevalidation",
+    "AnyState",
+    "CacheOptions",
+    "NeedToBeUpdated",
+    "State",
+    "StoreAndUse",
+    "CouldNotBeStored",
+    "create_idle_state",
+    ## Models
+    "Request",
+    "Response",
+    "Pair",
+    "IncompletePair",
+    "CompletePair",
+    "PairMeta",
+    ## Headers
+    "Headers",
+    ## Storages
+    "SyncBaseStorage",
     "AsyncBaseStorage",
-    "AsyncFileStorage",
-    "AsyncInMemoryStorage",
-    "AsyncRedisStorage",
-    "AsyncS3Storage",
-    "AsyncSQLiteStorage",
-    "AsyncCacheTransport",
-    "HEURISTICALLY_CACHEABLE_STATUS_CODES",
-    "Controller",
-    "CacheControlError",
-    "ParseError",
-    "ValidationError",
-    "CacheControl",
-    "Vary",
-    "BaseSerializer",
-    "JSONSerializer",
-    "Metadata",
-    "PickleSerializer",
-    "YAMLSerializer",
-    "clone_model",
-    "CacheClient",
-    "MockConnectionPool",
-    "MockTransport",
-    "CacheConnectionPool",
-    "BaseStorage",
-    "FileStorage",
-    "InMemoryStorage",
-    "RedisStorage",
-    "S3Storage",
-    "SQLiteStorage",
-    "CacheTransport",
-    "LFUCache",
+    "SyncSqliteStorage",
+    "AsyncSqliteStorage",
 )
-
-def install_cache() -> None:  # pragma: no cover
-    httpx.AsyncClient = AsyncCacheClient  # type: ignore
-    httpx.Client = CacheClient  # type: ignore
-
-
-__version__ = "0.1.4"
-

hishel/{beta/_async_cache.py → _async_cache.py}

@@ -8,7 +8,7 @@ from typing import AsyncIterator, Awaitable, Callable
 
 from typing_extensions import assert_never
 
-from hishel.beta import (
+from hishel import (
     AnyState,
     AsyncBaseStorage,
     AsyncSqliteStorage,
@@ -24,8 +24,8 @@ from hishel.beta import (
     StoreAndUse,
     create_idle_state,
 )
-from hishel.beta._core._spec import InvalidatePairs, vary_headers_match
-from hishel.beta._core.models import CompletePair
+from hishel._core._spec import InvalidatePairs, vary_headers_match
+from hishel._core.models import CompletePair
 
 logger = logging.getLogger("hishel.integrations.clients")
 

hishel/{beta → _core}/__init__.py

@@ -1,10 +1,10 @@
-from hishel.beta._core._async._storages._sqlite import AsyncSqliteStorage
-from hishel.beta._core._base._storages._base import (
+from hishel._core._async._storages._sqlite import AsyncSqliteStorage
+from hishel._core._base._storages._base import (
     AsyncBaseStorage as AsyncBaseStorage,
     SyncBaseStorage as SyncBaseStorage,
 )
-from hishel.beta._core._headers import Headers as Headers
-from hishel.beta._core._spec import (
+from hishel._core._headers import Headers as Headers
+from hishel._core._spec import (
     AnyState as AnyState,
     CacheMiss as CacheMiss,
     CacheOptions as CacheOptions,
@@ -17,8 +17,8 @@ from hishel.beta._core._spec import (
     StoreAndUse as StoreAndUse,
     create_idle_state as create_idle_state,
 )
-from hishel.beta._core._sync._storages._sqlite import SyncSqliteStorage
-from hishel.beta._core.models import (
+from hishel._core._sync._storages._sqlite import SyncSqliteStorage
+from hishel._core.models import (
     CompletePair as CompletePair,
     IncompletePair as IncompletePair,
     Pair as Pair,

hishel/{beta/_core → _core}/_async/_storages/_sqlite.py

@@ -15,9 +15,9 @@ from typing import (
 
 import anysqlite
 
-from hishel.beta._core._base._storages._base import AsyncBaseStorage, ensure_cache_dict
-from hishel.beta._core._base._storages._packing import pack, unpack
-from hishel.beta._core.models import (
+from hishel._core._base._storages._base import AsyncBaseStorage, ensure_cache_dict
+from hishel._core._base._storages._packing import pack, unpack
+from hishel._core.models import (
     CompletePair,
     IncompletePair,
     Pair,

hishel/{beta/_core → _core}/_base/_storages/_base.py

@@ -7,7 +7,7 @@ import uuid
 from abc import ABC
 from pathlib import Path
 
-from hishel.beta._core.models import CompletePair, IncompletePair, Request, Response
+from hishel._core.models import CompletePair, IncompletePair, Request, Response
 
 
 class SyncBaseStorage(ABC):
@@ -87,6 +87,12 @@ class SyncBaseStorage(ABC):
         """
         raise NotImplementedError()
 
+    def close(self) -> None:
+        """
+        Close any resources held by the storage backend.
+        """
+        pass
+
     def is_soft_deleted(self, pair: IncompletePair | CompletePair) -> bool:
         """
         Check if a pair is soft deleted based on its metadata.
@@ -205,6 +211,12 @@ class AsyncBaseStorage(ABC):
         """
         raise NotImplementedError()
 
+    async def close(self) -> None:
+        """
+        Close any resources held by the storage backend.
+        """
+        pass
+
     def is_soft_deleted(self, pair: IncompletePair | CompletePair) -> bool:
         """
         Check if a pair is soft deleted based on its metadata.

hishel/{beta/_core → _core}/_base/_storages/_packing.py

@@ -6,8 +6,8 @@ from typing import TYPE_CHECKING, Any, Mapping, Optional, Union, overload
 import msgpack
 from typing_extensions import Literal, cast
 
-from hishel.beta._core._headers import Headers
-from hishel.beta._core.models import PairMeta, Request, Response
+from hishel._core._headers import Headers
+from hishel._core.models import PairMeta, Request, Response
 
 
 def filter_out_hishel_metadata(data: Mapping[str, Any]) -> dict[str, Any]:
@@ -15,7 +15,7 @@ def filter_out_hishel_metadata(data: Mapping[str, Any]) -> dict[str, Any]:
 
 
 if TYPE_CHECKING:
-    from hishel.beta import CompletePair, IncompletePair
+    from hishel import CompletePair, IncompletePair
 
 
 @overload
@@ -39,7 +39,7 @@ def pack(
     /,
     kind: Literal["pair", "entry_db_key_index"],
 ) -> bytes:
-    from hishel.beta import CompletePair, IncompletePair
+    from hishel import CompletePair, IncompletePair
 
     if kind == "entry_db_key_index":
         assert isinstance(value, uuid.UUID)
@@ -115,7 +115,7 @@ def unpack(
     /,
     kind: Literal["pair", "entry_db_key_index"],
 ) -> Union["CompletePair", "IncompletePair", uuid.UUID, None]:
-    from hishel.beta import CompletePair, IncompletePair
+    from hishel import CompletePair, IncompletePair
 
     if value is None:
         return None