hishel 1.1.4__tar.gz → 1.1.5__tar.gz

{hishel-1.1.4 → hishel-1.1.5}/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 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
 

{hishel-1.1.4 → hishel-1.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hishel
-Version: 1.1.4
+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,16 @@ 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
 

{hishel-1.1.4 → hishel-1.1.5}/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)
@@ -330,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-1.1.4 → hishel-1.1.5}/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)
@@ -330,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-1.1.4 → hishel-1.1.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "hishel"
-version = "1.1.4"
+version = "1.1.5"
 dynamic = ["readme"]
 description = " Elegant HTTP Caching for Python"
 license = "BSD-3-Clause"