hishel 0.1.2__tar.gz → 0.1.3__tar.gz

{hishel-0.1.2 → hishel-0.1.3}/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.1.3 (1st July, 2025)
+
+- Remove `types-redis` from dev dependencies (#336)
+- Bump redis to 6.0.0 and address async `.close()` deprecation warning (#336)
+- Avoid race condition when unlinking files in `FileStorage`. (#334)  
+- Allow prodiving a `path_prefix` in `S3Storage` and `AsyncS3Storage`. (#342)
+
 ## 0.1.2 (5th April, 2025)
 
 - Add check for fips compliant python. (#325)

{hishel-0.1.2 → hishel-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hishel
-Version: 0.1.2
+Version: 0.1.3
 Summary: Persistent cache implementation for httpx and httpcore
 Project-URL: Homepage, https://hishel.com
 Project-URL: Source, https://github.com/karpetrosyan/hishel
@@ -25,14 +25,14 @@ Classifier: Topic :: Internet :: WWW/HTTP
 Requires-Python: >=3.9
 Requires-Dist: httpx>=0.28.0
 Provides-Extra: redis
-Requires-Dist: redis==5.0.4; extra == 'redis'
+Requires-Dist: redis==6.2.0; 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'
 Provides-Extra: sqlite
 Requires-Dist: anysqlite>=0.0.5; extra == 'sqlite'
 Provides-Extra: yaml
-Requires-Dist: pyyaml==6.0.1; extra == 'yaml'
+Requires-Dist: pyyaml==6.0.2; extra == 'yaml'
 Description-Content-Type: text/markdown
 
 <p align="center" class="logo">
@@ -181,6 +181,13 @@ Help us grow and continue developing good software for you ❤️
 
 # Changelog
 
+## 0.1.3 (1st July, 2025)
+
+- Remove `types-redis` from dev dependencies (#336)
+- Bump redis to 6.0.0 and address async `.close()` deprecation warning (#336)
+- Avoid race condition when unlinking files in `FileStorage`. (#334)  
+- Allow prodiving a `path_prefix` in `S3Storage` and `AsyncS3Storage`. (#342)
+
 ## 0.1.2 (5th April, 2025)
 
 - Add check for fips compliant python. (#325)

{hishel-0.1.2 → hishel-0.1.3}/hishel/__init__.py

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

{hishel-0.1.2 → hishel-0.1.3}/hishel/_async/_storages.py

@@ -159,7 +159,7 @@ class AsyncFileStorage(AsyncBaseStorage):
 
         async with self._lock:
             if response_path.exists():
-                response_path.unlink()
+                response_path.unlink(missing_ok=True)
 
     async def update_metadata(self, key: str, response: Response, request: Request, metadata: Metadata) -> None:
         """
@@ -222,7 +222,7 @@ class AsyncFileStorage(AsyncBaseStorage):
             if response_path.is_file():
                 age = time.time() - response_path.stat().st_mtime
                 if age > self._ttl:
-                    response_path.unlink()
+                    response_path.unlink(missing_ok=True)
             return
 
         self._last_cleaned = time.monotonic()
@@ -507,7 +507,7 @@ class AsyncRedisStorage(AsyncBaseStorage):
         return self._serializer.loads(cached_response)
 
     async def aclose(self) -> None:  # pragma: no cover
-        await self._client.close()
+        await self._client.aclose()
 
 
 class AsyncInMemoryStorage(AsyncBaseStorage):
@@ -654,6 +654,8 @@ class AsyncS3Storage(AsyncBaseStorage):  # pragma: no cover
     :type check_ttl_every: tp.Union[int, float]
     :param client: A client for S3, defaults to None
     :type client: tp.Optional[tp.Any], optional
+    :param path_prefix: A path prefix to use for S3 object keys, defaults to "hishel-"
+    :type path_prefix: str, optional
     """
 
     def __init__(
@@ -663,6 +665,7 @@ class AsyncS3Storage(AsyncBaseStorage):  # pragma: no cover
         ttl: tp.Optional[tp.Union[int, float]] = None,
         check_ttl_every: tp.Union[int, float] = 60,
         client: tp.Optional[tp.Any] = None,
+        path_prefix: str = "hishel-",
     ) -> None:
         super().__init__(serializer, ttl)
 
@@ -680,6 +683,7 @@ class AsyncS3Storage(AsyncBaseStorage):  # pragma: no cover
             bucket_name=bucket_name,
             is_binary=self._serializer.is_binary,
             check_ttl_every=check_ttl_every,
+            path_prefix=path_prefix,
         )
         self._lock = AsyncLock()
 

{hishel-0.1.2 → hishel-0.1.3}/hishel/_s3.py

@@ -11,16 +11,22 @@ def get_timestamp_in_ms() -> float:
 
 class S3Manager:
     def __init__(
-        self, client: tp.Any, bucket_name: str, check_ttl_every: tp.Union[int, float], is_binary: bool = False
+        self,
+        client: tp.Any,
+        bucket_name: str,
+        check_ttl_every: tp.Union[int, float],
+        is_binary: bool = False,
+        path_prefix: str = "hishel-",
     ):
         self._client = client
         self._bucket_name = bucket_name
         self._is_binary = is_binary
         self._last_cleaned = time.monotonic()
         self._check_ttl_every = check_ttl_every
+        self._path_prefix = path_prefix
 
     def write_to(self, path: str, data: tp.Union[bytes, str], only_metadata: bool = False) -> None:
-        path = "hishel-" + path
+        path = self._path_prefix + path
         if isinstance(data, str):
             data = data.encode("utf-8")
 
@@ -43,7 +49,7 @@ class S3Manager:
         )
 
     def read_from(self, path: str) -> tp.Union[bytes, str]:
-        path = "hishel-" + path
+        path = self._path_prefix + path
         response = self._client.get_object(
             Bucket=self._bucket_name,
             Key=path,
@@ -57,7 +63,7 @@ class S3Manager:
         return tp.cast(str, content.decode("utf-8"))
 
     def remove_expired(self, ttl: int, key: str) -> None:
-        path = "hishel-" + key
+        path = self._path_prefix + key
 
         if time.monotonic() - self._last_cleaned < self._check_ttl_every:
             try:
@@ -72,7 +78,7 @@ class S3Manager:
 
         self._last_cleaned = time.monotonic()
         for obj in self._client.list_objects(Bucket=self._bucket_name).get("Contents", []):
-            if not obj["Key"].startswith("hishel-"):  # pragma: no cover
+            if not obj["Key"].startswith(self._path_prefix):  # pragma: no cover
                 continue
 
             try:
@@ -88,15 +94,20 @@ class S3Manager:
                 self._client.delete_object(Bucket=self._bucket_name, Key=obj["Key"])
 
     def remove_entry(self, key: str) -> None:
-        path = "hishel-" + key
+        path = self._path_prefix + key
         self._client.delete_object(Bucket=self._bucket_name, Key=path)
 
 
 class AsyncS3Manager:  # pragma: no cover
     def __init__(
-        self, client: tp.Any, bucket_name: str, check_ttl_every: tp.Union[int, float], is_binary: bool = False
+        self,
+        client: tp.Any,
+        bucket_name: str,
+        check_ttl_every: tp.Union[int, float],
+        is_binary: bool = False,
+        path_prefix: str = "hishel-",
     ):
-        self._sync_manager = S3Manager(client, bucket_name, check_ttl_every, is_binary)
+        self._sync_manager = S3Manager(client, bucket_name, check_ttl_every, is_binary, path_prefix)
 
     async def write_to(self, path: str, data: tp.Union[bytes, str], only_metadata: bool = False) -> None:
         return await to_thread.run_sync(self._sync_manager.write_to, path, data, only_metadata)

{hishel-0.1.2 → hishel-0.1.3}/hishel/_sync/_storages.py

@@ -159,7 +159,7 @@ class FileStorage(BaseStorage):
 
         with self._lock:
             if response_path.exists():
-                response_path.unlink()
+                response_path.unlink(missing_ok=True)
 
     def update_metadata(self, key: str, response: Response, request: Request, metadata: Metadata) -> None:
         """
@@ -222,7 +222,7 @@ class FileStorage(BaseStorage):
             if response_path.is_file():
                 age = time.time() - response_path.stat().st_mtime
                 if age > self._ttl:
-                    response_path.unlink()
+                    response_path.unlink(missing_ok=True)
             return
 
         self._last_cleaned = time.monotonic()
@@ -654,6 +654,8 @@ class S3Storage(BaseStorage):  # pragma: no cover
     :type check_ttl_every: tp.Union[int, float]
     :param client: A client for S3, defaults to None
     :type client: tp.Optional[tp.Any], optional
+    :param path_prefix: A path prefix to use for S3 object keys, defaults to "hishel-"
+    :type path_prefix: str, optional
     """
 
     def __init__(
@@ -663,6 +665,7 @@ class S3Storage(BaseStorage):  # pragma: no cover
         ttl: tp.Optional[tp.Union[int, float]] = None,
         check_ttl_every: tp.Union[int, float] = 60,
         client: tp.Optional[tp.Any] = None,
+        path_prefix: str = "hishel-",
     ) -> None:
         super().__init__(serializer, ttl)
 
@@ -680,6 +683,7 @@ class S3Storage(BaseStorage):  # pragma: no cover
             bucket_name=bucket_name,
             is_binary=self._serializer.is_binary,
             check_ttl_every=check_ttl_every,
+            path_prefix=path_prefix,
         )
         self._lock = Lock()
 

{hishel-0.1.2 → hishel-0.1.3}/pyproject.toml

@@ -35,11 +35,11 @@ dependencies = [
 [project.optional-dependencies]
 
 yaml = [
-    "pyyaml==6.0.1",
+    "pyyaml==6.0.2",
 ]
 
 redis = [
-    "redis==5.0.4"
+    "redis==6.2.0"
 ]
 
 sqlite = [
@@ -92,7 +92,7 @@ filterwarnings = []
 
 [tool.coverage.run]
 omit = [
-    "venv/*", 
+    "venv/*",
     "hishel/_sync/*",
     "hishel/_s3.py"
 ]
@@ -136,6 +136,5 @@ dev = [
     "trio==0.28.0",
     "types-boto3==1.0.2",
     "types-pyyaml==6.0.12.20240311",
-    "types-redis==4.6.0.20240425",
     "zipp>=3.19.1",
 ]