hishel 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl

hishel/__init__.py

@@ -14,4 +14,4 @@ def install_cache() -> None:  # pragma: no cover
     httpx.Client = CacheClient  # type: ignore
 
 
-__version__ = "0.1.0"
+__version__ = "0.1.2"

hishel/_async/_pool.py

@@ -47,7 +47,7 @@ class AsyncCacheConnectionPool(AsyncRequestInterface):
 
         self._storage = storage if storage is not None else AsyncFileStorage(serializer=JSONSerializer())
 
-        if not isinstance(self._storage, AsyncBaseStorage):
+        if not isinstance(self._storage, AsyncBaseStorage):  # pragma: no cover
             raise TypeError(f"Expected subclass of `AsyncBaseStorage` but got `{storage.__class__.__name__}`")
 
         self._controller = controller if controller is not None else Controller()

hishel/_async/_storages.py

@@ -23,7 +23,9 @@ except ImportError:  # pragma: no cover
     anysqlite = None  # type: ignore
 
 from httpcore import Request, Response
-from typing_extensions import TypeAlias
+
+if t.TYPE_CHECKING:  # pragma: no cover
+    from typing_extensions import TypeAlias
 
 from hishel._serializers import BaseSerializer, clone_model
 

hishel/_async/_transports.py

@@ -64,7 +64,7 @@ class AsyncCacheTransport(httpx.AsyncBaseTransport):
 
         self._storage = storage if storage is not None else AsyncFileStorage(serializer=JSONSerializer())
 
-        if not isinstance(self._storage, AsyncBaseStorage):
+        if not isinstance(self._storage, AsyncBaseStorage):  # pragma: no cover
             raise TypeError(f"Expected subclass of `AsyncBaseStorage` but got `{storage.__class__.__name__}`")
 
         self._controller = controller if controller is not None else Controller()
@@ -152,7 +152,7 @@ class AsyncCacheTransport(httpx.AsyncBaseTransport):
                 # Controller has determined that the response needs to be re-validated.
                 assert isinstance(res.stream, tp.AsyncIterable)
                 revalidation_request = Request(
-                    method=res.method,
+                    method=res.method.decode(),
                     url=normalized_url(res.url),
                     headers=res.headers,
                     stream=AsyncCacheStream(res.stream),

hishel/_controller.py

@@ -60,8 +60,12 @@ def get_freshness_lifetime(response: Response) -> tp.Optional[int]:
     if header_presents(response.headers, b"expires"):
         expires = extract_header_values_decoded(response.headers, b"expires", single=True)[0]
         expires_timestamp = parse_date(expires)
+        if expires_timestamp is None:
+            return None
         date = extract_header_values_decoded(response.headers, b"date", single=True)[0]
         date_timestamp = parse_date(date)
+        if date_timestamp is None:
+            return None
 
         return expires_timestamp - date_timestamp
     return None
@@ -72,11 +76,12 @@ def get_heuristic_freshness(response: Response, clock: "BaseClock") -> int:
 
     if last_modified:
         last_modified_timestamp = parse_date(last_modified[0])
-        now = clock.now()
+        if last_modified_timestamp is not None:
+            now = clock.now()
 
-        ONE_WEEK = 604_800
+            ONE_WEEK = 604_800
 
-        return min(ONE_WEEK, int((now - last_modified_timestamp) * 0.1))
+            return min(ONE_WEEK, int((now - last_modified_timestamp) * 0.1))
 
     ONE_DAY = 86_400
     return ONE_DAY
@@ -89,6 +94,8 @@ def get_age(response: Response, clock: "BaseClock") -> int:
         return float("inf")  # type: ignore
 
     date = parse_date(extract_header_values_decoded(response.headers, b"date")[0])
+    if date is None:
+        return float("inf")  # type: ignore
 
     now = clock.now()
 

hishel/_headers.py

@@ -94,13 +94,13 @@ def parse_cache_control(cache_control_values: List[str]) -> "CacheControl":
                         for value_char in value:
                             if value_char not in tchar:
                                 raise ParseError(
-                                    f"The character '{value_char!r}' " "is not permitted for the unquoted values."
+                                    f"The character '{value_char!r}' is not permitted for the unquoted values."
                                 )
                     else:
                         for value_char in value[1:-1]:
                             if value_char not in qdtext:
                                 raise ParseError(
-                                    f"The character '{value_char!r}' " "is not permitted for the quoted values."
+                                    f"The character '{value_char!r}' is not permitted for the quoted values."
                                 )
                     break
 

hishel/_s3.py

@@ -75,7 +75,16 @@ class S3Manager:
             if not obj["Key"].startswith("hishel-"):  # pragma: no cover
                 continue
 
-            if get_timestamp_in_ms() - float(obj["Metadata"]["created_at"]) > ttl:
+            try:
+                metadata_obj = self._client.head_object(Bucket=self._bucket_name, Key=obj["Key"]).get("Metadata", {})
+            except ClientError as e:
+                if e.response["Error"]["Code"] == "404":
+                    continue
+
+            if not metadata_obj or "created_at" not in metadata_obj:
+                continue
+
+            if get_timestamp_in_ms() - float(metadata_obj["created_at"]) > ttl:
                 self._client.delete_object(Bucket=self._bucket_name, Key=obj["Key"])
 
     def remove_entry(self, key: str) -> None:

hishel/_sync/_pool.py

@@ -47,7 +47,7 @@ class CacheConnectionPool(RequestInterface):
 
         self._storage = storage if storage is not None else FileStorage(serializer=JSONSerializer())
 
-        if not isinstance(self._storage, BaseStorage):
+        if not isinstance(self._storage, BaseStorage):  # pragma: no cover
             raise TypeError(f"Expected subclass of `BaseStorage` but got `{storage.__class__.__name__}`")
 
         self._controller = controller if controller is not None else Controller()

hishel/_sync/_storages.py

@@ -23,7 +23,9 @@ except ImportError:  # pragma: no cover
     sqlite3 = None  # type: ignore
 
 from httpcore import Request, Response
-from typing_extensions import TypeAlias
+
+if t.TYPE_CHECKING:  # pragma: no cover
+    from typing_extensions import TypeAlias
 
 from hishel._serializers import BaseSerializer, clone_model
 

hishel/_sync/_transports.py

@@ -5,7 +5,7 @@ import typing as tp
 
 import httpcore
 import httpx
-from httpx import ByteStream, Request, Response
+from httpx import SyncByteStream, Request, Response
 from httpx._exceptions import ConnectError
 
 from hishel._utils import extract_header_values_decoded, normalized_url
@@ -29,7 +29,7 @@ def generate_504() -> Response:
     return Response(status_code=504)
 
 
-class CacheStream(ByteStream):
+class CacheStream(SyncByteStream):
     def __init__(self, httpcore_stream: tp.Iterable[bytes]):
         self._httpcore_stream = httpcore_stream
 
@@ -64,7 +64,7 @@ class CacheTransport(httpx.BaseTransport):
 
         self._storage = storage if storage is not None else FileStorage(serializer=JSONSerializer())
 
-        if not isinstance(self._storage, BaseStorage):
+        if not isinstance(self._storage, BaseStorage):  # pragma: no cover
             raise TypeError(f"Expected subclass of `BaseStorage` but got `{storage.__class__.__name__}`")
 
         self._controller = controller if controller is not None else Controller()
@@ -152,7 +152,7 @@ class CacheTransport(httpx.BaseTransport):
                 # Controller has determined that the response needs to be re-validated.
                 assert isinstance(res.stream, tp.Iterable)
                 revalidation_request = Request(
-                    method=res.method,
+                    method=res.method.decode(),
                     url=normalized_url(res.url),
                     headers=res.headers,
                     stream=CacheStream(res.stream),

hishel/_utils.py

@@ -1,8 +1,8 @@
 import calendar
+import hashlib
 import time
 import typing as tp
 from email.utils import parsedate_tz
-from hashlib import blake2b
 
 import anyio
 import httpcore
@@ -30,7 +30,7 @@ def normalized_url(url: tp.Union[httpcore.URL, str, bytes]) -> str:
 
     if isinstance(url, httpcore.URL):
         port = f":{url.port}" if url.port is not None else ""
-        return f'{url.scheme.decode("ascii")}://{url.host.decode("ascii")}{port}{url.target.decode("ascii")}'
+        return f"{url.scheme.decode('ascii')}://{url.host.decode('ascii')}{port}{url.target.decode('ascii')}"
     assert False, "Invalid type for `normalized_url`"  # pragma: no cover
 
 
@@ -49,10 +49,26 @@ def generate_key(request: httpcore.Request, body: bytes = b"") -> str:
 
     key_parts = [request.method, encoded_url, body]
 
-    key = blake2b(digest_size=16, usedforsecurity=False)
-    for part in key_parts:
-        key.update(part)
-    return key.hexdigest()
+    # FIPs mode disables blake2 algorithm, use sha256 instead when not found.
+    blake2b_hasher = None
+    sha256_hasher = hashlib.sha256(usedforsecurity=False)
+    try:
+        blake2b_hasher = hashlib.blake2b(digest_size=16, usedforsecurity=False)
+    except (ValueError, TypeError, AttributeError):
+        pass
+
+    hexdigest: str
+    if blake2b_hasher:
+        for part in key_parts:
+            blake2b_hasher.update(part)
+
+        hexdigest = blake2b_hasher.hexdigest()
+    else:
+        for part in key_parts:
+            sha256_hasher.update(part)
+
+        hexdigest = sha256_hasher.hexdigest()
+    return hexdigest
 
 
 def extract_header_values(
@@ -82,9 +98,11 @@ def header_presents(headers: tp.List[tp.Tuple[bytes, bytes]], header_key: bytes)
     return bool(extract_header_values(headers, header_key, single=True))
 
 
-def parse_date(date: str) -> int:
+def parse_date(date: str) -> tp.Optional[int]:
     expires = parsedate_tz(date)
-    timestamp = calendar.timegm(expires[:6])  # type: ignore
+    if expires is None:
+        return None
+    timestamp = calendar.timegm(expires[:6])
     return timestamp
 
 

{hishel-0.1.0.dist-info → hishel-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: hishel
-Version: 0.1.0
+Version: 0.1.2
 Summary: Persistent cache implementation for httpx and httpcore
 Project-URL: Homepage, https://hishel.com
 Project-URL: Source, https://github.com/karpetrosyan/hishel
@@ -23,9 +23,9 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Internet :: WWW/HTTP
 Requires-Python: >=3.9
-Requires-Dist: httpx>=0.22.0
+Requires-Dist: httpx>=0.28.0
 Provides-Extra: redis
-Requires-Dist: redis==5.0.1; extra == 'redis'
+Requires-Dist: redis==5.0.4; extra == 'redis'
 Provides-Extra: s3
 Requires-Dist: boto3<=1.15.3,>=1.15.0; (python_version < '3.12') and extra == 's3'
 Requires-Dist: boto3>=1.15.3; (python_version >= '3.12') and extra == 's3'
@@ -181,6 +181,18 @@ Help us grow and continue developing good software for you ❤️
 
 # Changelog
 
+## 0.1.2 (5th April, 2025)
+
+- Add check for fips compliant python. (#325)
+- Fix compatibility with httpx. (#291)
+- Use `SyncByteStream` instead of `ByteStream`. (#298)
+- Don't raise exceptions if date-containing headers are invalid. (#318)
+- Fix for S3 Storage missing metadata in API request. (#320)
+
+## 0.1.1 (2nd Nov, 2024)
+
+- Fix typing extensions not found. (#290)
+
 ## 0.1.0 (2nd Nov, 2024)
 
 - Add support for Python 3.12 / drop Python 3.8. (#286)

hishel-0.1.2.dist-info/RECORD

@@ -0,0 +1,27 @@
+hishel/__init__.py,sha256=R91Ika4Y8yXeuWLIrpbrXHUPASzYa-ZlaC2r7cX7L74,368
+hishel/_controller.py,sha256=be1_eL34Gue6a1px_eLFWWxViPQbYENMvtZmv8gFRhA,24636
+hishel/_exceptions.py,sha256=qbg55RNlzwhv5JreWY9Zog_zmmiKdn5degtqJKijuRs,198
+hishel/_files.py,sha256=7J5uX7Nnzd7QQWfYuDGh8v6XGLG3eUDBjoJZ4aTaY1c,2228
+hishel/_headers.py,sha256=BPvas0LQgwbz-HZhFykZiHEIeNgnY-E33U__oskYzJw,7323
+hishel/_lfu_cache.py,sha256=GBxToQI8u_a9TzYnLlZMLhgZ8Lb83boPHzTvIgqV6pA,2707
+hishel/_s3.py,sha256=HDS3-3HM8xmIb-1_p2VRKJk9EwfzoxgTT0F1Kryl8sU,4087
+hishel/_serializers.py,sha256=gepVb8JC4aBkGw9kLcbAsyo-1XgK_lzTssLr_8av4SQ,11640
+hishel/_synchronization.py,sha256=xOmU9_8KAWTAv3r8EpqPISrtSF3slyh1J0Sc7ZQO1rg,897
+hishel/_utils.py,sha256=7HhJlomBCqbhBv01ZuK5WfG8dCtGONLFFF7ujIvBBWQ,3277
+hishel/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+hishel/_async/__init__.py,sha256=_oAltH4emAtUF7_9SSxz_KKGYzSXL34o_EGgGvoPG7E,187
+hishel/_async/_client.py,sha256=AkVSSbNTTHmK0gX6PRYVQ-3aDbuCX2Im4VKbLkwLiBU,1101
+hishel/_async/_mock.py,sha256=995v9p5xiw3svGSOJATkLMqwodlhZhcwmGygLHM2VFw,1515
+hishel/_async/_pool.py,sha256=xCcSAl4bHI5eVsZyPap7iHDpxzzgfMqYE_txcjQJ1Hs,8195
+hishel/_async/_storages.py,sha256=tJXwov37HOvwYwXyjFtf-uRn7y7wR8RZs49F_Urj570,28744
+hishel/_async/_transports.py,sha256=BhtEj8SHxu0YKHWDDP5mfCabIWgrAM7lMLJ1-TwWigw,11203
+hishel/_sync/__init__.py,sha256=_oAltH4emAtUF7_9SSxz_KKGYzSXL34o_EGgGvoPG7E,187
+hishel/_sync/_client.py,sha256=O-gwm9DsveKtSFUfqdbBB-3I1FmXr5rE-uQ7X5frwDA,1060
+hishel/_sync/_mock.py,sha256=im88tZr-XhP9BpzvIt3uOjndAlNcJvFP7Puv3H-6lKU,1430
+hishel/_sync/_pool.py,sha256=U2b9ZGYUltwTjI2q2KHZwmj4boIqUExJ_rUKWuLmYSs,7960
+hishel/_sync/_storages.py,sha256=NhIIAoWdpFECcexz121rfYLFRCk3C1iBazVXwoDVoSU,27954
+hishel/_sync/_transports.py,sha256=cQQgdJSy1zfmIa14ycADPek9Tobpa33nqBHA614_6kc,10875
+hishel-0.1.2.dist-info/METADATA,sha256=aqgCs4WIdawt1s7MUa6kVR32jEWG9Zeu3yTGJUL9ah4,12583
+hishel-0.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hishel-0.1.2.dist-info/licenses/LICENSE,sha256=1qQj7pE0V2O9OIedvyOgLGLvZLaPd3nFEup3IBEOZjQ,1493
+hishel-0.1.2.dist-info/RECORD,,

{hishel-0.1.0.dist-info → hishel-0.1.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.25.0
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any

hishel-0.1.0.dist-info/RECORD

@@ -1,27 +0,0 @@
-hishel/__init__.py,sha256=fX1GZHvMOXBaKhL2zJEGcO6t2WEwyub2J1hMajtQUtU,368
-hishel/_controller.py,sha256=F7hj1ePUvau2Wj5r6zzdYr8UXPq4osfmMxkmx_Ig2L8,24390
-hishel/_exceptions.py,sha256=qbg55RNlzwhv5JreWY9Zog_zmmiKdn5degtqJKijuRs,198
-hishel/_files.py,sha256=7J5uX7Nnzd7QQWfYuDGh8v6XGLG3eUDBjoJZ4aTaY1c,2228
-hishel/_headers.py,sha256=TWuHi7sRoeS2xxdNGujKmqWtgncUqfhNGCgHKYpRU-I,7329
-hishel/_lfu_cache.py,sha256=GBxToQI8u_a9TzYnLlZMLhgZ8Lb83boPHzTvIgqV6pA,2707
-hishel/_s3.py,sha256=JqRlygITK5uAryviC15HZKQlKY7etUOPWcazTJeYKBI,3736
-hishel/_serializers.py,sha256=gepVb8JC4aBkGw9kLcbAsyo-1XgK_lzTssLr_8av4SQ,11640
-hishel/_synchronization.py,sha256=xOmU9_8KAWTAv3r8EpqPISrtSF3slyh1J0Sc7ZQO1rg,897
-hishel/_utils.py,sha256=wANSbtWrxZwi3eEkR03oLXZ4Y2WsOtBf90W4BLB_abM,2759
-hishel/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hishel/_async/__init__.py,sha256=_oAltH4emAtUF7_9SSxz_KKGYzSXL34o_EGgGvoPG7E,187
-hishel/_async/_client.py,sha256=AkVSSbNTTHmK0gX6PRYVQ-3aDbuCX2Im4VKbLkwLiBU,1101
-hishel/_async/_mock.py,sha256=995v9p5xiw3svGSOJATkLMqwodlhZhcwmGygLHM2VFw,1515
-hishel/_async/_pool.py,sha256=li-921qyGzrV7SVUOUlMI0KE7IRsupSkE5iApzxmgqk,8175
-hishel/_async/_storages.py,sha256=SPWifKGSGAFP2wMFoxZf5weZFbuVgHFciyglY6Hb6fc,28699
-hishel/_async/_transports.py,sha256=moeH-eQLJHkMp83NnScgsQTSQntDCR1_4A1ByZ_fXjk,11174
-hishel/_sync/__init__.py,sha256=_oAltH4emAtUF7_9SSxz_KKGYzSXL34o_EGgGvoPG7E,187
-hishel/_sync/_client.py,sha256=O-gwm9DsveKtSFUfqdbBB-3I1FmXr5rE-uQ7X5frwDA,1060
-hishel/_sync/_mock.py,sha256=im88tZr-XhP9BpzvIt3uOjndAlNcJvFP7Puv3H-6lKU,1430
-hishel/_sync/_pool.py,sha256=VcAknzyAL2i4-zcyE2fOTmTjfBZ2wkBVNYTvSw0OjVQ,7940
-hishel/_sync/_storages.py,sha256=RYzYXqnv0o2JO3RoEmlEUp0yOg_ungXfz4dLN7UTpIQ,27909
-hishel/_sync/_transports.py,sha256=G3_8SdPwlnrHZRvE1gqFLE4oZadVqNgg5mvxghDMih0,10838
-hishel-0.1.0.dist-info/METADATA,sha256=I_gBTsungH30fu2WCN18Ls-6r9zp0RKzRRVFHemfkCg,12212
-hishel-0.1.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-hishel-0.1.0.dist-info/licenses/LICENSE,sha256=1qQj7pE0V2O9OIedvyOgLGLvZLaPd3nFEup3IBEOZjQ,1493
-hishel-0.1.0.dist-info/RECORD,,