clinicedc 2.0.14__py3-none-any.whl → 2.0.16__py3-none-any.whl

edc_visit_tracking/form_validators/visit_form_validator.py

@@ -168,41 +168,44 @@ class VisitFormValidator(WindowPeriodFormValidatorMixin, FormValidator):
         """Asserts the report_datetime is not before the
         appt_datetime.
         """
-        if report_datetime_local := self.report_datetime:
-            if report_datetime_local.date() < self.appt_datetime_local.date():
-                appt_datetime_str = formatted_datetime(
-                    self.appt_datetime_local, format_as_date=True
-                )
-                self.raise_validation_error(
-                    {
-                        "report_datetime": (
-                            "Invalid. Cannot be before appointment date. "
-                            f"Got appointment date {appt_datetime_str}"
-                        )
-                    },
-                    INVALID_ERROR,
-                )
+        if (report_datetime_local := self.report_datetime) and (
+            report_datetime_local.date() < self.appt_datetime_local.date()
+        ):
+            appt_datetime_str = formatted_datetime(
+                self.appt_datetime_local, format_as_date=True
+            )
+            self.raise_validation_error(
+                {
+                    "report_datetime": (
+                        "Invalid. Cannot be before appointment date. "
+                        f"Got appointment date {appt_datetime_str}"
+                    )
+                },
+                INVALID_ERROR,
+            )
 
     def validate_visit_datetime_matches_appt_datetime_at_baseline(self) -> None:
         """Asserts the report_datetime matches the appt_datetime
         as baseline.
         """
-        if is_baseline(instance=self.appointment):
-            if report_datetime_local := self.report_datetime:
-                if report_datetime_local.date() != self.appt_datetime_local.date():
-                    appt_datetime_str = formatted_datetime(
-                        self.appt_datetime_local, format_as_date=True
-                    )
-                    self.raise_validation_error(
-                        {
-                            "report_datetime": (
-                                "Invalid. Must match appointment date at baseline. "
-                                "If necessary, change the appointment date and "
-                                f"try again. Got appointment date {appt_datetime_str}"
-                            )
-                        },
-                        INVALID_ERROR,
+        if (
+            (is_baseline(instance=self.appointment))
+            and (report_datetime_local := self.report_datetime)
+            and (report_datetime_local.date() != self.appt_datetime_local.date())
+        ):
+            appt_datetime_str = formatted_datetime(
+                self.appt_datetime_local, format_as_date=True
+            )
+            self.raise_validation_error(
+                {
+                    "report_datetime": (
+                        "Invalid. Must match appointment date at baseline. "
+                        "If necessary, change the appointment date and "
+                        f"try again. Got appointment date {appt_datetime_str}"
                     )
+                },
+                INVALID_ERROR,
+            )
 
     def validate_visits_completed_in_order(self) -> None:
         """Asserts visits are completed in order."""
@@ -210,7 +213,7 @@ class VisitFormValidator(WindowPeriodFormValidatorMixin, FormValidator):
         try:
             visit_sequence.enforce_sequence()
         except VisitSequenceError as e:
-            raise forms.ValidationError(e, code=INVALID_ERROR)
+            raise forms.ValidationError(e, code=INVALID_ERROR) from e
 
     def validate_visit_code_sequence_and_reason(self) -> None:
         """Asserts the `reason` makes sense relative to the
@@ -234,7 +237,7 @@ class VisitFormValidator(WindowPeriodFormValidatorMixin, FormValidator):
                 and EDC_VISIT_TRACKING_ALLOW_MISSED_UNSCHEDULED is False
             ):
                 raise forms.ValidationError(
-                    {"reason": ("Invalid. This is an unscheduled visit. See appointment.")},
+                    {"reason": "Invalid. This is an unscheduled visit. See appointment."},
                     code=INVALID_ERROR,
                 )
             # raise if CRF metadata exist
@@ -267,23 +270,25 @@ class VisitFormValidator(WindowPeriodFormValidatorMixin, FormValidator):
                 field_required="reason_missed_other",
             )
 
-        if self.validate_unscheduled_visit_reason:
-            if "reason_unscheduled" in self.cleaned_data:
-                self.applicable_if(
-                    UNSCHEDULED,
-                    field="reason",
-                    field_applicable="reason_unscheduled",
-                )
+        if (
+            self.validate_unscheduled_visit_reason
+            and "reason_unscheduled" in self.cleaned_data
+        ):
+            self.applicable_if(
+                UNSCHEDULED,
+                field="reason",
+                field_applicable="reason_unscheduled",
+            )
 
-                self.required_if(
-                    OTHER,
-                    field="reason_unscheduled",
-                    field_required="reason_unscheduled_other",
-                )
+            self.required_if(
+                OTHER,
+                field="reason_unscheduled",
+                field_required="reason_unscheduled_other",
+            )
 
     def metadata_exists_for(
         self,
-        entry_status: str = None,
+        entry_status: str | None = None,
         filter_models: list[str] | None = None,
         exclude_models: list[str] | None = None,
     ) -> int:
@@ -291,8 +296,9 @@ class VisitFormValidator(WindowPeriodFormValidatorMixin, FormValidator):
         the given entry_status.
         """
         exclude_opts: dict = {}
+        entry_status = entry_status or KEYED
         filter_opts = deepcopy(self.crf_filter_options)
-        filter_opts.update(entry_status=entry_status or KEYED)
+        filter_opts.update(entry_status=entry_status)
         if filter_models:
             filter_opts.update(model__in=filter_models)
         if exclude_models:

edc_visit_tracking/form_validators/visit_missed_form_validator.py

@@ -3,6 +3,8 @@ from edc_form_validators import FormValidator
 
 
 class VisitMissedFormValidator(FormValidator):
+    min_contact_attempts_count = 3
+
     def clean(self) -> None:
         self.applicable_if(YES, field="contact_attempted", field_applicable="contact_made")
         self.required_if(
@@ -16,7 +18,10 @@ class VisitMissedFormValidator(FormValidator):
             if self.cleaned_data.get("contact_attempts_count") is None
             else self.cleaned_data.get("contact_attempts_count")
         )
-        cond = self.cleaned_data.get("contact_made") == NO and contact_attempts_count < 3
+        cond = (
+            self.cleaned_data.get("contact_made") == NO
+            and contact_attempts_count < self.min_contact_attempts_count
+        )
         self.required_if_true(
             cond,
             field_required="contact_attempts_explained",

edc_visit_tracking/model_mixins/utils.py

@@ -25,7 +25,7 @@ def get_related_visit_model_attr(model_cls) -> str:
             fld_cls.related_model is not None
             and fld_cls.related_model == related_visit_model_cls
         ):
-            attrs.append(fld_cls.name)
+            attrs.append(fld_cls.name)  # noqa: PERF401
     if len(attrs) > 1:
         raise RelatedVisitFieldError(
             f"More than one field is related to the visit model. See {model_cls}. "

edc_visit_tracking/modelform_mixins/crf/visit_tracking_crf_modelform_mixin.py

@@ -76,11 +76,11 @@ class VisitTrackingCrfModelFormMixin:
     def related_visit_model_attr(self) -> str:
         try:
             return self._meta.model.related_visit_model_attr()
-        except AttributeError:
+        except AttributeError as e:
             raise VisitTrackingCrfModelFormMixinError(
                 "Expected method `related_visit_model_attr`. Is this a CRF? "
                 f"See model {self._meta.model}"
-            )
+            ) from e
 
     def validate_visit_tracking(self: Any) -> None:
         # trigger a validation error if visit field is None
@@ -104,7 +104,7 @@ class VisitTrackingCrfModelFormMixin:
                 CrfReportDateBeforeStudyStart,
                 CrfReportDateIsFuture,
             ) as e:
-                raise forms.ValidationError({self.report_datetime_field_attr: str(e)})
+                raise forms.ValidationError({self.report_datetime_field_attr: str(e)}) from e
 
     def validate_visits_completed_in_order(self) -> None:
         """Asserts visits are completed in order."""
@@ -115,4 +115,4 @@ class VisitTrackingCrfModelFormMixin:
             try:
                 visit_sequence.enforce_sequence(document_type="CRF")
             except VisitSequenceError as e:
-                raise forms.ValidationError(str(e), code=INVALID_ERROR)
+                raise forms.ValidationError(str(e), code=INVALID_ERROR) from e

edc_visit_tracking/modelform_mixins/utils.py

@@ -29,9 +29,9 @@ def get_related_visit(
         VisitTrackingCrfModelFormMixin
         | InlineCrfModelFormMixin
         | CrfFormValidator
-        | CrfFormValidatorMixin,
+        | CrfFormValidatorMixin
     ),
-    related_visit_model_attr: str = None,
+    related_visit_model_attr: str | None = None,
 ) -> RelatedVisitModel | None:
     """Returns the related visit model instance or None.
 

edc_visit_tracking/models/signals.py

@@ -18,7 +18,7 @@ def visit_tracking_check_in_progress_on_post_save(
     """Calls method on the visit tracking instance"""
     if not raw and not update_fields:
         try:
-            instance.appointment
+            instance.appointment  # noqa: B018
         except AttributeError:
             pass
         else:

edc_visit_tracking/typing_stubs.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Any, Generic, Protocol, Tuple, TypeVar
+from typing import Any, Protocol, TypeVar
 from uuid import UUID
 
 from django.contrib.contenttypes.fields import GenericForeignKey
@@ -33,10 +33,10 @@ class ModelBase(type):
     def _base_manager(cls: type[_Self]) -> BaseManager[_Self]: ...
 
 
-class Options(Generic[_M]):
+class Options([_M]):
     def label_lower(self) -> str: ...
 
-    def fields(self) -> Tuple[Field]: ...  # noqa
+    def fields(self) -> tuple[Field]: ...
 
     def get_fields(
         self, include_parents: bool = ..., include_hidden: bool = ...

edc_visit_tracking/utils.py

@@ -63,7 +63,7 @@ def get_subject_visit_missed_model() -> str:
     try:
         model = settings.SUBJECT_VISIT_MISSED_MODEL
     except AttributeError as e:
-        raise ImproperlyConfigured(f"{error_msg} Got {e}.")
+        raise ImproperlyConfigured(f"{error_msg} Got {e}.") from e
     else:
         if not model:
             raise ImproperlyConfigured(f"{error_msg} Got None.")

edc_visit_tracking/visit_sequence.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import contextlib
 from typing import TYPE_CHECKING
 
 from django.utils.translation import gettext_lazy as _
@@ -39,7 +40,7 @@ class VisitSequence:
         self.visit_code = self.appointment.visit_code
         self.visit_code_sequence = self.appointment.visit_code_sequence
 
-    def enforce_sequence(self, document_type: str = None) -> None:
+    def enforce_sequence(self, document_type: str | None = None) -> None:
         """Raises an exception if sequence is not adhered to; that is,
         the visit reports are not completed in order.
 
@@ -80,10 +81,8 @@ class VisitSequence:
             previous_visit_code = self.visit_code
         else:
             previous = self.appointment.schedule.visits.previous(self.visit_code)
-            try:
+            with contextlib.suppress(AttributeError):
                 previous_visit_code = previous.code
-            except AttributeError:
-                pass
         return previous_visit_code
 
     @property