clinicedc 2.0.27__py3-none-any.whl → 2.0.29__py3-none-any.whl

edc_reportable/utils/get_grade_for_value.py

@@ -19,12 +19,12 @@ __all__ = ["get_grade_for_value"]
 
 def get_grade_for_value(
     reference_range_collection: ReferenceRangeCollection,
-    value: float | int = None,
-    label: str = None,
-    units: str = None,
-    gender: str = None,
-    dob: date = None,
-    report_datetime: datetime = None,
+    value: float | int | None = None,
+    label: str | None = None,
+    units: str | None = None,
+    gender: str | None = None,
+    dob: date | None = None,
+    report_datetime: datetime | None = None,
     age_units: str | None = None,
     site: Site | None = None,
     create_missing_normal: bool | None = None,
@@ -56,11 +56,11 @@ def get_grade_for_value(
         upper_limit = get_upper_limit(normal_data, grading_data)
         value = float(value)
         condition_str = (
-            f'{"" if lower_limit is None else lower_limit}'
-            f'{grading_data.lower_operator or ""}{value}'
-            f'{grading_data.upper_operator or ""}{"" if upper_limit is None else upper_limit}'
+            f"{'' if lower_limit is None else lower_limit}"
+            f"{grading_data.lower_operator or ''}{value}"
+            f"{grading_data.upper_operator or ''}{'' if upper_limit is None else upper_limit}"
         )
-        if eval(condition_str):  # nosec B307
+        if eval(condition_str):  # nosec B307  # noqa: S307
             if not found_grading_data:
                 found_grading_data = grading_data
                 found_condition_str = (
@@ -104,11 +104,11 @@ def get_upper_limit(
 
 def get_grading_data_instances(
     reference_range_collection: ReferenceRangeCollection,
-    label: str = None,
-    units: str = None,
-    gender: str = None,
-    dob: date = None,
-    report_datetime: datetime = None,
+    label: str | None = None,
+    units: str | None = None,
+    gender: str | None = None,
+    dob: date | None = None,
+    report_datetime: datetime | None = None,
     age_units: str | None = None,
     site: Site | None = None,
 ) -> list[GradingData]:

edc_reportable/utils/get_normal_data_or_raise.py

@@ -25,11 +25,11 @@ __all__ = ["get_normal_data_or_raise"]
 
 def get_normal_data_or_raise(
     reference_range_collection: ReferenceRangeCollection = None,
-    label: str = None,
-    units: str = None,
-    gender: str = None,
-    dob: date = None,
-    report_datetime: datetime = None,
+    label: str | None = None,
+    units: str | None = None,
+    gender: str | None = None,
+    dob: date | None = None,
+    report_datetime: datetime | None = None,
     age_units: str | None = None,
     site: Site | None = None,
     create_missing_normal: bool | None = None,
@@ -48,7 +48,7 @@ def get_normal_data_or_raise(
             units=units,
             age_units=age_units,
         )
-    except ObjectDoesNotExist:
+    except ObjectDoesNotExist as e:
         if create_missing_normal:
             opts = dict(
                 reference_range_collection=reference_range_collection,
@@ -68,23 +68,23 @@ def get_normal_data_or_raise(
                 f"age={getattr(age_rdelta, age_units)}{age_units}. "
                 "Perhaps add this to the default normal reference range data or "
                 "pass 'create_missing=True' to convert an existing normal reference."
-            )
-    except MultipleObjectsReturned:
+            ) from e
+    except MultipleObjectsReturned as e:
         raise NotEvaluated(
             f"Value not evaluated. "
             f"Multiple normal references found for `{label}`. "
             f"Using units={units}, gender={gender}, age={getattr(age_rdelta, age_units)}. "
-        )
+        ) from e
     return obj
 
 
 def create_obj_for_new_units_or_raise(
     reference_range_collection: ReferenceRangeCollection = None,
-    label: str = None,
-    units: str = None,
-    gender: str = None,
-    dob: date = None,
-    report_datetime: datetime = None,
+    label: str | None = None,
+    units: str | None = None,
+    gender: str | None = None,
+    dob: date | None = None,
+    report_datetime: datetime | None = None,
     age_units: str | None = None,
 ) -> NormalData | None:
     opts = {}

edc_reportable/utils/in_normal_bounds_or_raise.py

@@ -14,12 +14,12 @@ __all__ = ["in_normal_bounds_or_raise"]
 
 def in_normal_bounds_or_raise(
     reference_range_collection: ReferenceRangeCollection = None,
-    label: str = None,
-    value: int | float = None,
-    units: str = None,
-    gender: str = None,
-    dob: date = None,
-    report_datetime: datetime = None,
+    label: str | None = None,
+    value: int | float | None = None,
+    units: str | None = None,
+    gender: str | None = None,
+    dob: date | None = None,
+    report_datetime: datetime | None = None,
     age_units: str | None = None,
     create_missing_normal: bool | None = None,
 ) -> bool:

edc_reportable/utils/load_data.py

@@ -18,7 +18,7 @@ if TYPE_CHECKING:
     from ..models import ReferenceRangeCollection
 
 
-class AlreadyLoaded(Exception):
+class AlreadyLoaded(Exception):  # noqa: N818
     pass
 
 

edc_reportable/utils/update_grading_exceptions.py

@@ -21,12 +21,12 @@ def update_grading_exceptions(
             reference_range_collection=reference_range_collection
         ).delete()
     for label, grades in reportable_grades_exceptions.items():
-        grades = [int(g) for g in grades]
+        grades = [int(g) for g in grades]  # noqa: PLW2901
         grading_exception_model_cls().objects.get_or_create(
             reference_range_collection=reference_range_collection,
             label=label,
-            grade1=True if 1 in grades else False,
-            grade2=True if 2 in grades else False,
-            grade3=True if 3 in grades else False,
-            grade4=True if 4 in grades else False,
+            grade1=1 in grades,
+            grade2=2 in grades,  # noqa: PLR2004
+            grade3=3 in grades,  # noqa: PLR2004
+            grade4=4 in grades,  # noqa: PLR2004
         )

edc_visit_schedule/site_visit_schedules.py

@@ -95,9 +95,11 @@ class SiteVisitSchedules:
     def get_by_consent_definition(
         self,
         cdef: ConsentDefinition,
-    ) -> tuple[VisitSchedule, Schedule]:
-        """Returns a visit schedule instance or raises."""
-        ret = []
+    ) -> tuple[tuple[VisitSchedule, Schedule], ...]:
+        """Returns a tuple of (visit schedule, schedule instances) that
+        match this cdef or raises.
+        """
+        visit_schedules = []
         attr = "consent_definitions"
         for visit_schedule in self.visit_schedules.values():
             for schedule in visit_schedule.schedules.values():
@@ -109,18 +111,12 @@ class SiteVisitSchedules:
                     ) from e
                 for _cdef in consent_definitions:
                     if _cdef == cdef:
-                        ret.append([visit_schedule, schedule])  # noqa: PERF401
-        if not ret:
+                        visit_schedules.append((visit_schedule, schedule))  # noqa: PERF401
+        if not visit_schedules:
             raise SiteVisitScheduleError(
                 f"Schedule not found. No schedule exists for {attr}={cdef}."
             )
-        if len(ret) > 1:
-            raise SiteVisitScheduleError(
-                f"Schedule is ambiguous. More than one schedule exists for "
-                f"{attr}={cdef}. Got {ret}"
-            )
-        visit_schedule, schedule = ret[0]
-        return visit_schedule, schedule
+        return tuple(visit_schedules)
 
     def get_by_onschedule_model(self, onschedule_model: str) -> tuple[VisitSchedule, Schedule]:
         """Returns a tuple of (visit_schedule, schedule)