aa-alumni 0.2.0__tar.gz → 0.4.0__tar.gz

{aa_alumni-0.2.0 → aa_alumni-0.4.0}/PKG-INFO

@@ -1,31 +1,30 @@
-Metadata-Version: 2.1
-Name: aa_alumni
-Version: 0.2.0
+Metadata-Version: 2.4
+Name: aa-alumni
+Version: 0.4.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-solo>=2.0.0,<3.0.0
+License-File: LICENSE
+Requires-Dist: allianceauth>=4.6.4,<6
+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
@@ -60,11 +59,13 @@ 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="0", hour="0", day_of_week="4"),
+    'apply_offset': True,
 }
 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="0", hour="0", day_of_week="3"),
+    'apply_offset': True,
 }
 ```
 
@@ -85,6 +86,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.2.0 → aa_alumni-0.4.0}/README.md

@@ -28,11 +28,13 @@ 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="0", hour="0", day_of_week="4"),
+    'apply_offset': True,
 }
 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="0", hour="0", day_of_week="3"),
+    'apply_offset': True,
 }
 ```
 
@@ -53,6 +55,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.2.0 → aa_alumni-0.4.0}/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.2.0"
+__version__ = "0.4.0"
 __title__ = "Alumni"

aa_alumni-0.4.0/alumni/app_settings.py

@@ -0,0 +1,9 @@
+from django.conf import settings
+
+ALUMNI_STATE_NAME = getattr(settings, 'ALUMNI_STATE_NAME', "Alumni")
+
+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)

aa_alumni-0.4.0/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"

{aa_alumni-0.2.0 → aa_alumni-0.4.0}/alumni/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-11 18:13+1000\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"
@@ -17,25 +17,26 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: alumni/models.py:14
+
+#: alumni/models.py:15
 msgid ""
 "Characters with these Corps in their History will be given Alumni Status"
 msgstr ""
 
-#: alumni/models.py:18
+#: alumni/models.py:19
 msgid ""
 "Characters with these Alliances in their History will be given Alumni Status"
 msgstr ""
 
-#: alumni/models.py:21 alumni/models.py:24 alumni/models.py:25
+#: alumni/models.py:22 alumni/models.py:25 alumni/models.py:26
 msgid "Alumni Config"
 msgstr ""
 
-#: alumni/models.py:37 alumni/models.py:52
+#: alumni/models.py:38 alumni/models.py:53
 msgid "True if the corporation has been deleted"
 msgstr ""
 
-#: alumni/models.py:39 alumni/models.py:54
+#: 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"

{aa_alumni-0.2.0 → aa_alumni-0.4.0}/alumni/models.py

@@ -18,7 +18,7 @@ class AlumniSetup(SingletonModel):
         blank=True,
         help_text=_("Characters with these Alliances in their History will be given Alumni Status"))
 
-    def __str__(self):
+    def __str__(self) -> str:
         return _("Alumni Config")
 
     class Meta:

{aa_alumni-0.2.0 → aa_alumni-0.4.0}/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()

{aa_alumni-0.2.0 → aa_alumni-0.4.0}/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.2.0 → aa_alumni-0.4.0}/pyproject.toml

@@ -1,49 +1,50 @@
 [build-system]
-requires = ["flit_core >=3.2,<4"]
 build-backend = "flit_core.buildapi"
+requires = [
+    "flit-core>=3.2,<4",
+]
 
 [project]
-name = "aa_alumni"
-dynamic = ["version", "description" ]
+name = "aa-alumni"
 readme = "README.md"
-license = {file = "LICENSE"}
-requires-python = ">=3.8"
-authors = [
-    { name = "Joel Falknau", email = "joel.falknau@gmail.com" },
-]
 keywords = [
     "allianceauth",
     "eveonline",
 ]
+license = { file = "LICENSE" }
+authors = [
+    { name = "Joel Falknau", email = "joel.falknau@gmail.com" },
+]
+requires-python = ">=3.10"
 classifiers = [
     "Environment :: Web Environment",
     "Framework :: Celery",
     "Framework :: Django",
-    "Framework :: Django :: 4.0",
     "Framework :: Django :: 4.2",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3 :: Only",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: Implementation :: CPython",
     "Topic :: Internet :: WWW/HTTP",
-    "Topic :: Internet :: WWW/HTTP :: Dynamic Content"
+    "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
+]
+dynamic = [
+    "description",
+    "version",
 ]
 dependencies = [
-    "allianceauth>=3.0.0,<5.0.0",
-    "django-solo>=2.0.0,<3.0.0"
+    "allianceauth>=4.6.4,<6",
+    "django-solo>=2,<3",
 ]
-
-[project.urls]
-Homepage = "https://gitlab.com/tactical-supremacy/aa-alumni"
-Source = "https://gitlab.com/tactical-supremacy/aa-alumni"
-Tracker = "https://gitlab.com/tactical-supremacy/aa-alumni/-/issues"
+urls.Homepage = "https://gitlab.com/tactical-supremacy/aa-alumni"
+urls.Source = "https://gitlab.com/tactical-supremacy/aa-alumni"
+urls.Tracker = "https://gitlab.com/tactical-supremacy/aa-alumni/-/issues"
 
 [tool.flit.module]
 name = "alumni"
@@ -57,19 +58,19 @@ sections = [
     "DJANGO",
     "ALLIANCEAUTH",
     "FIRSTPARTY",
-    "LOCALFOLDER"
+    "LOCALFOLDER",
 ]
-known_allianceauth = ["allianceauth", "esi"]
-known_django = ["django"]
+known_allianceauth = [ "allianceauth", "esi" ]
+known_django = [ "django" ]
 skip_gitignore = true
 
 [tool.flake8]
-exclude = [".git", "*migrations*", ".tox", "dist", "htmlcov"]
+exclude = [ ".git", "*migrations*", ".tox", "dist", "htmlcov" ]
 max-line-length = 119
-select = ["C", "E", "F", "W", "B", "B950"]
-ignore = ['E203', 'E231', 'E501', 'W503', 'W291', 'W293']
+select = [ "C", "E", "F", "W", "B", "B950" ]
+ignore = [ 'E203', 'E231', 'E501', 'W503', 'W291', 'W293' ]
 
 [tool.djlint]
-max_attribute_length=119
-max_line_length=119
-max_blank_lines=1
+max_attribute_length = 119
+max_line_length = 119
+max_blank_lines = 1

aa_alumni-0.2.0/alumni/app_settings.py

@@ -1,5 +0,0 @@
-from django.conf import settings
-
-ALUMNI_STATE_NAME = getattr(settings, 'ALUMNI_STATE_NAME', "Alumni")
-
-ALUMNI_TASK_PRIORITY = getattr(settings, 'ALUMNI_TASK_PRIORITY', 7)