clinicedc 2.0.4__py3-none-any.whl → 2.0.6__py3-none-any.whl

edc_action_item/models/action_type.py

@@ -11,6 +11,13 @@ from edc_model.models import BaseUuidModel
 from ..choices import PRIORITY
 from ..exceptions import ActionTypeError
 
+MISSING_ACTION_CLASS = "Model missing an action class. See {reference_model_cls!r}"
+NOT_CONFIGURED_FOR_ACTIONS = (
+    "Model not configured for Actions. Are you using the model mixin? "
+    "See {reference_model_cls!r}. Got {err}"
+)
+REFERENCE_MODEL_LOOKUP_ERROR = "{err}. Got reference_model=`{reference_model}`"
+
 
 class ActionTypeManager(models.Manager):
     use_in_migrations = True
@@ -25,11 +32,17 @@ class ActionType(BaseUuidModel):
     display_name = models.CharField(max_length=100)
 
     reference_model = models.CharField(
-        max_length=100, null=True, blank=True, help_text="reference model"
+        max_length=100,
+        blank=True,
+        default="",
+        help_text="reference model",
     )
 
     related_reference_model = models.CharField(
-        max_length=100, null=True, blank=True, help_text="origin reference model"
+        max_length=100,
+        blank=True,
+        default="",
+        help_text="origin reference model",
     )
 
     priority = models.CharField(max_length=25, choices=PRIORITY, default=HIGH_PRIORITY)
@@ -46,7 +59,7 @@ class ActionType(BaseUuidModel):
         default=True, help_text="This action may be created by the user"
     )
 
-    instructions = models.TextField(max_length=250, null=True, blank=True)
+    instructions = models.TextField(max_length=250, blank=True, default="")
 
     objects = ActionTypeManager()
 
@@ -54,7 +67,7 @@ class ActionType(BaseUuidModel):
         return self.display_name
 
     def natural_key(self) -> tuple:
-        return (self.name,)  # noqa
+        return (self.name,)
 
     @property
     def reference_model_cls(self) -> Any:
@@ -63,7 +76,11 @@ class ActionType(BaseUuidModel):
             try:
                 model_cls = django_apps.get_model(self.reference_model)
             except (LookupError, ValueError) as e:
-                raise ActionTypeError(f"{e}. Got reference_model=`{self.reference_model}`")
+                raise ActionTypeError(
+                    REFERENCE_MODEL_LOOKUP_ERROR.format(
+                        err=str(e), reference_model=self.reference_model
+                    )
+                ) from e
         return model_cls
 
     def save(self, *args, **kwargs):
@@ -72,20 +89,23 @@ class ActionType(BaseUuidModel):
             try:
                 if not self.reference_model_cls.action_name:
                     raise ActionTypeError(
-                        f"Model missing an action class. See {repr(self.reference_model_cls)}"
+                        MISSING_ACTION_CLASS.format(
+                            reference_model_cls=self.reference_model_cls
+                        )
                     )
             except AttributeError as e:
                 if "action_name" in str(e):
                     raise ActionTypeError(
-                        f"Model not configured for Actions. Are you using the model mixin? "
-                        f"See {repr(self.reference_model_cls)}. Got {e}"
-                    )
-                else:
-                    raise
+                        NOT_CONFIGURED_FOR_ACTIONS.format(
+                            reference_model_cls=self.reference_model_cls, err=str(e)
+                        )
+                    ) from e
+                raise
         super().save(*args, **kwargs)
 
     class Meta(BaseUuidModel.Meta):
-        indexes = BaseUuidModel.Meta.indexes + [
+        indexes = (
+            *BaseUuidModel.Meta.indexes,
             models.Index(fields=["id", "name"]),
-        ]
+        )
         default_permissions = ("add", "change", "delete", "view", "export", "import")

edc_action_item/models/reference.py

@@ -33,9 +33,10 @@ class Reference(NonUniqueSubjectIdentifierFieldMixin, ActionModelMixin, BaseUuid
     objects = ReferenceManager()
 
     def natural_key(self):
-        return (self.action_identifier,)  # noqa
+        return (self.action_identifier,)
 
     class Meta(BaseUuidModel.Meta, NonUniqueSubjectIdentifierFieldMixin.Meta):
         indexes = (
-            BaseUuidModel.Meta.indexes + NonUniqueSubjectIdentifierFieldMixin.Meta.indexes
+            *BaseUuidModel.Meta.indexes,
+            *NonUniqueSubjectIdentifierFieldMixin.Meta.indexes,
         )

edc_action_item/site_action_items.py

@@ -4,7 +4,7 @@ import copy
 import sys
 from dataclasses import InitVar, dataclass, field
 from importlib import import_module
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
 from django.core.management.color import color_style
@@ -36,12 +36,12 @@ class SiteActionError(Exception):
 
 @dataclass
 class ActionButton:
-    action_cls: InitVar[Type[Action] | Type[ActionWithNotification]] = None
+    action_cls: InitVar[type[Action] | type[ActionWithNotification]] = None
     name: str = field(init=False)
     display_name: str = field(init=False)
     action_type_id: str = field(init=False)
 
-    def __post_init__(self, action_cls: Type[Action] | Type[ActionWithNotification]):
+    def __post_init__(self, action_cls: type[Action] | type[ActionWithNotification]):
         self.name = action_cls.name
         self.display_name = action_cls.display_name
         self.action_type_id = str(get_action_type(action_cls).pk)
@@ -49,7 +49,7 @@ class ActionButton:
 
 class SiteActionItemCollection:
     def __init__(self):
-        self.registry: dict[str, Type[Action] | Type[ActionWithNotification]] = {}
+        self.registry: dict[str, type[Action] | type[ActionWithNotification]] = {}
         self.updated_action_types: bool | None = None
         prn = Prn(model="edc_action_item.actionitem", url_namespace="edc_action_item_admin")
         site_prn_forms.register(prn)
@@ -63,7 +63,7 @@ class SiteActionItemCollection:
     def __iter__(self):
         return iter(self.registry.values())
 
-    def unregister(self, action_cls: Type[Action] | Type[ActionWithNotification]) -> None:
+    def unregister(self, action_cls: type[Action] | type[ActionWithNotification]) -> None:
         if action_cls.name in self.registry:
             del self.registry[action_cls.name]
             prn = Prn(
@@ -72,14 +72,13 @@ class SiteActionItemCollection:
             )
             site_prn_forms.unregister(prn)
 
-    def register(self, action_cls: Type[Action] | Type[ActionWithNotification] = None) -> None:
+    def register(self, action_cls: type[Action] | type[ActionWithNotification] = None) -> None:
         if action_cls.name in self.registry:
             raise AlreadyRegistered(
                 f"Action class is already registered. Got name='{action_cls.name}' "
                 f"for {action_cls.__name__}"
             )
-        else:
-            self.registry.update({action_cls.name: action_cls})
+        self.registry.update({action_cls.name: action_cls})
         if action_cls.show_link_to_changelist:
             prn = Prn(
                 model=action_cls.get_reference_model(),
@@ -97,7 +96,7 @@ class SiteActionItemCollection:
             self.register_notifications(action_cls)
 
     @staticmethod
-    def register_notifications(action_cls: Type[Action] | Type[ActionWithNotification]):
+    def register_notifications(action_cls: type[Action] | type[ActionWithNotification]):
         """Registers a new model notification and an updated model
         notification for this action cls.
 
@@ -110,10 +109,10 @@ class SiteActionItemCollection:
                 pass
 
     @property
-    def all(self) -> dict[str, Type[Action] | Type[ActionWithNotification]]:
+    def all(self) -> dict[str, type[Action] | type[ActionWithNotification]]:
         return self.registry
 
-    def get(self, name) -> Type[Action] | Type[ActionWithNotification]:
+    def get(self, name) -> type[Action] | type[ActionWithNotification]:
         """Returns an action class."""
         if name not in self.registry:
             raise SiteActionError(
@@ -122,14 +121,14 @@ class SiteActionItemCollection:
             )
         return self.registry.get(name)
 
-    def get_by_model(self, model=None) -> Type[Action] | Type[ActionWithNotification] | None:
+    def get_by_model(self, model=None) -> type[Action] | type[ActionWithNotification] | None:
         """Returns the action_cls linked to this reference model."""
         for action_cls in self.registry.values():
             if action_cls.get_reference_model() == model:
                 return self.get(action_cls.name)
         return None
 
-    def get_add_actions_to_show(self) -> dict[str, Type[Action]]:
+    def get_add_actions_to_show(self) -> dict[str, type[Action]]:
         actions = {
             action_cls.name: action_cls
             for action_cls in self.registry.values()
@@ -164,7 +163,7 @@ class SiteActionItemCollection:
                 except ImportError as e:
                     site_action_items.registry = before_import_registry
                     if module_has_submodule(mod, module_name):
-                        raise SiteActionError(str(e))
+                        raise SiteActionError(str(e)) from e
             except ImportError:
                 pass
             # except Exception as e:

edc_action_item/stubs.py

@@ -1,4 +1,4 @@
-from typing import Optional, Protocol, Type
+from typing import Optional, Protocol
 from uuid import UUID
 
 from django.db import models
@@ -8,20 +8,20 @@ class ActionStub(Protocol):
     def __init__(
         self,
         action_item: Optional["ActionItemStub"] = None,
-        reference_obj: Optional[models.Model] = None,
+        reference_obj: models.Model | None = None,
         subject_identifier: str = None,
         action_identifier: str = None,
         parent_action_item: Optional["ActionItemStub"] = None,
         related_action_item: Optional["ActionItemStub"] = None,
-        using: Optional[str] = None,
-        readonly: Optional[bool] = None,
+        using: str | None = None,
+        readonly: bool | None = None,
     ) -> None: ...
 
     name: str
     action_item: "ActionItemStub"
     action_identifier: str
-    related_reference_model: Optional[str]
-    related_reference_fk_attr: Optional[str]
+    related_reference_model: str | None
+    related_reference_fk_attr: str | None
     subject_identifier: str
     related_action_item: Optional["ActionItemStub"]
     ...
@@ -30,8 +30,8 @@ class ActionStub(Protocol):
 class ActionTypeStub(Protocol):
     name: str
     display_name: str
-    reference_model: Optional[str]
-    related_reference_model: Optional[str]
+    reference_model: str | None
+    related_reference_model: str | None
     ...
 
 
@@ -53,7 +53,7 @@ class ActionItemStub(Protocol):
 
     def get_status_display(self) -> str: ...
 
-    def get_action_cls(self) -> Type[ActionStub]: ...
+    def get_action_cls(self) -> type[ActionStub]: ...
 
 
 class ActionItemWithNotificationStub(ActionItemStub, Protocol):

edc_action_item/templatetags/action_item_extras.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django import template
 
@@ -74,7 +74,7 @@ def add_action_item_popover(
     `Add action linked PRN forms`
     """
     action_item_add_url: str = "edc_action_item_admin:edc_action_item_actionitem_add"
-    add_actions: dict[str, Type[Action]] = site_action_items.get_add_actions_to_show()
+    add_actions: dict[str, type[Action]] = site_action_items.get_add_actions_to_show()
     if add_actions:
         d = {k: v.display_name for k, v in add_actions.items()}
         add_actions = {}

edc_action_item/view_utils/action_item_button.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 from uuid import UUID
 
 from django.contrib.sites.models import Site
@@ -18,9 +18,9 @@ if TYPE_CHECKING:
 
 @dataclass(kw_only=True)
 class ActionItemButton(ModelButton):
-    action_cls: Type[Action] = None
+    action_cls: type[Action] = None
     model_obj: ActionItem | None = None
-    model_cls: Type[ActionItem] = field(default=None)
+    model_cls: type[ActionItem] = field(default=None)
     appointment: Appointment = None
     next_url_name: str = field(default="subject_dashboard_url")
 

edc_action_item/view_utils/action_item_popover_list_item.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 from uuid import UUID
 
 from django.core.exceptions import ObjectDoesNotExist
@@ -17,9 +17,9 @@ if TYPE_CHECKING:
 
     class PrnModel(BaseUuidModel):
         subject_identifier: str
-        ...  # noqa
+        ...
 
-    class CrfModel(CrfModelMixin): ...  # noqa
+    class CrfModel(CrfModelMixin): ...
 
 
 @dataclass
@@ -28,7 +28,7 @@ class ActionItemPopoverListItem(PrnButton):
     category: str = None
     appointment: Appointment | None = None
     model_obj: PrnModel | CrfModel | None = field(default=None, init=False)
-    model_cls: Type[PrnModel | CrfModel | None] = field(default=None, init=False)
+    model_cls: type[PrnModel | CrfModel | None] = field(default=None, init=False)
 
     def __post_init__(self):
         if self.category == "reference":

edc_adherence/form_validator_mixin.py

@@ -7,7 +7,7 @@ from edc_constants.constants import NEVER, OTHER, YES
 
 class MedicationAdherenceFormValidatorMixin:
     def clean(self: Any):
-        # super()._clean()  # noqa
+        # super()._clean()
         self.confirm_visual_scores_match()
         self.required_if(
             YES,

edc_adverse_event/action_items/ae_followup_action.py

@@ -35,7 +35,7 @@ class AeFollowupAction(ActionWithNotification):
     name = AE_FOLLOWUP_ACTION
     display_name = "Submit AE Followup Report"
     notification_display_name = "AE Followup Report"
-    parent_action_names = [AE_INITIAL_ACTION, AE_FOLLOWUP_ACTION]
+    parent_action_names = (AE_INITIAL_ACTION, AE_FOLLOWUP_ACTION)
     related_reference_fk_attr = "ae_initial"
     create_by_user = False
     show_link_to_changelist = True

edc_adverse_event/action_items/ae_initial_action.py

@@ -15,7 +15,7 @@ class AeInitialAction(ActionWithNotification):
     name = AE_INITIAL_ACTION
     display_name = "Submit AE Initial Report"
     notification_display_name = "AE Initial Report"
-    parent_action_names = []
+    parent_action_names = ()
     reference_model = f"{ADVERSE_EVENT_APP_LABEL}.aeinitial"
     show_link_to_changelist = True
     show_link_to_add = True

edc_adverse_event/action_items/ae_susar_action.py

@@ -13,7 +13,7 @@ class AeSusarAction(ActionWithNotification):
     name = AE_SUSAR_ACTION
     display_name = "Submit AE SUSAR Report"
     notification_display_name = "AE SUSAR Report"
-    parent_action_names = [AE_INITIAL_ACTION]
+    parent_action_names = (AE_INITIAL_ACTION,)
     reference_model = f"{ADVERSE_EVENT_APP_LABEL}.aesusar"
     related_reference_model = f"{ADVERSE_EVENT_APP_LABEL}.aeinitial"
     related_reference_fk_attr = "ae_initial"

edc_adverse_event/action_items/ae_tmg_action.py

@@ -13,7 +13,7 @@ class AeTmgAction(ActionWithNotification):
     name = AE_TMG_ACTION
     display_name = "TMG AE Report pending"
     notification_display_name = "TMG AE Report"
-    parent_action_names = [AE_INITIAL_ACTION, AE_FOLLOWUP_ACTION, AE_TMG_ACTION]
+    parent_action_names = (AE_INITIAL_ACTION, AE_FOLLOWUP_ACTION, AE_TMG_ACTION)
     reference_model = f"{ADVERSE_EVENT_APP_LABEL}.aetmg"
     related_reference_model = f"{ADVERSE_EVENT_APP_LABEL}.aeinitial"
     related_reference_fk_attr = "ae_initial"

edc_adverse_event/action_items/death_report_action.py

@@ -17,12 +17,11 @@ class DeathReportAction(ActionWithNotification):
     name = DEATH_REPORT_ACTION
     display_name = "Submit Death Report"
     notification_display_name = "Death Report"
-    parent_action_names = [AE_INITIAL_ACTION, AE_FOLLOWUP_ACTION]
+    parent_action_names = (AE_INITIAL_ACTION, AE_FOLLOWUP_ACTION)
     show_link_to_changelist = True
     show_link_to_add = True
     priority = HIGH_PRIORITY
     singleton = True
-    dirty_fields = ["cause_of_death"]
     enable_tmg_workflow = True
 
     reference_model = f"{ADVERSE_EVENT_APP_LABEL}.deathreport"

edc_adverse_event/action_items/death_report_tmg_action.py

@@ -14,7 +14,7 @@ class DeathReportTmgAction(ActionWithNotification):
     name = DEATH_REPORT_TMG_ACTION
     display_name = "TMG Death Report (1st) pending"
     notification_display_name = "TMG Death Report (1st)"
-    parent_action_names = [DEATH_REPORT_ACTION]
+    parent_action_names = (DEATH_REPORT_ACTION,)
     related_reference_fk_attr = "death_report"
     priority = HIGH_PRIORITY
     create_by_user = False

edc_adverse_event/action_items/death_report_tmg_second_action.py

@@ -13,7 +13,7 @@ class DeathReportTmgSecondAction(ActionWithNotification):
     name = DEATH_REPORT_TMG_SECOND_ACTION
     display_name = "TMG Death Report (2nd) pending"
     notification_display_name = "TMG Death Report (2nd)"
-    parent_action_names = [DEATH_REPORT_TMG_ACTION]
+    parent_action_names = (DEATH_REPORT_TMG_ACTION,)
     related_reference_fk_attr = "death_report"
     priority = HIGH_PRIORITY
     create_by_user = False

edc_adverse_event/action_items/hospitalization_action.py

@@ -11,7 +11,7 @@ class HospitalizationAction(ActionWithNotification):
     name = HOSPITALIZATION_ACTION
     display_name = "Submit Hospitalization Report"
     notification_display_name = "Hospitalization"
-    parent_action_names = []
+    parent_action_names = ()
     show_link_to_changelist = True
     show_link_to_add = True
     priority = HIGH_PRIORITY

edc_adverse_event/form_validator_mixins/death_report_form_validator.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any
 from zoneinfo import ZoneInfo
 
 from django import forms
@@ -56,7 +56,7 @@ class DeathReportFormValidatorMixin:
 
     def validate_study_day_with_death_report_date(
         self: Any,
-        subject_identifier: Optional[str] = None,
+        subject_identifier: str | None = None,
     ) -> None:
         """Raises an exception if study day does not match
         calculation against ZoneInfo.
@@ -73,7 +73,7 @@ class DeathReportFormValidatorMixin:
                 or self.instance.subject_identifier
             )
             if not subject_identifier:
-                raise ValueError(f"Subject identifier cannot be None. See {repr(self)}")
+                raise ValueError(f"Subject identifier cannot be None. See {self!r}")
             registered_subject_model_cls = django_apps.get_model(
                 "edc_registration.registeredsubject"
             )

edc_adverse_event/form_validator_mixins/requires_death_report_form_validator_mixin.py

@@ -56,7 +56,7 @@ class BaseRequiresDeathReportFormValidatorMixin:
         instance.
         """
         death_report = self.death_report_or_raises
-        value = getattr(death_report, getattr(death_report, "death_date_field"))
+        value = getattr(death_report, death_report.death_date_field)
 
         try:
             death_report_date = value.astimezone(ZoneInfo("UTC")).date()
@@ -105,7 +105,7 @@ class RequiresDeathReportFormValidatorMixin(BaseRequiresDeathReportFormValidator
                         "death report form first."
                     }
                 )
-            elif (
+            if (
                 self.cleaned_data.get(self.offschedule_reason_field).name != DEAD
                 and self.death_report
             ):
@@ -125,7 +125,7 @@ class RequiresDeathReportFormValidatorMixin(BaseRequiresDeathReportFormValidator
                     )
                 }
             )
-        elif self.cleaned_data.get(self.death_date_field) and self.death_report:
+        if self.cleaned_data.get(self.death_date_field) and self.death_report:
             self.match_date_of_death_or_raise()
 
     def match_date_of_death_or_raise(self) -> None:
@@ -153,4 +153,3 @@ class RequiresDeathReportFormValidatorMixin(BaseRequiresDeathReportFormValidator
                         )
                     }
                 )
-        return None

edc_adverse_event/form_validators/death_report_tmg.py

@@ -27,7 +27,7 @@ class DeathReportTmgFormValidator(
             )
         except ObjectDoesNotExist:
             self.raise_validation_error("Death report not found.", INVALID_ERROR)
-        death_date = getattr(obj, getattr(obj, "death_date_field"))
+        death_date = getattr(obj, obj.death_date_field)
         try:
             death_date = death_date.date()
         except AttributeError:

edc_adverse_event/model_mixins/ae_followup/ae_followup_methods_model_mixin.py

@@ -7,6 +7,9 @@ class AeFollowupMethodsModelMixin(models.Model):
     def __str__(self):
         return f"{self.action_identifier[-9:]}"
 
+    class Meta:
+        abstract = True
+
     def save(self, *args, **kwargs):
         self.subject_identifier = self.ae_initial.subject_identifier
         super().save(*args, **kwargs)
@@ -27,6 +30,3 @@ class AeFollowupMethodsModelMixin(models.Model):
 
     def get_action_item_reason(self):
         return self.ae_initial.ae_description
-
-    class Meta:
-        abstract = True

edc_adverse_event/model_mixins/ae_followup/ae_followup_model_mixin.py

@@ -35,7 +35,7 @@ class AeFollowupModelMixin(
         abstract = True
         verbose_name = "AE Follow-up Report"
         indexes = (
-            NonUniqueSubjectIdentifierFieldMixin.Meta.indexes
-            + ActionModelMixin.Meta.indexes
-            + [models.Index(fields=["subject_identifier", "action_identifier", "site", "id"])]
+            *NonUniqueSubjectIdentifierFieldMixin.Meta.indexes,
+            *ActionModelMixin.Meta.indexes,
+            models.Index(fields=["subject_identifier", "action_identifier", "site", "id"]),
         )

edc_adverse_event/model_mixins/ae_initial/ae_initial_fields_model_mixin.py

@@ -50,7 +50,6 @@ class AeInitialFieldsModelMixin(models.Model):
         verbose_name="Relation to study drug:",
         max_length=25,
         choices=STUDY_DRUG_RELATIONSHIP,
-        null=True,
     )
 
     class Meta:

edc_adverse_event/model_mixins/ae_initial/ae_initial_methods_model_mixin.py

@@ -3,6 +3,9 @@ from django.db import models
 
 
 class AeInitialMethodsModelMixin(models.Model):
+    class Meta:
+        abstract = True
+
     def __str__(self):
         return f"{self.action_identifier[-9:]} Grade {self.ae_grade}"
 
@@ -26,6 +29,3 @@ class AeInitialMethodsModelMixin(models.Model):
     def description(self):
         """Returns a description."""
         return f"{self.action_identifier[-9:]} Grade-{self.ae_grade}. {self.ae_description}"
-
-    class Meta:
-        abstract = True

edc_adverse_event/model_mixins/ae_initial/ae_initial_model_mixin.py

@@ -44,7 +44,7 @@ class AeInitialModelMixin(
         abstract = True
         verbose_name = "AE Initial Report"
         indexes = (
-            NonUniqueSubjectIdentifierFieldMixin.Meta.indexes
-            + ActionModelMixin.Meta.indexes
-            + [models.Index(fields=["subject_identifier", "action_identifier", "site"])]
+            *NonUniqueSubjectIdentifierFieldMixin.Meta.indexes,
+            *ActionModelMixin.Meta.indexes,
+            models.Index(fields=["subject_identifier", "action_identifier", "site"]),
         )

edc_adverse_event/model_mixins/ae_special_interest/aesi_methods_model_mixin.py

@@ -2,6 +2,9 @@ from django.db import models
 
 
 class AesiMethodsModelMixin(models.Model):
+    class Meta:
+        abstract = True
+
     def __str__(self):
         return f"{self.action_identifier[-9:]}"
 
@@ -10,7 +13,4 @@ class AesiMethodsModelMixin(models.Model):
         super().save(*args, **kwargs)
 
     def natural_key(self):
-        return (self.action_identifier,)  # noqa
-
-    class Meta:
-        abstract = True
+        return (self.action_identifier,)

edc_adverse_event/model_mixins/ae_special_interest/aesi_model_mixin.py

@@ -33,7 +33,7 @@ class AesiModelMixin(
         abstract = True
         verbose_name = "AE of Special Interest Report"
         indexes = (
-            NonUniqueSubjectIdentifierFieldMixin.Meta.indexes
-            + ActionModelMixin.Meta.indexes
-            + [models.Index(fields=["subject_identifier", "action_identifier", "site", "id"])]
+            *NonUniqueSubjectIdentifierFieldMixin.Meta.indexes,
+            *ActionModelMixin.Meta.indexes,
+            models.Index(fields=["subject_identifier", "action_identifier", "site", "id"]),
         )

edc_adverse_event/model_mixins/ae_susar/ae_susar_methods_model_mixin.py

@@ -4,6 +4,9 @@ from edc_constants.constants import CLOSED, OPEN
 
 
 class AeSusarMethodsModelMixin(models.Model):
+    class Meta:
+        abstract = True
+
     def __str__(self):
         return f"{self.action_identifier[-9:]}"
 
@@ -18,7 +21,4 @@ class AeSusarMethodsModelMixin(models.Model):
         super().save(*args, **kwargs)
 
     def natural_key(self):
-        return (self.action_identifier,)  # noqa
-
-    class Meta:
-        abstract = True
+        return (self.action_identifier,)

edc_adverse_event/model_mixins/ae_susar/ae_susar_model_mixin.py

@@ -34,7 +34,7 @@ class AeSusarModelMixin(
         verbose_name = "AE SUSAR Report"
         verbose_name_plural = "AE SUSAR Reports"
         indexes = (
-            NonUniqueSubjectIdentifierFieldMixin.Meta.indexes
-            + ActionModelMixin.Meta.indexes
-            + [models.Index(fields=["subject_identifier", "action_identifier", "site", "id"])]
+            *NonUniqueSubjectIdentifierFieldMixin.Meta.indexes,
+            *ActionModelMixin.Meta.indexes,
+            models.Index(fields=["subject_identifier", "action_identifier", "site", "id"]),
         )