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

edc_export/models/plan.py

@@ -21,15 +21,15 @@ class Plan(BaseUuidModel):
 
     model = models.CharField(max_length=50)
 
-    field_names = models.TextField(max_length=500, blank=True, null=True)
+    field_names = models.TextField(max_length=500, blank=True, default="")
 
-    header_labels = models.TextField(max_length=500, blank=True, null=True)
+    header_labels = models.TextField(max_length=500, blank=True, default="")
 
-    lookups = models.TextField(max_length=500, blank=True, null=True)
+    lookups = models.TextField(max_length=500, blank=True, default="")
 
     model_type = models.CharField(max_length=25, choices=MODEL_TYPES, default="plain")
 
-    excluded_field_names = models.TextField(max_length=500, blank=True, null=True)
+    excluded_field_names = models.TextField(max_length=500, blank=True, default="")
 
     header = models.BooleanField(verbose_name="Include header", default=True)
 

edc_export/models/upload_export_receipt_file.py

@@ -34,7 +34,7 @@ class UploadExportReceiptFile(BaseUuidModel):
 
     total = models.IntegerField(default=0, editable=False)
 
-    errors = models.TextField(editable=False, null=True)
+    errors = models.TextField(editable=False, default="")
 
     receipt_datetime = models.DateTimeField(editable=False, null=True)
 
@@ -74,4 +74,4 @@ class UploadExportReceiptFile(BaseUuidModel):
         self.errors = "; ".join(error_list)
 
     class Meta(BaseUuidModel.Meta):
-        indexes = [Index(fields=["created"])]
+        indexes = (Index(fields=["created"]),)

edc_export/utils.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import os
 import re
-from typing import Iterable
+from collections.abc import Iterable
 
 from django import forms
 from django.utils.html import format_html

edc_facility/facility.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from datetime import datetime
 from operator import methodcaller
-from typing import TYPE_CHECKING, Any, List, Tuple, Union
+from typing import TYPE_CHECKING, Any
 from zoneinfo import ZoneInfo
 
 import arrow
@@ -42,7 +42,7 @@ class Facility:
         self.days = []
         self.name = name
         if not name:
-            raise FacilityError(f"Name cannot be None. See {repr(self)}")
+            raise FacilityError(f"Name cannot be None. See {self!r}")
         self.best_effort_available_datetime = (
             True if best_effort_available_datetime is None else best_effort_available_datetime
         )
@@ -53,7 +53,7 @@ class Facility:
                 day = weekday(day)
             self.days.append(day)
         self.slots = slots or [99999 for _ in self.days]
-        self.config = dict(zip([str(d) for d in self.days], self.slots))
+        self.config = dict(zip([str(d) for d in self.days], self.slots, strict=False))
         self.holidays = self.holiday_cls()
 
     def __repr__(self):
@@ -94,7 +94,7 @@ class Facility:
     @staticmethod
     def get_arr_span(
         suggested_arr, forward_delta, reverse_delta
-    ) -> Tuple[List[Union[Arrow, Any]], Arrow, Arrow]:
+    ) -> tuple[list[Arrow | Any], Arrow, Arrow]:
         """Returns a list of arrow objects in a custom ordered.
         Objects are ordered around the suggested date. For example,
         """
@@ -111,7 +111,7 @@ class Facility:
         span_lt = sorted(span_lt, key=methodcaller("date"), reverse=True)
         span_gt = [arw for arw in span if arw.date() > suggested_arr.date()]
         arr_span = []
-        max_len = len(span_gt) if len(span_gt) > len(span_lt) else len(span_lt)
+        max_len = max(len(span_lt), len(span_gt))
         for i in range(0, max_len):
             try:
                 item = span_lt.pop()
@@ -183,7 +183,7 @@ class Facility:
                     f"No available appointment dates at facility for period. "
                     f"Got no available dates within {reverse_delta.days}-"
                     f"{forward_delta.days} days of {formatted_date}. "
-                    f"Facility is {repr(self)}."
+                    f"Facility is {self!r}."
                 )
         available_arr = arrow.Arrow.fromdatetime(
             datetime.combine(available_arr.date(), suggested_arr.time())

edc_facility/holidays.py

@@ -80,11 +80,8 @@ class Holidays:
         if not self._holidays:
             if holidays_disabled():
                 self._holidays = self.model_cls.objects.none()
-            else:
-                if not self.model_cls.objects.filter(country=self.country).exists():
-                    raise HolidayError(
-                        f"No holidays found for '{self.country}. See {self.model}."
-                    )
+            elif not self.model_cls.objects.filter(country=self.country).exists():
+                raise HolidayError(f"No holidays found for '{self.country}. See {self.model}.")
             self._holidays = self.model_cls.objects.filter(country=self.country)
         return self._holidays
 

edc_facility/import_holidays.py

@@ -4,7 +4,7 @@ import csv
 import sys
 from datetime import datetime
 from pathlib import Path
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
@@ -54,7 +54,7 @@ def import_holidays(verbose: bool | None = None, test: bool | None = None) -> No
 
 def check_for_duplicates_in_file(path) -> list:
     """Returns a list of records."""
-    with open(path, "r") as f:
+    with open(path) as f:
         reader = csv.DictReader(f, fieldnames=["local_date", "label", "country"])
         recs = [(row["local_date"], row["country"]) for row in reader]
     if len(recs) != len(list(set(recs))):
@@ -63,7 +63,7 @@ def check_for_duplicates_in_file(path) -> list:
 
 
 def import_file(path: str, recs: list, model_cls: Holiday):
-    with open(path, "r") as f:
+    with open(path) as f:
         reader = csv.DictReader(f, fieldnames=["local_date", "label", "country"])
         for index, row in tqdm(enumerate(reader), total=len(recs)):
             if index == 0:
@@ -72,7 +72,7 @@ def import_file(path: str, recs: list, model_cls: Holiday):
                 local_date = datetime.strptime(row["local_date"], "%Y-%m-%d").date()
             except ValueError as e:
                 raise HolidayImportError(
-                    f"Invalid format when importing from " f"{path}. Got '{e}'"
+                    f"Invalid format when importing from {path}. Got '{e}'"
                 )
             else:
                 try:
@@ -86,7 +86,7 @@ def import_file(path: str, recs: list, model_cls: Holiday):
                     obj.save()
 
 
-def import_for_tests(model_cls: Type[Holiday]):
+def import_for_tests(model_cls: type[Holiday]):
     year = get_utcnow().year
     country = sites.get_current_country()
     if not country:
@@ -115,7 +115,7 @@ def import_for_tests(model_cls: Type[Holiday]):
             local_date = datetime.strptime(row[LOCAL_DATE], "%Y-%m-%d").date()
         except ValueError as e:
             raise HolidayImportError(
-                f"Invalid format when importing holidays (test). " f"Got '{e}'"
+                f"Invalid format when importing holidays (test). Got '{e}'"
             )
         else:
             objs.append(

edc_facility/model_mixins.py

@@ -72,7 +72,7 @@ class HealthFacilityModelMixin(models.Model):
     sat = models.BooleanField()
     sun = models.BooleanField()
 
-    notes = models.TextField(null=True, blank=True)
+    notes = models.TextField(default="", blank=True)
 
     objects = Manager()
 

edc_facility/models/holiday.py

@@ -35,4 +35,4 @@ class Holiday(models.Model):
                 name="%(app_label)s_%(class)s_country_uniq",
             )
         ]
-        indexes = [Index(fields=["name", "country", "local_date"])]
+        indexes = (Index(fields=["name", "country", "local_date"]),)

edc_facility/utils.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
 from django.conf import settings
@@ -16,7 +16,7 @@ def get_holiday_model() -> str:
     return getattr(settings, "EDC_FACILITY_HOLIDAY_MODEL", "edc_facility.holiday")
 
 
-def get_holiday_model_cls() -> Type[Holiday]:
+def get_holiday_model_cls() -> type[Holiday]:
     return django_apps.get_model(get_holiday_model())
 
 
@@ -44,7 +44,7 @@ def get_facility(name: str = None) -> Facility:
     return facility
 
 
-def get_health_facility_model_cls() -> Type[HealthFacility]:
+def get_health_facility_model_cls() -> type[HealthFacility]:
     return django_apps.get_model(get_health_facility_model())
 
 

edc_fieldsets/fieldsets.py

@@ -65,7 +65,7 @@ class Fieldsets:
         try:
             fields = copy.copy(self.fieldsets_asdict[section]["fields"])
         except KeyError:
-            raise FieldsetError("Invalid fieldset section. Got {}".format(section))
+            raise FieldsetError(f"Invalid fieldset section. Got {section}")
         return list(fields)
 
     @staticmethod

edc_form_describer/forms_reference.py

@@ -1,6 +1,5 @@
 from datetime import datetime
 from importlib.metadata import version
-from typing import Optional
 
 from django.apps import apps as django_apps
 from django.conf import settings
@@ -54,8 +53,8 @@ class FormsReference:
 
     def to_file(
         self,
-        path: Optional[str] = None,
-        overwrite: Optional[bool] = None,
+        path: str | None = None,
+        overwrite: bool | None = None,
         pad: int | None = None,
     ):
         pad = pad if pad is not None else 2
@@ -77,9 +76,8 @@ class FormsReference:
             if anchor not in self._anchors:
                 self._anchors.append(anchor)
                 break
-            else:
-                index += 1
-                anchor = anchor_orig + f"-{index}"
+            index += 1
+            anchor = anchor_orig + f"-{index}"
         return anchor
 
     @property
@@ -108,8 +106,7 @@ class FormsReference:
                         describer.markdown.append("\n")
                         anchor = f"{self.get_anchor(describer.anchor)}"
                         toc.append(
-                            f'{index + 1}. <a href="#{anchor}">'
-                            f"{describer.verbose_name}</a>"
+                            f'{index + 1}. <a href="#{anchor}">{describer.verbose_name}</a>'
                         )
                         markdown.extend(describer.markdown)
                     markdown.append(f"{self.h4} Requisitions\n")

edc_form_describer/make_forms_reference.py

@@ -23,7 +23,7 @@ def make_forms_reference(
     path: str | None = None,
 ):
     module = import_module(app_label)
-    admin_site = getattr(getattr(module, "admin_site"), admin_site_name)
+    admin_site = getattr(module.admin_site, admin_site_name)
     visit_schedule = site_visit_schedules.get_visit_schedule(visit_schedule_name)
     title = title or _("%(title_app)s Forms Reference") % dict(title_app=app_label.upper())
     sys.stdout.write(

edc_form_describer/management/commands/make_forms_reference.py

@@ -27,7 +27,7 @@ def update_forms_reference(
     module = import_module(app_label)
     default_doc_folder = Path(settings.BASE_DIR / "docs")
     filename = filename or "forms_reference.md"
-    admin_site = getattr(getattr(module, "admin_site"), admin_site_name)
+    admin_site = getattr(module.admin_site, admin_site_name)
     visit_schedule = site_visit_schedules.get_visit_schedule(visit_schedule_name)
     title = title or _("%(title_app)s Forms Reference") % dict(title_app=app_label.upper())
     sys.stdout.write(

edc_form_label/custom_label_condition.py

@@ -26,7 +26,7 @@ class CustomLabelCondition:
 
         If True, form label will be customized. See`FormLabel`.
         """
-        return None
+        return
 
     def get_additional_options(self, request=None, obj=None, model=None):
         return {}

edc_form_label/form_label.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from .custom_label_condition import CustomFormLabelError
 
@@ -10,7 +10,7 @@ class FormLabel:
     def __init__(self, field=None, custom_label=None, condition_cls=None):
         self.field = field
         self.custom_label = custom_label
-        self.condition_cls: Type[CustomLabelCondition] = condition_cls
+        self.condition_cls: type[CustomLabelCondition] = condition_cls
 
     def get_form_label(self, request=None, obj=None, model=None, form=None):
         """Returns a customized form label, if condition is met,

edc_form_runners/exceptions.py

@@ -1,7 +1,7 @@
 __all__ = [
     "FormRunnerError",
-    "FormRunnerModelAdminNotFound",
     "FormRunnerImproperlyConfigured",
+    "FormRunnerModelAdminNotFound",
     "FormRunnerRegisterError",
 ]
 

edc_form_runners/models/issue.py

@@ -57,7 +57,8 @@ class Issue(BaseUuidModel):
                 name="unique_label_lower_subject_identifier_etc",
             )
         ]
-        indexes = BaseUuidModel.Meta.indexes + [
+        indexes = (
+            *BaseUuidModel.Meta.indexes,
             Index(fields=["label_lower", "field_name", "panel_name", "short_message"]),
             Index(
                 fields=[
@@ -69,4 +70,4 @@ class Issue(BaseUuidModel):
                     "short_message",
                 ],
             ),
-        ]
+        )

edc_form_runners/site.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import sys
 from copy import deepcopy
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
 from django.core.management.color import color_style
@@ -25,7 +25,7 @@ __all__ = ["site_form_runners"]
 
 class SiteFormRunners:
     def __init__(self):
-        self.registry: dict[str, Type[FormRunner]] = {}
+        self.registry: dict[str, type[FormRunner]] = {}
         self.loaded = False
 
     def register(self, runner=None):

edc_form_runners/templatetags/form_runners_extras.py

@@ -12,7 +12,7 @@ if TYPE_CHECKING:
     from edc_crf.model_mixins import CrfModelMixin
     from edc_metadata.models import CrfMetadata, RequisitionMetadata
 
-    class Model(CrfModelMixin, models.Model): ...  # noqa
+    class Model(CrfModelMixin, models.Model): ...
 
 
 register = template.Library()

edc_form_runners/utils.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import cache
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
 from django.conf import settings
@@ -42,7 +42,7 @@ def get_issue_model_cls() -> Issue:
 
 
 @cache
-def get_modeladmins_from_admin_sites() -> dict[str, Type[ModelAdmin]]:
+def get_modeladmins_from_admin_sites() -> dict[str, type[ModelAdmin]]:
     registry = {}
     for admin_site in admin.sites.all_sites:
         registry.update(**get_modeladmins_from_admin_site(admin_site))
@@ -50,7 +50,7 @@ def get_modeladmins_from_admin_sites() -> dict[str, Type[ModelAdmin]]:
 
 
 @cache
-def get_modelforms_from_admin_site(admin_site) -> dict[str, Type[ModelForm]]:
+def get_modelforms_from_admin_site(admin_site) -> dict[str, type[ModelForm]]:
     registry = {}
     for admin_class in admin_site._registry.values():
         registry.update({admin_class.model._meta.label_lower: admin_class.form})
@@ -58,14 +58,14 @@ def get_modelforms_from_admin_site(admin_site) -> dict[str, Type[ModelForm]]:
 
 
 @cache
-def get_modeladmins_from_admin_site(admin_site) -> dict[str, Type[ModelAdmin]]:
+def get_modeladmins_from_admin_site(admin_site) -> dict[str, type[ModelAdmin]]:
     registry = {}
     for admin_class in admin_site._registry.values():
         registry.update({admin_class.model._meta.label_lower: admin_class})
     return registry
 
 
-def get_modeladmin_cls(model_name: str) -> Type[ModelAdmin]:
+def get_modeladmin_cls(model_name: str) -> type[ModelAdmin]:
     return get_modeladmins_from_admin_sites().get(model_name)
 
 

edc_form_validators/applicable_field_validator.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 from edc_constants.constants import NOT_APPLICABLE
 
@@ -13,8 +13,8 @@ class ApplicableFieldValidator(BaseFormValidator):
     def raise_applicable(
         self,
         field,
-        msg: Optional[str] = None,
-        applicable_msg: Optional[str] = None,
+        msg: str | None = None,
+        applicable_msg: str | None = None,
     ) -> None:
         message = {field: applicable_msg or f"This field is applicable. {msg or ''}".strip()}
         self.raise_validation_error(message, APPLICABLE_ERROR)
@@ -22,8 +22,8 @@ class ApplicableFieldValidator(BaseFormValidator):
     def raise_not_applicable(
         self,
         field,
-        msg: Optional[str] = None,
-        not_applicable_msg: Optional[str] = None,
+        msg: str | None = None,
+        not_applicable_msg: str | None = None,
     ) -> None:
         message = {
             field: not_applicable_msg or f"This field is not applicable. {msg or ''}".strip()
@@ -35,11 +35,11 @@ class ApplicableFieldValidator(BaseFormValidator):
         *responses: Any,
         field: str = None,
         field_applicable: str = None,
-        inverse: Optional[bool] = None,
-        is_instance_field: Optional[bool] = None,
-        msg: Optional[str] = None,
-        applicable_msg: Optional[str] = None,
-        not_applicable_msg: Optional[str] = None,
+        inverse: bool | None = None,
+        is_instance_field: bool | None = None,
+        msg: str | None = None,
+        applicable_msg: str | None = None,
+        not_applicable_msg: str | None = None,
         not_applicable_value=None,
     ) -> bool:
         return self.applicable(
@@ -59,11 +59,11 @@ class ApplicableFieldValidator(BaseFormValidator):
         *responses: Any,
         field: str = None,
         field_applicable: str = None,
-        inverse: Optional[bool] = None,
-        is_instance_field: Optional[bool] = None,
-        msg: Optional[str] = None,
-        applicable_msg: Optional[str] = None,
-        not_applicable_msg: Optional[str] = None,
+        inverse: bool | None = None,
+        is_instance_field: bool | None = None,
+        msg: str | None = None,
+        applicable_msg: str | None = None,
+        not_applicable_msg: str | None = None,
         not_applicable_value=None,
     ) -> bool:
         return self.not_applicable(
@@ -87,7 +87,7 @@ class ApplicableFieldValidator(BaseFormValidator):
         field_applicable_value = self.get(field_applicable)
 
         if field_value in responses and (
-            (field_applicable_value and field_applicable_value is not None)
+            field_applicable_value and field_applicable_value is not None
         ):
             self.raise_not_applicable(field_applicable)
         return False
@@ -97,11 +97,11 @@ class ApplicableFieldValidator(BaseFormValidator):
         *responses: Any,
         field: str = None,
         field_applicable: str = None,
-        inverse: Optional[bool] = None,
-        is_instance_field: Optional[bool] = None,
-        msg: Optional[str] = None,
-        applicable_msg: Optional[str] = None,
-        not_applicable_msg: Optional[str] = None,
+        inverse: bool | None = None,
+        is_instance_field: bool | None = None,
+        msg: str | None = None,
+        applicable_msg: str | None = None,
+        not_applicable_msg: str | None = None,
         not_applicable_value=None,
     ) -> bool:
         """Returns False or raises a validation error for field
@@ -135,11 +135,11 @@ class ApplicableFieldValidator(BaseFormValidator):
         *responses: Any,
         field: str = None,
         field_applicable: str = None,
-        inverse: Optional[bool] = None,
-        is_instance_field: Optional[bool] = None,
-        msg: Optional[str] = None,
-        applicable_msg: Optional[str] = None,
-        not_applicable_msg: Optional[str] = None,
+        inverse: bool | None = None,
+        is_instance_field: bool | None = None,
+        msg: str | None = None,
+        applicable_msg: str | None = None,
+        not_applicable_msg: str | None = None,
         not_applicable_value=None,
     ) -> bool:
         """Returns False or raises a validation error for field
@@ -166,9 +166,9 @@ class ApplicableFieldValidator(BaseFormValidator):
         self,
         condition: bool,
         field_applicable: str = None,
-        applicable_msg: Optional[str] = None,
-        not_applicable_msg: Optional[str] = None,
-        inverse: Optional[bool] = None,
+        applicable_msg: str | None = None,
+        not_applicable_msg: str | None = None,
+        inverse: bool | None = None,
         not_applicable_value=None,
     ) -> bool:
         inverse = True if inverse is None else inverse
@@ -189,9 +189,9 @@ class ApplicableFieldValidator(BaseFormValidator):
         self,
         condition: bool,
         field_applicable: str = None,
-        applicable_msg: Optional[str] = None,
-        not_applicable_msg: Optional[str] = None,
-        inverse: Optional[bool] = None,
+        applicable_msg: str | None = None,
+        not_applicable_msg: str | None = None,
+        inverse: bool | None = None,
         not_applicable_value=None,
     ) -> bool:
         inverse = True if inverse is None else inverse

edc_form_validators/base_form_validator.py

@@ -45,7 +45,7 @@ class BaseFormValidator:
         self.data = {}
         if cleaned_data is None:
             raise ModelFormFieldValidatorError(
-                f"{repr(self)}. Expected a cleaned_data dictionary. Got None."
+                f"{self!r}. Expected a cleaned_data dictionary. Got None."
             )
         self.cleaned_data = copy(cleaned_data)
         self.original_cleaned_data = copy(cleaned_data)

edc_form_validators/extra_mixins/study_day_form_validator.py

@@ -29,7 +29,7 @@ class StudyDayFormValidatorMixin:
             except AttributeError:
                 pass
             if not subject_identifier or self.subject_identifier:
-                raise ValueError(f"Subject identifier cannot be None. See {repr(self)}")
+                raise ValueError(f"Subject identifier cannot be None. See {self!r}")
             registered_subject_model_cls = django_apps.get_model(
                 "edc_registration.registeredsubject"
             )