aa-alumni 0.1.6a0__py3-none-any.whl → 0.3.0__py3-none-any.whl

{aa_alumni-0.1.6a0.dist-info → aa_alumni-0.3.0.dist-info}/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Joel Falknau
+Copyright (c) 2021 Joel Falknau
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{aa_alumni-0.1.6a0.dist-info → aa_alumni-0.3.0.dist-info}/METADATA

@@ -1,31 +1,29 @@
-Metadata-Version: 2.1
-Name: aa_alumni
-Version: 0.1.6a0
+Metadata-Version: 2.3
+Name: aa-alumni
+Version: 0.3.0
 Summary: Integration with Alliance Auths State System, creates and maintains an Alumni State for past members of an Alliance and/or Corporation
 Keywords: allianceauth,eveonline
 Author-email: Joel Falknau <joel.falknau@gmail.com>
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Celery
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 4.0
+Classifier: Framework :: Django :: 4.2
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
-Requires-Dist: allianceauth>=3.0.0,<5.0.0
-Requires-Dist: django-eveuniverse
-Requires-Dist: django-solo>=2.0.0,<3.0.0
-Requires-Dist: py-cord>=2.0.0,<3.0.0
+Requires-Dist: allianceauth>=4,<5
+Requires-Dist: django-solo>=2,<3
 Project-URL: Homepage, https://gitlab.com/tactical-supremacy/aa-alumni
 Project-URL: Source, https://gitlab.com/tactical-supremacy/aa-alumni
 Project-URL: Tracker, https://gitlab.com/tactical-supremacy/aa-alumni/-/issues
@@ -44,7 +42,7 @@ Remove/Promote any state with a priority of `1`, Alumni is considered slightly b
 
 ### Step 2 - Install from pip
 
-```bash
+```shell
 pip install aa-alumni
 ```
 
@@ -60,17 +58,17 @@ Configure your Auth settings (`local.py`) as follows:
 # Tasks
 CELERYBEAT_SCHEDULE['alumni_run_alumni_check_all'] = {
     'task': 'alumni.tasks.run_alumni_check_all',
-    'schedule': crontab(minute=0, hour=0, day_of_week=4),
+    'schedule': crontab(minute=37, hour=3, day_of_week=4),
 }
 CELERYBEAT_SCHEDULE['alumni_run_update_all_models'] = {
     'task': 'alumni.tasks.update_all_models',
-    'schedule': crontab(minute=0, hour=0, day_of_week=3),
+    'schedule': crontab(minute=37, hour=3, day_of_week=3),
 }
 ```
 
 ### Step 4 - Update AA's State system
 
-```bash
+```shell
 python myauth/manage.py alumni_state
 ```
 
@@ -85,6 +83,12 @@ python myauth/manage.py alumni_state
 In the Admin interface, visit `alumni > config > add` or `<AUTH-URL>/admin/alumni/config/add/`
 Select the Alliances and/or Corporations for which characters with historical membership are Alumni
 
+## Settings
+
+| Name | Description | Default |
+| --- | --- | --- |
+|`ALUMNI_CHARACTERCORPORATION_RATELIMIT`| Celery Rate Limit _per worker_, 10 tasks * 10 Workers = 100 tasks/min | '10/m' |
+
 ## Contributing
 
 Make sure you have signed the [License Agreement](https://developers.eveonline.com/resource/license-agreement) by logging in at <https://developers.eveonline.com> before submitting any pull requests. All bug fixes or features must not include extra superfluous formatting changes.

aa_alumni-0.3.0.dist-info/RECORD

@@ -0,0 +1,23 @@
+alumni/__init__.py,sha256=KNnvjsgFVxaz4i7ivnq5wNZqvk-LTTj3n6Xl44iOgGk,186
+alumni/admin.py,sha256=VUDXqxBX-Dw_3T4QGXDTtz-Ulgc_WkoCW54OXbd3a5o,737
+alumni/app_settings.py,sha256=soF5EtRwxvWG2ARqzm7e7Qe5dpp-NCPZ-um781fENvs,383
+alumni/apps.py,sha256=JNO5V_uldj3Y2OEJL0h4u86LoPZr5UOhzkcTFZ6VeNI,239
+alumni/models.py,sha256=tgcy4FtHFZNyfCl_Rma3igPgxfaY433YG2CObBrsMe8,2206
+alumni/providers.py,sha256=hKzig2S28NGcCpf078hMzlAL7xarNekFRgGlDS1IWhI,1027
+alumni/signals.py,sha256=ZiWER0gs-0KCS6nWhCwE1_-iDXr9yrS7NSPBfLBDjak,789
+alumni/tasks.py,sha256=q2HkZMfDI1eFyoeTs5BqSYYko9mv46jynuLZMtw9FXw,9203
+alumni/locale/de/LC_MESSAGES/django.mo,sha256=hTZUh1Insgy-eZmz0-Owvgy9Mh6tNw3p2X9J6tD4TwE,1250
+alumni/locale/de/LC_MESSAGES/django.po,sha256=aEAiaM_iPQFp3BCjD0-WEKRMrtLSIn2gp7INLJ5KbJY,1744
+alumni/locale/en/LC_MESSAGES/django.mo,sha256=N1pb17IfLd0ASiKO8d68-B4ygSpDkhKOCs8YTzMXQo0,380
+alumni/locale/en/LC_MESSAGES/django.po,sha256=dW_HNYdzscfIrGUoGA1-0PwV0LNn7-WdgXmdMU7pGm8,1250
+alumni/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+alumni/management/commands/alumni_state.py,sha256=OyJKnkzk9eksk-vULSVBdGvMEhxZX_xa7eH5RXFjeJ8,759
+alumni/migrations/0001_initial.py,sha256=C8R2k4y5KvpTLU_etBQ0J3jkGYd3HAgevAekUZvzxDw,3283
+alumni/migrations/0002_auto_20211230_0147.py,sha256=p3sK1Ohdf6O20tDbMmuPJwC2vVFH-AR0kkXFy9H34_Y,626
+alumni/migrations/0003_alter_alumnisetup_options_and_more.py,sha256=JyXQqo9vR-hRx7CHsNpXLxZEjEijSBLW3zX7Zmw3Y50,1012
+alumni/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+alumni/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+aa_alumni-0.3.0.dist-info/LICENSE,sha256=6TxpZBZY7OLGLrJXe6vREu--u7CjCfW19u4oXW_uZKs,1069
+aa_alumni-0.3.0.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+aa_alumni-0.3.0.dist-info/METADATA,sha256=8JK5mOVUky9sNuPCYL4lvET4LhqzWT81zpL7Q0uciOo,3359
+aa_alumni-0.3.0.dist-info/RECORD,,

{aa_alumni-0.1.6a0.dist-info → aa_alumni-0.3.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: flit 3.9.0
+Generator: flit 3.10.1
 Root-Is-Purelib: true
 Tag: py3-none-any

alumni/__init__.py

@@ -1,5 +1,5 @@
 """
 Integration with Alliance Auths State System, creates and maintains an Alumni State for past members of an Alliance and/or Corporation
 """
-__version__ = "0.1.6a"
+__version__ = "0.3.0"
 __title__ = "Alumni"

alumni/admin.py

@@ -8,9 +8,7 @@ from .models import (
 @admin.register(AlumniSetup)
 class AlumniSetupAdmin(admin.ModelAdmin):
     search_fields = ['alumni_corporations', ]
-    filter_horizontal = [
-        "alumni_corporations",
-        "alumni_alliances"]
+    filter_horizontal = ["alumni_corporations", "alumni_alliances"]
 
 
 @admin.register(CorporationAllianceHistory)

alumni/app_settings.py

@@ -2,4 +2,8 @@ from django.conf import settings
 
 ALUMNI_STATE_NAME = getattr(settings, 'ALUMNI_STATE_NAME', "Alumni")
 
-ALUMNI_TASK_PRIORITY = getattr(settings, 'ALUMNI_TASK_PRIORITY', "7")
+ALUMNI_TASK_PRIORITY = getattr(settings, 'ALUMNI_TASK_PRIORITY', 7)
+
+ALUMNI_CHARACTERCORPORATION_RATELIMIT = getattr(settings, 'ALUMNI_CHARACTERCORPORATION_RATELIMIT', '10/m')  # 10*10workers = 100/300 per min
+
+ALUMNI_TASK_JITTER = getattr(settings, 'ALUMNI_TASK_PRIORITY', 600)

alumni/apps.py

@@ -7,4 +7,4 @@ class AlumniConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
     name = "alumni"
     label = "alumni"
-    verbose_name = f"alumni v{__version__}"
+    verbose_name = f"AA Alumni v{__version__}"

alumni/locale/de/LC_MESSAGES/django.po

@@ -0,0 +1,53 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+# Translators:
+# Peter Pfeufer, 2024
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-05-11 18:13+1000\n"
+"PO-Revision-Date: 2024-05-11 10:42+0000\n"
+"Last-Translator: Peter Pfeufer, 2024\n"
+"Language-Team: German (https://app.transifex.com/alliance-auth/teams/107430/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: alumni/models.py:14
+msgid ""
+"Characters with these Corps in their History will be given Alumni Status"
+msgstr ""
+"Charaktere mit diesen Corps in ihrer Vergangenheit erhalten den Alumni-"
+"Status"
+
+#: alumni/models.py:18
+msgid ""
+"Characters with these Alliances in their History will be given Alumni Status"
+msgstr ""
+"Charaktere mit diesen Allianzen in ihrer Vergangenheit erhalten den Alumni-"
+"Status"
+
+#: alumni/models.py:21 alumni/models.py:24 alumni/models.py:25
+msgid "Alumni Config"
+msgstr "Alumni-Konfiguration"
+
+#: alumni/models.py:37 alumni/models.py:52
+msgid "True if the corporation has been deleted"
+msgstr "Wahr, wenn die Corporation gelöscht wurde"
+
+#: alumni/models.py:39 alumni/models.py:54
+msgid ""
+"An incrementing ID that can be used to canonically establish order of "
+"records in cases where dates may be ambiguous"
+msgstr ""
+"Eine aufsteigende ID, die zur kanonischen Festlegung der Reihenfolge von "
+"Datensätzen in Fällen verwendet werden kann, in denen Daten möglicherweise "
+"nicht eindeutig sind"

alumni/locale/en/LC_MESSAGES/django.po

@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-08-29 14:59+1000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: alumni/models.py:15
+msgid ""
+"Characters with these Corps in their History will be given Alumni Status"
+msgstr ""
+
+#: alumni/models.py:19
+msgid ""
+"Characters with these Alliances in their History will be given Alumni Status"
+msgstr ""
+
+#: alumni/models.py:22 alumni/models.py:25 alumni/models.py:26
+msgid "Alumni Config"
+msgstr ""
+
+#: alumni/models.py:38 alumni/models.py:53
+msgid "True if the corporation has been deleted"
+msgstr ""
+
+#: alumni/models.py:40 alumni/models.py:55
+msgid ""
+"An incrementing ID that can be used to canonically establish order of "
+"records in cases where dates may be ambiguous"
+msgstr ""

alumni/migrations/0003_alter_alumnisetup_options_and_more.py

@@ -0,0 +1,27 @@
+# Generated by Django 4.2.10 on 2024-05-11 08:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('alumni', '0002_auto_20211230_0147'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='alumnisetup',
+            options={'verbose_name': 'Alumni Config', 'verbose_name_plural': 'Alumni Config'},
+        ),
+        migrations.AlterField(
+            model_name='charactercorporationhistory',
+            name='record_id',
+            field=models.PositiveIntegerField(help_text='An incrementing ID that can be used to canonically establish order of records in cases where dates may be ambiguous'),
+        ),
+        migrations.AlterField(
+            model_name='corporationalliancehistory',
+            name='record_id',
+            field=models.PositiveIntegerField(help_text='An incrementing ID that can be used to canonically establish order of records in cases where dates may be ambiguous'),
+        ),
+    ]

alumni/models.py

@@ -1,31 +1,29 @@
-from django.core.exceptions import ValidationError
+from solo.models import SingletonModel
+
 from django.db import models
+from django.utils.translation import gettext as _
 
 from allianceauth.eveonline.models import (
     EveAllianceInfo, EveCharacter, EveCorporationInfo,
 )
 
 
-class AlumniSetup(models.Model):
+class AlumniSetup(SingletonModel):
     alumni_corporations = models.ManyToManyField(
         EveCorporationInfo,
         blank=True,
-        help_text="Characters with these Corps in their History will be given Alumni Status")
+        help_text=_("Characters with these Corps in their History will be given Alumni Status"))
     alumni_alliances = models.ManyToManyField(
         EveAllianceInfo,
         blank=True,
-        help_text="Characters with these Alliances in their History will be given Alumni Status")
+        help_text=_("Characters with these Alliances in their History will be given Alumni Status"))
 
-    def save(self, *args, **kwargs):
-        if not self.pk and AlumniSetup.objects.exists():
-            # Force a single object
-            raise ValidationError('There is can be only one \
-                                AlumniCorp instance')
-        self.pk = self.id = 1  # If this happens to be deleted and recreated, force it to be 1
-        return super().save(*args, **kwargs)
+    def __str__(self):
+        return _("Alumni Config")
 
     class Meta:
-        verbose_name_plural = "Alumni Config"
+        verbose_name = _("Alumni Config")
+        verbose_name_plural = _("Alumni Config")
 
 
 class CorporationAllianceHistory(models.Model):
@@ -37,9 +35,9 @@ class CorporationAllianceHistory(models.Model):
     alliance_id = models.PositiveIntegerField(blank=True, null=True, db_index=True)
     is_deleted = models.BooleanField(
         default=False,
-        help_text='True if the corporation has been deleted')
-    record_id = models.IntegerField(
-        help_text='An incrementing ID that can be used to canonically establish order of records in cases where dates may be ambiguous')
+        help_text=_("True if the corporation has been deleted"))
+    record_id = models.PositiveIntegerField(
+        help_text=_("An incrementing ID that can be used to canonically establish order of records in cases where dates may be ambiguous"))
     start_date = models.DateTimeField()
 
 
@@ -48,13 +46,11 @@ class CharacterCorporationHistory(models.Model):
         constraints = [
             models.UniqueConstraint(fields=['character', 'record_id'], name="CharacterCorporationRecord"),
         ]
-    character = models.ForeignKey(
-        EveCharacter,
-        on_delete=models.CASCADE)
+    character = models.ForeignKey(EveCharacter, on_delete=models.CASCADE)
     corporation_id = models.PositiveIntegerField()
     is_deleted = models.BooleanField(
         default=False,
-        help_text='True if the corporation has been deleted')
-    record_id = models.IntegerField(
-        help_text='An incrementing ID that can be used to canonically establish order of records in cases where dates may be ambiguous')
+        help_text=_("True if the corporation has been deleted"))
+    record_id = models.PositiveIntegerField(
+        help_text=_("An incrementing ID that can be used to canonically establish order of records in cases where dates may be ambiguous"))
     start_date = models.DateTimeField()

alumni/providers.py

@@ -1,14 +1,13 @@
-from typing import Dict
-
 from allianceauth import __version__ as aa__version__
 from allianceauth.services.hooks import get_extension_logger
+from esi import __version__ as esi__version__
 from esi.clients import EsiClientProvider
 
-from . import __version__ as a__version__
+from . import __version__
 
 logger = get_extension_logger(__name__)
 
-APP_INFO_TEXT = f"allianceauth v{aa__version__} & aa-alumni v{a__version__}"
+APP_INFO_TEXT = f"aa-alumni/{__version__} allianceauth/{aa__version__} django-esi/{esi__version__}"
 
 """
 Swagger spec operations:
@@ -19,14 +18,14 @@ get_characters_character_id_corporationhistory
 esi = EsiClientProvider(app_info_text=APP_INFO_TEXT)
 
 
-def get_corporations_corporation_id_alliancehistory(corporation_id: int) -> Dict:
+def get_corporations_corporation_id_alliancehistory(corporation_id: int) -> dict:
     result = esi.client.Corporation.get_corporations_corporation_id_alliancehistory(
         corporation_id=corporation_id
     ).results()
     return result
 
 
-def get_characters_character_id_corporationhistory(character_id: int) -> Dict:
+def get_characters_character_id_corporationhistory(character_id: int) -> dict:
     result = esi.client.Character.get_characters_character_id_corporationhistory(
         character_id=character_id
     ).results()

alumni/tasks.py

@@ -1,12 +1,19 @@
 import datetime
+from random import randint
 
+from bravado.exception import HTTPClientError, HTTPInternalServerError
 from celery import shared_task
 
+from django.db import IntegrityError
+
 from allianceauth.authentication.models import State
 from allianceauth.eveonline.models import EveCharacter
 from allianceauth.services.hooks import get_extension_logger
 
-from .app_settings import ALUMNI_STATE_NAME, ALUMNI_TASK_PRIORITY
+from .app_settings import (
+    ALUMNI_CHARACTERCORPORATION_RATELIMIT, ALUMNI_STATE_NAME,
+    ALUMNI_TASK_JITTER, ALUMNI_TASK_PRIORITY,
+)
 from .models import (
     AlumniSetup, CharacterCorporationHistory, CorporationAllianceHistory,
 )
@@ -22,7 +29,8 @@ logger = get_extension_logger(__name__)
 def run_alumni_check_all():
     for character in EveCharacter.objects.all().values('character_id'):
         alumni_check_character.apply_async(
-            args=[character['character_id']], priority=ALUMNI_TASK_PRIORITY
+            args=[character['character_id']],
+            priority=ALUMNI_TASK_PRIORITY
         )
 
 
@@ -134,7 +142,7 @@ def char_alliance_datecompare(alliance_id: int, character_id: int) -> bool:
                     pass
             except Exception as e:
                 # Need to actually add some IndexError handling to above tasks, but lets log this gracefully so as not to cactus up the whole thing.
-                logger.error(e)
+                logger.exception(e)
     return False
 
 
@@ -144,7 +152,9 @@ def update_all_models():
 
     for character in EveCharacter.objects.all().values('character_id'):
         update_charactercorporationhistory.apply_async(
-            args=[character['character_id']], priority=ALUMNI_TASK_PRIORITY
+            args=[character['character_id']],
+            priority=ALUMNI_TASK_PRIORITY,
+            countdown=randint(1, ALUMNI_TASK_JITTER)
         )
 
     # Once all charactercorporations are updated/exist.
@@ -159,12 +169,13 @@ def update_all_models_followup():
     for char_corp_record in CharacterCorporationHistory.objects.values('corporation_id').distinct():
         update_corporationalliancehistory.apply_async(
             args=[char_corp_record['corporation_id']],
-            priority=ALUMNI_TASK_PRIORITY
+            priority=ALUMNI_TASK_PRIORITY,
+            countdown=randint(1, ALUMNI_TASK_JITTER)
         )
 
 
-@shared_task
-def update_corporationalliancehistory(corporation_id: int):
+@shared_task(bind=True, rate_limit=ALUMNI_CHARACTERCORPORATION_RATELIMIT)
+def update_corporationalliancehistory(self, corporation_id: int):
     """Update CorporationAllianceHistory models from ESI
 
     Parameters
@@ -177,19 +188,26 @@ def update_corporationalliancehistory(corporation_id: int):
                 deleted = True
             else:
                 deleted = False
-            CorporationAllianceHistory.objects.update_or_create(
+            CorporationAllianceHistory.objects.create(
                 corporation_id=corporation_id,
                 alliance_id=dat['alliance_id'],
                 is_deleted=deleted,
                 record_id=dat['record_id'],
                 start_date=dat['start_date'],
             )
+        except IntegrityError:
+            # This already exists, move on
+            pass
+        except HTTPClientError as e:  # 429?
+            raise self.retry(exc=e, countdown=61)
+        except HTTPInternalServerError as e:  # Custom timeouts are defined as a 500 on this endpoint
+            raise self.retry(exc=e, countdown=61)
         except Exception as e:
-            logger.error(e)
+            logger.exception(e)
 
 
-@shared_task
-def update_charactercorporationhistory(character_id: int):
+@shared_task(bind=True, rate_limit=ALUMNI_CHARACTERCORPORATION_RATELIMIT)
+def update_charactercorporationhistory(self, character_id: int) -> None:
     """Update CharacterCorporationHistory models from ESI
 
     Parameters
@@ -200,7 +218,7 @@ def update_charactercorporationhistory(character_id: int):
     try:
         character = EveCharacter.objects.get(character_id=character_id)
     except Exception as e:
-        logger.error(e)
+        logger.exception(e)
         return
 
     for dat in get_characters_character_id_corporationhistory(character_id):
@@ -209,14 +227,19 @@ def update_charactercorporationhistory(character_id: int):
                 deleted = True
             else:
                 deleted = False
-
-            model = CharacterCorporationHistory(
+            CharacterCorporationHistory.objects.create(
                 character=character,
                 corporation_id=dat['corporation_id'],
                 is_deleted=deleted,
                 record_id=dat['record_id'],
                 start_date=dat['start_date'],
             )
-            model.save()
+        except IntegrityError:
+            # This already exists, move on
+            pass
+        except HTTPClientError as e:  # 429?
+            raise self.retry(exc=e, countdown=61)
+        except HTTPInternalServerError as e:  # Custom timeouts are defined as a 500 on this endpoint
+            raise self.retry(exc=e, countdown=61)
         except Exception as e:
-            logger.error(e)
+            logger.exception(e)

aa_alumni-0.1.6a0.dist-info/RECORD

@@ -1,18 +0,0 @@
-alumni/__init__.py,sha256=gynnMEjTF3hnWOInUY2HE8WzTMEdanzvhCmrPzzhxHA,187
-alumni/admin.py,sha256=C1-AHencOf4764-iVTLtENN33QjBRNFvlloy4sx7dzQ,754
-alumni/app_settings.py,sha256=fmhFSNdpH7ky2TTVI7JjHp_IUFUiD_fz0JmLqriwk5o,174
-alumni/apps.py,sha256=e58h_dmh1S6Swj6Zb4V5fQx42jMXA_7Tpwq6cKFr4TU,236
-alumni/models.py,sha256=gFvdrMxJ5JIm7cYm8FCrFqKQ9AMIfH-guu3JixW0yns,2432
-alumni/providers.py,sha256=g0i7nqSdnfScx-ZjByFZGoHw-ptNkiey5g_yycobSCQ,999
-alumni/signals.py,sha256=ZiWER0gs-0KCS6nWhCwE1_-iDXr9yrS7NSPBfLBDjak,789
-alumni/tasks.py,sha256=hXd340JHb3HM-ZVdMI4GHJDQ7C6mMrQcwVMYVU9MsR8,8058
-alumni/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-alumni/management/commands/alumni_state.py,sha256=OyJKnkzk9eksk-vULSVBdGvMEhxZX_xa7eH5RXFjeJ8,759
-alumni/migrations/0001_initial.py,sha256=C8R2k4y5KvpTLU_etBQ0J3jkGYd3HAgevAekUZvzxDw,3283
-alumni/migrations/0002_auto_20211230_0147.py,sha256=p3sK1Ohdf6O20tDbMmuPJwC2vVFH-AR0kkXFy9H34_Y,626
-alumni/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-alumni/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aa_alumni-0.1.6a0.dist-info/LICENSE,sha256=M983x9Ht7Kd7YrhBXITYDg1viQWT-3-_e-9MRix08_c,1069
-aa_alumni-0.1.6a0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-aa_alumni-0.1.6a0.dist-info/METADATA,sha256=yav14HivBr6DtDb3-ruj1X2kRBAgydnUJ063_QiqPKM,3243
-aa_alumni-0.1.6a0.dist-info/RECORD,,