django-esi 5.2.0__tar.gz → 5.3.0b2__tar.gz

{django_esi-5.2.0 → django_esi-5.3.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-esi
-Version: 5.2.0
+Version: 5.3.0b2
 Summary: Django app for accessing the EVE Swagger Interface (ESI).
 Author-email: Alliance Auth <adarnof@gmail.com>
 Requires-Python: >=3.8

{django_esi-5.2.0 → django_esi-5.3.0b2}/esi/__init__.py

@@ -2,5 +2,5 @@
 
 default_app_config = 'esi.apps.EsiConfig'
 
-__version__ = '5.2.0'
+__version__ = '5.3.0b2'
 __title__ = 'django-esi'

{django_esi-5.2.0 → django_esi-5.3.0b2}/esi/app_settings.py

@@ -31,7 +31,7 @@ ESI_INFO_LOGGING_ENABLED = getattr(settings, 'ESI_INFO_LOGGING_ENABLED', False)
 ESI_LOG_LEVEL_LIBRARIES = str(getattr(settings, 'ESI_LOG_LEVEL_LIBRARIES', 'INFO'))
 """Set log level for libraries like bravado and urlib3."""
 
-ESI_DEBUG_RESPONSE_CONTENT_LOGGING = str(getattr(settings, 'ESI_DEBUG_RESPONSE_CONTENT_LOGGING', True))
+ESI_DEBUG_RESPONSE_CONTENT_LOGGING = getattr(settings, 'ESI_DEBUG_RESPONSE_CONTENT_LOGGING', True)
 """Enable/Disable logging of ESI response contents."""
 
 ESI_USER_CONTACT_EMAIL = getattr(settings, 'ESI_USER_CONTACT_EMAIL', None)

{django_esi-5.2.0 → django_esi-5.3.0b2}/esi/managers.py

@@ -1,18 +1,16 @@
-from datetime import timedelta
 import logging
-from typing import Union, Any
+from datetime import timedelta
+from typing import Any, Union
 
 import requests
-from requests_oauthlib import OAuth2Session
-
 from django.db import models
 from django.utils import timezone
-
-from .errors import TokenError, IncompleteResponseError
-from . import app_settings
-
 from jose import jwt
 from jose.exceptions import ExpiredSignatureError, JWTError
+from requests_oauthlib import OAuth2Session
+
+from . import app_settings
+from .errors import IncompleteResponseError, TokenError
 
 logger = logging.getLogger(__name__)
 
@@ -75,10 +73,12 @@ class TokenQueryset(models.QuerySet):
         Returns:
             All tokens which are still valid.
         """
-        expired = self.get_expired()
-        valid = self.exclude(pk__in=expired)
-        valid_expired = expired.bulk_refresh()
-        return valid_expired | valid
+        expired_pks = set(self.get_expired().values_list("pk", flat=True))
+        fresh_pks = set(self.exclude(pk__in=expired_pks).values_list("pk", flat=True))
+        refreshed = self.filter(pk__in=expired_pks).bulk_refresh()
+        refreshed_pks = set(refreshed.values_list("pk", flat=True))
+        qs = self.filter(pk__in=fresh_pks | refreshed_pks)
+        return qs
 
     def require_scopes(self, scope_string: Union[str, list]) -> models.QuerySet:
         """Filter tokens which have at least a subset of given scopes.