django-esi 8.0.0a1__py3-none-any.whl → 8.0.0a3__py3-none-any.whl

{django_esi-8.0.0a1.dist-info → django_esi-8.0.0a3.dist-info}/METADATA

@@ -1,9 +1,10 @@
 Metadata-Version: 2.4
 Name: django-esi
-Version: 8.0.0a1
+Version: 8.0.0a3
 Summary: Django app for accessing the EVE Swagger Interface (ESI).
+Keywords: eveonline
 Author-email: Alliance Auth <adarnof@gmail.com>
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
@@ -15,8 +16,6 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12

{django_esi-8.0.0a1.dist-info → django_esi-8.0.0a3.dist-info}/RECORD

@@ -1,28 +1,28 @@
-esi/__init__.py,sha256=YJLUW2OGg6KIB9lxOqyACdI_zrRPfz7OJgtyfErVLT4,199
+esi/__init__.py,sha256=h7UNGlHMW_Mr3hZ1uc6-nP6J4YJU0GnnNvq1WRgx1Eo,199
 esi/admin.py,sha256=9i68WwW_gR0zsGhJKTWK2yMEi44EkhpAaOW0LDpVfM8,1176
-esi/app_settings.py,sha256=FRetsq-ToHwiiRNtJoPSg8bCRruOFCiFqxjg_si4qQs,4286
+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/decorators.py,sha256=2RmPdkrIAwbxOV5Ls8-RIWd_VhmXEDzIG6g5-bs6WZc,9093
 esi/errors.py,sha256=KfFtgX8Mys4uMoQtco0n_pQeaM83yVrRSyW6StXuUjo,308
-esi/exceptions.py,sha256=Zf2cPFFbIYL90sYVtGeZXmna2n_3VyLdVApa5BRUvKc,747
+esi/exceptions.py,sha256=nR-Z0BXVt5xSkgUL56E97pqtTyEu3MFr8_P0uCCCQ-E,1448
 esi/helpers.py,sha256=-lYojtcWYWtlC_olSItWR3O3zJpjMYTQpNvsax81us8,672
 esi/managers.py,sha256=zdri1aSJrSX9W_kwzbXq44CAAhdufikoOViaJntA41A,11443
 esi/managers.pyi,sha256=BxRNX2yOT3domdrxsuGp4G0TrP_bWmf8VVwvM03eHQE,1977
 esi/models.py,sha256=v33dvnWoiDwhcwc5Y4CvNOtAJocNd2qh5JtyNTtu-P8,11483
-esi/openapi_clients.py,sha256=vMy3u42xna9NzaNmA8IpGTou8FSWHxhBLwncUUnQxkg,31890
+esi/openapi_clients.py,sha256=ORYRPjW4pqmmMFmaK6oiIHsCpVlLL-s7LTKcXA3xhSM,36874
 esi/rate_limiting.py,sha256=fUzso1YCHlBes8SVrEAsP58eRWcFNuO2XEkW6RQLhUE,2600
 esi/stubs.py,sha256=UakysEAq5V454oKbxyEUewncr5sCFZCgwHFh0SJvU3Y,30
-esi/stubs.pyi,sha256=J2SN_fZz3gXANqDamnRUiHzBX3LRd0cFMWC8XbcgiFI,236053
+esi/stubs.pyi,sha256=rmWy-cM_qcZyEIAQcAbNJ2jMtgPU4Ai-SOncFmuBHSA,233649
 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=B8me42zaBJJJyUmARZAJS2fahbmZFih2HGxpTpJ3LF8,3252
+esi/aiopenapi3/plugins.py,sha256=1JGDhsca2vO_R_J5Gi4b5_lK0VDQ_AoyMHHyvzYoLrM,4673
 esi/locale/de/LC_MESSAGES/django.mo,sha256=9_Fc_R8oZpT_CojH8gBxdSqj2K84EMEMn4wkvmOr7Dg,820
 esi/locale/de/LC_MESSAGES/django.po,sha256=2NQVGYzLroHPPrWgmACSnb2d3nwlkMBLxA1uWU3K0FA,1503
 esi/locale/en/LC_MESSAGES/django.mo,sha256=N1pb17IfLd0ASiKO8d68-B4ygSpDkhKOCs8YTzMXQo0,380
-esi/locale/en/LC_MESSAGES/django.po,sha256=-y3WrC0mq4OoKp_xwmBqOaoPwEQA_P09J7Mgm1TKTRs,1305
+esi/locale/en/LC_MESSAGES/django.po,sha256=Ex11J8RaZM4KuP8xGtRi-TrSSAG05jU-KiemYeG84yc,1305
 esi/locale/es/LC_MESSAGES/django.mo,sha256=dtCivRk6vD0mT2Wx9kcBRtMhU41bdqERHkBYPLoI5qg,737
 esi/locale/es/LC_MESSAGES/django.po,sha256=KvCk4FLdPl_SMEcEWL6KAr870ScmsL5jnyCJvpglOB4,1504
 esi/locale/fr_FR/LC_MESSAGES/django.mo,sha256=CG7EL6JGYoSVaAggmIvwerXuzf55b6VWmcOSK_1okik,643
@@ -34,11 +34,11 @@ esi/locale/ja/LC_MESSAGES/django.po,sha256=uWDpo_f8YyTn6VIH1S87PbGvQnsCiKe_i9LYm
 esi/locale/ko_KR/LC_MESSAGES/django.mo,sha256=-GXsBq-bhlghnrxsuNfS2rirCJn9sPQi1whTvRCvGV4,746
 esi/locale/ko_KR/LC_MESSAGES/django.po,sha256=gjPHlrraWxVBS-H4n88y-5a2n7PbwvwZzeaZdP5aquc,1511
 esi/locale/ru/LC_MESSAGES/django.mo,sha256=WbKkLTav0kXvfTadQ6fccwh0T7iI_1wmPVu_LjQaYMo,915
-esi/locale/ru/LC_MESSAGES/django.po,sha256=_pMs3mMOGMiHGpk27p8ykllpGnw20l5sSDg-N27RNDY,1703
+esi/locale/ru/LC_MESSAGES/django.po,sha256=zQm-QOcIIu3vfU60bG2zFXv1sstsEV39EcN0VJErHrs,1812
 esi/locale/zh_Hans/LC_MESSAGES/django.mo,sha256=hPSO7wlU9cN8f32Qo1Dztq6AHUm2hZfL1hHIDW1R1F4,681
 esi/locale/zh_Hans/LC_MESSAGES/django.po,sha256=fZhif8jOUvY22xurl7eBYsHNKoqf7obtkW5L3894hk4,1451
 esi/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-esi/management/commands/generate_esi_stubs.py,sha256=wwCyrl5UooZJ6Dt4YU7gVMdI22GAQSn_gCHxNsfjipo,9467
+esi/management/commands/generate_esi_stubs.py,sha256=MlsLe_otphvkRDXs-MwbNLfvIhESKD9tOJxMdqvGunc,10579
 esi/management/commands/migrate_to_ssov2.py,sha256=x9W4xaefrNoG_dNscHIWrWTRk4SuVGIW0s44q2QBN9k,6427
 esi/migrations/0001_initial.py,sha256=ItZOyyCRyfyxUhxCG1P08oylCY355gqOKGF3cJTQmcM,3396
 esi/migrations/0002_scopes_20161208.py,sha256=AG3qVAoEXh8WTgxuvS1pgG8LxLGMzpqr-jqtMjy3qC0,2846
@@ -73,13 +73,14 @@ esi/tests/test_decorators.py,sha256=I5MhcLKhN5xD4PxgEQqOWQ2kiXquDqQIEve9dbTOsho,
 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.py,sha256=UJB6g8Olpb71OenLmuoQEok4RNWo2F3-37wL-HtV-RI,459
 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.0a1.dist-info/licenses/LICENSE,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
-django_esi-8.0.0a1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-django_esi-8.0.0a1.dist-info/METADATA,sha256=1KLv0PgWJaTuDBUJ8oFKxjMRhZHc_gSBsReo471tHfA,4817
-django_esi-8.0.0a1.dist-info/RECORD,,
+django_esi-8.0.0a3.dist-info/licenses/LICENSE,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
+django_esi-8.0.0a3.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+django_esi-8.0.0a3.dist-info/METADATA,sha256=Q_uxmC2AihrvgYtxiVATgX0MFhM3bmrAk81axnHUyP4,4738
+django_esi-8.0.0a3.dist-info/RECORD,,

esi/__init__.py

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

esi/aiopenapi3/plugins.py

@@ -1,6 +1,45 @@
 from aiopenapi3.plugin import Document
 
 
+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
+        for path_item in spec.get("paths", {}).values():
+            for method_name in ("get", "post", "put", "delete", "patch", "options", "head"):
+                method = path_item.get(method_name)
+                if not method:
+                    continue
+                if "204" in method['responses']:
+                    method['responses']["204"].pop("content", [])
+        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
+        for path_item in spec.get("paths", {}).values():
+            for method_name in ("get", "post", "put", "delete", "patch", "options", "head"):
+                method = path_item.get(method_name)
+                if not method:
+                    continue
+                if "304" not in method['responses']:
+                    method['responses']["304"]={
+                        "description": "Not Modified"
+                    }
+        return ctx
+
+
 class RemoveSecurityParameter(Document):
     """
     Removes the whole OAuth2 securityScheme

esi/app_settings.py

@@ -108,5 +108,5 @@ ESI_TOKEN_JWT_AUDIENCE = str(getattr(settings, "ESI_TOKEN_JWT_AUDIENCE", "EVE On
 
 # list of all official language codes supported by ESI
 ESI_LANGUAGES = getattr(settings, 'ESI_LANGUAGES', [
-    'de', 'en-us', 'fr', 'ja', 'ru', 'zh', 'ko'
+    'en', 'de', 'fr', 'ja', 'ru', 'zh', 'ko', 'es'
 ])

esi/exceptions.py

@@ -1,3 +1,9 @@
+import dataclasses
+
+from aiopenapi3.errors import HTTPServerError as base_HTTPServerError
+from aiopenapi3.errors import HTTPClientError as base_HTTPClientError
+from aiopenapi3.errors import HTTPError
+
 class ESIErrorLimitException(Exception):
     """ESI Global Error Limit Exceeded
     https://developers.eveonline.com/docs/services/esi/best-practices/#error-limit
@@ -16,3 +22,26 @@ class ESIBucketLimitException(Exception):
         self.bucket = bucket
         msg = kwargs.get("message") or f"ESI bucket limit reached for {bucket}."
         super().__init__(msg, *args)
+
+
+@dataclasses.dataclass(repr=False)
+class HTTPNotModified(HTTPError):
+    """The HTTP Status is 304"""
+
+    status_code: int
+    headers: dict[str, str]
+
+    def __str__(self):
+        return f"""<{self.__class__.__name__} {self.status_code} {self.headers}>"""
+
+
+@dataclasses.dataclass(repr=False)
+class HTTPClientError(base_HTTPClientError):
+    """response code 4xx"""
+    pass
+
+
+@dataclasses.dataclass(repr=False)
+class HTTPServerError(base_HTTPServerError):
+    """response code 5xx"""
+    pass

esi/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: 2025-06-30 10:57+1000\n"
+"POT-Creation-Date: 2025-09-04 13:41+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"
@@ -18,11 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: esi/models.py:73
+#: esi/models.py:66
 msgid "Character"
 msgstr ""
 
-#: esi/models.py:74
+#: esi/models.py:67
 msgid "Corporation"
 msgstr ""
 

esi/locale/ru/LC_MESSAGES/django.po

@@ -5,15 +5,16 @@
 # 
 # Translators:
 # Filipp Chertiev <f@fzfx.ru>, 2023
+# Gnevich <and.vareba81@gmail.com>, 2025
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-08 23:42+1000\n"
+"POT-Creation-Date: 2025-06-30 10:57+1000\n"
 "PO-Revision-Date: 2023-10-25 11:04+0000\n"
-"Last-Translator: Filipp Chertiev <f@fzfx.ru>, 2023\n"
+"Last-Translator: Gnevich <and.vareba81@gmail.com>, 2025\n"
 "Language-Team: Russian (https://app.transifex.com/alliance-auth/teams/107430/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,13 +22,13 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: esi/models.py:72
+#: esi/models.py:73
 msgid "Character"
-msgstr ""
+msgstr "Персонаж"
 
-#: esi/models.py:73
+#: esi/models.py:74
 msgid "Corporation"
-msgstr ""
+msgstr "Корпорация"
 
 #: esi/templates/esi/select_token.html:13
 msgid "ESI Token Selection"
@@ -49,7 +50,7 @@ msgstr "Новый персонаж"
 #: esi/templates/esi/select_token.html:71
 #: esi/templates/esi/select_token.html:107
 msgid "Add Token"
-msgstr ""
+msgstr "Добавить токен"
 
 #: esi/templates/esi/select_token.html:88
 #: esi/templates/esi/select_token.html:89

esi/management/commands/generate_esi_stubs.py

@@ -102,7 +102,7 @@ class Command(BaseCommand):
             f.write("# flake8: noqa=E501\n")
             f.write("# Auto Generated do not edit\n")
             # Python Imports
-            f.write("from typing import Any, Optional\n\n")
+            f.write("from typing import Any\n\n")
             f.write("from esi.openapi_clients import EsiOperation\n")
             f.write("from esi.models import Token\n\n\n")
 
@@ -114,15 +114,25 @@ class Command(BaseCommand):
                 # result(), Results(), Results_Localized() etc. all live here
                 ops = stub_api._operationindex._tags[tag]
                 for nm, op in sorted(ops._operations.items()):
+                    op_type = op[0]
                     op_obj = op[2]
                     docstring = (op_obj.description or op_obj.summary or "").replace("\n", " ").strip()
                     op_class_name = sanitize_operation_class(nm)
 
                     response_type = "Any"
                     try:
-                        resp_200 = op_obj.responses.get("200")
-                        if resp_200 and "application/json" in resp_200.content:
-                            response_type = schema_to_type(resp_200.content["application/json"].schema_)
+                        match op_type:
+                            case "post":
+                                resp_201 = op_obj.responses.get("201")
+                                if resp_201 and "application/json" in resp_201.content:
+                                    response_type = schema_to_type(resp_201.content["application/json"].schema_)
+                            case "put" | "delete":
+                                response_type = "None"
+                            case _:
+                                resp_200 = op_obj.responses.get("200")
+                                if resp_200 and "application/json" in resp_200.content:
+                                    response_type = schema_to_type(resp_200.content["application/json"].schema_)
+
                     except Exception:
                         response_type = "Any"
 
@@ -130,22 +140,26 @@ class Command(BaseCommand):
 
                     if op_class_name not in operation_classes:
                         f.write(f"class {op_class_name}(EsiOperation):\n")
-                        f.write("    \"\"\"EsiOperation, use result(), results() or results_localized()\"\"\"\n")
+                        if response_type != "None":
+                            f.write("    \"\"\"EsiOperation, use result(), results() or results_localized()\"\"\"\n")
+                        else:
+                            f.write("    \"\"\"EsiOperation, use result()\"\"\"\n")
 
                         # result()
                         f.write(f"    def result(self, etag: str | None = None, return_response: bool = False, use_cache: bool = True, **extra) -> {response_type}:\n")  # noqa: E501
                         f.write(f"        \"\"\"{docstring}\"\"\"\n") if docstring else None
                         f.write("        ...\n\n")
-
-                        # results()
-                        f.write(f"    def results(self, etag: str | None = None, return_response: bool = False, use_cache: bool = True, **extra) -> {results_type}:\n")  # noqa: E501
-                        f.write(f"        \"\"\"{docstring}\"\"\"\n") if docstring else None
-                        f.write("        ...\n\n")
-
-                        # results_localized()
-                        f.write(f"    def results_localized(self, languages: str | list[str] = 'en', **kwargs) -> {results_type}:\n")
-                        f.write(f"        \"\"\"{docstring}\"\"\"\n") if docstring else None
-                        f.write("        ...\n\n\n")
+                        if response_type != "None":
+                            # We only need the extra utility functions if its actually an endpoint that returns data
+                            # results()
+                            f.write(f"    def results(self, etag: str | None = None, return_response: bool = False, use_cache: bool = True, **extra) -> {results_type}:\n")  # noqa: E501
+                            f.write(f"        \"\"\"{docstring}\"\"\"\n") if docstring else None
+                            f.write("        ...\n\n")
+
+                            # results_localized()
+                            f.write(f"    def results_localized(self, languages: list[str] | str | None = None, **extra) -> dict[str, {results_type}]:\n")
+                            f.write(f"        \"\"\"{docstring}\"\"\"\n") if docstring else None
+                            f.write("        ...\n\n\n")
 
                         operation_classes[op_class_name] = True
 
@@ -172,6 +186,9 @@ class Command(BaseCommand):
 
                     params = ["self"]
                     optional_params = []
+                    if getattr(op_obj, "requestBody", None):
+                        params.append(f"body: {schema_to_type(op_obj.requestBody.content['application/json'].schema_)}")
+
                     for p in getattr(op_obj, "parameters", []):
                         required = getattr(p, "required", False)
                         schema_type_value = getattr(getattr(p, "schema_", None), "type", None)
@@ -181,7 +198,7 @@ class Command(BaseCommand):
                             param_type = "Any"
                         default = ""
                         if not required:
-                            param_type = f"Optional[{param_type}]"
+                            param_type = f"{param_type} | None"
                             default = " = ..."
                         param_name = p.name.replace("-", "_")
                         if param_name == "authorization" and needs_oauth: