aa-structures 3.3.1__tar.gz → 4.0.0b3__tar.gz

{aa_structures-3.3.1 → aa_structures-4.0.0b3}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: aa-structures
-Version: 3.3.1
+Version: 4.0.0b3
 Summary: App for managing Eve Online structures with Alliance Auth.
 Author-email: Erik Kalkoken <kalkoken87@gmail.com>
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
@@ -12,28 +12,33 @@ Classifier: Intended Audience :: End Users/Desktop
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-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
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 License-File: LICENSE
-Requires-Dist: allianceauth-app-utils>=1.29.1
-Requires-Dist: allianceauth>=4,<5
+Requires-Dist: allianceauth-app-utils>=1.31.0a1
+Requires-Dist: allianceauth>=4,<6
 Requires-Dist: dhooks-lite>=1.0
-Requires-Dist: django-eveuniverse>=1.6
+Requires-Dist: django-esi>=8,<10
+Requires-Dist: django-eveuniverse>=2.0.0a1
 Requires-Dist: django-multiselectfield
 Requires-Dist: django-navhelper
+Requires-Dist: humanize>=4.7
 Requires-Dist: pytz!=2022.2
+Requires-Dist: pyyaml>=6
 Requires-Dist: redis-simple-mq>=1.1
-Requires-Dist: humanize>=4.7
+Requires-Dist: coverage ; extra == "test"
+Requires-Dist: factory_boy ; extra == "test"
+Requires-Dist: markdown ; extra == "test"
+Requires-Dist: pook ; extra == "test"
 Project-URL: Changelog, https://gitlab.com/ErikKalkoken/aa-structures/-/blob/master/CHANGELOG.md
 Project-URL: Documentation, https://aa-structures.readthedocs.io/en/latest/
 Project-URL: Homepage, https://gitlab.com/ErikKalkoken/aa-structures
 Project-URL: Source, https://gitlab.com/ErikKalkoken/aa-structures
 Project-URL: Tracker, https://gitlab.com/ErikKalkoken/aa-structures/-/issues
+Provides-Extra: test
 
 # Structures
 

{aa_structures-3.3.1 → aa_structures-4.0.0b3}/pyproject.toml

@@ -7,7 +7,7 @@ name = "aa-structures"
 dynamic = ["version", "description"]
 readme = "README.md"
 license = { file = "LICENSE" }
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 authors = [{ name = "Erik Kalkoken", email = "kalkoken87@gmail.com" }]
 classifiers = [
     "Environment :: Web Environment",
@@ -17,8 +17,6 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -26,17 +24,22 @@ classifiers = [
     "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
 ]
 dependencies = [
-    "allianceauth-app-utils>=1.29.1",
-    "allianceauth>=4,<5",
+    "allianceauth-app-utils>=1.31.0a1",
+    "allianceauth>=4,<6",
     "dhooks-lite>=1.0",
-    "django-eveuniverse>=1.6",
+    "django-esi>=8,<10",
+    "django-eveuniverse>=2.0.0a1",
     "django-multiselectfield",
     "django-navhelper",
+    "humanize>=4.7",
     "pytz!=2022.2",
+    "pyyaml>=6",
     "redis-simple-mq>=1.1",
-    "humanize>=4.7",
 ]
 
+[project.optional-dependencies]
+test = ["coverage", "factory_boy", "markdown", "pook"]
+
 [project.urls]
 Homepage = "https://gitlab.com/ErikKalkoken/aa-structures"
 Documentation = "https://aa-structures.readthedocs.io/en/latest/"
@@ -74,12 +77,13 @@ max-line-length = 120
 
 [tool.pylint.'MESSAGES CONTROL']
 disable = [
-    "too-many-instance-attributes",
-    "too-few-public-methods",
-    "imported-auth-user",
     "cyclic-import",
     "fixme",
     "import-outside-toplevel",
-    "redefined-builtin",
+    "imported-auth-user",
     "no-member",
+    "redefined-builtin",
+    "too-few-public-methods",
+    "too-many-instance-attributes",
+    "too-many-return-statements",
 ]

{aa_structures-3.3.1 → aa_structures-4.0.0b3}/structures/__init__.py

@@ -3,5 +3,5 @@
 # pylint: disable = invalid-name
 default_app_config = "structures.apps.StructuresConfig"
 
-__version__ = "3.3.1"
+__version__ = "4.0.0b3"
 __title__ = "Structures"

{aa_structures-3.3.1 → aa_structures-4.0.0b3}/structures/admin.py

@@ -18,9 +18,8 @@ from django.utils.translation import gettext_lazy as _
 from allianceauth.eveonline.models import EveAllianceInfo, EveCorporationInfo
 from allianceauth.services.hooks import get_extension_logger
 from app_utils.django import admin_boolean_icon_html
-from app_utils.logging import LoggerAddTag
 
-from . import __title__, app_settings, tasks
+from . import app_settings, tasks
 from .core.notification_types import NotificationType
 from .models import (
     FuelAlert,
@@ -40,7 +39,7 @@ from .models import (
     Webhook,
 )
 
-logger = LoggerAddTag(get_extension_logger(__name__), __title__)
+logger = get_extension_logger(__name__)
 
 
 def lines_sorted_html(items: list) -> str:

{aa_structures-3.3.1 → aa_structures-4.0.0b3}/structures/app_settings.py

@@ -49,7 +49,7 @@ STRUCTURES_FEATURE_REFUELED_NOTIFICATIONS = clean_setting(
 )
 """Enable / disable refueled notifications feature."""
 
-STRUCTURES_FEATURE_SKYHOOKS = clean_setting("STRUCTURES_FEATURE_SKYHOOKS", False)
+STRUCTURES_FEATURE_SKYHOOKS = clean_setting("STRUCTURES_FEATURE_SKYHOOKS", True)
 """Show skyhooks in structures list."""
 
 

{aa_structures-3.3.1 → aa_structures-4.0.0b3}/structures/constants.py

@@ -33,17 +33,18 @@ class EveGroupId(IntEnum):
     REFINERY = 1406
     STRUCTURE_CITADEL_SERVICE_MODULE = 1321
     UNCOMMON_MOON_ASTEROIDS = 1921
+    UPWELL_JUMP_BRIDGE = 1408
     UPWELL_MOON_DRILL = 4744
 
 
 class EveTypeId(IntEnum):
     """An EVE type ID."""
 
+    ANSIBLE_JUMP_BRIDGE = 35841
     ASTRAHUS_UPWELL_QUANTUM_CORE = 56201
     CALDARI_CONTROL_TOWER = 16213
     CUSTOMS_OFFICE = 2233
     IHUB = 32458
-    JUMP_GATE = 35841
     LIQUID_OZONE = 16273
     NITROGEN_FUEL_BLOCK = 4051
     ORBITAL_SKYHOOK = 81080

{aa_structures-3.3.1 → aa_structures-4.0.0b3}/structures/core/notification_embeds/helpers.py

@@ -63,17 +63,15 @@ def gen_eve_entity_link(eve_entity: EveEntity) -> str:
     except AttributeError:
         return ""
 
-    if category == EveEntity.CATEGORY_ALLIANCE:
-        url = dotlan.alliance_url(eve_entity.name)
-
-    elif category == EveEntity.CATEGORY_CORPORATION:
-        url = dotlan.corporation_url(eve_entity.name)
-
-    elif category == EveEntity.CATEGORY_CHARACTER:
-        url = evewho.character_url(eve_entity.id)
-
-    else:
-        return ""
+    match category:
+        case EveEntity.CATEGORY_ALLIANCE:
+            url = dotlan.alliance_url(eve_entity.name)
+        case EveEntity.CATEGORY_CORPORATION:
+            url = dotlan.corporation_url(eve_entity.name)
+        case EveEntity.CATEGORY_CHARACTER:
+            url = evewho.character_url(eve_entity.id)
+        case _:
+            return ""
 
     return Webhook.create_link(eve_entity.name, url)
 

{aa_structures-3.3.1 → aa_structures-4.0.0b3}/structures/core/notification_embeds/main.py

@@ -11,7 +11,6 @@ from django.conf import settings
 from django.utils.translation import gettext as _
 
 from allianceauth.services.hooks import get_extension_logger
-from app_utils.logging import LoggerAddTag
 from app_utils.urls import reverse_absolute, static_file_absolute_url
 
 from structures import __title__
@@ -21,7 +20,7 @@ from structures.models.notifications import Notification, NotificationBase, Webh
 
 from .helpers import gen_alliance_link, gen_corporation_link, target_datetime_formatted
 
-logger = LoggerAddTag(get_extension_logger(__name__), __title__)
+logger = get_extension_logger(__name__)
 
 
 class NotificationBaseEmbed:

{aa_structures-3.3.1 → aa_structures-4.0.0b3}/structures/core/notification_timers.py

@@ -14,9 +14,7 @@ from app_utils.datetime import (
     ldap_timedelta_2_timedelta,
 )
 from app_utils.django import app_labels
-from app_utils.logging import LoggerAddTag
 
-from structures import __title__
 from structures.app_settings import (
     STRUCTURES_MOON_EXTRACTION_TIMERS_ENABLED,
     STRUCTURES_TIMERS_ARE_CORP_RESTRICTED,
@@ -37,7 +35,7 @@ if "structuretimers" in app_labels():
 else:
     Timer = None  # pylint: disable = invalid-name
 
-logger = LoggerAddTag(get_extension_logger(__name__), __title__)
+logger = get_extension_logger(__name__)
 
 
 def add_or_remove_timer(notif: Notification) -> bool:
@@ -45,33 +43,36 @@ def add_or_remove_timer(notif: Notification) -> bool:
 
     Returns True when timers where added or removed, else False
     """
-    if notif.notif_type in [
-        NotificationType.STRUCTURE_LOST_ARMOR,
-        NotificationType.STRUCTURE_LOST_SHIELD,
-    ]:
-        timer_processed = _gen_timer_structure_reinforcement(notif)
-    elif notif.notif_type == NotificationType.SOV_STRUCTURE_REINFORCED:
-        timer_processed = _gen_timer_sov_reinforcements(notif)
-    elif notif.notif_type == NotificationType.ORBITAL_REINFORCED:
-        timer_processed = _gen_timer_customs_office_reinforcements(notif)
-    elif notif.notif_type == NotificationType.SKYHOOK_LOST_SHIELDS:
-        timer_processed = _gen_timer_skyhook_reinforcements(notif)
-    elif notif.notif_type in [
-        NotificationType.MOONMINING_EXTRACTION_STARTED,
-        NotificationType.MOONMINING_EXTRACTION_CANCELLED,
-    ]:
-        if not STRUCTURES_MOON_EXTRACTION_TIMERS_ENABLED:
-            timer_processed = None
-        else:
-            timer_processed = _gen_timer_moon_extraction(notif)
-    elif notif.notif_type == NotificationType.TOWER_REINFORCED_EXTRA:
-        timer_processed = _gen_timer_tower_reinforcements(notif)
-    else:
-        raise NotImplementedError(notif.notif_type)
+    match notif.notif_type:
+        case (
+            NotificationType.STRUCTURE_LOST_ARMOR
+            | NotificationType.STRUCTURE_LOST_SHIELD
+        ):
+            timer_processed = _gen_timer_structure_reinforcement(notif)
+        case NotificationType.SOV_STRUCTURE_REINFORCED:
+            timer_processed = _gen_timer_sov_reinforcements(notif)
+        case NotificationType.ORBITAL_REINFORCED:
+            timer_processed = _gen_timer_customs_office_reinforcements(notif)
+        case NotificationType.SKYHOOK_LOST_SHIELDS:
+            timer_processed = _gen_timer_skyhook_reinforcements(notif)
+        case (
+            NotificationType.MOONMINING_EXTRACTION_STARTED
+            | NotificationType.MOONMINING_EXTRACTION_CANCELLED
+        ):
+            if not STRUCTURES_MOON_EXTRACTION_TIMERS_ENABLED:
+                timer_processed = None
+            else:
+                timer_processed = _gen_timer_moon_extraction(notif)
+        case NotificationType.TOWER_REINFORCED_EXTRA:
+            timer_processed = _gen_timer_tower_reinforcements(notif)
+        case _:
+            raise NotImplementedError(notif.notif_type)
+
     if timer_processed:
         logger.info("%s: Created timer for notification", notif.notification_id)
         notif.is_timer_added = True
         notif.save()
+
     return timer_processed
 
 
@@ -290,88 +291,89 @@ def _gen_timer_moon_extraction(notif: Notification) -> bool:
     timer_processed = False
     structure_type = notif.eve_structure_type()
 
-    if notif.notif_type == NotificationType.MOONMINING_EXTRACTION_STARTED:
-        if AuthTimer:
-            AuthTimer.objects.create(
-                details=gettext("Extraction ready"),
-                system=solar_system.name,
-                planet_moon=moon.name,
-                structure=structure_type_name,
-                objective=objective,
-                eve_time=eve_time,
-                eve_corp=notif.owner.corporation,
-                corp_timer=STRUCTURES_TIMERS_ARE_CORP_RESTRICTED,
-            )
-            timer_processed = True
-
-        if Timer:
-            Timer.objects.create(
-                eve_solar_system=solar_system,
-                structure_type=structure_type,
-                timer_type=Timer.Type.MOONMINING,
-                objective=Timer.Objective.FRIENDLY,
-                date=eve_time,
-                location_details=moon.name,
-                eve_corporation=notif.owner.corporation,
-                eve_alliance=notif.owner.corporation.alliance,
-                visibility=_calc_visibility(),
-                structure_name=parsed_text["structureName"],
-                owner_name=notif.owner.corporation.corporation_name,
-                details_notes=_timer_details_notes(notif),
-            )
+    match notif.notif_type:
+        case NotificationType.MOONMINING_EXTRACTION_STARTED:
+            if AuthTimer:
+                AuthTimer.objects.create(
+                    details=gettext("Extraction ready"),
+                    system=solar_system.name,
+                    planet_moon=moon.name,
+                    structure=structure_type_name,
+                    objective=objective,
+                    eve_time=eve_time,
+                    eve_corp=notif.owner.corporation,
+                    corp_timer=STRUCTURES_TIMERS_ARE_CORP_RESTRICTED,
+                )
+                timer_processed = True
+
+            if Timer:
+                Timer.objects.create(
+                    eve_solar_system=solar_system,
+                    structure_type=structure_type,
+                    timer_type=Timer.Type.MOONMINING,
+                    objective=Timer.Objective.FRIENDLY,
+                    date=eve_time,
+                    location_details=moon.name,
+                    eve_corporation=notif.owner.corporation,
+                    eve_alliance=notif.owner.corporation.alliance,
+                    visibility=_calc_visibility(),
+                    structure_name=parsed_text["structureName"],
+                    owner_name=notif.owner.corporation.corporation_name,
+                    details_notes=_timer_details_notes(notif),
+                )
+                timer_processed = True
+
+        case NotificationType.MOONMINING_EXTRACTION_CANCELLED:
             timer_processed = True
 
-    elif notif.notif_type == NotificationType.MOONMINING_EXTRACTION_CANCELLED:
-        timer_processed = True
-
-        for notification in Notification.objects.filter(
-            notif_type=NotificationType.MOONMINING_EXTRACTION_STARTED,
-            owner=notif.owner,
-            is_timer_added=True,
-            timestamp__lte=notif.timestamp,
-        ).order_by("-timestamp"):
-            notification: Notification
-            parsed_text_2 = notification.parsed_text()
-            my_structure_type_id = parsed_text_2["structureTypeID"]
-            if my_structure_type_id == parsed_text["structureTypeID"]:
-                eve_time_2 = _extract_eve_time(parsed_text_2)
-
-                if AuthTimer:
-                    timer_query = AuthTimer.objects.filter(
-                        system=solar_system.name,
-                        planet_moon=moon.name,
-                        structure=structure_type_name,
-                        objective=objective,
-                        eve_time=eve_time_2,
-                    )
-                    deleted_count, _ = timer_query.delete()
-                    logger.info(
-                        "%s: removed %d obsolete Auth timers related to notification",
-                        notif.notification_id,
-                        deleted_count,
-                    )
-
-                if Timer:
-                    timer_query = Timer.objects.filter(
-                        eve_solar_system=solar_system,
-                        structure_type=structure_type,
-                        timer_type=Timer.Type.MOONMINING,
-                        location_details=moon.name,
-                        date=eve_time_2,
-                        objective=Timer.Objective.FRIENDLY,
-                        eve_corporation=notif.owner.corporation,
-                        eve_alliance=notif.owner.corporation.alliance,
-                        visibility=_calc_visibility(),
-                        structure_name=parsed_text["structureName"],
-                        owner_name=notif.owner.corporation.corporation_name,
-                    )
-                    deleted_count, _ = timer_query.delete()
-                    logger.info(
-                        "%s: removed %d obsolete structure timers "
-                        "related to notification",
-                        notif.notification_id,
-                        deleted_count,
-                    )
+            for notification in Notification.objects.filter(
+                notif_type=NotificationType.MOONMINING_EXTRACTION_STARTED,
+                owner=notif.owner,
+                is_timer_added=True,
+                timestamp__lte=notif.timestamp,
+            ).order_by("-timestamp"):
+                notification: Notification
+                parsed_text_2 = notification.parsed_text()
+                my_structure_type_id = parsed_text_2["structureTypeID"]
+                if my_structure_type_id == parsed_text["structureTypeID"]:
+                    eve_time_2 = _extract_eve_time(parsed_text_2)
+
+                    if AuthTimer:
+                        timer_query = AuthTimer.objects.filter(
+                            system=solar_system.name,
+                            planet_moon=moon.name,
+                            structure=structure_type_name,
+                            objective=objective,
+                            eve_time=eve_time_2,
+                        )
+                        deleted_count, _ = timer_query.delete()
+                        logger.info(
+                            "%s: removed %d obsolete Auth timers related to notification",
+                            notif.notification_id,
+                            deleted_count,
+                        )
+
+                    if Timer:
+                        timer_query = Timer.objects.filter(
+                            eve_solar_system=solar_system,
+                            structure_type=structure_type,
+                            timer_type=Timer.Type.MOONMINING,
+                            location_details=moon.name,
+                            date=eve_time_2,
+                            objective=Timer.Objective.FRIENDLY,
+                            eve_corporation=notif.owner.corporation,
+                            eve_alliance=notif.owner.corporation.alliance,
+                            visibility=_calc_visibility(),
+                            structure_name=parsed_text["structureName"],
+                            owner_name=notif.owner.corporation.corporation_name,
+                        )
+                        deleted_count, _ = timer_query.delete()
+                        logger.info(
+                            "%s: removed %d obsolete structure timers "
+                            "related to notification",
+                            notif.notification_id,
+                            deleted_count,
+                        )
 
     return timer_processed
 

{aa_structures-3.3.1 → aa_structures-4.0.0b3}/structures/core/starbases.py

@@ -22,6 +22,7 @@ def is_starbase(eve_type: EveType) -> bool:
     return eve_type.eve_group_id == EveGroupId.CONTROL_TOWER
 
 
+# TODO: Use dogmas to determine tower size instead of name
 def starbase_size(eve_type: EveType) -> StarbaseSize:
     """Return the size of a starbase or None if this type is not a starbase."""
     if not is_starbase(eve_type):

{aa_structures-3.3.1 → aa_structures-4.0.0b3}/structures/management/commands/structures_load_eve.py

@@ -4,12 +4,11 @@ from django.core.management import call_command
 from django.core.management.base import BaseCommand
 
 from allianceauth.services.hooks import get_extension_logger
-from app_utils.logging import LoggerAddTag
 
 from structures import __title__
 from structures.constants import EveCategoryId, EveGroupId, EveTypeId
 
-logger = LoggerAddTag(get_extension_logger(__name__), __title__)
+logger = get_extension_logger(__name__)
 
 
 class Command(BaseCommand):

{aa_structures-3.3.1 → aa_structures-4.0.0b3}/structures/management/commands/structures_preload_eveuniverse.py

@@ -5,12 +5,10 @@ from eveuniverse.models import EveEntity, EveMoon, EvePlanet, EveSolarSystem, Ev
 
 from allianceauth.services.hooks import get_extension_logger
 from app_utils.esi import fetch_esi_status
-from app_utils.logging import LoggerAddTag
 
-from structures import __title__
 from structures.models import Notification, StarbaseDetailFuel, Structure, StructureItem
 
-logger = LoggerAddTag(get_extension_logger(__name__), __title__)
+logger = get_extension_logger(__name__)
 
 
 class Command(BaseCommand):

{aa_structures-3.3.1 → aa_structures-4.0.0b3}/structures/management/commands/structures_update_poco_planets.py

@@ -4,13 +4,11 @@ from django.core.management.base import BaseCommand
 from eveuniverse.models import EveSolarSystem
 
 from allianceauth.services.hooks import get_extension_logger
-from app_utils.logging import LoggerAddTag
 
-from structures import __title__
 from structures.constants import EveTypeId
 from structures.models import Structure
 
-logger = LoggerAddTag(get_extension_logger(__name__), __title__)
+logger = get_extension_logger(__name__)
 
 
 class Command(BaseCommand):

{aa_structures-3.3.1 → aa_structures-4.0.0b3}/structures/managers.py

@@ -17,9 +17,7 @@ from eveuniverse.models import EveMoon, EvePlanet, EveSolarSystem, EveType
 
 from allianceauth.eveonline.models import EveCorporationInfo
 from allianceauth.services.hooks import get_extension_logger
-from app_utils.logging import LoggerAddTag
 
-from . import __title__
 from .app_settings import STRUCTURES_HOURS_UNTIL_STALE_NOTIFICATION
 from .constants import EveCategoryId, EveTypeId
 from .core.notification_types import NotificationType
@@ -27,19 +25,20 @@ from .providers import esi
 from .webhooks.managers import WebhookBaseManager
 
 if TYPE_CHECKING:
-    from .models import Owner
+    from .models import Owner, Structure
 
-logger = LoggerAddTag(get_extension_logger(__name__), __title__)
+logger = get_extension_logger(__name__)
 
 
 class EveSovereigntyMapManager(models.Manager):
     def update_or_create_all_from_esi(self):
         """Update or create complete sovereignty map from ESI."""
-        sov_map = esi.client.Sovereignty.get_sovereignty_map().results()
+        sov_map = esi.client.Sovereignty.GetSovereigntyMap().results(use_etag=False)
         logger.info("Retrieved sovereignty map from ESI")
         last_updated = now()
         obj_list = []
-        for solar_system in sov_map:
+        for row in sov_map:
+            solar_system = row.model_dump()
             obj_def = {
                 "solar_system_id": solar_system["system_id"],
                 "last_updated": last_updated,
@@ -373,9 +372,10 @@ class StructureManagerBase(models.Manager):
         if token is None:
             raise ValueError("Can not fetch structure without token")
 
-        structure_info = esi.client.Universe.get_universe_structures_structure_id(
-            structure_id=id, token=token.valid_access_token()
-        ).results()
+        data = esi.client.Universe.GetUniverseStructuresStructureId(
+            structure_id=id, token=token
+        ).result(use_etag=False)
+        structure_info = data.model_dump()
         structure = {
             "structure_id": id,
             "name": self.model.extract_name_from_esi_response(structure_info["name"]),
@@ -384,7 +384,7 @@ class StructureManagerBase(models.Manager):
             "system_id": structure_info["solar_system_id"],
         }
         owner = Owner.objects.get(
-            corporation__corporation_id=structure_info["corporation_id"]
+            corporation__corporation_id=structure_info["owner_id"]
         )
         obj, created = self.update_or_create_from_dict(structure=structure, owner=owner)
         return obj, created
@@ -393,7 +393,6 @@ class StructureManagerBase(models.Manager):
         self, structure: dict, owner: Owner
     ) -> Tuple[Any, bool]:
         """Update or create a structure from a dict."""
-
         eve_type: EveType = EveType.objects.get_or_create_esi(id=structure["type_id"])[
             0
         ]
@@ -409,6 +408,7 @@ class StructureManagerBase(models.Manager):
         except self.model.DoesNotExist:
             old_obj = None
 
+        obj: Structure
         obj, created = self.update_or_create(
             id=structure["structure_id"],
             defaults={