easyapi-django 0.34__tar.gz → 0.35__tar.gz

{easyapi_django-0.34/easyapi_django.egg-info → easyapi_django-0.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easyapi_django
-Version: 0.34
+Version: 0.35
 Summary: A simple rest api generator for django based on models
 Author-email: Stamatios Stamou Jr <bushier.outsets.0c@icloud.com>
 License: MIT

{easyapi_django-0.34 → easyapi_django-0.35}/easyapi/base.py

@@ -482,8 +482,15 @@ class BaseResource(View):
 
         label = self.model._meta.label_lower if self.model else 'unknown'
         outcome = 'hits' if response else 'misses'
-        await redis.incr(f'{KEY_PREFIX}cache_stats:{outcome}')
-        await redis.incr(f'{KEY_PREFIX}cache_stats:{outcome}:{label}')
+        # Per-model counters live in a single hash so ``get_cache_stats``
+        # can read them with one HGETALL instead of SCAN over the whole
+        # keyspace (the original ``cache_stats:hits:<label>`` layout
+        # cost 10+ seconds on production-sized Redis).
+        from .redis_config import _BY_MODEL_KEY, cache_stats_field
+        pipe = redis.pipeline()
+        pipe.incr(f'{KEY_PREFIX}cache_stats:{outcome}')
+        pipe.hincrby(_BY_MODEL_KEY, cache_stats_field(outcome, label), 1)
+        await pipe.execute()
 
         if response:
             return HttpResponse(response, content_type='application/json')

{easyapi_django-0.34 → easyapi_django-0.35}/easyapi/redis_config.py

@@ -68,26 +68,56 @@ def get_redis():
     return client
 
 
+# Cache hit/miss counters live in two places now:
+#
+#   {KEY_PREFIX}cache_stats:hits        global hit counter   (INCR)
+#   {KEY_PREFIX}cache_stats:misses      global miss counter  (INCR)
+#   {KEY_PREFIX}cache_stats:by_model    HASH keyed by ``hits:<label>`` /
+#                                       ``misses:<label>``     (HINCRBY)
+#
+# Pre-0.30 deploys used per-model keys (``cache_stats:hits:<label>``) and
+# discovered them via ``SCAN``. With a large keyspace SCAN walked every
+# key in the database, costing 10+ seconds for a single ``cachestats``
+# call. The HASH variant reads everything in one ``HGETALL`` (O(M) where
+# M = number of distinct models). Counters reset across the upgrade —
+# they were observability-only.
+_BY_MODEL_KEY = f'{KEY_PREFIX}cache_stats:by_model'
+
+
+def cache_stats_field(outcome, label):
+    """Hash field for ``cache_stats:by_model``. ``outcome`` is ``hits`` or
+    ``misses``; ``label`` is the model's ``app.model`` lowercased name."""
+    return f'{outcome}:{label}'
+
+
 async def get_cache_stats():
     redis = get_redis()
-    hits = int(await redis.get(f'{KEY_PREFIX}cache_stats:hits') or 0)
-    misses = int(await redis.get(f'{KEY_PREFIX}cache_stats:misses') or 0)
+    pipe = redis.pipeline()
+    pipe.get(f'{KEY_PREFIX}cache_stats:hits')
+    pipe.get(f'{KEY_PREFIX}cache_stats:misses')
+    pipe.hgetall(_BY_MODEL_KEY)
+    raw_hits, raw_misses, raw_by_model = await pipe.execute()
+
+    hits = int(raw_hits or 0)
+    misses = int(raw_misses or 0)
     total = hits + misses
     ratio = hits / total if total else 0.0
 
-    pattern = f'{KEY_PREFIX}cache_stats:hits:*'
     by_model = {}
-    async for key in redis.scan_iter(match=pattern):
-        label = key.split(':hits:', 1)[1]
-        h = int(await redis.get(key) or 0)
-        m = int(await redis.get(f'{KEY_PREFIX}cache_stats:misses:{label}') or 0)
-        t = h + m
-        by_model[label] = {
-            'hits': h,
-            'misses': m,
-            'total': t,
-            'ratio': h / t if t else 0.0,
-        }
+    for field, value in (raw_by_model or {}).items():
+        if ':' not in field:
+            continue
+        kind, label = field.split(':', 1)
+        if kind not in ('hits', 'misses'):
+            continue
+        bucket = by_model.setdefault(label, {'hits': 0, 'misses': 0})
+        bucket[kind] = int(value)
+
+    for label, bucket in by_model.items():
+        bucket['total'] = bucket['hits'] + bucket['misses']
+        bucket['ratio'] = (
+            bucket['hits'] / bucket['total'] if bucket['total'] else 0.0
+        )
 
     return {
         'hits': hits,
@@ -100,7 +130,8 @@ async def get_cache_stats():
 
 async def reset_cache_stats():
     redis = get_redis()
-    pattern = f'{KEY_PREFIX}cache_stats:*'
-    keys = [k async for k in redis.scan_iter(match=pattern)]
-    if keys:
-        await redis.delete(*keys)
+    pipe = redis.pipeline()
+    pipe.delete(f'{KEY_PREFIX}cache_stats:hits')
+    pipe.delete(f'{KEY_PREFIX}cache_stats:misses')
+    pipe.delete(_BY_MODEL_KEY)
+    await pipe.execute()

{easyapi_django-0.34 → easyapi_django-0.35/easyapi_django.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: easyapi_django
-Version: 0.34
+Version: 0.35
 Summary: A simple rest api generator for django based on models
 Author-email: Stamatios Stamou Jr <bushier.outsets.0c@icloud.com>
 License: MIT

{easyapi_django-0.34 → easyapi_django-0.35}/pyproject.toml

@@ -11,7 +11,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "easyapi_django"
-version = "0.34"
+version = "0.35"
 authors = [
   { name="Stamatios Stamou Jr", email="bushier.outsets.0c@icloud.com" },
 ]

{easyapi_django-0.34 → easyapi_django-0.35}/tests/test_redis_config.py

@@ -77,8 +77,12 @@ async def test_cache_stats_counts(fake_redis):
     await redis.incr(f'{KEY_PREFIX}cache_stats:hits')
     await redis.incr(f'{KEY_PREFIX}cache_stats:hits')
     await redis.incr(f'{KEY_PREFIX}cache_stats:misses')
-    await redis.incr(f'{KEY_PREFIX}cache_stats:hits:testapp.space')
-    await redis.incr(f'{KEY_PREFIX}cache_stats:misses:testapp.space')
+    # Per-model counters live in a single hash now (HGETALL on read,
+    # HINCRBY on write) so ``get_cache_stats`` doesn't SCAN the whole
+    # keyspace when Redis has millions of unrelated keys.
+    by_model_key = f'{KEY_PREFIX}cache_stats:by_model'
+    await redis.hincrby(by_model_key, 'hits:testapp.space', 1)
+    await redis.hincrby(by_model_key, 'misses:testapp.space', 1)
 
     stats = await get_cache_stats()
     assert stats['hits'] == 3
@@ -93,11 +97,29 @@ async def test_cache_stats_counts(fake_redis):
     }
 
 
+@pytest.mark.asyncio
+async def test_cache_stats_handles_only_misses(fake_redis):
+    """Resource that always misses should still appear with hits=0."""
+    await reset_cache_stats()
+    redis = get_redis()
+    by_model_key = f'{KEY_PREFIX}cache_stats:by_model'
+    await redis.hincrby(by_model_key, 'misses:testapp.space', 5)
+
+    stats = await get_cache_stats()
+    assert stats['by_model']['testapp.space'] == {
+        'hits': 0,
+        'misses': 5,
+        'total': 5,
+        'ratio': 0.0,
+    }
+
+
 @pytest.mark.asyncio
 async def test_reset_cache_stats(fake_redis):
     redis = get_redis()
+    by_model_key = f'{KEY_PREFIX}cache_stats:by_model'
     await redis.incr(f'{KEY_PREFIX}cache_stats:hits')
-    await redis.incr(f'{KEY_PREFIX}cache_stats:misses:testapp.space')
+    await redis.hincrby(by_model_key, 'misses:testapp.space', 3)
 
     await reset_cache_stats()