aa-ledger 0.9.9.1__py3-none-any.whl → 0.9.9.2__py3-none-any.whl

{aa_ledger-0.9.9.1.dist-info → aa_ledger-0.9.9.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aa-ledger
-Version: 0.9.9.1
+Version: 0.9.9.2
 Summary: Character and Corporation statistics, including detailed information on ESS, Ratting, Trading, Mining, and other activities.
 Project-URL: Changelog, https://github.com/Geuthur/aa-ledger/blob/master/CHANGELOG.md
 Project-URL: Documentation, https://github.com/Geuthur/aa-ledger/blob/master/README.md

{aa_ledger-0.9.9.1.dist-info → aa_ledger-0.9.9.2.dist-info}/RECORD

@@ -1,16 +1,16 @@
-ledger/__init__.py,sha256=pCFd5DKZRKm4BXylGLIBFX8IdVyRwApROtVLFesfMzQ,207
+ledger/__init__.py,sha256=SmD-iaiVbHb4TvNt2hPH3sGudQ4HKZ26Eo9HUOqkBJA,207
 ledger/admin.py,sha256=wp6nLps1tTGHznyHBLMoRnwjnYZW1RfXOnw4TfwRWhM,9408
 ledger/app_settings.py,sha256=r9CcNaBDo6kFOlYXXlRx3aTq1xErDz_JwJy7vM-mJNk,1363
 ledger/apps.py,sha256=XQxXGP-1xvmQqTRJYrVIuUgCwUPOdEW3iSZaxTOYvT0,442
 ledger/auth_hooks.py,sha256=yaOoOqfHqKoqcDm4eA-_wejIxvNIEcGa_glwHK-Sul0,1454
 ledger/checks.py,sha256=Sq-tfUyc_OElBi9Xj71DuJXBbRU0Zqu1XDSbEtp3bPI,1474
 ledger/constants.py,sha256=WBS7yuhBcEW9nWdj4Ieit-PolUQP_Uz393QBZFNUmvs,3662
-ledger/decorators.py,sha256=ka3LJ1XFiIsiWqex5i0qiO80UH0NICshLfft3sy9ceU,4924
+ledger/decorators.py,sha256=HCC79YwIqwFQd0Kw4dLtVcUHOqBW7V2sypb6h6TNoaQ,2177
 ledger/errors.py,sha256=8VMvWzlpjilvC6h9WSUhBtz19oN_shRoradq5sp-G-8,495
 ledger/forms.py,sha256=DUVd2s6D9rdyhYxoM0VXlA5PODywmpKUw5FfTBJft-w,269
 ledger/hooks.py,sha256=ofua_eHg_ikCxaql8O7c3itSx2FyUhpeXJNH39asncA,15
 ledger/providers.py,sha256=Ggmna3W-izQdB0AwcTkJ6tijoFFHJt-VFRwT-n1Pvhw,303
-ledger/tasks.py,sha256=FO1Oy458GaA9g2dbXrCvmL3u_d-T7tyOWW7O-qOpQl0,14733
+ledger/tasks.py,sha256=7w1vFrD9Md2Um7_NGOiwZMXsgydoNLKaJxxV07_PtZ8,14894
 ledger/urls.py,sha256=Zs6kkBmEdsVC7ZA2rOYjTtnfT6etQu_d4pZmPyUQg08,8419
 ledger/api/__init__.py,sha256=GtiQ3H7rMKu_i63rp5GpHieHzVH-fWtFRHnZ6s9wS_k,655
 ledger/api/helpers.py,sha256=SyoARfjY3hxlhbnXbVKmpbMsFXvH6k1lF2QiBmynaP0,4199
@@ -36,33 +36,33 @@ ledger/helpers/discord.py,sha256=D59TBtPHAldCCWi2j_z1CzuW6140aP2kHYvgzgYwuP0,442
 ledger/helpers/etag.py,sha256=7x4balvYOypaC0jKlBbjRuETn6ol3gMBTL_363b7iVA,7421
 ledger/helpers/ref_type.py,sha256=BnRypVpSZmBaJbULWh9URJDlHrDnqRDoynd_nDSmdCo,16413
 ledger/locale/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ledger/locale/django.pot,sha256=XKNnc2EkU5ouwBHWLvLfCvBAJRXc7KTmNHDWj_4AswY,24140
+ledger/locale/django.pot,sha256=wpXzSlHjvad6TEyL40wkGDjcTc71NTH3GJGnCu-XSGM,26836
 ledger/locale/cs_CZ/LC_MESSAGES/django.mo,sha256=UXCQbz2AxBvh-IQ7bGgjoBnijo8h9DfE9107A-2Mgkk,337
-ledger/locale/cs_CZ/LC_MESSAGES/django.po,sha256=katvJhTP3EEHgVBjlHrborUJJUDZEbpNtAtK8GKhltk,24141
-ledger/locale/de/LC_MESSAGES/django.mo,sha256=hvb1lwwhCusnivkWXcisch2Oy47GDNONmifk3ng0YJ4,11746
-ledger/locale/de/LC_MESSAGES/django.po,sha256=ZqapwCcafOjdfzQkLcDzQjLoS1W_ksBNdQnkmzQauIo,28447
+ledger/locale/cs_CZ/LC_MESSAGES/django.po,sha256=3se9bYkf-yYgS1gFsR7haSmosGUnn2cyT0m3jIjZZxo,26829
+ledger/locale/de/LC_MESSAGES/django.mo,sha256=YEf3YV6w4zrZtYahJzQdLLQ7JfMjcrBhbVUqaqJ2rZY,12105
+ledger/locale/de/LC_MESSAGES/django.po,sha256=IVupk3brTAxUXKmfBa-xDY3dTe0ExFM5AnfBDXNBOhs,31494
 ledger/locale/es/LC_MESSAGES/django.mo,sha256=N1pb17IfLd0ASiKO8d68-B4ygSpDkhKOCs8YTzMXQo0,380
-ledger/locale/es/LC_MESSAGES/django.po,sha256=r4PCLW8rMmzWyov4Z5saatMbcGKEyYoYcUwYnDz8aUc,24188
+ledger/locale/es/LC_MESSAGES/django.po,sha256=dmImWCFb8Pn6dB_HnWeqHGdzWBlrHBAKg8Rcf0i7byQ,26876
 ledger/locale/fr_FR/LC_MESSAGES/django.mo,sha256=UXCQbz2AxBvh-IQ7bGgjoBnijo8h9DfE9107A-2Mgkk,337
-ledger/locale/fr_FR/LC_MESSAGES/django.po,sha256=katvJhTP3EEHgVBjlHrborUJJUDZEbpNtAtK8GKhltk,24141
+ledger/locale/fr_FR/LC_MESSAGES/django.po,sha256=3se9bYkf-yYgS1gFsR7haSmosGUnn2cyT0m3jIjZZxo,26829
 ledger/locale/it_IT/LC_MESSAGES/django.mo,sha256=UXCQbz2AxBvh-IQ7bGgjoBnijo8h9DfE9107A-2Mgkk,337
-ledger/locale/it_IT/LC_MESSAGES/django.po,sha256=katvJhTP3EEHgVBjlHrborUJJUDZEbpNtAtK8GKhltk,24141
+ledger/locale/it_IT/LC_MESSAGES/django.po,sha256=3se9bYkf-yYgS1gFsR7haSmosGUnn2cyT0m3jIjZZxo,26829
 ledger/locale/ja/LC_MESSAGES/django.mo,sha256=XMj5I8Aah7EGpU-KfFOr25hoOxxLT5dfmjror1-uc8g,373
-ledger/locale/ja/LC_MESSAGES/django.po,sha256=_IGQgNKM5yvWdEuxQWK4tU39W2R-b1GrVYGyy371KJQ,24181
+ledger/locale/ja/LC_MESSAGES/django.po,sha256=SoC9qYHZnHk7huEaheEvQ3O2k-G7DdPFM23N9tJAOlM,26869
 ledger/locale/ko_KR/LC_MESSAGES/django.mo,sha256=UXCQbz2AxBvh-IQ7bGgjoBnijo8h9DfE9107A-2Mgkk,337
-ledger/locale/ko_KR/LC_MESSAGES/django.po,sha256=katvJhTP3EEHgVBjlHrborUJJUDZEbpNtAtK8GKhltk,24141
+ledger/locale/ko_KR/LC_MESSAGES/django.po,sha256=3se9bYkf-yYgS1gFsR7haSmosGUnn2cyT0m3jIjZZxo,26829
 ledger/locale/nl_NL/LC_MESSAGES/django.mo,sha256=UXCQbz2AxBvh-IQ7bGgjoBnijo8h9DfE9107A-2Mgkk,337
-ledger/locale/nl_NL/LC_MESSAGES/django.po,sha256=katvJhTP3EEHgVBjlHrborUJJUDZEbpNtAtK8GKhltk,24141
+ledger/locale/nl_NL/LC_MESSAGES/django.po,sha256=3se9bYkf-yYgS1gFsR7haSmosGUnn2cyT0m3jIjZZxo,26829
 ledger/locale/pl_PL/LC_MESSAGES/django.mo,sha256=UXCQbz2AxBvh-IQ7bGgjoBnijo8h9DfE9107A-2Mgkk,337
-ledger/locale/pl_PL/LC_MESSAGES/django.po,sha256=katvJhTP3EEHgVBjlHrborUJJUDZEbpNtAtK8GKhltk,24141
+ledger/locale/pl_PL/LC_MESSAGES/django.po,sha256=3se9bYkf-yYgS1gFsR7haSmosGUnn2cyT0m3jIjZZxo,26829
 ledger/locale/ru/LC_MESSAGES/django.mo,sha256=hs3OUHIMDSoIE9PjzkBNf97lqqo84dp6fQ_nZOMq2us,518
-ledger/locale/ru/LC_MESSAGES/django.po,sha256=bwxi1iqISdMlTq26xi0H6l5W8CewtF2MWs3NcLWAWug,24332
+ledger/locale/ru/LC_MESSAGES/django.po,sha256=pQaDGnnaD6f1dMvfu18_qTNBQwCenU6Luhl5bJPhjW8,27020
 ledger/locale/sk/LC_MESSAGES/django.mo,sha256=TRRRHrYeiLCvDNFGFTmkHmuh25TerdFy4jNVwPsWkzA,455
-ledger/locale/sk/LC_MESSAGES/django.po,sha256=y6ZJSEiAAoEyiXm6NFAOHDaIpdM5ltQDCBZTgQH8vV4,24266
+ledger/locale/sk/LC_MESSAGES/django.po,sha256=JSQ7NYvHqJq46MrN--zN0N-_45-jcKV8zG_GQorELZw,26954
 ledger/locale/uk/LC_MESSAGES/django.mo,sha256=db3vApZ7nY3-IsGkDVAV5ckHkmwj9XGdsaB-jj90uLE,602
-ledger/locale/uk/LC_MESSAGES/django.po,sha256=b4NDbUVjmBtgEspucudT8lAHdng8AHfj-7yZLsY8hFA,24419
+ledger/locale/uk/LC_MESSAGES/django.po,sha256=NhBuZqoUuv7MxWmQogVl10EslaIyXYM6ntMCqNjwoPA,27107
 ledger/locale/zh_Hans/LC_MESSAGES/django.mo,sha256=XMj5I8Aah7EGpU-KfFOr25hoOxxLT5dfmjror1-uc8g,373
-ledger/locale/zh_Hans/LC_MESSAGES/django.po,sha256=_IGQgNKM5yvWdEuxQWK4tU39W2R-b1GrVYGyy371KJQ,24181
+ledger/locale/zh_Hans/LC_MESSAGES/django.po,sha256=SoC9qYHZnHk7huEaheEvQ3O2k-G7DdPFM23N9tJAOlM,26869
 ledger/managers/character_audit_manager.py,sha256=UoI1aeyLLkEDo9KBgtgYYmJXtPXmxld9ARDQlcNk6Bg,6797
 ledger/managers/character_journal_manager.py,sha256=2uEkVZ_Sp-iP68rL8s7Ia0uiT-UXHNQslxF3RfqWPdY,17482
 ledger/managers/character_mining_manager.py,sha256=zh5wFs4RnhOTfua5AmgVeGuZFvl4pU7VuEAcaUilUGI,8182
@@ -161,7 +161,7 @@ ledger/templatetags/ledger.py,sha256=TRpJjT0YnLDzHkwf0aMKYKl9EwxJK-1QH32OKyyhtMQ
 ledger/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ledger/tests/test_admin.py,sha256=URLocRx_WiF1_DQwcba4EB6Qu18sfl2-gpZS1HZnvAU,8843
 ledger/tests/test_auth_hook.py,sha256=QTheohS7syk-Hs7FZmCK4emIZhH68TfuOpLrJ1mV0LM,2007
-ledger/tests/test_decarators.py,sha256=51XvZEYzeVrUM-Q-V6tzGvzQ4TVG84uTiJwS6ryWwTA,5592
+ledger/tests/test_decarators.py,sha256=PMYA4K154z3q1r-ebuDEUqaPPsh0gf1rWIj1wJdEX_k,3095
 ledger/tests/test_discord_installed.py,sha256=Tf-y1-RduOcxpgLNu4dDOBQKmRwJWkwx3I6JVh51Pyo,1001
 ledger/tests/test_tasks.py,sha256=YDcklSh_QrlVaoR9CtjLM6j-241uGFXa37BizSoktd4,8576
 ledger/tests/test_templatetags.py,sha256=KfKF1DGU8e9QofeQwai69xIvRYiaI7cEdiNrnvflUz0,1881
@@ -224,7 +224,7 @@ ledger/views/character/character_ledger.py,sha256=A8n3ela-Yv4PicXwR8c_YUpIn81WNw
 ledger/views/character/planetary.py,sha256=zfcyxfs8x7B6DTZ4tViI8aO8fty94JhphTb9bd73Xr8,4459
 ledger/views/corporation/add_corp.py,sha256=1SLMITOZ5GdBuk4VSkduaxiS5mNgP9aObsJ1SwYMUOQ,1837
 ledger/views/corporation/corporation_ledger.py,sha256=CcRg1B1-GilF4M-6b_xlY2Qmufutoy5HRLOZgmlePzU,7357
-aa_ledger-0.9.9.1.dist-info/METADATA,sha256=_-Vy1KvQNEoRK-BqlZoM5Ic9v-AEdcL9piCsy0dHWjc,50241
-aa_ledger-0.9.9.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aa_ledger-0.9.9.1.dist-info/licenses/LICENSE,sha256=2oHuqnDfrjCrYAM1--Wyhv8jO3VBpnrq8zkABGzB8N8,35109
-aa_ledger-0.9.9.1.dist-info/RECORD,,
+aa_ledger-0.9.9.2.dist-info/METADATA,sha256=RwnVzAHgK3wYDD2zmXBoquBu2V9BhTUiVBDMKYTTtlI,50241
+aa_ledger-0.9.9.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aa_ledger-0.9.9.2.dist-info/licenses/LICENSE,sha256=2oHuqnDfrjCrYAM1--Wyhv8jO3VBpnrq8zkABGzB8N8,35109
+aa_ledger-0.9.9.2.dist-info/RECORD,,

ledger/__init__.py

@@ -1,6 +1,6 @@
 """Initialize the app"""
 
-__version__ = "0.9.9.1"
+__version__ = "0.9.9.2"
 __title__ = "Ledger"
 
 __package_name__ = "aa-ledger"

ledger/decorators.py

@@ -4,14 +4,15 @@ Decorators
 
 # Standard Library
 import time
-import uuid
 from functools import wraps
 
+# Django
+from django.core.cache import cache
+
 # Alliance Auth
 from allianceauth.services.hooks import get_extension_logger
 
 # Alliance Auth (External Libs)
-from app_utils.allianceauth import get_redis_client
 from app_utils.esi import fetch_esi_status
 from app_utils.logging import LoggerAddTag
 
@@ -21,57 +22,16 @@ from ledger.app_settings import IS_TESTING
 
 logger = LoggerAddTag(get_extension_logger(__name__), __title__)
 
+# Use shared ESI status route rate limit from app_settings
+ESI_STATUS_ROUTE_RATE_LIMIT = 5
+ESI_STATUS_KEY = "esi-is-available-status"
 
-def _esi_cache_available(redis_client, cache_key):
-    """Return True if ESI availability cache is present. Handles Redis errors."""
-    try:
-        if redis_client.get(cache_key):
-            return True
-    except Exception:  # pylint: disable=broad-except
-        # If Redis is flaky, fall through to live check
-        logger.debug("Error reading ESI cache, will attempt live check.")
-    return False
-
-
-def _acquire_lock(redis_client, lock_key, token, lock_ttl):
-    """Try to acquire a short-lived lock in Redis. Returns True on success."""
-    try:
-        return redis_client.set(lock_key, token, nx=True, ex=lock_ttl)
-    except Exception:  # pylint: disable=broad-except
-        logger.exception("Failed to acquire ESI status lock, will attempt live check.")
-        return False
 
-
-def _wait_for_lock_or_cache(redis_client, cache_key, lock_key, token, lock_ttl):
-    """Wait a short time for either the cache to appear or the lock to become available.
-
-    Returns a tuple (acquired, cache_available).
-    """
-    waited = 0.0
-    poll_interval = 0.1
-    max_wait = float(lock_ttl) - 0.1
-    while waited < max_wait:
-        try:
-            # If cache was set while waiting, proceed.
-            if _esi_cache_available(redis_client, cache_key):
-                logger.debug("ESI status became available in cache while waiting.")
-                return False, True
-
-            # If the lock expired or was released, try to acquire it.
-            if not redis_client.get(lock_key):
-                try:
-                    acquired = redis_client.set(lock_key, token, nx=True, ex=lock_ttl)
-                    if acquired:
-                        # We acquired the lock and will perform the check
-                        return True, False
-                except Exception:  # pylint: disable=broad-except
-                    logger.debug("Failed to re-acquire lock while waiting for holder.")
-        except Exception:  # pylint: disable=broad-except
-            logger.debug("Error polling ESI cache while waiting for lock holder.")
-        time.sleep(poll_interval)
-        waited += poll_interval
-
-    return False, False
+def get_esi_available_cache() -> bool:
+    """Return True if ESI availability cache is present."""
+    if cache.get(ESI_STATUS_KEY):
+        return True
+    return False
 
 
 def when_esi_is_available(func):
@@ -83,42 +43,17 @@ def when_esi_is_available(func):
 
     @wraps(func)
     def outer(*args, **kwargs):
-        # During tests we skip ESI checks
-        if IS_TESTING:
-            return func(*args, **kwargs)
 
-        cache_key = "esi_status_is_up"
-        redis_client = get_redis_client()
-
-        # Prevent hammering ESI status endpoint
-        if _esi_cache_available(redis_client, cache_key):
-            logger.debug("ESI status cached as available.")
+        # During tests we skip ESI checks
+        if IS_TESTING or get_esi_available_cache():
+            logger.debug("Skipping ESI check (testing mode or cache present).")
             return func(*args, **kwargs)
 
-        # Try to acquire a short-lived lock so only one process checks ESI
-        token = str(uuid.uuid4())
-        lock_key = "esi_status_lock"
-        lock_ttl = 5
-        acquired = _acquire_lock(redis_client, lock_key, token, lock_ttl)
-
-        # If we didn't get the lock, wait a short time for cache or lock
-        if not acquired:
-            acquired, cache_available = _wait_for_lock_or_cache(
-                redis_client, cache_key, lock_key, token, lock_ttl
-            )
-            if cache_available:
-                return func(*args, **kwargs)
-
         # Check ESI status
         if fetch_esi_status().is_ok:
             logger.debug("ESI is available, proceeding.")
-            # 5 second TTL
-            try:
-                redis_client.setex(cache_key, 5, "1")
-            except Exception:  # pylint: disable=broad-except
-                logger.debug("Failed to set ESI availability cache.")
+            cache.set(ESI_STATUS_KEY, "1", timeout=ESI_STATUS_ROUTE_RATE_LIMIT)
             return func(*args, **kwargs)
-
         return None  # function will not run
 
     return outer