hishel 1.1.3__py3-none-any.whl → 1.1.5__py3-none-any.whl

hishel/_async_httpx.py

@@ -118,12 +118,24 @@ def _httpx_to_internal(
             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)
         )
 
+        if value.is_stream_consumed and "content-encoding" in value.headers:
+            # If the stream was consumed and we don't know about
+            # the original data and its size, fix the Content-Length
+            # header and remove Content-Encoding so we can recreate it later properly.
+            headers = Headers(
+                {
+                    **filter_mapping(
+                        headers,
+                        ["content-encoding"],
+                    ),
+                    "content-length": str(len(value.content)),
+                }
+            )
+
         return Response(
             status_code=value.status_code,
             headers=headers,

hishel/_core/_storages/_async_sqlite.py

@@ -161,8 +161,19 @@ try:
             for row in await cursor.fetchall():
                 pair_data = unpack(row[1], kind="pair")
 
+                if pair_data is None:
+                    continue
+
                 # Skip entries without a response (incomplete)
-                if not isinstance(pair_data, Entry) or pair_data.response is None:
+                if not await self._is_stream_complete(pair_data.id, cursor=cursor):
+                    continue
+
+                # Skip expired entries
+                if await self._is_pair_expired(pair_data, cursor=cursor):
+                    continue
+
+                # Skip soft-deleted entries
+                if self.is_soft_deleted(pair_data):
                     continue
 
                 final_pairs.append(pair_data)
@@ -237,6 +248,11 @@ try:
             await self._soft_delete_pair(pair, cursor)
             await connection.commit()
 
+        async def close(self) -> None:
+            if self.connection is not None:
+                await self.connection.close()
+                self.connection = None
+
         async def _is_stream_complete(self, pair_id: uuid.UUID, cursor: anysqlite.Cursor) -> bool:
             # Check if there's a completion marker (chunk_number = -1) for response stream
             await cursor.execute(
@@ -325,15 +341,7 @@ try:
 
         async def _is_corrupted(self, pair: Entry, cursor: anysqlite.Cursor) -> bool:
             # if entry was created more than 1 hour ago and still has no response (incomplete)
-            if pair.meta.created_at + 3600 < time.time() and pair.response is None:
-                return True
-
-            # Check if response stream is complete for Entry with response
-            if (
-                isinstance(pair, Entry)
-                and pair.response is not None
-                and not await self._is_stream_complete(pair.id, cursor)
-            ):
+            if pair.meta.created_at + 3600 < time.time() and not self._is_stream_complete(pair.id, cursor):
                 return True
             return False
 

hishel/_core/_storages/_sync_sqlite.py

@@ -161,8 +161,19 @@ try:
             for row in cursor.fetchall():
                 pair_data = unpack(row[1], kind="pair")
 
+                if pair_data is None:
+                    continue
+
                 # Skip entries without a response (incomplete)
-                if not isinstance(pair_data, Entry) or pair_data.response is None:
+                if not self._is_stream_complete(pair_data.id, cursor=cursor):
+                    continue
+
+                # Skip expired entries
+                if self._is_pair_expired(pair_data, cursor=cursor):
+                    continue
+
+                # Skip soft-deleted entries
+                if self.is_soft_deleted(pair_data):
                     continue
 
                 final_pairs.append(pair_data)
@@ -237,6 +248,11 @@ try:
             self._soft_delete_pair(pair, cursor)
             connection.commit()
 
+        def close(self) -> None:
+            if self.connection is not None:
+                self.connection.close()
+                self.connection = None
+
         def _is_stream_complete(self, pair_id: uuid.UUID, cursor: sqlite3.Cursor) -> bool:
             # Check if there's a completion marker (chunk_number = -1) for response stream
             cursor.execute(
@@ -325,15 +341,7 @@ try:
 
         def _is_corrupted(self, pair: Entry, cursor: sqlite3.Cursor) -> bool:
             # if entry was created more than 1 hour ago and still has no response (incomplete)
-            if pair.meta.created_at + 3600 < time.time() and pair.response is None:
-                return True
-
-            # Check if response stream is complete for Entry with response
-            if (
-                isinstance(pair, Entry)
-                and pair.response is not None
-                and not self._is_stream_complete(pair.id, cursor)
-            ):
+            if pair.meta.created_at + 3600 < time.time() and not self._is_stream_complete(pair.id, cursor):
                 return True
             return False
 

hishel/_sync_httpx.py

@@ -118,12 +118,24 @@ def _httpx_to_internal(
             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_sync_iterator([value.content]) if value.is_stream_consumed else value.iter_raw(chunk_size=CHUNK_SIZE)
         )
 
+        if value.is_stream_consumed and "content-encoding" in value.headers:
+            # If the stream was consumed and we don't know about
+            # the original data and its size, fix the Content-Length
+            # header and remove Content-Encoding so we can recreate it later properly.
+            headers = Headers(
+                {
+                    **filter_mapping(
+                        headers,
+                        ["content-encoding"],
+                    ),
+                    "content-length": str(len(value.content)),
+                }
+            )
+
         return Response(
             status_code=value.status_code,
             headers=headers,

hishel/requests.py

@@ -10,7 +10,7 @@ from hishel._core._storages._sync_base import SyncBaseStorage
 from hishel._core.models import extract_metadata_from_headers
 from hishel._policies import CachePolicy
 from hishel._sync_cache import SyncCacheProxy
-from hishel._utils import snake_to_header
+from hishel._utils import filter_mapping, snake_to_header
 
 try:
     import requests
@@ -94,12 +94,17 @@ def _requests_to_internal(
     elif isinstance(model, requests.models.Response):
         try:
             stream = model.raw.stream(amt=CHUNK_SIZE, decode_content=None)
+            headers = Headers(filter_mapping(model.headers, ["transfer-encoding"]))
         except requests.exceptions.StreamConsumedError:
             stream = iter([model.content])
+            # If the stream was consumed and we don't know about the original
+            # data and its size, fix the Content-Length header and remove
+            # Content-Encoding so we can recreate it later properly.
+            headers = Headers(filter_mapping(model.headers, ["content-encoding", "transfer-encoding"]))
 
         return Response(
             status_code=model.status_code,
-            headers=Headers(model.headers),
+            headers=headers,
             stream=stream,
         )
     else:

{hishel-1.1.3.dist-info → hishel-1.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hishel
-Version: 1.1.3
+Version: 1.1.5
 Summary:  Elegant HTTP Caching for Python
 Project-URL: Homepage, https://hishel.com
 Project-URL: Source, https://github.com/karpetrosyan/hishel
@@ -406,6 +406,27 @@ Hishel is inspired by and builds upon the excellent work in the Python HTTP ecos
   <strong>Made with ❤️ by <a href="https://github.com/karpetrosyan">Kar Petrosyan</a></strong>
 </p>
 
+## What's Changed in 1.1.5
+### 🐛 Bug Fixes
+
+* filter out soft-deleted, expired and incomplete entries in `get_entries` by @karpetrosyan
+
+### Contributors
+* @karpetrosyan
+
+**Full Changelog**: https://github.com/karpetrosyan/hishel/compare/1.1.4...1.1.5
+
+## What's Changed in 1.1.4
+### 🐛 Bug Fixes
+
+* don't raise an error on consumed streams that were read into memory by @karpetrosyan
+* close sqlite connections properly by @karpetrosyan
+
+### Contributors
+* @karpetrosyan
+
+**Full Changelog**: https://github.com/karpetrosyan/hishel/compare/1.1.3...1.1.4
+
 ## What's Changed in 1.1.3
 ### ⚙️ Miscellaneous Tasks
 
@@ -416,9 +437,9 @@ Hishel is inspired by and builds upon the excellent work in the Python HTTP ecos
 * fix: set `after_revalidation=True` for `NeedsToBeUpdated` -> `FromCache` transition by @jlopex in [#402](https://github.com/karpetrosyan/hishel/pull/402)
 
 ### Contributors
+* @karpetrosyan
 * @martinblech
 * @jlopex
-* @karpetrosyan
 
 **Full Changelog**: https://github.com/karpetrosyan/hishel/compare/1.1.2...1.1.3
 

{hishel-1.1.3.dist-info → hishel-1.1.5.dist-info}/RECORD

@@ -1,24 +1,24 @@
 hishel/__init__.py,sha256=1EdAEXWx41gmxUzG1Fchd_B4gQDtqlxlqQw0WkCBaUE,1826
 hishel/_async_cache.py,sha256=4wm6YBL9ClNOg4WbEkALTJVCIXuzQU80MVem2C3hHrQ,8785
-hishel/_async_httpx.py,sha256=_-M5BEIyhrPiWJYy-zX0XbAvGFY6NLDdKtfiLt6Io6c,7726
+hishel/_async_httpx.py,sha256=89i92f2SlvgWrav_TDNU1iUzMxdR607apauxXA3pE3U,8127
 hishel/_policies.py,sha256=1ae_rmDF7oaG91-lQyOGVaTrRX8uI2GImmu5gN6WJa4,1135
 hishel/_sync_cache.py,sha256=k0AN0M--yR4Jc6SiAreaxPUFiwEt5Dx7wi9jqW9sy50,8510
-hishel/_sync_httpx.py,sha256=0wVXeapkFqWtsLq1xtlTpvL-TQ5T6HUyQ7RK4Kz0GMA,7551
+hishel/_sync_httpx.py,sha256=z1pwVUQfRf72Q48PXXZ4FKwXGevll0X5iHcVRANiP38,7952
 hishel/_utils.py,sha256=kR7RnhFqLzFRmB-YNnZteQVP0iDPUouCscA0_FHHFls,3837
 hishel/asgi.py,sha256=ocXzqrrYGazeJxlKFcz1waoKvKGOqJ7YBEAmly4Towk,14998
 hishel/fastapi.py,sha256=CVWCyXTxBPwG_XALo-Oldekv4lqMgH2-W-PPZ9rZjXg,10826
 hishel/httpx.py,sha256=99a8X9COPiPHSgGW61O2uMWMZB7dY93Ty9DTCJ9C18Q,467
 hishel/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hishel/requests.py,sha256=FbOBMvgNSWkH0Bh0qZdr-dhCYG6siR5Lmxcu5eMay3s,6409
+hishel/requests.py,sha256=F3BntFGeesm19NmWFgGoBg-rfkcIs9OTpXDass73t6w,6819
 hishel/_core/_headers.py,sha256=hGaT6o1F-gs1pm5RpdGb0IMQL3uJYDH1xpwJLy28Cys,17514
 hishel/_core/_spec.py,sha256=5VLwyT-eSdbez87A6xJG8T_Z3ySVcEEQp8WyTY_mhCo,102988
 hishel/_core/models.py,sha256=EabP2qnjYVzhPWhQer3QFmdDE6TDbqEBEqPHzv25VnA,7978
 hishel/_core/_storages/_async_base.py,sha256=iZ6Mb30P0ho5h4UU5bgOrcsSMZ1427j9tht-tupZs68,2106
-hishel/_core/_storages/_async_sqlite.py,sha256=QZEWroGZKGhCMf7CcYpZfKZdKd88R8elQCoPge0Khxc,15674
+hishel/_core/_storages/_async_sqlite.py,sha256=L1772hba8Onpu7zyEVx74ouFEgQFILuo4xY73BHg8SI,15911
 hishel/_core/_storages/_packing.py,sha256=mC8LMFQ5uPfFOgingKm2WKFO_DwcZ1OjTgI6xc0hfJI,3708
 hishel/_core/_storages/_sync_base.py,sha256=qfOvcFY5qvrzSh4ztV2Trlxft-BF7An5SFsLlEb8EeE,2075
-hishel/_core/_storages/_sync_sqlite.py,sha256=P3vIp636tTtM553-sBTZkam3-sNv0EEkh1rRSd1Qw90,15167
-hishel-1.1.3.dist-info/METADATA,sha256=wnTvK34erjBZbe20gkt-19WumeD2OFsURe9pSQfGcuk,19884
-hishel-1.1.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hishel-1.1.3.dist-info/licenses/LICENSE,sha256=1qQj7pE0V2O9OIedvyOgLGLvZLaPd3nFEup3IBEOZjQ,1493
-hishel-1.1.3.dist-info/RECORD,,
+hishel/_core/_storages/_sync_sqlite.py,sha256=_d5d4ApZ-CTFY_frs4iehBbn0buQ0zcdRL5RF40MPo4,15386
+hishel-1.1.5.dist-info/METADATA,sha256=dWg7HdttEhW6yjA1Em9ye-wy9bmOa_uXMgyoB_MZngc,20444
+hishel-1.1.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hishel-1.1.5.dist-info/licenses/LICENSE,sha256=1qQj7pE0V2O9OIedvyOgLGLvZLaPd3nFEup3IBEOZjQ,1493
+hishel-1.1.5.dist-info/RECORD,,