aa-structures 3.0.2__py3-none-any.whl → 3.2.0__py3-none-any.whl

{aa_structures-3.0.2.dist-info → aa_structures-3.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aa-structures
-Version: 3.0.2
+Version: 3.2.0
 Summary: App for managing Eve Online structures with Alliance Auth.
 Author-email: Erik Kalkoken <kalkoken87@gmail.com>
 Requires-Python: >=3.8
@@ -20,7 +20,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 License-File: LICENSE
-Requires-Dist: allianceauth-app-utils>=1.26
+Requires-Dist: allianceauth-app-utils>=1.27
 Requires-Dist: allianceauth>=4,<5
 Requires-Dist: dhooks-lite>=1.0
 Requires-Dist: django-eveuniverse>=1.5.2

{aa_structures-3.0.2.dist-info → aa_structures-3.2.0.dist-info}/RECORD

@@ -1,14 +1,15 @@
-structures/__init__.py,sha256=SB9G1NFC5j5Qwz4NIpytjIBCCc0m18mj1Oy_F8qTzCk,203
+structures/__init__.py,sha256=yRLr9DYNwHt6AoPk28of4869LzuVHw9SNw7nVii_sXE,203
 structures/admin.py,sha256=K7wh8mHFfGHONn7oLdqXsBAxq0rmYrwbZ7S3uIOuMtg,41303
 structures/app_settings.py,sha256=aWA2bTcv_vVwIyisx-G7GBSpfM6JDyt2MWcXKtHnjK0,6651
-structures/apps.py,sha256=MNZH9l3qWCwuS7OGiKGkBVrDzKoOFlqwDdEgyEFzxVA,195
+structures/apps.py,sha256=lTn0cSCzbUr_6To6utVpApkPcBdwJBYHwYFNqeSamk8,298
 structures/auth_hooks.py,sha256=nRbrixFkAE5gphDokB1E8xhH8FY2VtXVwu0XMmSGBAw,1013
+structures/checks.py,sha256=FbuGC0-pHpv9YBvtZVUH1kwAsJYzdd3nQVqhm0mggbI,1397
 structures/constants.py,sha256=k5rfD29ZjR7ToRmJw4WnLVd4LmoZvDw4OK5IoiiyJ6w,1063
 structures/forms.py,sha256=kXs-SGIIj-D9xtFCILKe_PMRU4eHl3-HLNWRhaZKmnQ,391
 structures/helpers.py,sha256=iadnXcpkHrWciB9snTHyc2bfxk3Hd5Xj1hKshOpvTJU,2542
 structures/managers.py,sha256=_XZhsWb4is7LpQTUmGZwxQeJzyZnsB3n21EETgEIlzU,20062
 structures/providers.py,sha256=9QYHd8X5HwBhrbgbX3LUrXXV1KGM3hFhcxK6qIJjJtg,317
-structures/tasks.py,sha256=INZ3soMYHYfxrQsyTO-ozoxbVX6lpMnF3AUo8ybWIoA,9083
+structures/tasks.py,sha256=71f7Bhx84FjyTOWZvTjfDKAO3cOLRCAf16K50Z0Ke_g,9200
 structures/urls.py,sha256=An5v27AD_NXMNL66cMVtQNci1C_Aqry32rrvDkMpgYo,1467
 structures/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/core/notification_timers.py,sha256=KLjkVrlCCKTWtHJNUfI3U6ppAIZN8vPnIx1zCafRkKQ,16748
@@ -168,7 +169,7 @@ structures/tests/test_admin.py,sha256=aDd88Ry0ahitpYyF_wa1jG_pWJ5m5w3jsat45sBhEm
 structures/tests/test_helpers.py,sha256=BQC-4H-9-v5qW4nugqy0bkxuGlA3UO2clYY2lI2LjoY,4893
 structures/tests/test_managers_1.py,sha256=4dnlK7Le04eJUPjJc9ex5BxZWIJGAyEvdKuuYXU2gqY,34846
 structures/tests/test_managers_2.py,sha256=FISr_NT1Qnu9j1JYYTceNsUk8k9rfCTKwjKi5WUVbPs,3025
-structures/tests/test_tasks.py,sha256=reL1rPv_kvTgsC4lq5SXulkbEHaJrw5B1-hFI4tiDWY,17269
+structures/tests/test_tasks.py,sha256=21Z-nCVZi_MgfRSYYGQAoghIrDOEGMNuqwpF_krrH8o,17372
 structures/tests/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/tests/core/test_notification_structuretimers.py,sha256=OvldjgIHmRVsqoC9C6VJRqwS9WeRFMgpyutRc69PjAU,10857
 structures/tests/core/test_notification_types.py,sha256=2J5A8Dr9UHhzLEj6QTMty5iZXlNkQxtFmLvU8Wpdno4,10447
@@ -228,7 +229,7 @@ structures/webhooks/models.py,sha256=kUkt9rnRQIJIrU9Bjcs34rvkb-TMbUubHdn-kny08kI
 structures/webhooks/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/webhooks/tests/test_core.py,sha256=4NcEAQgK2KhQkFOxYh2ad0S-qUWh1DNGDmLo5Mo5opI,6762
 structures/webhooks/tests/test_utils.py,sha256=ekADFv0JOEtXeqdiejbeqrABO__Q1flJHzVieQ7L9e0,459
-aa_structures-3.0.2.dist-info/licenses/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
-aa_structures-3.0.2.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-aa_structures-3.0.2.dist-info/METADATA,sha256=2UQo3YRjTWfvaTXy0RPC39eXjrsNLgfwrn_c3bQAzhM,6006
-aa_structures-3.0.2.dist-info/RECORD,,
+aa_structures-3.2.0.dist-info/licenses/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
+aa_structures-3.2.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+aa_structures-3.2.0.dist-info/METADATA,sha256=HuRNqoF8ZykrYhNp4AyflxLgi8EeIdIbQE74_RA3dVQ,6006
+aa_structures-3.2.0.dist-info/RECORD,,

structures/__init__.py

@@ -3,5 +3,5 @@
 # pylint: disable = invalid-name
 default_app_config = "structures.apps.StructuresConfig"
 
-__version__ = "3.0.2"
+__version__ = "3.2.0"
 __title__ = "Structures"

structures/apps.py

@@ -7,3 +7,6 @@ class StructuresConfig(AppConfig):
     name = "structures"
     label = "structures"
     verbose_name = f"Structures v{__version__}"
+
+    def ready(self) -> None:
+        from . import checks  # noqa: F401 pylint: disable=unused-import

structures/checks.py

@@ -0,0 +1,49 @@
+"""Django checks."""
+
+import numbers
+
+from django.conf import settings
+from django.core.checks import Warning, register
+
+
+@register()
+def structures_config_check(app_configs, **kwargs):  # pylint: disable=W0613
+    """structures_config_check is a Django check that verifies that all periodic tasks
+    have been configured correctly in settings.
+    """
+    if not hasattr(settings, "CELERYBEAT_SCHEDULE"):
+        return []
+
+    warnings = []
+    for name, obj in settings.CELERYBEAT_SCHEDULE.items():
+        _verify_task_config(
+            warnings, name, obj, "structures.tasks.update_all_structures"
+        )
+        _verify_task_config(
+            warnings, name, obj, "structures.tasks.fetch_all_notifications"
+        )
+    return warnings
+
+
+def _verify_task_config(warnings: list, name: str, obj: dict, task_name: str):
+    if obj["task"] != task_name:
+        return
+
+    schedule = obj["schedule"]
+    if isinstance(schedule, numbers.Number):
+        return
+
+    warnings.append(
+        Warning(
+            (
+                "Periodic task has deprecated schedule: "
+                f'CELERYBEAT_SCHEDULE["{name}"]'
+            ),
+            hint=(
+                'The value for "schedule" must be a positive number, '
+                "not e.g. a cron definition. "
+                f"Current value is: {schedule}"
+            ),
+            id="structures.W001",
+        )
+    )

structures/tasks.py

@@ -44,6 +44,9 @@ def update_all_structures():
 @shared_task(time_limit=STRUCTURES_TASKS_TIME_LIMIT)
 def update_sov_map():
     """Update sovereignty map from ESI."""
+    if not fetch_esi_status().is_ok:
+        logger.warning("ESI currently not available. Aborting.")
+        return
     EveSovereigntyMap.objects.update_or_create_all_from_esi()
 
 

structures/tests/test_tasks.py

@@ -3,6 +3,7 @@ from unittest.mock import patch
 from django.contrib.auth.models import User
 from django.test import TestCase, override_settings
 
+from app_utils.esi import EsiStatus
 from app_utils.testdata_factories import UserFactory
 from app_utils.testing import NoSocketsTestCase, generate_invalid_pk
 
@@ -316,6 +317,7 @@ class TestUpdateNotificationsStructureRelations(NoSocketsTestCase):
         self.assertEqual(result, 0)
 
 
+@patch(MODULE_PATH + ".fetch_esi_status", lambda: EsiStatus(True))
 class TestOtherTasks(NoSocketsTestCase):
     @patch(
         MODULE_PATH + ".EveSovereigntyMap.objects.update_or_create_all_from_esi",