clinicedc 2.0.0__py3-none-any.whl → 2.0.2__py3-none-any.whl

edc_metadata/models/crf_metadata_model_mixin.py

@@ -38,15 +38,11 @@ class CrfMetadataModelMixin(
 
     model = models.CharField(max_length=50)
 
-    document_name = models.CharField(
-        verbose_name=_("Document"), max_length=250, null=True
-    )
+    document_name = models.CharField(verbose_name=_("Document"), max_length=250, null=True)
 
     show_order = models.IntegerField()  # must always be provided!
 
-    entry_status = models.CharField(
-        max_length=25, choices=ENTRY_STATUS, default=REQUIRED
-    )
+    entry_status = models.CharField(max_length=25, choices=ENTRY_STATUS, default=REQUIRED)
 
     due_datetime = models.DateTimeField(null=True, blank=True)
 

edc_metadata/next_form_getter.py

@@ -79,9 +79,7 @@ class NextFormGetter:
                     appointment=self.appointment
                 )
             else:
-                self._getter = self.crf_metadata_getter_cls(
-                    appointment=self.appointment
-                )
+                self._getter = self.crf_metadata_getter_cls(appointment=self.appointment)
         return self._getter
 
     @property

edc_metadata/requisition/requisition_metadata_handler.py

@@ -35,8 +35,9 @@ class RequisitionMetadataHandler(MetadataHandler):
         except IndexError as e:
             if self.related_visit.reason != MISSED_VISIT:
                 raise MetadataHandlerError(
-                    "Model not found. Not in visit.all_requisitions. "
-                    f"Model {self.model}. Got {e}"
+                    "Panel not found. Not in visit.all_requisitions. "
+                    f"Panel `{self.panel}` at `{self.creator.related_visit.visit}`. "
+                    f"Got {e}. Check your visit schedule."
                 )
         else:
             metadata_obj = self.creator.create_requisition(requisition_object)

edc_metadata/requisition/requisition_metadata_updater.py

@@ -42,6 +42,4 @@ class RequisitionMetadataUpdater(MetadataUpdater):
         """Returns a dictionary of query options to filter for, or
         get, the SubjectRequisition model instance.
         """
-        return dict(
-            subject_visit_id=self.related_visit.id, panel__name=self.source_panel.name
-        )
+        return dict(subject_visit_id=self.related_visit.id, panel__name=self.source_panel.name)

edc_metadata/update_metadata_on_schedule_change.py

@@ -22,9 +22,7 @@ class UpdateMetadataOnScheduleChange:
         sys.stdout.write(style.SUCCESS("\n\nUpdate metadata.\n"))
         sys.stdout.write(style.SUCCESS(f"Field is '{self.fieldname}'.\n"))
         sys.stdout.write(
-            style.SUCCESS(
-                f"Old value='{self.old_value}', New value='{self.new_value}'.\n"
-            )
+            style.SUCCESS(f"Old value='{self.old_value}', New value='{self.new_value}'.\n")
         )
         if self.dry_run:
             sys.stdout.write(
@@ -36,25 +34,20 @@ class UpdateMetadataOnScheduleChange:
                 f"Old value='{self.old_value}', New value='{self.new_value}'.\n"
             )
             for name, model_cls in self.models.items():
-                count = model_cls.objects.filter(
-                    **{self.fieldname: self.old_value}
-                ).count()
-                sys.stdout.write(
-                    f"{model_cls._meta.label_lower}. {count} records found.\n"
-                )
+                count = model_cls.objects.filter(**{self.fieldname: self.old_value}).count()
+                sys.stdout.write(f"{model_cls._meta.label_lower}. {count} records found.\n")
             sys.stdout.write(
                 style.ERROR(
-                    "No records have been updated. \n"
-                    "Set --dry-run=False to update.\n"
+                    "No records have been updated. \n" "Set --dry-run=False to update.\n"
                 )
             )
         else:
             sys.stdout.write(style.SUCCESS("Updating... \n"))
             for name, model_cls in self.models.items():
                 sys.stdout.write(f"Updating {name} ...\r")
-                updated = model_cls.objects.filter(
-                    **{self.fieldname: self.old_value}
-                ).update(**{self.fieldname: self.new_value})
+                updated = model_cls.objects.filter(**{self.fieldname: self.old_value}).update(
+                    **{self.fieldname: self.new_value}
+                )
                 sys.stdout.write(f"Updated {name}. {updated} records.     \n")
             sys.stdout.write(style.SUCCESS("Done. \n"))
 

edc_model/models/fields/initials_field.py

@@ -12,9 +12,7 @@ class InitialsField(CharField):
         kwargs.setdefault("editable", True)
         kwargs.setdefault("verbose_name", _("Initials"))
         kwargs.setdefault("max_length", 3)
-        kwargs.setdefault(
-            "help_text", _("Type 2-3 letters, all in uppercase and no spaces")
-        )
+        kwargs.setdefault("help_text", _("Type 2-3 letters, all in uppercase and no spaces"))
         CharField.__init__(self, *args, **kwargs)
 
     def get_internal_type(self):

edc_model/models/signals.py

@@ -3,9 +3,7 @@ from django.db.models import expressions
 from simple_history import signals
 
 
-@dispatch.receiver(
-    signals.pre_create_historical_record, dispatch_uid="simple_history_refresh"
-)
+@dispatch.receiver(signals.pre_create_historical_record, dispatch_uid="simple_history_refresh")
 def remove_f_expressions(sender, instance, history_instance, **kwargs) -> None:
     """Model with history manager fails to save if update contains
     an F() expression.

edc_model/system_checks.py

@@ -5,8 +5,6 @@ from django.core.checks import CheckMessage, Error
 def check_for_edc_model(app_configs, **kwargs) -> list[CheckMessage]:
     errors = []
     if not settings.USE_TZ:
-        errors.append(
-            Error("EDC requires settings.USE_TZ = True", id="settings.USE_TZ")
-        )
+        errors.append(Error("EDC requires settings.USE_TZ = True", id="settings.USE_TZ"))
 
     return errors

edc_model/validators/duration.py

@@ -14,9 +14,7 @@ dh_validator = RegexValidator(
 
 hm_validator = RegexValidator(
     r"^([0-9]{1,3}h([0-5]?[0-9]m)?)$",
-    message=_(
-        "Invalid format. Expected something like 1h20m, 11h5m, etc. No spaces allowed."
-    ),
+    message=_("Invalid format. Expected something like 1h20m, 11h5m, etc. No spaces allowed."),
 )
 
 ymd_validator = RegexValidator(

edc_model_admin/admin_site.py

@@ -106,6 +106,4 @@ class EdcAdminSite(DjangoAdminSite):
             **(extra_context or {}),
         }
         request.current_app = self.name
-        return TemplateResponse(
-            request, self.index_template or "admin/index.html", context
-        )
+        return TemplateResponse(request, self.index_template or "admin/index.html", context)

edc_model_admin/changelist_buttons/model_admin_changelist_button_mixin.py

@@ -6,9 +6,7 @@ from django.utils.translation import gettext_lazy as _
 
 
 class ModelAdminChangelistButtonMixin:
-    changelist_model_button_template_name = (
-        "edc_model_admin/changelist_model_button.html"
-    )
+    changelist_model_button_template_name = "edc_model_admin/changelist_model_button.html"
 
     def button(
         self,
@@ -23,9 +21,7 @@ class ModelAdminChangelistButtonMixin:
         if namespace:
             url_name = f"{namespace}:{url_name}"
         url = reverse(url_name, args=reverse_args)
-        return self.button_template(
-            label=label, url=url, disabled=disabled, title=title
-        )
+        return self.button_template(label=label, url=url, disabled=disabled, title=title)
 
     def change_button(
         self,
@@ -40,9 +36,7 @@ class ModelAdminChangelistButtonMixin:
         if namespace:
             url_name = f"{namespace}:{url_name}"
         url = reverse(url_name, args=reverse_args)
-        return self.button_template(
-            label=label, url=url, disabled=disabled, title=title
-        )
+        return self.button_template(label=label, url=url, disabled=disabled, title=title)
 
     def add_button(
         self,
@@ -57,9 +51,7 @@ class ModelAdminChangelistButtonMixin:
         if namespace:
             url_name = f"{namespace}:{url_name}"
         url = reverse(url_name) + "" if querystring is None else querystring
-        return self.button_template(
-            label=label, url=url, disabled=disabled, title=title
-        )
+        return self.button_template(label=label, url=url, disabled=disabled, title=title)
 
     def button_template(
         self,

edc_model_admin/changelist_buttons/model_admin_changelist_model_button_mixin.py

@@ -93,9 +93,7 @@ class ChangelistButtonModelAdminMixin(ModelAdminChangelistButtonMixin):
         if querystring_value:
             querystring = f"?q={querystring_value}"
         url = reverse(f"{namespace}:{app_label}_{model_name}_changelist") + querystring
-        return self.button_template(
-            label=label, disabled=disabled, title=title, url=url
-        )
+        return self.button_template(label=label, disabled=disabled, title=title, url=url)
 
     def disabled_button(self, label):
         return self.button_template(label=label, disabled="disabled", url="#")

edc_model_admin/dashboard/model_admin_crf_dashboard_mixin.py

@@ -32,8 +32,6 @@ class ModelAdminCrfDashboardMixin(
         except ObjectDoesNotExist:
             report_datetime = None
         else:
-            report_datetime = getattr(
-                related_visit, self.report_datetime_field_attr, None
-            )
+            report_datetime = getattr(related_visit, self.report_datetime_field_attr, None)
         initial_data.update(report_datetime=report_datetime)
         return initial_data

edc_model_admin/dashboard/model_admin_dashboard_mixin.py

@@ -29,9 +29,7 @@ class ModelAdminDashboardMixin:
                 kwargs=self.get_subject_dashboard_url_kwargs(obj),
             )
         context = dict(title=_("Go to subject's dashboard"), url=url, label=label)
-        return render_to_string(
-            "edc_subject_dashboard/dashboard_button.html", context=context
-        )
+        return render_to_string("edc_subject_dashboard/dashboard_button.html", context=context)
 
     def get_screening_listboard_url_name(self) -> str:
         return url_names.get(self.screening_listboard_url_name)

edc_model_admin/mixins/base_model_admin_redirect_mixin.py

@@ -9,14 +9,10 @@ class BaseModelAdminRedirectMixin:
     def redirect_url(self, request, obj, post_url_continue=None) -> Optional[str]:
         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) -> Optional[str]:
         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) -> Optional[str]:
         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]:

edc_model_admin/mixins/inlines/limited_admin_inline_mixin.py

@@ -40,9 +40,7 @@ class LimitedAdminInlineMixin:
             formset.form.base_fields[field].queryset = qs
 
     def get_formset(self, request, obj=None, **kwargs):
-        formset = super(LimitedAdminInlineMixin, self).get_formset(
-            request, obj, **kwargs
-        )
+        formset = super(LimitedAdminInlineMixin, self).get_formset(request, obj, **kwargs)
 
         for field, filters in self.get_filters(obj):
             if obj:

edc_model_admin/mixins/model_admin_bypass_default_form_cls_mixin.py

@@ -38,9 +38,7 @@ class ModelAdminBypassDefaultFormClsMixin:
     """
 
     # if custom_form_codename is None, this mixin does nothing
-    custom_form_codename: str | None = (
-        None  # "e.g. edc_data_manager.special_bypassmodelform"
-    )
+    custom_form_codename: str | None = None  # "e.g. edc_data_manager.special_bypassmodelform"
 
     def custom_modelform_factory(self):
         """Returns a basic modelform (with no validation checks)"""
@@ -64,9 +62,7 @@ class ModelAdminBypassDefaultFormClsMixin:
         permissions otherwise returns the Form class originally
         declared on this ModelAdmin class.
         """
-        if self.custom_form_codename and request.user.has_perm(
-            self.custom_form_codename
-        ):
+        if self.custom_form_codename and request.user.has_perm(self.custom_form_codename):
             try:
                 messages.add_message(
                     request,
@@ -126,9 +122,7 @@ class ModelAdminBypassDefaultFormClsMixin:
         exclude = exclude or None
 
         # Remove declared form fields which are in readonly_fields.
-        new_attrs = dict.fromkeys(
-            f for f in readonly_fields if f in self.form.declared_fields
-        )
+        new_attrs = dict.fromkeys(f for f in readonly_fields if f in self.form.declared_fields)
         form = type(form_cls.__name__, (form_cls,), new_attrs)
 
         defaults = {
@@ -139,9 +133,7 @@ class ModelAdminBypassDefaultFormClsMixin:
             **kwargs,
         }
 
-        if defaults["fields"] is None and not modelform_defines_fields(
-            defaults["form"]
-        ):
+        if defaults["fields"] is None and not modelform_defines_fields(defaults["form"]):
             defaults["fields"] = forms.ALL_FIELDS
 
         try:

edc_model_admin/mixins/model_admin_form_auto_number_mixin.py

@@ -25,15 +25,11 @@ class ModelAdminFormAutoNumberMixin:
         widget = 1
         start = getattr(form, "AUTO_NUMBER_START", 1)
         base_fields = {
-            k: v
-            for k, v in form.base_fields.items()
-            if k not in self.skip_auto_numbering
+            k: v for k, v in form.base_fields.items() if k not in self.skip_auto_numbering
         }
         for index, fld in enumerate(base_fields.items(), start=start):
             label = str(fld[widget].label)
-            if not re.match(r"^\d+\.", label) and not re.match(
-                r"\<a\ title\=\"", label
-            ):
+            if not re.match(r"^\d+\.", label) and not re.match(r"\<a\ title\=\"", label):
                 fld[widget].original_label = copy(label)
                 fld[widget].label = format_html(
                     '<a title="{}">{}</a>. {}',

edc_model_admin/mixins/model_admin_form_instructions_mixin.py

@@ -65,15 +65,11 @@ class ModelAdminFormInstructionsMixin:
         )
         return extra_context
 
-    def add_view(
-        self, request: WSGIRequest, form_url: str = "", extra_context: dict = None
-    ):
+    def add_view(self, request: WSGIRequest, form_url: str = "", extra_context: dict = None):
         extra_context = self.get_add_instructions(extra_context, request=request)
         return super().add_view(request, form_url=form_url, extra_context=extra_context)
 
-    def change_view(
-        self, request: WSGIRequest, object_id, form_url="", extra_context=None
-    ):
+    def change_view(self, request: WSGIRequest, object_id, form_url="", extra_context=None):
         extra_context = self.get_change_instructions(extra_context, request=request)
         return super().change_view(
             request, object_id, form_url=form_url, extra_context=extra_context

edc_model_admin/mixins/model_admin_next_url_redirect_mixin.py

@@ -57,16 +57,12 @@ class ModelAdminNextUrlRedirectMixin(BaseModelAdminRedirectMixin):
         extra_context = self.extra_context(extra_context)
         return super().add_view(request, form_url=form_url, extra_context=extra_context)
 
-    def change_view(
-        self, request: WSGIRequest, object_id, form_url="", extra_context=None
-    ):
+    def change_view(self, request: WSGIRequest, object_id, form_url="", extra_context=None):
         """Redirect before save on "cancel", otherwise return
         normal behavior.
         """
         if self.show_cancel and request.POST.get("_cancel"):
-            redirect_url = self.get_next_redirect_url(
-                request=request, object_id=object_id
-            )
+            redirect_url = self.get_next_redirect_url(request=request, object_id=object_id)
             return HttpResponseRedirect(redirect_url)
         extra_context = self.extra_context(extra_context)
         return super().change_view(
@@ -155,9 +151,7 @@ class ModelAdminNextUrlRedirectMixin(BaseModelAdminRedirectMixin):
                 redirect_url = reverse(f"{url_name}_change", args=(next_obj.id,))
         next_querystring = request.GET.get(self.next_querystring_attr)
         querystring_opts = self.get_next_options(request=request)
-        querystring_opts.update(
-            {obj.related_visit_model_attr(): str(obj.related_visit.id)}
-        )
+        querystring_opts.update({obj.related_visit_model_attr(): str(obj.related_visit.id)})
         if panel_name:
             panel_model_cls = django_apps.get_model("edc_lab.panel")
             panel = panel_model_cls.objects.get(name=panel_name)

edc_model_admin/mixins/model_admin_protect_pii_mixin.py

@@ -36,9 +36,7 @@ class ModelAdminProtectPiiMixin:
         list_display = super().get_list_display(request)
         if not request.user.groups.filter(name__in=[PII, PII_VIEW]).exists():
             # TODO: search replace from list_display if extra_pii_attr has tuple
-            list_display = [
-                f for f in list_display if f not in self.get_encrypted_fields()
-            ]
+            list_display = [f for f in list_display if f not in self.get_encrypted_fields()]
             list_display = tuple(list_display)
         return list_display
 

edc_model_admin/mixins/model_admin_redirect_all_to_changelist_mixin.py

@@ -29,9 +29,7 @@ class ModelAdminRedirectAllToChangelistMixin:
 
     def redirect_url(self, request, obj, post_url_continue=None) -> str | None:
         if request.GET.dict().get(self.next_querystring_attr):
-            return super().redirect_url(
-                request, obj, post_url_continue=post_url_continue
-            )
+            return super().redirect_url(request, obj, post_url_continue=post_url_continue)
         return self.response_post_save_change(request, obj)
 
     def response_post_save_change(self, request, obj):
@@ -54,9 +52,7 @@ class ModelAdminRedirectAllToChangelistMixin:
     def add_view(self, request, form_url="", extra_context=None):
         q = get_value_from_lookup_string(
             self.add_search_field_name, request=request
-        ) or get_value_from_lookup_string(
-            self.change_search_field_name, request=request
-        )
+        ) or get_value_from_lookup_string(self.change_search_field_name, request=request)
         extra_context = extra_context or {}
         extra_context.update(
             cancel_url=self.get_changelist_url(request),

edc_model_admin/mixins/model_admin_redirect_on_delete_mixin.py

@@ -33,9 +33,7 @@ class ModelAdminRedirectOnDeleteMixin:
     def get_post_url_on_delete(self, request, obj) -> str | None:
         """Returns a url for the redirect after delete."""
         post_url_on_delete = None
-        querystring = urlencode(
-            self.post_url_on_delete_querystring_kwargs(request, obj)
-        )
+        querystring = urlencode(self.post_url_on_delete_querystring_kwargs(request, obj))
         if self.get_post_full_url_on_delete(request):
             post_url_on_delete = reverse(self.get_post_full_url_on_delete(request))
         else:

edc_model_admin/templatetags/edc_admin_modify.py

@@ -103,9 +103,7 @@ def edc_submit_row(
     See also ModelAdminRedirectAllToChangelistMixin
     """
     request: WSGIRequest = get_request_object(context)
-    model_site_id: int | None = getattr(
-        getattr(context["original"], "site", None), "id", None
-    )
+    model_site_id: int | None = getattr(getattr(context["original"], "site", None), "id", None)
     if model_site_id and request.site.id != model_site_id:
         context["has_add_permission"] = False
         context["has_change_permission"] = False
@@ -150,9 +148,7 @@ def instructions(context):
     return {"instructions": context.get("instructions")}
 
 
-@register.inclusion_tag(
-    "edc_model_admin/edc_additional_instructions.html", takes_context=True
-)
+@register.inclusion_tag("edc_model_admin/edc_additional_instructions.html", takes_context=True)
 def additional_instructions(context):
     return {
         "additional_instructions": context.get("additional_instructions"),
@@ -180,9 +176,7 @@ def yes_no_coloring(value) -> dict:
     return context
 
 
-@register.inclusion_tag(
-    "edc_model_admin/navbar_for_admin_templates.html", takes_context=True
-)
+@register.inclusion_tag("edc_model_admin/navbar_for_admin_templates.html", takes_context=True)
 def show_navbar_for_admin_templates(context):
     return context
 

edc_model_fields/fields/initials_field.py

@@ -13,9 +13,7 @@ class InitialsField(CharField):
         kwargs.setdefault("editable", True)
         kwargs.setdefault("verbose_name", _("Initials"))
         kwargs.setdefault("max_length", 3)
-        kwargs.setdefault(
-            "help_text", _("Type 2-3 letters, all in uppercase and no spaces")
-        )
+        kwargs.setdefault("help_text", _("Type 2-3 letters, all in uppercase and no spaces"))
         CharField.__init__(self, *args, **kwargs)
 
     def get_internal_type(self):

edc_model_form/mixins/inline_model_form_mixin.py

@@ -32,9 +32,7 @@ class InlineModelFormMixin:
                     field_values.append(self.data[inline_field])
         return field_values
 
-    def unique_inline_values_or_raise(
-        self, field=None, inline_model=None, field_label=None
-    ):
+    def unique_inline_values_or_raise(self, field=None, inline_model=None, field_label=None):
         self.field_exists_or_raise(field, inline_model)
         inline_set = f"{inline_model.split('.')[1]}_set"
         items = self.get_inline_field_values(field=field, inline_set=inline_set)
@@ -44,9 +42,7 @@ class InlineModelFormMixin:
                 f"{field_label}: The list of values below must be unique"
             )
 
-    def dates_not_after_report_datetime(
-        self, field=None, inline_model=None, field_label=None
-    ):
+    def dates_not_after_report_datetime(self, field=None, inline_model=None, field_label=None):
         self.field_cls_is_date_or_raise(field=field, inline_model=inline_model)
         inline_set = f"{inline_model.split('.')[1]}_set"
         dates_as_str = self.get_inline_field_values(field=field, inline_set=inline_set)
@@ -59,9 +55,9 @@ class InlineModelFormMixin:
                         f"{field_label}: Invalid date or date format. Got {dte_as_str}"
                     )
                 else:
-                    if dte.astimezone(
-                        ZoneInfo(settings.TIME_ZONE)
-                    ) > self.cleaned_data.get("report_datetime"):
+                    if dte.astimezone(ZoneInfo(settings.TIME_ZONE)) > self.cleaned_data.get(
+                        "report_datetime"
+                    ):
                         raise forms.ValidationError(
                             f"{field_label}: Date cannot be after report date/time. "
                             f"Got `{dte_as_str}`."

edc_model_to_dataframe/model_to_dataframe.py

@@ -87,9 +87,7 @@ class ModelToDataframe:
         self._encrypted_columns = None
         self._site_columns = None
         self._dataframe = pd.DataFrame()
-        self.read_frame_verbose = (
-            False if read_frame_verbose is None else read_frame_verbose
-        )
+        self.read_frame_verbose = False if read_frame_verbose is None else read_frame_verbose
         self.sites = sites
         self.drop_sys_columns = True if drop_sys_columns is None else drop_sys_columns
         self.drop_action_item_columns = (
@@ -159,12 +157,8 @@ class ModelToDataframe:
 
             # remove timezone if asked
             if self.remove_timezone:
-                for column in list(
-                    dataframe.select_dtypes(include=["datetimetz"]).columns
-                ):
-                    dataframe[column] = pd.to_datetime(
-                        dataframe[column]
-                    ).dt.tz_localize(None)
+                for column in list(dataframe.select_dtypes(include=["datetimetz"]).columns):
+                    dataframe[column] = pd.to_datetime(dataframe[column]).dt.tz_localize(None)
 
             # convert bool to int64
             for column in list(dataframe.select_dtypes(include=["bool"]).columns):
@@ -178,9 +172,7 @@ class ModelToDataframe:
                 dataframe[column] = dataframe[column].astype(str)
 
             # convert timedeltas to secs
-            for column in list(
-                dataframe.select_dtypes(include=["timedelta64"]).columns
-            ):
+            for column in list(dataframe.select_dtypes(include=["timedelta64"]).columns):
                 dataframe[column] = dataframe[column].dt.total_seconds()
 
             # fillna
@@ -239,9 +231,7 @@ class ModelToDataframe:
                 .values("id", m2m_field_name)
             )
             df_m2m = df_m2m.groupby("id")[m2m_field_name].apply(",".join).reset_index()
-            df_m2m = df_m2m.rename(
-                columns={m2m_field_name: m2m_field_name.split("__")[0]}
-            )
+            df_m2m = df_m2m.rename(columns={m2m_field_name: m2m_field_name.split("__")[0]})
             dataframe = dataframe.merge(df_m2m, on="id", how="left")
         return dataframe
 
@@ -261,24 +251,17 @@ class ModelToDataframe:
 
     def move_sys_columns_to_end(self, columns: dict[str, str]) -> dict[str, str]:
         system_columns = [
-            f.name
-            for f in self.model_cls._meta.get_fields()
-            if f.name in SYSTEM_COLUMNS
+            f.name for f in self.model_cls._meta.get_fields() if f.name in SYSTEM_COLUMNS
         ]
         new_columns = {k: v for k, v in columns.items() if k not in system_columns}
         if system_columns:
-            if (
-                len(new_columns.keys()) != len(columns.keys())
-                and not self.drop_sys_columns
-            ):
+            if len(new_columns.keys()) != len(columns.keys()) and not self.drop_sys_columns:
                 new_columns.update({k: k for k in system_columns})
         return new_columns
 
     def move_action_item_columns(self, columns: dict[str, str]) -> dict[str, str]:
         action_item_columns = [
-            f.name
-            for f in self.model_cls._meta.get_fields()
-            if f.name in ACTION_ITEM_COLUMNS
+            f.name for f in self.model_cls._meta.get_fields() if f.name in ACTION_ITEM_COLUMNS
         ]
         new_columns = {k: v for k, v in columns.items() if k not in ACTION_ITEM_COLUMNS}
         if action_item_columns:
@@ -322,9 +305,7 @@ class ModelToDataframe:
             columns = self.move_sys_columns_to_end(columns)
             # ensure no encrypted fields were added
             if not self.decrypt:
-                columns = {
-                    k: v for k, v in columns.items() if k not in self.encrypted_columns
-                }
+                columns = {k: v for k, v in columns.items() if k not in self.encrypted_columns}
             self._columns = columns
         return self._columns
 
@@ -342,9 +323,7 @@ class ModelToDataframe:
             except ValueError:
                 pass
         if not self.decrypt:
-            columns_list = [
-                col for col in columns_list if col not in self.encrypted_columns
-            ]
+            columns_list = [col for col in columns_list if col not in self.encrypted_columns]
         return columns_list
 
     @property
@@ -369,9 +348,7 @@ class ModelToDataframe:
                 if (
                     hasattr(fld_cls, "related_model")
                     and fld_cls.related_model
-                    and issubclass(
-                        fld_cls.related_model, (ListModelMixin, ListUuidModelMixin)
-                    )
+                    and issubclass(fld_cls.related_model, (ListModelMixin, ListUuidModelMixin))
                 ):
                     list_columns.append(fld_cls.attname)
             self._list_columns = list(set(list_columns))
@@ -417,9 +394,7 @@ class ModelToDataframe:
     def add_subject_identifier_column(self, columns: dict[str, str]) -> dict[str, str]:
         if "subject_identifier" not in [v for v in columns.values()]:
             subject_identifier_column = None
-            id_columns = [
-                col.replace("_id", "") for col in columns if col.endswith("_id")
-            ]
+            id_columns = [col.replace("_id", "") for col in columns if col.endswith("_id")]
             for col in id_columns:
                 field = getattr(self.model_cls, col, None)
                 if field and [
@@ -439,13 +414,9 @@ class ModelToDataframe:
     ) -> dict[str, str]:
         if "subject_identifier" not in [v for v in columns.values()]:
             columns.update(
-                {
-                    f"{column_name}__appointment__subject_identifier": "subject_identifier"
-                }
+                {f"{column_name}__appointment__subject_identifier": "subject_identifier"}
             )
-        columns.update(
-            {f"{column_name}__appointment__appt_datetime": "appointment_datetime"}
-        )
+        columns.update({f"{column_name}__appointment__appt_datetime": "appointment_datetime"})
         columns.update({f"{column_name}__appointment__visit_code": "visit_code"})
         columns.update(
             {f"{column_name}__appointment__visit_code_sequence": "visit_code_sequence"}
@@ -482,9 +453,7 @@ class ModelToDataframe:
                 columns.update({f"{col_prefix}__name": f"{col_prefix}_name"})
         return columns
 
-    def add_list_model_name_columns(
-        self, columns: dict[str, str] = None
-    ) -> dict[str, str]:
+    def add_list_model_name_columns(self, columns: dict[str, str] = None) -> dict[str, str]:
         for col in copy(columns):
             if col in self.list_columns:
                 column_name = col.split("_id")[0]