django-esi 8.0.0a4__py3-none-any.whl → 8.0.0b1__py3-none-any.whl

{django_esi-8.0.0a4.dist-info → django_esi-8.0.0b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-esi
-Version: 8.0.0a4
+Version: 8.0.0b1
 Summary: Django app for accessing the EVE Swagger Interface (ESI).
 Keywords: eveonline
 Author-email: Alliance Auth <adarnof@gmail.com>
@@ -20,6 +20,7 @@ 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 :: 3.14
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 License-File: LICENSE
@@ -27,7 +28,7 @@ Requires-Dist: aiopenapi3
 Requires-Dist: bravado>=10.6,<12
 Requires-Dist: celery>=4.0.2
 Requires-Dist: django>=4.2,<6
-Requires-Dist: httpx[http2, brotli, zstd]
+Requires-Dist: httpx[brotli, http2, zstd]
 Requires-Dist: jsonschema<4
 Requires-Dist: python-jose>=3.3
 Requires-Dist: requests>=2.26

{django_esi-8.0.0a4.dist-info → django_esi-8.0.0b1.dist-info}/RECORD

@@ -1,52 +1,52 @@
-esi/__init__.py,sha256=AJRGqO80Mo5rJTmvrH2T1RcuhIWbecQzOXbjP_812Ow,205
+esi/__init__.py,sha256=vsNIce83g99LxdSg1jj7tPr0a4Eq2SwB-9SfKADjZUM,204
 esi/admin.py,sha256=9i68WwW_gR0zsGhJKTWK2yMEi44EkhpAaOW0LDpVfM8,1176
 esi/app_settings.py,sha256=2Jp_1myzKCL8A20RYvwQnQd04Ds_CBGsCqwDtsrYf0M,4289
 esi/apps.py,sha256=HIu1niTkOXYmCzMVAjYcaFhHrrXeBbHvui6I44OCHXw,280
 esi/checks.py,sha256=31puQdsrpRUJB-kedp2k7Evo0x2knTWQPZsCUUrJ3dY,1912
-esi/clients.py,sha256=WB5YseJnfZdTeJ9C1Eze-iWXEqIpo5i_8uiQ6w0VkCw,23503
+esi/clients.py,sha256=KNFNa5SXFshifap84Q1rCNgZusQ3vmRlePIQG3XICUE,23894
 esi/decorators.py,sha256=2RmPdkrIAwbxOV5Ls8-RIWd_VhmXEDzIG6g5-bs6WZc,9093
 esi/errors.py,sha256=KfFtgX8Mys4uMoQtco0n_pQeaM83yVrRSyW6StXuUjo,308
 esi/exceptions.py,sha256=nR-Z0BXVt5xSkgUL56E97pqtTyEu3MFr8_P0uCCCQ-E,1448
-esi/helpers.py,sha256=-lYojtcWYWtlC_olSItWR3O3zJpjMYTQpNvsax81us8,672
+esi/helpers.py,sha256=pafq8XZ6NAsaOYNqAvgbJ4n0JHCopDtUd3h_HWLcg4c,2206
 esi/managers.py,sha256=zdri1aSJrSX9W_kwzbXq44CAAhdufikoOViaJntA41A,11443
 esi/managers.pyi,sha256=BxRNX2yOT3domdrxsuGp4G0TrP_bWmf8VVwvM03eHQE,1977
 esi/models.py,sha256=MEY8jmHGwA8ZJjq37h-vC8LnOVn_Mnv5Gw0NoI9tkXk,11484
-esi/openapi_clients.py,sha256=8NoWqH24z3nOCo4JOhcMJJkY9TGmBXdpDb4zsCD60WQ,40135
+esi/openapi_clients.py,sha256=kmijZukB7wICIG5lCEd_3uRha0qAR_sKyHn48V4azts,41127
 esi/rate_limiting.py,sha256=fUzso1YCHlBes8SVrEAsP58eRWcFNuO2XEkW6RQLhUE,2600
 esi/stubs.py,sha256=UakysEAq5V454oKbxyEUewncr5sCFZCgwHFh0SJvU3Y,30
-esi/stubs.pyi,sha256=gJzK6pizZV0OGIojAE0qfe5gtTod3YaOemRgGnI8R08,244125
+esi/stubs.pyi,sha256=ua9zHzZtrWct1mj_UV1pN7HJyA2RxqWPYapL7DQMRYA,244089
 esi/tasks.py,sha256=TaE_Q03oLk1ohkPw8KknXpIK-nY47C-oaGUUu4nr8pw,2658
 esi/urls.py,sha256=B4EnmT-MZzs4F8a9ORK1ejAHbpGRN_V4TKks8ww3JGE,151
 esi/views.py,sha256=cq2JkqSAwx-Nqi3amRUA9CKLu3ZLQYHSAH8c8g7xIQ4,3917
-esi/aiopenapi3/plugins.py,sha256=4erd3dL6bSMEp_AeB7JWnRZPnOSRrZHK5QsHaGJilBg,5001
+esi/aiopenapi3/plugins.py,sha256=jMW82FM-g_aL-RfmB7ip3xmXF1-Evq-euv3KMbEfWds,7898
 esi/locale/cs_CZ/LC_MESSAGES/django.mo,sha256=WyxsjDEeArGMNhtpY2eCJjdENMDmmxdxz4oW1s4N5eA,391
-esi/locale/cs_CZ/LC_MESSAGES/django.po,sha256=f4fVr2btQpIeeMaqZL0tpj0j06Evwe2xPHh1OH6gPuU,1318
+esi/locale/cs_CZ/LC_MESSAGES/django.po,sha256=mlmqr5WqKZr7AI1AGPYt7W10vfJmvgLddbD16ClX5hQ,1317
 esi/locale/de/LC_MESSAGES/django.mo,sha256=uNJPd25k3AUU6FceBsJV9pqCpM1ZW4wDDFKNZkPlXqg,874
-esi/locale/de/LC_MESSAGES/django.po,sha256=YVZKMGC0jeZltrhlY2I4wXWmlf5tRgjw6IcLpIUkNsk,1564
+esi/locale/de/LC_MESSAGES/django.po,sha256=ahUQxXocWCsyE7xj5OpG4iBDeE4cL1Xdm-OQvf7N-Q4,1563
 esi/locale/en/LC_MESSAGES/django.mo,sha256=gtTXjZjZ18WCvehANkW-Uo_YU4dOolu57DYXtWnOZkA,434
-esi/locale/en/LC_MESSAGES/django.po,sha256=LGrMRv02ftr0c470FRija9WOrz4NZcLor7XR_O2WGgQ,1365
+esi/locale/en/LC_MESSAGES/django.po,sha256=CeihWA8VviLtx-x1sS3lr10nNLOyg1wEQZGeBBbyK8g,1364
 esi/locale/es/LC_MESSAGES/django.mo,sha256=XegUUE14RGv9SYxO7FoJjz2jNvG64hA8oOFhqjYZc8g,791
-esi/locale/es/LC_MESSAGES/django.po,sha256=OvqlzHQkuaODF1IZhTWj22d3zvtzLCYgX-XQZdbcyZg,1568
+esi/locale/es/LC_MESSAGES/django.po,sha256=yAF4Kcv9px0utUmAhYuQnaZzS4SDwEA0cax4hOx_e6k,1567
 esi/locale/fr_FR/LC_MESSAGES/django.mo,sha256=FFAiYNUgD1zv056mRf3actNPDDIagu3Bb13EXaAlV94,697
-esi/locale/fr_FR/LC_MESSAGES/django.po,sha256=vAiDmUPmqP9AGs6rqo-mX3rsda6QZFQvADMr6pmGlgk,1577
+esi/locale/fr_FR/LC_MESSAGES/django.po,sha256=L4noD0WBE2389Zzo2k5rxUWWhAO5Obm7eyVOOF4TDxY,1576
 esi/locale/it_IT/LC_MESSAGES/django.mo,sha256=SicuHgSlkdIV-Jc9QuR4JaC8QwfycDznJR0yuP9jCoI,931
-esi/locale/it_IT/LC_MESSAGES/django.po,sha256=sh7kXEfDlJy94VCwknwQbJMobn9xCNA1_zuzs_keLHc,1624
+esi/locale/it_IT/LC_MESSAGES/django.po,sha256=DNwyc7pZuFXYthb07SIFTRNowLiXhkk1X9OwuKa-MXE,1623
 esi/locale/ja/LC_MESSAGES/django.mo,sha256=0900q-CQ5WT98zWn746YfdOy51uE_nlEbJyxogqxrvc,761
-esi/locale/ja/LC_MESSAGES/django.po,sha256=4NBEUf6NwYI_DempuOkjaZFuJ_71aWsEZS6yHhGsRpw,1537
+esi/locale/ja/LC_MESSAGES/django.po,sha256=kpVz2TLwFYGCc1vkCXiMBhLk9LkBypox6oIF0rmGBW8,1536
 esi/locale/ko_KR/LC_MESSAGES/django.mo,sha256=7NktQKVols2D9r8LH0fVmNXtF4L3tmKyAf90IoRhSAY,800
-esi/locale/ko_KR/LC_MESSAGES/django.po,sha256=J-qdtO_4P9j0-qyfRDbw9M_BIEiSKSU_tq3IbcNsFFQ,1572
+esi/locale/ko_KR/LC_MESSAGES/django.po,sha256=PQrNrTxw6bTU43KUSNc0okGXes21cSZ3_4MAhBIA1jw,1571
 esi/locale/nl_NL/LC_MESSAGES/django.mo,sha256=WyxsjDEeArGMNhtpY2eCJjdENMDmmxdxz4oW1s4N5eA,391
-esi/locale/nl_NL/LC_MESSAGES/django.po,sha256=f4fVr2btQpIeeMaqZL0tpj0j06Evwe2xPHh1OH6gPuU,1318
+esi/locale/nl_NL/LC_MESSAGES/django.po,sha256=mlmqr5WqKZr7AI1AGPYt7W10vfJmvgLddbD16ClX5hQ,1317
 esi/locale/pl_PL/LC_MESSAGES/django.mo,sha256=WyxsjDEeArGMNhtpY2eCJjdENMDmmxdxz4oW1s4N5eA,391
-esi/locale/pl_PL/LC_MESSAGES/django.po,sha256=f4fVr2btQpIeeMaqZL0tpj0j06Evwe2xPHh1OH6gPuU,1318
+esi/locale/pl_PL/LC_MESSAGES/django.po,sha256=mlmqr5WqKZr7AI1AGPYt7W10vfJmvgLddbD16ClX5hQ,1317
 esi/locale/ru/LC_MESSAGES/django.mo,sha256=g9515s_BB2pyCJe9-oqPXGEU7vc0EdFoh1SpTUCkGus,1128
-esi/locale/ru/LC_MESSAGES/django.po,sha256=s5p5D5ILhwQJr2eoe11xPdDxR-BttWGh1OuQ3PZV4Lk,1879
+esi/locale/ru/LC_MESSAGES/django.po,sha256=pBczyt5Ri0MD7NB_zCC7FFxFOrTOFIMeN7zMi8b0slM,1878
 esi/locale/sk/LC_MESSAGES/django.mo,sha256=eWUijXSFZNruadb-y-FXso0-1a9lbp6zUPWS2kMoZi4,509
-esi/locale/sk/LC_MESSAGES/django.po,sha256=FuCsSPv580yZ7py6bWL_PgBA4cj7HmmS4-4-hz4l518,1443
+esi/locale/sk/LC_MESSAGES/django.po,sha256=9QbaP8YZzsA3IJMq9hNprU3DxeQteaTfXZlqKloGYMM,1442
 esi/locale/uk/LC_MESSAGES/django.mo,sha256=LlEo98zaX1whlyZTn_UqXyNOa5rKleqem1XcoKvZ40E,656
-esi/locale/uk/LC_MESSAGES/django.po,sha256=46ZA2mjbgClqMK-I0FnBIKiTYOVoDMs-o5M8QgcHsfk,1596
+esi/locale/uk/LC_MESSAGES/django.po,sha256=-NCRwISPt1wkk-LQKkCbYupI5ouDVNtRrum_1vqqS3A,1595
 esi/locale/zh_Hans/LC_MESSAGES/django.mo,sha256=O2csJQMFxmvSWM4iNfNozHAQjAAd76LwFy0sx3oLHCY,735
-esi/locale/zh_Hans/LC_MESSAGES/django.po,sha256=tNaPILQzZK2v6YyBxmq3FOKWdQUFn-9I2kWpF3thBKk,1512
+esi/locale/zh_Hans/LC_MESSAGES/django.po,sha256=vcU0X-11Pj6WJNXcMRR7HaQ-7JcETNgiTFQKru5IL0Y,1511
 esi/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 esi/management/commands/generate_esi_stubs.py,sha256=dunWHFSRb6NFu5emeDdskqIt3YqnEqQLBiuNERMkdmE,9798
 esi/management/commands/migrate_to_ssov2.py,sha256=x9W4xaefrNoG_dNscHIWrWTRk4SuVGIW0s44q2QBN9k,6427
@@ -71,27 +71,27 @@ esi/static/esi/img/EVE_SSO_Login_Buttons_Small_White.png,sha256=al3NRjIngZtrNzEx
 esi/templates/esi/select_token.html,sha256=qofOjKWHco_sSuoEJoLRsXP_doK_barHvkF7h5LLxjY,6941
 esi/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 esi/templatetags/scope_tags.py,sha256=5-7vEwe-B91xo7oSnn-tSuudHSJCoGIhbddDpNrqUnw,167
-esi/tests/__init__.py,sha256=1ymL-74_4alt8AQNs7cFiXO5MmQKlIeOcA4OPOdAitM,3092
+esi/tests/__init__.py,sha256=SWXR4QgKWg_ZdwOG4vJoRKcd8zQ11dz3z2-Oifdq5kA,3091
 esi/tests/client_authed_pilot.py,sha256=GN0J59TcscHM9HZH6OaPODM9Zel3mvObjJ4Dmmzc2j8,1622
 esi/tests/client_public_pilot.py,sha256=u6P-qbdYSvQ6A_MJqt8Jrkswt-u-FlvYDKtCvA5-PMo,1252
 esi/tests/factories.py,sha256=2pjkSYKDfO50bzX1nNcUHz_FAAJs7k07u7R8om6AlP0,1375
 esi/tests/factories_2.py,sha256=25NqVe9zzHkl4U1EN3R7pjdN2ahIBXxrrJhQzZhvw58,1972
 esi/tests/jwt_factory.py,sha256=0Jj9TjEv18h2XVsRpYc7BWHr3CPtQJgfKeB-9mdHevk,4919
 esi/tests/test_checks.py,sha256=ntq2ijuJ-6pxGruNh21rM4GlXDLVm-o3sy8DrFbjwEM,1846
-esi/tests/test_clients.py,sha256=1JWTBV83nZbt82e37DAnJ7h4gm9m_xU1ZDvEjt0sHsc,41363
+esi/tests/test_clients.py,sha256=qoiv3OztuhjizNknZplJhwnMzAlX689MGad4Azu809M,44163
 esi/tests/test_decorators.py,sha256=I5MhcLKhN5xD4PxgEQqOWQ2kiXquDqQIEve9dbTOsho,15069
 esi/tests/test_management_command.py,sha256=mtxfBtG6CHP1bTy1tJEO-djX4SQwMT3T_mqGnUIM6qs,9863
 esi/tests/test_managers.py,sha256=CEpjXSXyVY6xxgrs0f9FnEh-KY9JPaKjKYiutXLLShE,24309
 esi/tests/test_models.py,sha256=lDj5IcYgXHeOFTHXTsWGg13CSooFaxD0c51kJn_ytAc,13748
 esi/tests/test_openapi.json,sha256=rGvX02M_LmMoWRTVZZ7NkGzc3-lQy7-2WQCrt6DlqM0,11828
-esi/tests/test_openapi.py,sha256=yWgm7clO_RfWxOWGmAYFr0oAp1jzgFmnbIRWjDucp9E,7988
+esi/tests/test_openapi.py,sha256=VCDbEENoHZbrNJiLzSTvjIkMNR3huAl3522v5XJ3XRg,12445
 esi/tests/test_swagger.json,sha256=HOrPgbvwm5N521QNcE3baWcZJkSjmuN_VWrR06wEQoo,17241
 esi/tests/test_swagger_full.json,sha256=JCEAZNMFhkdZhquTx4lDhrqGgCrzzzlYU64HdbEv8E4,2548369
 esi/tests/test_tasks.py,sha256=nIvfXax_8nQCxNQeT-4TJ84i0__t1qWe155z5rnsktQ,4399
 esi/tests/test_templatetags.py,sha256=b68JWE3HvOlr2aUisJHsTsDS4e7IMjDeqTuzMqC7Re4,517
 esi/tests/test_views.py,sha256=Kj_f2yIpmPG0kx-lAX_sfkaHlIpgbkm02ieA1V3o-k4,13073
 esi/tests/threading_pilot.py,sha256=ax_dEdnTNibA-UQHqbZle_2dh_3jcHKRyrYSOKuE_6U,1931
-django_esi-8.0.0a4.dist-info/licenses/LICENSE,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
-django_esi-8.0.0a4.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-django_esi-8.0.0a4.dist-info/METADATA,sha256=71zaRb8BRkKRsA6L8vFFb34wbnDqUmQw639Kh1hCE9s,4738
-django_esi-8.0.0a4.dist-info/RECORD,,
+django_esi-8.0.0b1.dist-info/licenses/LICENSE,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
+django_esi-8.0.0b1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+django_esi-8.0.0b1.dist-info/METADATA,sha256=jGWQujfVYTjC6wNdXUx6toYBwn5jV0QisqQuUJC9-QY,4789
+django_esi-8.0.0b1.dist-info/RECORD,,

esi/__init__.py

@@ -1,6 +1,6 @@
 """Django app for accessing the EVE Swagger Interface (ESI)."""
 
-__version__ = "8.0.0-alpha.4"
+__version__ = "8.0.0-beta.1"
 __title__ = 'Django-ESI'
 __url__ = 'https://gitlab.com/allianceauth/django-esi'
 __build_date__ = "2025-09-18"

esi/aiopenapi3/plugins.py

@@ -1,10 +1,17 @@
+import logging
+from typing import Any
+from collections.abc import Generator
 from aiopenapi3.plugin import Document, Init
 
+logger = logging.getLogger(__name__)
+
+
 class Trim204ContentType(Document):
     """
     Removes and content-type from responses on a 204 reponses
     A 204 never has content...
     """
+
     def parsed(self, ctx: Document.Context) -> Document.Context:
         spec = ctx.document
         # Patch all paths
@@ -18,12 +25,88 @@ class Trim204ContentType(Document):
         return ctx
 
 
+def find_refs_recursively(data: Any, parent: Any = None) -> Generator[Any, None, None]:
+    """
+    Recursively searches for all instances of "#ref" in a dict+children and returns schemas.
+    """
+    if isinstance(data, dict):
+        for key, value in data.items():
+            if key == "$ref":
+                if "#/components/schemas/" in value:
+                    next = value.split("/")[-1]
+                    yield next
+                    if parent:
+                        yield from find_refs_recursively(parent[next], parent)
+            yield from find_refs_recursively(value, parent)
+    elif isinstance(data, list):
+        for item in data:
+            yield from find_refs_recursively(item, parent)
+
+
+class MinifySpec(Document):
+    """
+    Removes operations and schemas from spec to limit memory spam
+    """
+
+    def __init__(self, tags: list[str], operations: list[str]):
+        super().__init__()
+        self.keep_tags = set(tags)
+        self.keep_ops = operations
+
+    def parsed(self, ctx: Document.Context) -> Document.Context:
+        if self.keep_tags == set() and self.keep_ops == []:
+            logger.error("No tag/path filtering supplied to ESI Client. Using all tags. This will bloat memory use!")
+            return ctx
+        spec = ctx.document
+
+        remove_paths = set()
+        keep_schema = set()
+        logger.debug("Filtering Paths/Tags: ")
+        for name, path_item in spec.get("paths", {}).items():
+            keep = False
+            for method_name in ("get", "post", "put", "delete", "patch", "options", "head"):
+                method = path_item.get(method_name)
+                if not method:
+                    continue
+                if len(self.keep_tags.intersection(method['tags'])) or method["operationId"] in self.keep_ops:
+                    keep = True
+                    schemas = find_refs_recursively(
+                        path_item,
+                        spec["components"]["schemas"]  # find all sub schema's
+                    )
+                    for s in schemas:
+                        keep_schema.add(s)
+
+            if not keep:
+                remove_paths.add(name)
+            else:
+                logger.debug(f" - {name}")
+
+        # remove the  paths we don't care for
+        for name in remove_paths:
+            spec["paths"].pop(name)
+
+        # build new schema from what we need
+        logger.debug("Rebuilding Schema: ")
+        new_schema = {}
+        for name, data in spec["components"]["schemas"].items():
+            if name in keep_schema:
+                logger.debug(f" - {name}")
+                new_schema[name] = data
+
+        # replace schemas with the new schema
+        ctx.document["components"]["schemas"] = new_schema
+
+        return ctx
+
+
 class Add304ContentType(Document):
     """
     Adds 304 content-type to responses
     A 304 never has content. ESI defualt has application/json
     This is a hack for now
     """
+
     def parsed(self, ctx: Document.Context) -> Document.Context:
         spec = ctx.document
         # Patch all paths
@@ -33,7 +116,7 @@ class Add304ContentType(Document):
                 if not method:
                     continue
                 if "304" not in method['responses']:
-                    method['responses']["304"]={
+                    method['responses']["304"] = {
                         "description": "Not Modified"
                     }
         return ctx
@@ -43,6 +126,7 @@ class RemoveSecurityParameter(Document):
     """
     Removes the whole OAuth2 securityScheme
     """
+
     def parsed(self, ctx: Document.Context) -> Document.Context:
         print("RemoveSecurityParameterPlugin: Removing OAuth2 securityScheme")
         spec = ctx.document
@@ -63,6 +147,7 @@ class TrimSecurityParameter(Document):
     Trims out of Spec OAuth2 attributes. CCP have fixed this.
     Leaving in place in case we need a quick reference again.
     """
+
     def parsed(self, ctx: Document.Context) -> Document.Context:
         print("TrimSecurityParameter: Trimming out of spec attributes")
         spec = ctx.document
@@ -80,8 +165,9 @@ class PatchCompatibilityDatePlugin(Document):
     This is because WE specifically add it in the library to the HTTP requests,
     but without this, it will be a required parameter during request generation before it hits the HTTP library.
     """
+
     def parsed(self, ctx: Document.Context) -> Document.Context:
-        print("PatchCompatibilityDatePlugin: making compatibility date optional")
+        logger.debug("PatchCompatibilityDatePlugin: making compatibility date optional")
         spec = ctx.document
 
         def patch_param(param):
@@ -124,5 +210,5 @@ class DjangoESIInit(Init):
 
     def initialized(self, ctx: Init.Context) -> Init.Context:
         # Force the app_name into the api client class for etags
-        self.api.app_name=self.app_name
+        self.api.app_name = self.app_name
         return ctx  # noqa

esi/clients.py

@@ -1,7 +1,7 @@
 import json
 import logging
 import warnings
-from datetime import datetime
+import datetime as dt
 from hashlib import md5
 from time import sleep
 from typing import Any
@@ -68,8 +68,10 @@ class CachingHttpFuture(HttpFuture):
             seconds until "Expires" time
         """
         try:
-            expires_dt = datetime.strptime(str(expires), '%a, %d %b %Y %H:%M:%S %Z')
-            delta = expires_dt - datetime.utcnow()
+            expires_dt = dt.datetime.strptime(str(expires), '%a, %d %b %Y %H:%M:%S %Z')
+            if expires_dt.tzinfo is None:
+                expires_dt = expires_dt.replace(tzinfo=dt.timezone.utc)
+            delta = expires_dt - dt.datetime.now(dt.timezone.utc)
             return delta.total_seconds()
         except ValueError:
             return 0
@@ -482,19 +484,26 @@ def esi_client_factory(
 
     client = RequestsClientPlus()
 
+    from esi.helpers import pascal_case_string
+    sanitized_appname = pascal_case_string(__title__)
+
     if app_info_text:
         # app_info_text (email@example) Django-ESI/1.2.3 (+https://gitlab.com/allianceauth/django-esi)
         # Deprecated
-        user_agent = f"{app_info_text} ({app_settings.ESI_USER_CONTACT_EMAIL}) {__title__}/{__version__} (+{__url__})"
+        user_agent = f"{app_info_text} ({app_settings.ESI_USER_CONTACT_EMAIL}) {sanitized_appname}/{__version__} (+{__url__})"
     elif ua_appname is None or ua_version is None:
         # Django-ESI/1.2.3 () (email@example; +https://gitlab.com/allianceauth/django-esi)
         # Deprecated
-        user_agent = f"{__title__}/{__version__} ({app_settings.ESI_USER_CONTACT_EMAIL}; +{__url__})"
+        user_agent = f"{sanitized_appname}/{__version__} ({app_settings.ESI_USER_CONTACT_EMAIL}; +{__url__})"
     else:
         # AppName/1.2.3 (email@example.com) Django-ESI/1.2.3 (+https://gitlab.com/allianceauth/django-esi)
         # or AppName/1.2.3 (email@example.com; +https://gitlab.com/) Django-ESI/1.2.3 (+https://gitlab.com/allianceauth/django-esi) (+https://gitlab.com/allianceauth/django-esi)
         # Preferred
-        user_agent = f"{ua_appname}/{ua_version} ({app_settings.ESI_USER_CONTACT_EMAIL}{f'; +{ua_url})' if ua_url else ')'} {__title__}/{__version__} (+{__url__})"
+
+        # Enforce PascalCase for `ua_appname` and strip whitespace
+        sanitized_ua_appname = pascal_case_string(ua_appname)
+
+        user_agent = f"{sanitized_ua_appname}/{ua_version} ({app_settings.ESI_USER_CONTACT_EMAIL}{f'; +{ua_url})' if ua_url else ')'} {sanitized_appname}/{__version__} (+{__url__})"
 
     client.user_agent = user_agent
 

esi/helpers.py

@@ -1,4 +1,5 @@
 from esi.models import Token
+from string import capwords
 
 
 def get_token(character_id: int, scopes: list) -> Token:
@@ -23,3 +24,39 @@ def get_token(character_id: int, scopes: list) -> Token:
             f"No valid token found for character_id={character_id} with required scopes."
         )
     return token
+
+def pascal_case_string(string: str) -> str:
+    """
+    Convert a string to PascalCase by capitalizing the first letter of each word and removing spaces,
+    but only if the string contains spaces or hyphens.
+
+    This function checks if the input string contains spaces or hyphens. If so, it replaces hyphens with spaces,
+    capitalizes the first letter of each word, removes the spaces, and returns the resulting PascalCase string.
+    If the input string does not contain spaces or hyphens, it is returned unchanged.
+
+    Behaviour:
+    Any string containing spaces or hyphens will be converted to PascalCase.
+    Strings without spaces or hyphens will be returned unchanged.
+    This gives you the opportunity to use already formatted strings as needed.
+
+    Examples:
+    - "app name" -> "AppName"
+    - "app-name" -> "AppName"
+    - "appname" -> "appname"
+    - "AppName" -> "AppName"
+    - "appName" -> "appName"
+    - "app_name" -> "app_name"
+
+    :param string: The input string to be converted to PascalCase.
+    :type string: str
+    :return: The PascalCase formatted string, or the original string if no spaces or hyphens are present.
+    :rtype: str
+    """
+
+    # Check if the string contains spaces or hyphens
+    if any(c in string for c in (" ", "-")):
+        # Replace hyphens with spaces, capitalize each word, and remove spaces
+        return capwords(string.replace("-", " ")).replace(" ", "")
+
+    # Return the original string if no spaces or hyphens are present
+    return string

esi/locale/cs_CZ/LC_MESSAGES/django.po

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Django ESI 8.0.0-alpha.4\n"
+"Project-Id-Version: Django ESI 8.0.0-beta.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/allianceauth/django-esi/-/issues\n"
-"POT-Creation-Date: 2025-09-21 13:23+1000\n"
+"POT-Creation-Date: 2025-10-17 15:19+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"

esi/locale/de/LC_MESSAGES/django.po

@@ -9,9 +9,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Django ESI 8.0.0-alpha.4\n"
+"Project-Id-Version: Django ESI 8.0.0-beta.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/allianceauth/django-esi/-/issues\n"
-"POT-Creation-Date: 2025-09-21 13:23+1000\n"
+"POT-Creation-Date: 2025-10-17 15:19+1000\n"
 "PO-Revision-Date: 2023-10-25 11:04+0000\n"
 "Last-Translator: Peter Pfeufer, 2023\n"
 "Language-Team: German (https://app.transifex.com/alliance-auth/teams/107430/"

esi/locale/en/LC_MESSAGES/django.po

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Django ESI 8.0.0-alpha.4\n"
+"Project-Id-Version: Django ESI 8.0.0-beta.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/allianceauth/django-esi/-/issues\n"
-"POT-Creation-Date: 2025-09-21 13:23+1000\n"
+"POT-Creation-Date: 2025-10-17 15:19+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"

esi/locale/es/LC_MESSAGES/django.po

@@ -9,9 +9,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Django ESI 8.0.0-alpha.4\n"
+"Project-Id-Version: Django ESI 8.0.0-beta.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/allianceauth/django-esi/-/issues\n"
-"POT-Creation-Date: 2025-09-21 13:23+1000\n"
+"POT-Creation-Date: 2025-10-17 15:19+1000\n"
 "PO-Revision-Date: 2023-10-25 11:04+0000\n"
 "Last-Translator: trenus, 2023\n"
 "Language-Team: Spanish (https://app.transifex.com/alliance-auth/teams/107430/"

esi/locale/fr_FR/LC_MESSAGES/django.po

@@ -9,9 +9,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Django ESI 8.0.0-alpha.4\n"
+"Project-Id-Version: Django ESI 8.0.0-beta.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/allianceauth/django-esi/-/issues\n"
-"POT-Creation-Date: 2025-09-21 13:23+1000\n"
+"POT-Creation-Date: 2025-10-17 15:19+1000\n"
 "PO-Revision-Date: 2020-12-28 06:44+0000\n"
 "Last-Translator: rockclodbuster, 2023\n"
 "Language-Team: French (France) (https://app.transifex.com/alliance-auth/"

esi/locale/it_IT/LC_MESSAGES/django.po

@@ -9,9 +9,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Django ESI 8.0.0-alpha.4\n"
+"Project-Id-Version: Django ESI 8.0.0-beta.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/allianceauth/django-esi/-/issues\n"
-"POT-Creation-Date: 2025-09-21 13:23+1000\n"
+"POT-Creation-Date: 2025-10-17 15:19+1000\n"
 "PO-Revision-Date: 2023-10-25 11:04+0000\n"
 "Last-Translator: Thomas Turini, 2024\n"
 "Language-Team: Italian (Italy) (https://app.transifex.com/alliance-auth/"

esi/locale/ja/LC_MESSAGES/django.po

@@ -9,9 +9,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Django ESI 8.0.0-alpha.4\n"
+"Project-Id-Version: Django ESI 8.0.0-beta.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/allianceauth/django-esi/-/issues\n"
-"POT-Creation-Date: 2025-09-21 13:23+1000\n"
+"POT-Creation-Date: 2025-10-17 15:19+1000\n"
 "PO-Revision-Date: 2023-10-25 11:04+0000\n"
 "Last-Translator: kotaneko, 2023\n"
 "Language-Team: Japanese (https://app.transifex.com/alliance-auth/"

esi/locale/ko_KR/LC_MESSAGES/django.po

@@ -9,9 +9,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Django ESI 8.0.0-alpha.4\n"
+"Project-Id-Version: Django ESI 8.0.0-beta.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/allianceauth/django-esi/-/issues\n"
-"POT-Creation-Date: 2025-09-21 13:23+1000\n"
+"POT-Creation-Date: 2025-10-17 15:19+1000\n"
 "PO-Revision-Date: 2023-10-25 11:04+0000\n"
 "Last-Translator: Seowon Jung <seowon@hawaii.edu>, 2023\n"
 "Language-Team: Korean (Korea) (https://app.transifex.com/alliance-auth/"

esi/locale/nl_NL/LC_MESSAGES/django.po

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Django ESI 8.0.0-alpha.4\n"
+"Project-Id-Version: Django ESI 8.0.0-beta.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/allianceauth/django-esi/-/issues\n"
-"POT-Creation-Date: 2025-09-21 13:23+1000\n"
+"POT-Creation-Date: 2025-10-17 15:19+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"

esi/locale/pl_PL/LC_MESSAGES/django.po

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Django ESI 8.0.0-alpha.4\n"
+"Project-Id-Version: Django ESI 8.0.0-beta.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/allianceauth/django-esi/-/issues\n"
-"POT-Creation-Date: 2025-09-21 13:23+1000\n"
+"POT-Creation-Date: 2025-10-17 15:19+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"

esi/locale/ru/LC_MESSAGES/django.po

@@ -10,9 +10,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Django ESI 8.0.0-alpha.4\n"
+"Project-Id-Version: Django ESI 8.0.0-beta.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/allianceauth/django-esi/-/issues\n"
-"POT-Creation-Date: 2025-09-21 13:23+1000\n"
+"POT-Creation-Date: 2025-10-17 15:19+1000\n"
 "PO-Revision-Date: 2023-10-25 11:04+0000\n"
 "Last-Translator: Gnevich <and.vareba81@gmail.com>, 2025\n"
 "Language-Team: Russian (https://app.transifex.com/alliance-auth/teams/107430/"

esi/locale/sk/LC_MESSAGES/django.po

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Django ESI 8.0.0-alpha.4\n"
+"Project-Id-Version: Django ESI 8.0.0-beta.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/allianceauth/django-esi/-/issues\n"
-"POT-Creation-Date: 2025-09-21 13:23+1000\n"
+"POT-Creation-Date: 2025-10-17 15:19+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"

esi/locale/uk/LC_MESSAGES/django.po

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Django ESI 8.0.0-alpha.4\n"
+"Project-Id-Version: Django ESI 8.0.0-beta.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/allianceauth/django-esi/-/issues\n"
-"POT-Creation-Date: 2025-09-21 13:23+1000\n"
+"POT-Creation-Date: 2025-10-17 15:19+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"

esi/locale/zh_Hans/LC_MESSAGES/django.po

@@ -9,9 +9,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Django ESI 8.0.0-alpha.4\n"
+"Project-Id-Version: Django ESI 8.0.0-beta.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.com/allianceauth/django-esi/-/issues\n"
-"POT-Creation-Date: 2025-09-21 13:23+1000\n"
+"POT-Creation-Date: 2025-10-17 15:19+1000\n"
 "PO-Revision-Date: 2023-10-25 11:04+0000\n"
 "Last-Translator: heguyChen, 2023\n"
 "Language-Team: Chinese Simplified (https://app.transifex.com/alliance-auth/"