aa-killtracker 1.0.0a1__py3-none-any.whl → 1.1.0__py3-none-any.whl

{aa_killtracker-1.0.0a1.dist-info → aa_killtracker-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aa-killtracker
-Version: 1.0.0a1
+Version: 1.1.0
 Summary: An app for running killmail trackers with Alliance Auth and Discord.
 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: dacite
 Requires-Dist: dhooks-lite>=1.1
@@ -242,7 +242,6 @@ Note that all settings are optional and the app will use the documented default
 Name | Description | Default
 -- | -- | --
 `KILLTRACKER_KILLMAIL_MAX_AGE_FOR_TRACKER`| Ignore killmails that are older than the given number in minutes. Sometimes killmails appear belated on ZKB, this feature ensures they don't create new alerts | `60`
-`KILLTRACKER_MAX_KILLMAILS_PER_RUN`| Maximum number of killmails retrieved from ZKB by task run. This value should be set such that the task that fetches new killmails from ZKB every minute will reliable finish within one minute. To test this run a "Catch all" tracker and see how many killmails your system is capable of processing. Note that you can get that information from the worker's log file. It will look something like this: `Total killmails received from ZKB in 49 secs: 100`   | `100`
 `KILLTRACKER_PURGE_KILLMAILS_AFTER_DAYS`| Killmails older than set number of days will be purged from the database. If you want to keep all killmails set this to 0. Note that this setting is only relevant if you have storing killmails enabled.  | `30`
 `KILLTRACKER_QUEUE_ID`| Unique ID used to identify this server when fetching killmails from zKillboard. This setting is mandatory.  | ``
 `KILLTRACKER_STORING_KILLMAILS_ENABLED`| If set to true Killtracker will automatically store all received killmails in the local database. This can be useful if you want to run analytics on killmails etc. However, please note that Killtracker itself currently does not use stored killmails in any way.  | `False`

{aa_killtracker-1.0.0a1.dist-info → aa_killtracker-1.1.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-killtracker/__init__.py,sha256=wIg1n4zLhPPBnSm9Q9U1g_FFh1IGzAzKfJQMohSx95s,356
+killtracker/__init__.py,sha256=rOIvRvSFLhVD9FJyVCT5A2a9T2B95taKGvInCbwDYzk,354
 killtracker/admin.py,sha256=IH04Q1etHUnXSJIhm3bnGfIbSU6lPSSaltLERb-OkYg,14229
 killtracker/app_settings.py,sha256=KqWSS4OVKIa7DmBAa5AbwxFVXw5EQebPfBtPo1UJYgY,4295
 killtracker/apps.py,sha256=lWolk2CVEHPNIMEylbK2fSuCSTRW1n6LBmiDjLoqqq4,384
@@ -8,7 +8,7 @@ killtracker/forms.py,sha256=SUM0U-Sa6FPcGVpsYJbVxHfEtf7hb1Qc_l92Zfa1OLk,5193
 killtracker/managers.py,sha256=hrmpiuMzK-7p-AsT4ee0mMEhQv4b57AGmhlRTxEl7wk,4416
 killtracker/providers.py,sha256=3DiOlklBq5kLGDV9nMlMbP2-S8AodNgR6gtB4cWWCUo,358
 killtracker/signals.py,sha256=rFCg-WYMVPmAhuqX8KHNaicsP1nyj_HYA2O4Qr8wqhk,892
-killtracker/tasks.py,sha256=9ZqItmm2tlzVA-lelNTyzpPuBYCUvfZR2nCV16Xu6fA,9267
+killtracker/tasks.py,sha256=4NTGw_pKs832b5h-YX6rT5zu4vdKS61WjGc1rf-WSiY,9296
 killtracker/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 killtracker/core/discord.py,sha256=cJY1qZ1ULlndliqn304B2deZkgL8VRqnAN_E5bXbTPk,5330
 killtracker/core/helpers.py,sha256=Ulwhz96IopCCNPD6m7ylz9IGnxknIvLSCfcLrmJ8uDE,335
@@ -40,8 +40,8 @@ killtracker/templates/admin/killtracker/tracker/killmail_test.html,sha256=TI2ON8
 killtracker/tests/__init__.py,sha256=CEt5qqp6ptDrx1lwuA6epZ5bzh1CwUJYXeMZqWK9jT0,278
 killtracker/tests/test_admin.py,sha256=XFAlF_Q4h5Z_agkmRtB30GmCayqQPblLolFrN41xu7Q,5659
 killtracker/tests/test_admin_2.py,sha256=rP0EscM9qUil_ZuXute3R8TQY2P5XSjmxHLbziCGcVw,1140
-killtracker/tests/test_integration.py,sha256=fOAOu-lKYFAk0hYYT-V4F3KgmPcrD7JgcR-w-z3lStg,3516
-killtracker/tests/test_tasks.py,sha256=hTxXKoza-hgAUsK2zj5qMkl4igHKB7SB2OkPFJtgXeA,16274
+killtracker/tests/test_integration.py,sha256=9zvM6DJrMioBp1C5_RYLZNu1eHRSLVSwep9y1-bkHkI,2482
+killtracker/tests/test_tasks.py,sha256=TnMFI6xIe2WNAx3sW5O0_OFVb3gF3CqRZI5ZhMN0ZO0,16140
 killtracker/tests/test_utils.py,sha256=1TA0pzCpq8CAKRBTi_xZ9_45n3rPx7UclkgFPzT1VFY,1130
 killtracker/tests/utils.py,sha256=auwXHSpLwI_Qi3NmQUOCrIAcEsuw04ZaNJW82-jD4DU,1139
 killtracker/tests/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -68,7 +68,7 @@ killtracker/tests/testdata/killmails.json,sha256=HKfpXQJ_ikymBSewh4wWixYpLwC3kNB
 killtracker/tests/testdata/load_eveuniverse.py,sha256=FitVc12E_ob56ezK5Y1q07Kbyc7N8poHiCNaLRGU4Jg,388
 killtracker/tools/drop_tables_killtracker.sql,sha256=fJrGY23NKRunpYC3hI-klFkWub4sBuhfP8TaT__zjPg,1726
 killtracker/tools/generate_conditions_text.py,sha256=LxAtTQIX-IbuqaNDMV1XHhq5AbrrlwxLWgXa1M7DWQo,767
-aa_killtracker-1.0.0a1.dist-info/licenses/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
-aa_killtracker-1.0.0a1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-aa_killtracker-1.0.0a1.dist-info/METADATA,sha256=D8mZwY0eM39wkvv8FcnkgaomKJ6KbQhb6cxew0iVqEo,13941
-aa_killtracker-1.0.0a1.dist-info/RECORD,,
+aa_killtracker-1.1.0.dist-info/licenses/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
+aa_killtracker-1.1.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+aa_killtracker-1.1.0.dist-info/METADATA,sha256=qe2Vc-BhMf6pdRCdzZic2SNFFW0WwaXhi1KhoPA-R4w,13442
+aa_killtracker-1.1.0.dist-info/RECORD,,

killtracker/__init__.py

@@ -3,7 +3,7 @@
 # pylint: disable = invalid-name
 default_app_config = "killtracker.apps.KillmailsConfig"
 
-__version__ = "1.0.0a1"
+__version__ = "1.1.0"
 __title__ = "Killtracker"
 
 APP_NAME = "aa-killtracker"

killtracker/tasks.py

@@ -11,7 +11,7 @@ from eveuniverse.tasks import update_unresolved_eve_entities
 
 from allianceauth.services.hooks import get_extension_logger
 from allianceauth.services.tasks import QueueOnce
-from app_utils.esi import retry_task_if_esi_is_down
+from app_utils.esi import retry_task_on_esi_error_and_offline
 from app_utils.logging import LoggerAddTag
 
 from killtracker import __title__
@@ -116,7 +116,6 @@ def run_tracker(
     self: Task, tracker_pk: int, killmail_id: int, ignore_max_age: bool = False
 ) -> None:
     """Run tracker for given killmail and trigger sending if needed."""
-    retry_task_if_esi_is_down(self)
     tracker: Tracker = Tracker.objects.get_cached(
         pk=tracker_pk,
         select_related="webhook",
@@ -128,9 +127,11 @@ def run_tracker(
         logger.error("Aborting. %s", ex)
         return
 
-    killmail_new = tracker.process_killmail(
-        killmail=killmail, ignore_max_age=ignore_max_age
-    )
+    with retry_task_on_esi_error_and_offline(self, f"Tracker {tracker}"):
+        killmail_new = tracker.process_killmail(
+            killmail=killmail, ignore_max_age=ignore_max_age
+        )
+
     if killmail_new:
         logger.info("%s: Killmail %d matches", tracker, killmail_id)
         killmail_new.save()
@@ -142,7 +143,6 @@ def run_tracker(
 @shared_task(bind=True, max_retries=None)
 def generate_killmail_message(self: Task, tracker_pk: int, killmail_id: int) -> None:
     """Generate and enqueue message from given killmail and start sending."""
-    retry_task_if_esi_is_down(self)
     tracker: Tracker = Tracker.objects.get_cached(
         pk=tracker_pk,
         select_related="webhook",
@@ -166,7 +166,7 @@ def generate_killmail_message(self: Task, tracker_pk: int, killmail_id: int) ->
         )
         raise self.retry(
             max_retries=KILLTRACKER_GENERATE_MESSAGE_MAX_RETRIES,
-            countdown=KILLTRACKER_GENERATE_MESSAGE_RETRY_COUNTDOWN,
+            retry_backoff=KILLTRACKER_GENERATE_MESSAGE_RETRY_COUNTDOWN,
             exc=ex,
         )
 

killtracker/tests/test_integration.py

@@ -47,8 +47,7 @@ class TestTasksEnd2End(NoSocketsTestCase):
     def setUp(self):
         cache.clear()
 
-    @patch(PACKAGE_PATH + ".tasks.retry_task_if_esi_is_down", lambda x: None)
-    def test_normal_case(self, requests_mocker, mock_execute):
+    def test_normal_case(self, mock_execute, requests_mocker):
         # given
         mock_execute.return_value = dhooks_lite.WebhookResponse({}, status_code=200)
         requests_mocker.register_uri(
@@ -71,28 +70,3 @@ class TestTasksEnd2End(NoSocketsTestCase):
         _, kwargs = mock_execute.call_args_list[1]
         self.assertIn("My Tracker", kwargs["content"])
         self.assertIn("10000002", kwargs["embeds"][0].url)
-
-    @patch(PACKAGE_PATH + ".tasks.retry_task_if_esi_is_down")
-    def test_should_retry_when_esi_error_limit_reached(
-        self, requests_mocker, mock_retry_task_if_esi_is_down, mock_execute
-    ):
-        def my_retry_task_if_esi_is_down(task):
-            """Retry the task one time only."""
-            if task.request.retries < 1:
-                raise task.retry()
-
-        # given
-        mock_execute.return_value = dhooks_lite.WebhookResponse({}, status_code=200)
-        mock_retry_task_if_esi_is_down.side_effect = my_retry_task_if_esi_is_down
-        requests_mocker.register_uri(
-            "GET",
-            _ZKB_REDISQ_URL,
-            [
-                {"status_code": 200, "json": {"package": killmails_data()[10000001]}},
-                {"status_code": 200, "json": {"package": None}},
-            ],
-        )
-        # when
-        tasks.run_killtracker.delay()
-        # then
-        self.assertEqual(mock_execute.call_count, 1)

killtracker/tests/test_tasks.py

@@ -205,7 +205,6 @@ class TestRunKilltracker(TestTrackerBase):
         self.assertFalse(mock_delete_stale_killmails.delay.called)
 
 
-@patch(MODULE_PATH + ".retry_task_if_esi_is_down", lambda x: None)
 @patch(MODULE_PATH + ".send_messages_to_webhook", spec=True)
 @patch(MODULE_PATH + ".generate_killmail_message", spec=True)
 class TestRunTracker(TestTrackerBase):
@@ -257,7 +256,6 @@ class TestRunTracker(TestTrackerBase):
         self.assertTrue(mock_send_messages_to_webhook.delay.called)
 
 
-@patch(MODULE_PATH + ".retry_task_if_esi_is_down", lambda x: None)
 @patch(MODULE_PATH + ".generate_killmail_message.retry", spec=True)
 @patch(MODULE_PATH + ".send_messages_to_webhook", spec=True)
 class TestGenerateKillmailMessage(TestTrackerBase):