clinicedc 2.0.39__py3-none-any.whl → 2.0.41__py3-none-any.whl

edc_listboard/middleware.py

@@ -1,24 +1,25 @@
 from django.conf import settings
 
+from edc_dashboard.middleware_mixins import EdcTemplateMiddlewareMixin
+
 from .dashboard_templates import dashboard_templates
 
 
-class DashboardMiddleware:
+class DashboardMiddleware(EdcTemplateMiddlewareMixin):
     def __init__(self, get_response):
         self.get_response = get_response
 
     def __call__(self, request):
+        self.check_for_required_request_attrs(request)
         return self.get_response(request)
 
-    def process_view(self, request, *args) -> None:
-        template_data = dashboard_templates
-        try:
-            template_data.update(settings.LISTBOARD_BASE_TEMPLATES)
-        except AttributeError:
-            pass
+    def process_view(self, request, *args):
+        template_data = getattr(settings, "LISTBOARD_BASE_TEMPLATES", {})
+        template_data.update(**dashboard_templates)
         request.template_data.update(**template_data)
 
     def process_template_response(self, request, response):
-        if response.context_data:
+        if getattr(response, "context_data", None):
             response.context_data.update(**request.template_data)
+            request.template_data.update(**request.template_data)
         return response

edc_listboard/templates/edc_listboard/listboard.html

@@ -1,4 +1,4 @@
-{% extends listboard_base_template %}
+{% extends listboard_base_template|default:"edc_dashboard/base.html" %}
 
 {% load edc_dashboard_extras %}
 {% load tz %}

edc_listboard/view_mixins/listboard_filter_view_mixin.py

@@ -12,7 +12,7 @@ if TYPE_CHECKING:
 
 class ListboardFilterViewMixin:
     listboard_view_filters = ListboardViewFilters()
-    listboard_filter_url = None
+    listboard_filter_url = None  # url name
 
     def __init__(self, **kwargs):
         self.listboard_view_exclude_filter_applied = False  # TODO: ??

edc_listboard/view_mixins/search_form_view_mixin.py

@@ -11,7 +11,7 @@ class SearchFormViewError(Exception):
 
 
 class SearchFormViewMixin:
-    search_form_url = None
+    search_form_url = None  # url_name in url_names dict
 
     def get_context_data(self, **kwargs) -> dict[str, Any]:
         kwargs.update(search_form_url_reversed=self.search_form_url_reversed)

edc_listboard/views/listboard_view.py

@@ -8,6 +8,7 @@ from django.db.models import Q
 from django.utils.translation import gettext as _
 from django.views.generic.list import ListView
 
+from edc_dashboard.url_names import url_names
 from edc_dashboard.view_mixins import (
     TemplateRequestContextMixin,
     UrlRequestContextMixin,
@@ -31,8 +32,8 @@ class BaseListboardView(SiteViewMixin, TemplateRequestContextMixin, ListView):
     listboard_template: str | None = None  # an existing key in request.context_data
 
     # if self.listboard_url declared through another mixin.
-    listboard_url: str | None = None  # an existing key in request.context_data
-    listboard_back_url: str | None = None
+    listboard_url: str | None = None  # an existing key in request.context_data.url_names
+    listboard_back_url: str | None = None  # see url_names, defaults to listboard_url
 
     # styling
     # default, info, success, danger, warning, etc. See Bootstrap.
@@ -65,32 +66,22 @@ class BaseListboardView(SiteViewMixin, TemplateRequestContextMixin, ListView):
             self.listboard_fa_icon = f"fas {self.listboard_fa_icon}"
         kwargs.update(
             empty_queryset_message=self.get_empty_queryset_message(),
+            has_listboard_model_perms=self.has_listboard_model_perms,
+            has_view_listboard_perms=self.has_view_listboard_perms,
             listboard_fa_icon=self.listboard_fa_icon,
+            listboard_instructions=self.listboard_instructions,
             listboard_panel_style=self.listboard_panel_style,
             listboard_panel_title=self.listboard_panel_title,
-            listboard_instructions=self.listboard_instructions,
-            show_change_form_button=self.show_change_form_button,
-            # object_list=self.object_list,
-            **self.add_url_to_context(
-                new_key="listboard_url", existing_key=self.listboard_url
-            ),
-        )
-        if self.listboard_back_url:
-            kwargs.update(
-                **self.add_url_to_context(
-                    new_key="listboard_back_url",
-                    existing_key=self.listboard_back_url,
-                )
-            )
-        kwargs.update(
-            has_listboard_model_perms=self.has_listboard_model_perms,
-            has_view_listboard_perms=self.has_view_listboard_perms,
             listboard_view_permission_codename=self.listboard_view_permission_codename,
             permissions_warning_message=self.permissions_warning_message,
-            **self.add_url_to_context(
-                new_key="paginator_url",
-                existing_key=self.paginator_url or self.listboard_url,
-            ),
+            show_change_form_button=self.show_change_form_button,
+            **{"listboard_url": url_names.get(self.listboard_url)},
+            **{"paginator_url": url_names.get(self.paginator_url or self.listboard_url)},
+            **{
+                "listboard_back_url": url_names.get(
+                    self.listboard_back_url or self.listboard_url
+                )
+            },
         )
         return super().get_context_data(**kwargs)
 
@@ -165,14 +156,14 @@ class BaseListboardView(SiteViewMixin, TemplateRequestContextMixin, ListView):
                 queryset = queryset.order_by(*ordering)
         return queryset
 
-    def get_queryset_filter_options(self, request, *args, **kwargs) -> tuple[Q, dict]:
+    def get_queryset_filter_options(self, request, *args, **kwargs) -> tuple[Q, dict]:  # noqa: ARG002
         """Returns filtering applied to every queryset"""
         options = dict(site_id__in=sites.get_site_ids_for_user(request=self.request))
         if self.has_view_only_my_listboard_perms:
             options.update(user_created=self.request.user.username)
         return Q(), options
 
-    def get_queryset_exclude_options(self, request, *args, **kwargs) -> tuple[Q, dict]:
+    def get_queryset_exclude_options(self, request, *args, **kwargs) -> tuple[Q, dict]:  # noqa: ARG002
         """Returns exclude options applied to every queryset"""
         return Q(), {}
 

edc_listboard/views/screen/screening_listboard_view.py

@@ -30,13 +30,13 @@ class ScreeningListboardView(
     ordering = "-report_datetime"
     paginate_by = 10
     search_form_url = "screening_listboard_url"
-    search_fields = [
+    search_fields = (
         "screening_identifier",
         "initials__exact",
         "subject_identifier",
         "user_created",
         "user_modified",
-    ]
+    )
 
     def get_context_data(self, **kwargs) -> dict:
         kwargs.update(

edc_listboard/views/subject/subject_listboard_view.py

@@ -23,7 +23,7 @@ class SubjectListboardView(
     navbar_selected_item: str = "consented_subject"
     search_form_url: str = "subject_listboard_url"
 
-    search_fields: list[str] = [
+    search_fields = (
         "user_created",
         "user_modified",
         "screening_identifier",
@@ -31,7 +31,7 @@ class SubjectListboardView(
         "initials__exact",
         "identity__exact",
         "first_name__exact",
-    ]
+    )
 
     def get_listboard_model(self) -> str:
         return self.listboard_model

edc_locator/forms/subject_locator_form_validator.py

@@ -49,12 +49,12 @@ class SubjectLocatorFormValidator(FormValidator):
 
     def validate_may_call_fields(self):
         validations = {}
-        number_fields = ["subject_cell", "subject_phone"]
+        number_fields = ("subject_cell", "subject_phone")
         if self.cleaned_data.get("may_call") == YES:
             if all([self.cleaned_data.get(f) is None for f in number_fields]):
                 validations = {k: "This field is required" for k in number_fields}
         elif self.cleaned_data.get("may_call") == NO:
-            number_fields.extend(["subject_cell_alt", "subject_phone_alt"]),
+            number_fields = {*number_fields, "subject_cell_alt", "subject_phone_alt"}
             for field in number_fields:
                 if self.cleaned_data.get(field):
                     validations.update({field: "This field is not required."})

edc_ltfu/action_items.py

@@ -19,5 +19,4 @@ class LtfuAction(ActionWithNotification):
     priority = HIGH_PRIORITY
 
     def get_next_actions(self):
-        next_actions = [END_OF_STUDY_ACTION]
-        return next_actions
+        return [END_OF_STUDY_ACTION]

edc_ltfu/forms/ltfu_form_validator_mixin.py

@@ -23,13 +23,13 @@ class LtfuFormValidatorMixin(FormValidator):
 
         try:
             self.ltfu_model_cls.objects.get(subject_identifier=subject_identifier)
-        except ObjectDoesNotExist:
+        except ObjectDoesNotExist as e:
             if self.offschedule_reason_field not in self.cleaned_data:
                 raise ImproperlyConfigured(
                     "Unknown offschedule_reason_field. "
                     f"Got '{self.offschedule_reason_field}'. "
                     f"See form {self.__class__.__name__}"
-                )
+                ) from e
             if self.cleaned_data.get(self.offschedule_reason_field) == LTFU:
                 raise forms.ValidationError(
                     {
@@ -39,4 +39,4 @@ class LtfuFormValidatorMixin(FormValidator):
                             "form first."
                         )
                     }
-                )
+                ) from e

edc_ltfu/modeladmin_mixin.py

@@ -46,7 +46,7 @@ class LtfuModelAdminMixin:
         "number_consecutive_missed_visits",
     )
 
-    radio_fields = {
+    radio_fields = {  # noqa: RUF012
         "home_visited": admin.VERTICAL,
         "ltfu_category": admin.VERTICAL,
     }

edc_ltfu/modelform_mixins.py

@@ -69,7 +69,7 @@ class RequiresLtfuFormValidatorMixin:
                 ltfu = django_apps.get_model(self.ltfu_model).objects.get(
                     subject_identifier=subject_identifier
                 )
-            except ObjectDoesNotExist:
+            except ObjectDoesNotExist as e:
                 if (
                     self.cleaned_data.get(self.offschedule_reason_field)
                     and self.cleaned_data.get(self.offschedule_reason_field).name
@@ -80,7 +80,7 @@ class RequiresLtfuFormValidatorMixin:
                         f"`{self.ltfu_model_cls._meta.verbose_name}` "
                         "form first."
                     )
-                    raise forms.ValidationError({self.offschedule_reason_field: msg})
+                    raise forms.ValidationError({self.offschedule_reason_field: msg}) from e
             else:
                 if self.cleaned_data.get(self.ltfu_date_field) and (
                     ltfu.ltfu_date != self.cleaned_data.get(self.ltfu_date_field)

edc_metadata/admin/modeladmin_mixins.py

@@ -8,12 +8,8 @@ from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 from django_audit_fields import ModelAdminAuditFieldsMixin, audit_fieldset_tuple
 from django_revision.modeladmin_mixin import ModelAdminRevisionMixin
-from rangefilter.filters import DateRangeFilterBuilder
-
 from edc_appointment.utils import get_appointment_model_cls
 from edc_dashboard.url_names import url_names
-from edc_metadata import KEYED, REQUIRED
-from edc_metadata.admin.list_filters import CreatedListFilter
 from edc_model_admin.mixins import (
     ModelAdminInstitutionMixin,
     ModelAdminNextUrlRedirectMixin,
@@ -22,6 +18,10 @@ from edc_model_admin.mixins import (
     TemplatesModelAdminMixin,
 )
 from edc_sites.admin import SiteModelAdminMixin
+from rangefilter.filters import DateRangeFilterBuilder
+
+from edc_metadata import KEYED, REQUIRED
+from edc_metadata.admin.list_filters import CreatedListFilter
 
 
 class MetadataModelAdminMixin(
@@ -49,6 +49,8 @@ class MetadataModelAdminMixin(
 
     change_search_field_name = "subject_identifier"
 
+    subject_dashboard_url_name = "subject_dashboard_url"  # url_name
+
     fieldsets = (
         [
             None,
@@ -149,8 +151,6 @@ class MetadataModelAdminMixin(
         extra_context.update(show_cancel=True)
         return extra_context
 
-    subject_dashboard_url_name = "subject_dashboard_url"
-
     def get_subject_dashboard_url(self, obj=None) -> str | None:
         opts = {}
         if obj:
@@ -195,9 +195,11 @@ class MetadataModelAdminMixin(
             )
         return obj.get_entry_status_display()
 
-    def get_view_on_site_url(self, obj=None):
+    def get_view_on_site_url(self, obj=None) -> None | str:
+        url = None
         if obj is None or not self.view_on_site:
-            return None
+            url = None
         if hasattr(obj, "get_absolute_url"):
             url = reverse(self.changelist_url)
-            return f"{url}?q={obj.subject_identifier}"
+            url = f"{url}?q={obj.subject_identifier}"
+        return url

edc_metadata/management/commands/update_metadata.py

@@ -12,7 +12,7 @@ style = color_style()
 class Command(BaseCommand):
     help = "Update metadata and re-run metadatarules"
 
-    def handle(self, *args, **options) -> None:
+    def handle(self, *args, **options) -> None:  # noqa: ARG002
         metadata_refresher = MetadataRefresher(verbose=True)
         sys.stdout.write("Deleting all CrfMetadata...     \r")
         CrfMetadata.objects.all().delete()

edc_metadata/management/commands/update_metadata_schedule_names.py

@@ -12,7 +12,7 @@ style = color_style()
 class Command(BaseCommand):
     help = "Update metadata for changed visit_schedule/schedule names"
     pattern = "^[0-9a-z_]+$"
-    fieldnames = ["visit_schedule_name", "schedule_name"]
+    fieldnames = ("visit_schedule_name", "schedule_name")
 
     def add_arguments(self, parser):
         parser.add_argument(
@@ -43,15 +43,15 @@ class Command(BaseCommand):
             help="Do a dry run. (Default: True)",
         )
 
-    def handle(self, *args, **options):
-        dry_run = False if options.get("dry_run", "") == "False" else True
+    def handle(self, *args, **options):  # noqa: ARG002
+        dry_run = options.get("dry_run", "") != "False"
 
         try:
             UpdateMetadataOnScheduleChange(
-                fieldname=options.get("field"),
-                new_value=options.get("new_value"),
-                old_value=options.get("old_value"),
+                field=options.get("field"),
+                new_name=options.get("new_value"),
+                old_name=options.get("old_value"),
                 dry_run=dry_run,
             )
         except UpdateMetadataError as e:
-            raise CommandError(e)
+            raise CommandError(e) from e

edc_metadata/management/commands/validate_entry_status.py

@@ -15,7 +15,7 @@ from ...models import CrfMetadata, RequisitionMetadata
 class Command(BaseCommand):
     help = "Performs a `get_model` for each target models referenced"
 
-    def handle(self, *args, **options):
+    def handle(self, *args, **options):  # noqa: ARG002
         grouping = (
             RequisitionMetadata.objects.distinct()
             .values("model")

edc_metadata/management/commands/validate_rule_groups.py

@@ -6,5 +6,5 @@ from ...metadata_rules import site_metadata_rules
 class Command(BaseCommand):
     help = "Performs a `get_model` for each target models referenced"
 
-    def handle(self, *args, **options):
+    def handle(self, *args, **options):  # noqa: ARG002
         site_metadata_rules.validate()

edc_metadata/metadata/metadata_getter.py

@@ -47,7 +47,8 @@ class MetadataValidator:
                 if not model_cls_registered_with_admin_site(source_model_cls):
                     warn(
                         "Model class not registered with Admin. "
-                        f"Deleting related metadata. Got {source_model_cls}."
+                        f"Deleting related metadata. Got {source_model_cls}.",
+                        stacklevel=2,
                     )
                     self.metadata_obj.delete()
                     self.metadata_obj = None
@@ -75,10 +76,7 @@ class MetadataValidator:
     @staticmethod
     def model_cls_registered_with_admin_site(model_cls: Any) -> bool:
         """Returns True if model cls is registered in Admin."""
-        for admin_site in all_sites:
-            if model_cls in admin_site._registry:
-                return True
-        return False
+        return any(model_cls in admin_site._registry for admin_site in all_sites)
 
 
 class MetadataGetter:

edc_metadata/metadata_handler.py

@@ -25,7 +25,7 @@ class MetadataHandlerError(Exception):
     pass
 
 
-class MetadataObjectDoesNotExist(Exception):
+class MetadataObjectDoesNotExist(Exception):  # noqa: N818
     pass
 
 
@@ -73,15 +73,15 @@ class MetadataHandler:
         """Returns a new metadata model instance for this CRF."""
         metadata_obj = None
         try:
-            crf = [
+            crf = next(
                 f for f in self.creator.related_visit.visit.all_crfs if f.model == self.model
-            ][0]
-        except IndexError as e:
+            )
+        except StopIteration as e:
             if self.related_visit.reason != MISSED_VISIT:
                 raise MetadataHandlerError(
                     "Create failed. Model not found. Not in visit.all_crfs. "
                     f"Model {self.model}. Got {e}"
-                )
+                ) from e
         else:
             metadata_obj = self.creator.create_crf(crf)
         return metadata_obj

edc_metadata/metadata_mixins/source_model_metadata_mixin.py

@@ -22,7 +22,7 @@ if TYPE_CHECKING:
 class SourceModelMetadataMixin:
     """Mixin class for Metadata and MetadataUpdater class."""
 
-    def __init__(self, source_model: str, related_visit: RelatedVisitModel = None):
+    def __init__(self, source_model: str, related_visit: RelatedVisitModel):
         self._source_model_obj = None
         self._source_model = source_model
         self.related_visit = related_visit

edc_metadata/metadata_refresher.py

@@ -44,7 +44,7 @@ class MetadataRefresher:
     def source_models(self) -> list[str]:
         if not self._source_models:
             self._source_models = []
-            for app_label, rule_groups_list in site_metadata_rules.rule_groups.items():
+            for rule_groups_list in site_metadata_rules.rule_groups.values():
                 for rule_groups in rule_groups_list:
                     if (
                         rule_groups._meta.source_model

edc_metadata/metadata_rules/crf/crf_rule.py

@@ -19,7 +19,7 @@ class CrfRuleModelConflict(Exception):  # noqa: N818
 
 
 class CrfRule(Rule):
-    def __init__(self, target_models: list[str] = None, **kwargs) -> None:
+    def __init__(self, target_models: list[str], **kwargs) -> None:
         super().__init__(**kwargs)
         self.metadata_category = CRF
         self.target_models = target_models

edc_metadata/metadata_rules/logic.py

@@ -29,9 +29,9 @@ class Logic:
 
     def __init__(
         self,
-        predicate: P | PF | Callable | None = None,
-        consequence: str | None = None,
-        alternative: str | None = None,
+        predicate: P | PF | Callable,
+        consequence: str,
+        alternative: str,
         comment: str | None = None,
     ) -> None:
         if not callable(predicate):

edc_metadata/metadata_rules/persistant_singleton_mixin.py

@@ -36,11 +36,9 @@ class PersistantSingletonMixin:
             )
         except ObjectDoesNotExist:
             obj = None
-            required = (
-                True
-                if visit == self.get_last_attended_scheduled_visit(visit)
+            required = bool(
+                visit == self.get_last_attended_scheduled_visit(visit)
                 and visit.visit_code not in exclude_visit_codes
-                else False
             )
         except MultipleObjectsReturned:
             # necessary if the collection schedule changes and a singleton form

edc_metadata/metadata_rules/requisition/requisition_rule_group.py

@@ -33,7 +33,7 @@ class RequisitionRuleGroupMetaOptions(RuleGroupMetaOptions):
         super().__init__(group_name, attrs)
         self.requisition_model = self.options.get("requisition_model")
         if self.requisition_model:
-            if len(self.requisition_model.split(".")) != 2:
+            if len(self.requisition_model.split(".")) != 2:  # noqa: PLR2004
                 self.requisition_model = f"{self.app_label}.{self.requisition_model}"
                 self.options.update(requisition_model=self.requisition_model)
             self.options.update(target_models=[self.requisition_model])

edc_metadata/metadata_rules/rule.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import contextlib
+from collections.abc import Callable
 from typing import TYPE_CHECKING
 
 from edc_appointment.constants import MISSED_APPT
@@ -28,9 +29,9 @@ class Rule:
 
     def __init__(
         self,
-        predicate: P | PF | callable | str = None,
-        consequence: str = None,
-        alternative: str = None,
+        predicate: P | PF | Callable | str,
+        consequence: str,
+        alternative: str,
     ) -> None:
         self.predicate = predicate
         self.consequence = consequence

edc_metadata/metadata_rules/rule_group.py

@@ -11,7 +11,7 @@ class RuleGroupError(Exception):
     pass
 
 
-class TargetModelConflict(Exception):
+class TargetModelConflict(Exception):  # noqa: N818
     pass
 
 
@@ -61,7 +61,7 @@ class RuleGroup:
                         )
 
     @classmethod
-    def _lookup_model(cls, model: str = None, category: str = None) -> Any:
+    def _lookup_model(cls, model: str, category: str) -> Any:
         sys.stdout.write(f"  ( ) {model}\r")
         model_cls = None
         try:

edc_metadata/metadata_rules/rule_group_meta_options.py

@@ -42,13 +42,13 @@ class RuleGroupMetaOptions:
         # source model
         self.source_model = self.options.get("source_model")
         if self.source_model:
-            if len(self.source_model.split(".")) != 2:
+            if len(self.source_model.split(".")) != 2:  # noqa: PLR2004
                 self.source_model = f"{self.app_label}.{self.source_model}"
             self.options.update(source_model=self.source_model)
         # related visit model
         self.related_visit_model = self.options.get("related_visit_model")
         if self.related_visit_model:
-            if len(self.related_visit_model.split(".")) != 2:
+            if len(self.related_visit_model.split(".")) != 2:  # noqa: PLR2004
                 raise RuleGroupMetaError(
                     "Invalid _meta attr. Expected _meta.related_visit_model to be in "
                     f"label_lower format. Got '{self.related_visit_model}'. See {group_name}."

edc_metadata/metadata_rules/rule_group_metaclass.py

@@ -51,7 +51,7 @@ class RuleGroupMetaclass(type):
         return super().__new__(mcs, name, bases, attrs)
 
     @classmethod
-    def __get_rules(mcs, name: str, attrs: dict, meta: Any) -> tuple:
+    def __get_rules(mcs, name: str, attrs: dict, meta: Any) -> tuple:  # noqa: N804
         """Returns a list of rules after updating each rule's attrs
         with values from Meta.
 
@@ -59,28 +59,27 @@ class RuleGroupMetaclass(type):
         """
         rules = []
         for key, value in attrs.items():
-            if not key.startswith("_"):
-                if isinstance(value, Rule):
-                    rule = value
-                    rule.name = key
-                    rule.group = name
-                    if isinstance(rule.predicate, (str,)):
-                        predicates = getattr(meta, "predicates", None)
-                        if not predicates:
-                            raise RuleGroupError(
-                                "RuleGroup Meta attr `predicates` may not be `None` if a "
-                                "rule.predicate in the RuleGroup is a string. "
-                                f"See {attrs.get('__qualname__')}."
-                            )
-                        rule.predicate = getattr(meta.predicates, rule.predicate)
-                    for k, v in meta.options.items():
-                        setattr(rule, k, v)
-                    rule.target_models = mcs.__get_target_models(rule, meta)
-                    rules.append(rule)
+            if not key.startswith("_") and isinstance(value, Rule):
+                rule = value
+                rule.name = key
+                rule.group = name
+                if isinstance(rule.predicate, (str,)):
+                    predicates = getattr(meta, "predicates", None)
+                    if not predicates:
+                        raise RuleGroupError(
+                            "RuleGroup Meta attr `predicates` may not be `None` if a "
+                            "rule.predicate in the RuleGroup is a string. "
+                            f"See {attrs.get('__qualname__')}."
+                        )
+                    rule.predicate = getattr(meta.predicates, rule.predicate)
+                for k, v in meta.options.items():
+                    setattr(rule, k, v)
+                rule.target_models = mcs.__get_target_models(rule, meta)
+                rules.append(rule)
         return tuple(rules)
 
     @classmethod
-    def __get_target_models(mcs, rule: Any, meta: Any) -> Any:
+    def __get_target_models(mcs, rule: Any, meta: Any) -> Any:  # noqa: N804
         """Returns target models as a list of label_lowers.
 
         Target models are the models whose metadata is acted upon.
@@ -90,7 +89,7 @@ class RuleGroupMetaclass(type):
         """
         target_models = []
         for target_model in rule.target_models:
-            if len(target_model.split(".")) != 2:
-                target_model = f"{meta.app_label}.{target_model}"
+            if len(target_model.split(".")) != 2:  # noqa: PLR2004
+                target_model = f"{meta.app_label}.{target_model}"  # noqa: PLW2901
             target_models.append(target_model)
         return target_models

edc_metadata/metadata_rules/site.py

@@ -9,7 +9,7 @@ from django.utils.module_loading import import_module, module_has_submodule
 style = color_style()
 
 
-class SiteMetadataRulesAlreadyRegistered(Exception):
+class SiteMetadataRulesAlreadyRegistered(Exception):  # noqa: N818
     pass
 
 

edc_metadata/metadata_updater.py

@@ -31,8 +31,9 @@ class MetadataUpdater(SourceModelMetadataMixin):
 
     def __init__(
         self,
-        related_visit: RelatedVisitModel = None,
-        source_model: str = None,
+        *,
+        related_visit: RelatedVisitModel,
+        source_model: str,
         allow_create: bool | None = None,
     ):
         super().__init__(source_model, related_visit)
@@ -46,7 +47,7 @@ class MetadataUpdater(SourceModelMetadataMixin):
             f"source_model={self.source_model})"
         )
 
-    def get_and_update(self, entry_status: str = None) -> CrfMetadata | RequisitionMetadata:
+    def get_and_update(self, entry_status: str) -> CrfMetadata | RequisitionMetadata:
         metadata_obj = self.metadata_handler.metadata_obj
         if entry_status != KEYED and self.source_model_obj_exists:
             entry_status = KEYED