aa-killtracker 1.0.0__tar.gz → 1.1.0__tar.gz

{aa_killtracker-1.0.0 → aa_killtracker-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aa-killtracker
-Version: 1.0.0
+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

{aa_killtracker-1.0.0 → aa_killtracker-1.1.0}/killtracker/__init__.py

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

{aa_killtracker-1.0.0 → aa_killtracker-1.1.0}/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,
         )
 

{aa_killtracker-1.0.0 → aa_killtracker-1.1.0}/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)

{aa_killtracker-1.0.0 → aa_killtracker-1.1.0}/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):

{aa_killtracker-1.0.0 → aa_killtracker-1.1.0}/pyproject.toml

@@ -26,7 +26,7 @@ classifiers = [
     "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
 ]
 dependencies = [
-    "allianceauth-app-utils>=1.26",
+    "allianceauth-app-utils>=1.27",
     "allianceauth>=4,<5",
     "dacite",
     "dhooks-lite>=1.1",