django-esi 8.0.0a4__tar.gz → 8.0.0b1__tar.gz

{django_esi-8.0.0a4 → django_esi-8.0.0b1}/PKG-INFO

@@ -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 → django_esi-8.0.0b1}/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"

{django_esi-8.0.0a4 → django_esi-8.0.0b1}/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

{django_esi-8.0.0a4 → django_esi-8.0.0b1}/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
 

django_esi-8.0.0b1/esi/helpers.py

@@ -0,0 +1,62 @@
+from esi.models import Token
+from string import capwords
+
+
+def get_token(character_id: int, scopes: list) -> Token:
+    """Helper method to get a valid token for a specific character with specific scopes.
+
+    Args:
+        character_id: Character to filter on.
+        scopes: array of ESI scope strings to search for.
+
+    Returns:
+        Matching Token
+    """
+    qs = (
+        Token.objects
+        .filter(character_id=character_id)
+        .require_scopes(scopes)
+        .require_valid()
+    )
+    token = qs.first()
+    if token is None:
+        raise Token.DoesNotExist(
+            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

{django_esi-8.0.0a4/esi/locale/pl_PL → django_esi-8.0.0b1/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"

{django_esi-8.0.0a4 → django_esi-8.0.0b1}/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/"

{django_esi-8.0.0a4 → django_esi-8.0.0b1}/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"

{django_esi-8.0.0a4 → django_esi-8.0.0b1}/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/"

{django_esi-8.0.0a4 → django_esi-8.0.0b1}/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/"

{django_esi-8.0.0a4 → django_esi-8.0.0b1}/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/"

{django_esi-8.0.0a4 → django_esi-8.0.0b1}/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/"

{django_esi-8.0.0a4 → django_esi-8.0.0b1}/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/"

{django_esi-8.0.0a4/esi/locale/cs_CZ → django_esi-8.0.0b1/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"

{django_esi-8.0.0a4/esi/locale/nl_NL → django_esi-8.0.0b1/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"

{django_esi-8.0.0a4 → django_esi-8.0.0b1}/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/"

{django_esi-8.0.0a4 → django_esi-8.0.0b1}/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"

{django_esi-8.0.0a4 → django_esi-8.0.0b1}/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"

{django_esi-8.0.0a4 → django_esi-8.0.0b1}/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/"