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

edc_model/models/url_model_mixin.py

@@ -31,7 +31,7 @@ class UrlModelMixin(models.Model):
             f"{self.admin_site_name}:{self._meta.label_lower.replace('.', '_')}_changelist"
         )
         if search_term:
-            url = f"{url}?q={str(search_term)}"
+            url = f"{url}?q={search_term!s}"
         return url
 
     @property

edc_model/utils.py

@@ -15,7 +15,6 @@ from django.urls import reverse
 from .constants import REPORT_DATETIME_FIELD_NAME
 
 if TYPE_CHECKING:
-
     from edc_visit_tracking.model_mixins import VisitTrackingCrfModelMixin
 
     from .models import BaseUuidModel
@@ -136,7 +135,6 @@ def raise_on_invalid_field_name(data: dict | models.Model, attrname: str) -> Non
                 raise InvalidFieldName(f"{e} Got {data}")
     else:
         raise InvalidFieldName(f"Field name cannot be None. Got {data}")
-    return None
 
 
 def model_exists_or_raise(

edc_model_admin/dashboard/model_admin_dashboard_mixin.py

@@ -85,7 +85,5 @@ class ModelAdminDashboardMixin:
                 if callable(super().view_on_site):
                     url = super().view_on_site(obj)
                 else:
-                    raise NoReverseMatch(
-                        f"{e}. See subject_dashboard_url_name for {repr(self)}."
-                    )
+                    raise NoReverseMatch(f"{e}. See subject_dashboard_url_name for {self!r}.")
         return url

edc_model_admin/history/model_admin_simple_history.py

@@ -1,5 +1,3 @@
-from typing import Optional, Tuple
-
 from django.apps import apps as django_apps
 from django.contrib import admin
 from django.utils.functional import lazy
@@ -12,7 +10,7 @@ format_html_lazy = lazy(format_html, str)
 
 
 class SimpleHistoryAdmin(BaseSimpleHistoryAdmin):
-    history_list_display: Tuple[str, ...] = ("dashboard", "change_message")
+    history_list_display: tuple[str, ...] = ("dashboard", "change_message")
     object_history_template = "edc_model_admin/admin/object_history.html"
     object_history_form_template = "edc_model_admin/admin/object_history_form.html"
 
@@ -20,7 +18,7 @@ class SimpleHistoryAdmin(BaseSimpleHistoryAdmin):
     save_as_continue = False
 
     @admin.display(description=_("Change Message"))
-    def change_message(self, obj) -> Optional[str]:
+    def change_message(self, obj) -> str | None:
         log_entry_model_cls = django_apps.get_model("admin.logentry")
         log_entry = (
             log_entry_model_cls.objects.filter(
@@ -36,7 +34,7 @@ class SimpleHistoryAdmin(BaseSimpleHistoryAdmin):
             )
         return None
 
-    def dashboard(self, obj) -> Optional[str]:
+    def dashboard(self, obj) -> str | None:
         if callable(self.view_on_site):
             return format_html_lazy(
                 '<A href="{url}">Dashboard</A>',
@@ -44,16 +42,16 @@ class SimpleHistoryAdmin(BaseSimpleHistoryAdmin):
             )
         return None
 
-    def get_list_display(self, request) -> Tuple[str, ...]:
+    def get_list_display(self, request) -> tuple[str, ...]:
         return tuple(super().get_list_display(request))
 
-    def get_list_filter(self, request) -> Tuple[str, ...]:
+    def get_list_filter(self, request) -> tuple[str, ...]:
         return tuple(super().get_list_filter(request))
 
-    def get_search_fields(self, request) -> Tuple[str, ...]:
+    def get_search_fields(self, request) -> tuple[str, ...]:
         return tuple(super().get_search_fields(request))
 
-    def get_readonly_fields(self, request, obj=None) -> Tuple[str, ...]:
+    def get_readonly_fields(self, request, obj=None) -> tuple[str, ...]:
         return tuple(super().get_readonly_fields(request, obj=obj))
 
     def history_view_title(self, request, obj):

edc_model_admin/mixins/base_model_admin_redirect_mixin.py

@@ -1,21 +1,19 @@
-from typing import Optional
-
 from django.http.response import HttpResponseRedirect
 
 
 class BaseModelAdminRedirectMixin:
     """Redirect on add, change, or delete."""
 
-    def redirect_url(self, request, obj, post_url_continue=None) -> Optional[str]:
+    def redirect_url(self, request, obj, post_url_continue=None) -> str | None:
         pass
 
-    def redirect_url_on_add(self, request, obj, post_url_continue=None) -> Optional[str]:
+    def redirect_url_on_add(self, request, obj, post_url_continue=None) -> str | None:
         return self.redirect_url(request, obj, post_url_continue=post_url_continue)
 
-    def redirect_url_on_change(self, request, obj, post_url_continue=None) -> Optional[str]:
+    def redirect_url_on_change(self, request, obj, post_url_continue=None) -> str | None:
         return self.redirect_url(request, obj, post_url_continue=post_url_continue)
 
-    def redirect_url_on_delete(self, request, obj_display, obj_id) -> Optional[str]:
+    def redirect_url_on_delete(self, request, obj_display, obj_id) -> str | None:
         pass
 
     def response_add(self, request, obj, post_url_continue=None):

edc_model_admin/mixins/model_admin_limit_to_selected_foreignkey.py

@@ -1,4 +1,4 @@
-from typing import Any, Tuple
+from typing import Any
 
 from django.core.handlers.wsgi import WSGIRequest
 
@@ -11,7 +11,7 @@ class ModelAdminLimitToSelectedForeignkeyError(Exception):
 
 
 class ModelAdminLimitToSelectedForeignkey:
-    limit_fk_field_to_selected: list[Tuple[str, Any]] = None
+    limit_fk_field_to_selected: list[tuple[str, Any]] = None
 
     def formfield_for_foreignkey(self, db_field, request: WSGIRequest, **kwargs):
         db = kwargs.get("using")

edc_model_admin/mixins/model_admin_model_redirect_mixin.py

@@ -29,11 +29,7 @@ class ModelAdminModelRedirectMixin(BaseModelAdminRedirectMixin):
         namespace = namespace or self.redirect_namespace
         return "{}?q={}".format(
             reverse(
-                "{namespace}:{app_label}_{model_name}_changelist".format(
-                    namespace=namespace,
-                    app_label=self.redirect_app_label,
-                    model_name=self.redirect_model_name,
-                )
+                f"{namespace}:{self.redirect_app_label}_{self.redirect_model_name}_changelist"
             ),
             self.search_value(obj) or "",
         )
@@ -41,9 +37,5 @@ class ModelAdminModelRedirectMixin(BaseModelAdminRedirectMixin):
     def redirect_url_on_delete(self, request, obj_display, obj_id, namespace=None):
         namespace = namespace or self.redirect_namespace
         return reverse(
-            "{namespace}:{app_label}_{model_name}_changelist".format(
-                namespace=namespace,
-                app_label=self.redirect_app_label,
-                model_name=self.redirect_model_name,
-            )
+            f"{namespace}:{self.redirect_app_label}_{self.redirect_model_name}_changelist"
         )

edc_model_admin/mixins/model_admin_next_url_redirect_mixin.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 from urllib.parse import urlencode
 
 from django.apps import apps as django_apps
@@ -82,15 +82,15 @@ class ModelAdminNextUrlRedirectMixin(BaseModelAdminRedirectMixin):
             extra_context.update(show_cancel=self.show_cancel)
         return extra_context
 
-    def redirect_url(self, request, obj, post_url_continue=None) -> Optional[str]:
+    def redirect_url(self, request, obj, post_url_continue=None) -> str | None:
         redirect_url = None
         if self.show_save_next and request.POST.get("_savenext"):
             redirect_url = self.get_savenext_redirect_url(request=request, obj=obj)
             if not redirect_url:
                 redirect_url = self.get_next_redirect_url(request=request, obj=obj)
-        elif self.show_cancel and request.POST.get("_cancel"):
-            redirect_url = self.get_next_redirect_url(request=request, obj=obj)
-        elif request.GET.get(self.next_querystring_attr):
+        elif (self.show_cancel and request.POST.get("_cancel")) or request.GET.get(
+            self.next_querystring_attr
+        ):
             redirect_url = self.get_next_redirect_url(request=request, obj=obj)
         if not redirect_url:
             redirect_url = super().redirect_url(
@@ -98,7 +98,7 @@ class ModelAdminNextUrlRedirectMixin(BaseModelAdminRedirectMixin):
             )
         return redirect_url
 
-    def get_next_redirect_url(self, request=None, **kwargs) -> Optional[str]:
+    def get_next_redirect_url(self, request=None, **kwargs) -> str | None:
         """Returns a redirect url determined from the "next" attr
         in the querystring.
         """
@@ -120,7 +120,7 @@ class ModelAdminNextUrlRedirectMixin(BaseModelAdminRedirectMixin):
                         redirect_url = f"{redirect_url}?q={options['q']}"
         return redirect_url
 
-    def get_savenext_redirect_url(self, request=None, obj=None) -> Optional[str]:
+    def get_savenext_redirect_url(self, request=None, obj=None) -> str | None:
         """Returns a redirect_url for the next form in
         the visit schedule.
 
@@ -159,8 +159,7 @@ class ModelAdminNextUrlRedirectMixin(BaseModelAdminRedirectMixin):
         querystring = urlencode(querystring_opts)
         if redirect_url:
             return (
-                f"{redirect_url}?{self.next_querystring_attr}="
-                f"{next_querystring}&{querystring}"
+                f"{redirect_url}?{self.next_querystring_attr}={next_querystring}&{querystring}"
             )
         return None
 

edc_model_admin/utils.py

@@ -41,15 +41,12 @@ def get_value_from_lookup_string(search_field_name: str = None, obj=None, reques
         if request:
             value = request.GET.get(field, "")
             break
-        else:
-            try:
-                value = getattr(value or obj, field)
-            except AttributeError as e:
-                raise SearchTermLookupError(
-                    f"Invalid search term. `{search_field_name}`. Got {e}"
-                )
-            if value is None:
-                break
+        try:
+            value = getattr(value or obj, field)
+        except AttributeError as e:
+            raise SearchTermLookupError(f"Invalid search term. `{search_field_name}`. Got {e}")
+        if value is None:
+            break
     return value
 
 

edc_model_form/mixins/__init__.py

@@ -2,8 +2,8 @@ from .base_model_form_mixin import BaseModelFormMixin, BaseModelFormMixinError
 from .inline_model_form_mixin import InlineModelFormMixin, InlineModelFormMixinError
 
 __all__ = [
-    "BaseModelFormMixinError",
     "BaseModelFormMixin",
+    "BaseModelFormMixinError",
     "InlineModelFormMixin",
     "InlineModelFormMixinError",
 ]

edc_model_form/mixins/base_model_form_mixin.py

@@ -13,7 +13,7 @@ class BaseModelFormMixinError(Exception):
     pass
 
 
-__all__ = ["BaseModelFormMixinError", "BaseModelFormMixin"]
+__all__ = ["BaseModelFormMixin", "BaseModelFormMixinError"]
 
 
 class BaseModelFormMixin(ReportDatetimeModelFormMixin):

edc_model_to_dataframe/model_to_dataframe.py

@@ -24,7 +24,7 @@ if TYPE_CHECKING:
             pass
 
 
-__all__ = ["ModelToDataframeError", "ModelToDataframe"]
+__all__ = ["ModelToDataframe", "ModelToDataframeError"]
 
 
 class ModelToDataframeError(Exception):
@@ -124,9 +124,7 @@ class ModelToDataframe:
         try:
             row_count = self.queryset.count()
         except OperationalError as e:
-            if "The user specified as a definer" in str(e) and getattr(
-                self.model_cls, "recreate_db_view"
-            ):
+            if "The user specified as a definer" in str(e) and self.model_cls.recreate_db_view:
                 self.model_cls.recreate_db_view()
                 row_count = self.queryset.count()
             else:

edc_navbar/site_navbars.py

@@ -52,14 +52,14 @@ class NavbarCollection:
         except KeyError:
             raise NavbarError(
                 f"Navbar '{name}' does not exist. Expected one of "
-                f"{list(self.registry.keys())}. See {repr(self)}."
+                f"{list(self.registry.keys())}. See {self!r}."
             )
         else:
             # does the navbar have items?
             if not navbar.navbar_items:
                 raise NavbarError(
                     f"Navbar '{navbar.name}' has no navbar_item. Expected "
-                    f"'{selected_item}'. See {repr(self)}"
+                    f"'{selected_item}'. See {self!r}"
                 )
             # does the selected item exist?
             if selected_item:

edc_navbar/system_checks.py

@@ -25,7 +25,7 @@ def edc_navbar_checks(app_configs, **kwargs) -> list[CheckMessage]:
                     msg = (
                         f"Invalid app_label in codename. Expected format "
                         f"'<app_label>.<some_codename>'. Got {navbar_item.codename}. "
-                        f"See {repr(navbar_item)}."
+                        f"See {navbar_item!r}."
                     )
                     errors.append(Error(msg, id="edc_navbar.E002"))
             try:

edc_notification/mailing_list_manager.py

@@ -47,8 +47,7 @@ class MailingListManager:
         """Returns the api_url or None."""
         if not self._api_url:
             error_msg = (
-                f"Email is enabled but API_URL is not set. "
-                f"See settings.{self.api_url_attr}"
+                f"Email is enabled but API_URL is not set. See settings.{self.api_url_attr}"
             )
             try:
                 self._api_url = getattr(settings, self.api_url_attr)
@@ -64,8 +63,7 @@ class MailingListManager:
         """Returns the api_key or None."""
         if not self._api_key:
             error_msg = (
-                f"Email is enabled but API_KEY is not set. "
-                f"See settings.{self.api_key_attr}"
+                f"Email is enabled but API_KEY is not set. See settings.{self.api_key_attr}"
             )
             try:
                 self._api_key = getattr(settings, self.api_key_attr)
@@ -91,7 +89,7 @@ class MailingListManager:
                 "subscribed": True,
                 "address": user.email,
                 "name": f"{user.first_name} {user.last_name}",
-                "description": f'{user.userprofile.job_title or ""}',
+                "description": f"{user.userprofile.job_title or ''}",
                 "upsert": "yes",
             },
             timeout=10,
@@ -124,7 +122,7 @@ class MailingListManager:
         except KeyError:
             sys.stdout.write(
                 f"{action.title()} failed. Got response={response.status_code} "
-                f"{str(response.json())}"
+                f"{response.json()!s}"
             )
         else:
             sys.stdout.write(
@@ -149,8 +147,7 @@ class MailingListManager:
         )
         if verbose:
             sys.stdout.write(
-                f"Creating mailing list {self.address}. "
-                f"Got response={response.status_code}.\n"
+                f"Creating mailing list {self.address}. Got response={response.status_code}.\n"
             )
         return response
 

edc_notification/management/commands/list_recipients_by_notification.py

@@ -9,7 +9,7 @@ class Command(BaseCommand):
     def handle(self, *args, **options):
         for notification_cls in site_notifications.registry.values():
             notification = notification_cls()
-            print("")
+            print()
             print(notification.name)
             print(notification.display_name)
             print(f"email: {notification.email_to}")

edc_notification/models/__init__.py

@@ -1,3 +1,5 @@
 from .notification import Notification
-from .signals import manage_mailists_on_userprofile_m2m_changed  # noqa
-from .signals import notification_on_post_create_historical_record  # noqa
+from .signals import (
+    manage_mailists_on_userprofile_m2m_changed,
+    notification_on_post_create_historical_record,
+)

edc_notification/notification/graded_event_notification.py

@@ -1,11 +1,9 @@
-from typing import Optional
-
 from .model_notification import ModelNotification
 
 
 class GradedEventNotification(ModelNotification):
-    grade: Optional[int] = None
-    model: Optional[str] = None
+    grade: int | None = None
+    model: str | None = None
     create_fields = ["ae_grade"]
     update_fields = ["ae_grade"]
 

edc_notification/notification/model_notification.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from django.apps import apps as django_apps
 
 from edc_model.stubs import BaseUuidHistoryModelStub
@@ -17,7 +15,7 @@ class ModelNotification(Notification):
     modification or deletion.
     """
 
-    model: Optional[str] = None  # label_lower format
+    model: str | None = None  # label_lower format
 
     model_operations = [CREATE, UPDATE, DELETE]
 

edc_notification/notification/notification.py

@@ -1,5 +1,3 @@
-from typing import List, Optional
-
 from django.apps import apps as django_apps
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
@@ -27,13 +25,13 @@ class Notification:
     """A generic class to generate a notification on a condition"""
 
     # app_name: str = None
-    name: Optional[str] = None
-    display_name: Optional[str] = None
+    name: str | None = None
+    display_name: str | None = None
 
     sms_client = Client
 
-    email_from: List[str] = get_email_contacts("data_manager")
-    email_to: Optional[List[str]] = None  # usually a mailing list address
+    email_from: list[str] = get_email_contacts("data_manager")
+    email_to: list[str] | None = None  # usually a mailing list address
     email_message_cls = EmailMessage
 
     email_body_template: str = (
@@ -50,7 +48,7 @@ class Notification:
         "Thanks."
     )
     email_subject_template: str = (
-        "{test_subject_line}{protocol_name}: " "{display_name} " "for {subject_identifier}"
+        "{test_subject_line}{protocol_name}: {display_name} for {subject_identifier}"
     )
     email_footer_template: str = (
         "\n\n-----------------\n"
@@ -72,7 +70,7 @@ class Notification:
     sms_test_line: str = "TEST MESSAGE. NO ACTION REQUIRED - "
 
     def __init__(self) -> None:
-        self._notification_enabled: Optional[bool] = None
+        self._notification_enabled: bool | None = None
         self._template_opts: dict = {}
         self.email_to = self.email_to or self.default_email_to
         self.test_message: bool = False
@@ -90,7 +88,7 @@ class Notification:
         return f"{self.name}: {self.display_name}"
 
     @property
-    def default_email_to(self) -> List[str]:
+    def default_email_to(self) -> list[str]:
         return [f"{self.name}.{settings.APP_NAME}@mg.clinicedc.org"]
 
     def notify(
@@ -113,8 +111,8 @@ class Notification:
             * instance
             * user
         """
-        email_sent: Optional[int] = None
-        sms_sent: Optional[dict] = None
+        email_sent: int | None = None
+        sms_sent: dict | None = None
         use_email = use_email or get_email_enabled()
         use_sms = use_sms or getattr(settings, "TWILIO_ENABLED", False)
         if force_notify or self._notify_on_condition(**kwargs):
@@ -140,8 +138,7 @@ class Notification:
         """Returns the value of `notify_on_condition` or False."""
         if test_message:
             return True
-        else:
-            return self.enabled and self.notify_on_condition(**kwargs)
+        return self.enabled and self.notify_on_condition(**kwargs)
 
     def post_notification_actions(self, **kwargs):
         pass
@@ -217,8 +214,8 @@ class Notification:
 
     def send_email(
         self,
-        fail_silently: Optional[bool] = None,
-        email_to: List[str] = None,
+        fail_silently: bool | None = None,
+        email_to: list[str] = None,
         email_body_template: str = None,
         **kwargs,
     ) -> int:
@@ -232,8 +229,8 @@ class Notification:
 
     def send_sms(
         self,
-        fail_silently: Optional[bool] = None,
-        sms_recipient: Optional[str] = None,
+        fail_silently: bool | None = None,
+        sms_recipient: str | None = None,
         **kwargs,
     ) -> dict:
         status = {}

edc_notification/site_notifications.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import copy
 import sys
 from json.decoder import JSONDecodeError
-from typing import TYPE_CHECKING, Any, Type
+from typing import TYPE_CHECKING, Any
 
 from django.apps import apps as django_apps
 from django.conf import settings
@@ -39,7 +39,7 @@ class NotificationNotRegistered(Exception):
 
 class SiteNotifications:
     def __init__(self):
-        self._registry: dict[str, Type[ActionItemNotification | Notification]] = {}
+        self._registry: dict[str, type[ActionItemNotification | Notification]] = {}
         self.loaded = False
         self.models = {}
 
@@ -55,7 +55,7 @@ class SiteNotifications:
             )
         return self._registry
 
-    def get(self, name) -> Type[Notification]:
+    def get(self, name) -> type[Notification]:
         """Returns a Notification by name."""
         if not self.loaded:
             raise RegistryNotLoaded(self)
@@ -63,7 +63,7 @@ class SiteNotifications:
             raise NotificationNotRegistered(f"Notification not registered. Got '{name}'.")
         return self._registry.get(name)
 
-    def register(self, notification_cls: Type[Notification] = None):
+    def register(self, notification_cls: type[Notification] = None):
         """Registers a Notification class unique by name."""
         self.loaded = True
         display_names = [n.display_name for n in self.registry.values()]
@@ -75,7 +75,7 @@ class SiteNotifications:
 
             models = getattr(notification_cls, "models", [])
             if not models and getattr(notification_cls, "model", None):
-                models = [getattr(notification_cls, "model")]
+                models = [notification_cls.model]
             for model in models:
                 try:
                     if notification_cls.name not in [n.name for n in self.models[model]]:
@@ -104,7 +104,7 @@ class SiteNotifications:
 
     def update_notification_list(
         self, apps: django_apps = None, schema_editor=None, verbose=False
-    ):  # noqa
+    ):
         """Updates the notification model to ensure all registered
         notifications classes are listed.
 
@@ -174,7 +174,7 @@ class SiteNotifications:
                     response = manager.create()
                 except ConnectionError as e:
                     sys.stdout.write(
-                        style.ERROR(f"  * Failed to create mailing list {name}. " f"Got {e}\n")
+                        style.ERROR(f"  * Failed to create mailing list {name}. Got {e}\n")
                     )
                 else:
                     if verbose:

edc_notification/stubs.py

@@ -1,17 +1,17 @@
 from datetime import datetime
-from typing import List, Optional, Protocol
+from typing import List, Protocol
 
 
 class BaseNotificationStub(Protocol):
-    display_name: Optional[str]
+    display_name: str | None
     email_body_template: str
     email_footer_template: str
-    email_from: List[str]
+    email_from: list[str]
     # email_message_cls = Type[EmailMessage]
     email_subject_template: str
     email_test_body_line: str
-    email_to: Optional[List[str]]
-    name: Optional[str]
+    email_to: list[str] | None
+    name: str | None
     # sms_client: Type[Client]
     sms_template: str
     sms_test_line: str
@@ -29,7 +29,7 @@ class BaseNotificationStub(Protocol):
     ) -> bool: ...
 
 
-class NotificationStub(BaseNotificationStub, Protocol): ...  # noqa
+class NotificationStub(BaseNotificationStub, Protocol): ...
 
 
 class NotificationModelStub(BaseNotificationStub, Protocol):

edc_notification/update_mailing_lists_in_m2m.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
 
@@ -38,7 +38,7 @@ def update_mailing_lists_in_m2m(
         and site_notifications.loaded
         and userprofile.email_notifications.through == sender
     ):
-        notification_model_cls: Type[Notification] = django_apps.get_model(
+        notification_model_cls: type[Notification] = django_apps.get_model(
             "edc_notification.Notification"
         )
         for notification_obj in notification_model_cls.objects.filter(

edc_offstudy/action_items.py

@@ -14,11 +14,11 @@ class EndOfStudyAction(ActionWithNotification):
     name = END_OF_STUDY_ACTION
     display_name = "Submit End of Study Report"
     notification_display_name = "End of Study Report"
-    parent_action_names = [
+    parent_action_names = (
         UNBLINDING_REVIEW_ACTION,
         DEATH_REPORT_ACTION,
         LTFU_ACTION,
-    ]
+    )
     show_link_to_changelist = True
     priority = HIGH_PRIORITY
     singleton = True

edc_offstudy/model_mixins/offstudy_model_mixin.py

@@ -56,7 +56,7 @@ class OffstudyModelMixin(UniqueSubjectIdentifierFieldMixin, models.Model):
         verbose_name="Please provide further details if possible",
         max_length=500,
         blank=True,
-        null=True,
+        default="",
     )
 
     def __str__(self):

edc_offstudy/models.py

@@ -25,4 +25,4 @@ class SubjectOffstudy(
     class Meta(BaseUuidModel.Meta):
         verbose_name = "Subject Offstudy"
         verbose_name_plural = "Subject Offstudy"
-        indexes = ActionNoManagersModelMixin.Meta.indexes + BaseUuidModel.Meta.indexes
+        indexes = (*ActionNoManagersModelMixin.Meta.indexes, *BaseUuidModel.Meta.indexes)

edc_pdf_reports/crf_pdf_report.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import os
 from textwrap import fill
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from bs4 import BeautifulSoup
 from django.apps import apps as django_apps
@@ -131,7 +131,7 @@ class CrfPdfReport(Report):
         return f"{slugify(cls.get_verbose_name().lower())}s.pdf"
 
     @classmethod
-    def get_model_cls(cls) -> Type[CrfModelMixin | UniqueSubjectIdentifierModelMixin]:
+    def get_model_cls(cls) -> type[CrfModelMixin | UniqueSubjectIdentifierModelMixin]:
         return django_apps.get_model(cls.model)
 
     @classmethod