careful 0.3.1__py3-none-any.whl → 0.3.2__py3-none-any.whl

careful/httpx/__init__.py

@@ -1,4 +1,6 @@
 import os
+import logging
+import pathlib
 from urllib.parse import urlparse
 from .retries import make_retry_client, retry_default_rule
 from .throttle import make_throttled_client
@@ -21,6 +23,8 @@ from .dev_cache import (
 from ._types import ResponsePredicate, CacheKeyfunc
 from httpx import Client
 
+log = logging.getLogger("careful")
+
 
 def make_careful_client(
     *,
@@ -120,12 +124,25 @@ def _cache_env(var_name: str, default: CacheStorage | None) -> CacheStorage | No
     if not cache_str:
         return default
     parsed = urlparse(cache_str)
+    # urlparse always starts with a / (var needs :/// to skip netloc -> into path)
+    true_path = parsed.path[1:] if parsed.path.startswith("/") else parsed.path
+    # if it starts with a //// then it is an absolute path
+    if true_path.startswith("/"):
+        path = pathlib.Path(true_path)
+    else:
+        path = pathlib.Path.cwd() / true_path
     if parsed.scheme == "memory":
+        log.info("cache from env %s => MemoryCache", var_name)
         return MemoryCache()
     elif parsed.scheme == "file":
-        return FileCache(parsed.path)
+        log.info("cache from env %s => FileCache(%s)", var_name, path)
+        return FileCache(path)
     elif parsed.scheme == "sqlite":
-        return SqliteCache(parsed.path)
+        log.info("cache from env %s => SqliteCache(%s)", var_name, path)
+        return SqliteCache(path)
+    else:
+        log.warning("invalid cache %s=%s", var_name, cache_str)
+        return default
 
 
 def make_careful_client_from_env(

careful/httpx/dev_cache.py

@@ -1,5 +1,6 @@
 import types
 import functools
+import pathlib
 import logging
 import re
 import os
@@ -238,6 +239,7 @@ class FileCache(CacheStorage):
                 content=resp_content,
                 default_encoding=resp_headers.pop("encoding"),
                 headers=resp_headers,
+                request=Request("GET", key),  # not perfect, but it'll do
             )
             return resp
         except IOError:
@@ -254,6 +256,8 @@ class FileCache(CacheStorage):
             encoding_str = "encoding: {0}\n".format(response.encoding)
             f.write(encoding_str.encode("utf8"))
             for h, v in response.headers.items():
+                if h.lower() in ("content-encoding", "content-length"):
+                    continue
                 # header: value\n
                 f.write(h.encode("utf8"))
                 f.write(b": ")
@@ -286,12 +290,17 @@ class SqliteCache(CacheStorage):
 
     _columns = ["key", "status", "modified", "encoding", "data", "headers"]
 
-    def __init__(self, cache_path: str, check_last_modified: bool = False):
+    def __init__(
+        self, cache_path: str | pathlib.Path, check_last_modified: bool = False
+    ):
         self.cache_path = cache_path
         self.check_last_modified = check_last_modified
-        self._conn = sqlite3.connect(cache_path)
+        self._conn = sqlite3.connect(str(cache_path))
         self._conn.text_factory = str
         self._build_table()
+        # self._conn.execute("PRAGMA journal_mode=WAL;")
+        # self._conn.execute("PRAGMA synchronous=1;")
+        # self._conn.isolation_level = None
 
     def _build_table(self) -> None:
         """Create table for storing request information and response."""
@@ -304,6 +313,8 @@ class SqliteCache(CacheStorage):
     def set(self, key: str, response: Response) -> None:
         """Set cache entry for key with contents of response."""
         mod = response.headers.pop("last-modified", None)
+        response.headers.pop("content-encoding", None)
+        response.headers.pop("content-length", None)
         status = int(response.status_code)
         rec = (
             key,
@@ -340,6 +351,7 @@ class SqliteCache(CacheStorage):
             content=rec["data"],
             default_encoding=rec["encoding"],
             headers=json.loads(rec["headers"]),
+            request=Request("GET", key),  # not perfect, but it'll do
         )
         return resp
 

{careful-0.3.1.dist-info → careful-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: careful
-Version: 0.3.1
+Version: 0.3.2
 Summary: a small library for writing resilient, well-behaved HTTP code
 Project-URL: Repository, https://codeberg.org/jpt/careful
 Author-email: jpt <dev@jpt.sh>

{careful-0.3.1.dist-info → careful-0.3.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
 careful/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-careful/httpx/__init__.py,sha256=sIKMgGf-Ea5VEsEFqxXFbAiaF1tYOYm9CIOvSCPooqw,6674
+careful/httpx/__init__.py,sha256=Ul_K5XSMMW8yo3M-lq8nDbvtDEQS0N-vmurIGnzE8dY,7381
 careful/httpx/_types.py,sha256=jefYDxSbLRUatU8QKeyxStc9UC3AJwAba2SfhNkM0RY,151
-careful/httpx/dev_cache.py,sha256=sfHX2TkKZQRTrOXSGSMgIWE0HbX3Fvuz88o8_jK9P8g,11316
+careful/httpx/dev_cache.py,sha256=cc4_rLKFc6Xggpx5MKc8DBurn5KXTDLHO19U_SipXiY,11873
 careful/httpx/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 careful/httpx/retries.py,sha256=3kjuHKYnK1N4Rtum5gUyY_XO4o4cL4jc59d17Y6UwrI,2949
 careful/httpx/robots.py,sha256=jfqQdplTap_RCENu6MHEIabFVznFLruMvSIaG_u0v_8,2168
 careful/httpx/throttle.py,sha256=b1fbmUskcm343D1bbPbY-ITLdL1zVm1dXtjt9LT1bEA,1412
-careful-0.3.1.dist-info/METADATA,sha256=fkI2V9YX5JKhPTYZga5q_3cyfatB4B_PMdTci3sRMmc,2692
-careful-0.3.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-careful-0.3.1.dist-info/licenses/LICENSE,sha256=oHe4LmCuo6CZne42DRXfiR3uqqIfGsk4dAvDKucAi4M,1315
-careful-0.3.1.dist-info/RECORD,,
+careful-0.3.2.dist-info/METADATA,sha256=fN6sNY5n4PFna9Eq9uTfxDbvzCpct-qXcLOkzrdItGE,2692
+careful-0.3.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+careful-0.3.2.dist-info/licenses/LICENSE,sha256=oHe4LmCuo6CZne42DRXfiR3uqqIfGsk4dAvDKucAi4M,1315
+careful-0.3.2.dist-info/RECORD,,