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

edc_utils/text.py

@@ -1,7 +1,6 @@
 import random
 import re
 from datetime import datetime
-from typing import Optional
 from zoneinfo import ZoneInfo
 
 from django.conf import settings
@@ -12,7 +11,7 @@ safe_allowed_chars = "ABCDEFGHKMNPRTUVWXYZ2346789"
 def get_safe_random_string(length=12, safe=None, allowed_chars=None):
     safe = True if safe is None else safe
     allowed_chars = allowed_chars or (
-        "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL" "MNOPQRTUVWXYZ012346789!@#%^&*()?<>.,[]{}"
+        "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRTUVWXYZ012346789!@#%^&*()?<>.,[]{}"
     )
     if safe:
         allowed_chars = "ABCDEFGHKMNPRTUVWXYZ2346789"
@@ -64,10 +63,10 @@ def convert_from_camel(name):
 
 
 def formatted_datetime(
-    aware_datetime: Optional[datetime],
-    php_dateformat: Optional[str] = None,
-    tz: Optional[str] = None,
-    format_as_date: Optional[bool] = None,
+    aware_datetime: datetime | None,
+    php_dateformat: str | None = None,
+    tz: str | None = None,
+    format_as_date: bool | None = None,
 ):
     """Returns a formatted datetime string, localized by default.
 

edc_view_utils/__init__.py

@@ -8,6 +8,9 @@ from .query_button import QueryButton
 from .render_history_and_query_buttons import render_history_and_query_buttons
 
 __all__ = [
+    "ADD",
+    "CHANGE",
+    "VIEW",
     "DashboardModelButton",
     "HistoryButton",
     "ModelButton",
@@ -16,7 +19,4 @@ __all__ = [
     "PrnButton",
     "QueryButton",
     "render_history_and_query_buttons",
-    "ADD",
-    "CHANGE",
-    "VIEW",
 ]

edc_view_utils/dashboard_model_button.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 from uuid import UUID
 
 from .model_button import ModelButton
@@ -15,9 +15,9 @@ if TYPE_CHECKING:
     from edc_metadata.models import CrfMetadata, RequisitionMetadata
     from edc_model.models import BaseUuidModel
 
-    class CrfModel(CrfModelMixin, BaseUuidModel): ...  # noqa
+    class CrfModel(CrfModelMixin, BaseUuidModel): ...
 
-    class RequisitionModel(RequisitionModelMixin, BaseUuidModel): ...  # noqa
+    class RequisitionModel(RequisitionModelMixin, BaseUuidModel): ...
 
 
 __all__ = ["DashboardModelButton"]
@@ -38,7 +38,7 @@ class DashboardModelButton(ModelButton):
     metadata_model_obj: CrfMetadata | RequisitionMetadata = None
     appointment: Appointment = None
     next_url_name: str = field(default="subject_dashboard_url")
-    model_cls: Type[CrfModel | RequisitionModel] = field(default=None, init=False)
+    model_cls: type[CrfModel | RequisitionModel] = field(default=None, init=False)
 
     def __post_init__(self):
         self.model_cls = self.metadata_model_obj.model_cls

edc_view_utils/model_button.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 from django.core.handlers.wsgi import WSGIRequest
@@ -28,7 +28,7 @@ ADD: int = 0
 CHANGE = 1
 VIEW = 2
 
-__all__ = ["ModelButton", "ADD", "CHANGE", "VIEW"]
+__all__ = ["ADD", "CHANGE", "VIEW", "ModelButton"]
 
 
 class ModelButtonError(Exception):
@@ -39,7 +39,7 @@ class ModelButtonError(Exception):
 class ModelButton:
     user: User = None
     model_obj: Model = None
-    model_cls: Type[Model] = field(default=None)
+    model_cls: type[Model] = field(default=None)
     current_site: Site = None
     subject_identifier: str | None = None
     request: WSGIRequestObject | None = None
@@ -104,11 +104,10 @@ class ModelButton:
     @property
     def disabled(self) -> str:
         disabled = "disabled"
-        if not self.model_obj and self.perms.add:
+        if (not self.model_obj and self.perms.add) or (
+            self.model_obj and (self.perms.change or self.perms.view)
+        ):
             disabled = ""
-        else:
-            if self.model_obj and (self.perms.change or self.perms.view):
-                disabled = ""
         return disabled
 
     @property
@@ -116,7 +115,7 @@ class ModelButton:
         btn_id = f"{self.model_cls._meta.label_lower.split('.')[1]}-{uuid4().hex}"
         if self.model_obj:
             btn_id = (
-                f"{self.model_cls._meta.label_lower.split('.')[1]}-" f"{self.model_obj.id.hex}"
+                f"{self.model_cls._meta.label_lower.split('.')[1]}-{self.model_obj.id.hex}"
             )
         return btn_id
 

edc_view_utils/perms.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import InitVar, dataclass, field
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.contrib.auth import get_permission_codename
 
@@ -60,7 +60,7 @@ class Perms:
     """
 
     user: User = None
-    model_cls: InitVar[Type[models.Model]] = None
+    model_cls: InitVar[type[models.Model]] = None
     current_site: Site = None
     site: Site = None
     add: bool = field(default=False, init=False)
@@ -70,7 +70,7 @@ class Perms:
     view_only: bool = field(default=False, init=False)
     _site_perms: SitePerms = field(default=None, init=False)
 
-    def __post_init__(self, model_cls: Type[models.Model]):
+    def __post_init__(self, model_cls: type[models.Model]):
         # self.user = get_object_or_404(User, pk=self.user.id)
         # set add, change, delete, view attrs for this user
         # based on the model class

edc_visit_schedule/action_items.py

@@ -11,10 +11,10 @@ class OffscheduleAction(ActionWithNotification):
     name = OFFSCHEDULE_ACTION
     display_name = "Submit Off-Schedule"
     notification_display_name = "Off-Schedule"
-    parent_action_names = [
+    parent_action_names = (
         DEATH_REPORT_ACTION,
         LTFU_ACTION,
-    ]
+    )
     reference_model = "edc_visit_schedule.offschedule"
     show_link_to_changelist = True
     admin_site_name = "edc_visit_schedule_admin"

edc_visit_schedule/admin/list_filters.py

@@ -11,7 +11,7 @@ class ScheduleStatusListFilter(SimpleListFilter):
     title = "Schedule status"
     parameter_name = "schedule_status"
 
-    def lookups(self, request, model_admin):
+    def lookups(self, request, model_admin):  # noqa: ARG002
         names = []
         qs = (
             SubjectScheduleHistory.objects.values(
@@ -20,13 +20,15 @@ class ScheduleStatusListFilter(SimpleListFilter):
             .order_by("schedule_name", "onschedule_model", "offschedule_model")
             .annotate(cnt=Count("schedule_name"))
         )
-        for obj in qs:
-            names.append(
-                (f"{obj.get('schedule_name')}__on", f"On: {obj.get('schedule_name')}")
-            )
-        for obj in qs:
-            names.append(
-                (f"{obj.get('schedule_name')}__off", f"Off: {obj.get('schedule_name')}")
+        for s in ["on", "off"]:
+            names.extend(
+                [
+                    (
+                        f"{obj.get('schedule_name')}__{s}",
+                        f"{s.title()}: {obj.get('schedule_name')}",
+                    )
+                    for obj in qs
+                ]
             )
         return tuple(names)
 
@@ -37,7 +39,7 @@ class ScheduleStatusListFilter(SimpleListFilter):
             schedule_name=schedule_name, offschedule_datetime__isnull=status == "on"
         ).values_list("subject_identifier", flat=True)
 
-    def queryset(self, request, queryset):
+    def queryset(self, request, queryset):  # noqa: ARG002
         if self.value() and self.value() != "none":
             queryset = queryset.filter(subject_identifier__in=self.subject_identifiers)
         return queryset

edc_visit_schedule/admin/subject_schedule_history_admin.py

@@ -61,25 +61,23 @@ class SubjectScheduleHistoryAdmin(
             "offschedule_datetime",
             "visit_schedule_name",
             "schedule_name",
-        ) + list_filter
+            *list_filter,
+        )
 
     def get_readonly_fields(self, request, obj=None) -> tuple:
         fields = super().get_readonly_fields(request, obj=obj)
-        fields = (
-            fields
-            + (
-                "subject_identifier",
-                "visit_schedule_name",
-                "schedule_name",
-                "schedule_status",
-                "onschedule_datetime",
-                "offschedule_datetime",
-                "onschedule_model",
-                "offschedule_model",
-            )
-            + audit_fields
+        return (
+            *fields,
+            "subject_identifier",
+            "visit_schedule_name",
+            "schedule_name",
+            "schedule_status",
+            "onschedule_datetime",
+            "offschedule_datetime",
+            "onschedule_model",
+            "offschedule_model",
+            *audit_fields,
         )
-        return fields
 
     def dashboard(self, obj=None, label=None) -> str:
         try:

edc_visit_schedule/admin/visit_schedule_admin.py

@@ -1,5 +1,3 @@
-from typing import Tuple
-
 from django.contrib.admin.decorators import register
 from django_audit_fields.admin import audit_fieldset_tuple
 
@@ -39,7 +37,7 @@ class VisitScheduleAdmin(SimpleHistoryAdmin):
         "visit_name",
     )
 
-    def get_list_display(self, request) -> Tuple[str, ...]:
+    def get_list_display(self, request) -> tuple[str, ...]:
         list_display = super().get_list_display(request)
         return (
             "visit_schedule_name",
@@ -49,18 +47,20 @@ class VisitScheduleAdmin(SimpleHistoryAdmin):
             "visit_name",
             "timepoint",
             "active",
-        ) + list_display
+            *list_display,
+        )
 
-    def get_list_filter(self, request) -> Tuple[str, ...]:
+    def get_list_filter(self, request) -> tuple[str, ...]:
         list_filter = super().get_list_filter(request)
         return (
             "active",
             "visit_schedule_name",
             "schedule_name",
             "visit_code",
-        ) + list_filter
+            *list_filter,
+        )
 
     @staticmethod
-    def populate_visit_schedule(request, queryset) -> None:
+    def populate_visit_schedule(request, queryset) -> None:  # noqa: ARG004
         VisitSchedule.objects.update(active=False)
         site_visit_schedules.to_model(VisitSchedule)

edc_visit_schedule/fieldsets.py

@@ -1,22 +1,20 @@
-from typing import Dict, Tuple
-
-visit_schedule_fields: Tuple[str, ...] = (
+visit_schedule_fields: tuple[str, ...] = (
     "visit_schedule_name",
     "schedule_name",
     "visit_code",
 )
 
-visit_schedule_fieldset_tuple: Tuple[str, Dict[str, Tuple[str, ...]]] = (
+visit_schedule_fieldset_tuple: tuple[str, dict[str, tuple[str, ...]]] = (
     "Visit Schedule",
     {"classes": ("collapse",), "fields": visit_schedule_fields},
 )
 
-visit_schedule_only_fields: Tuple[str, ...] = (
+visit_schedule_only_fields: tuple[str, ...] = (
     "visit_schedule_name",
     "schedule_name",
 )
 
-visit_schedule_only_fieldset_tuple: Tuple[str, Dict[str, Tuple[str, ...]]] = (
+visit_schedule_only_fieldset_tuple: tuple[str, dict[str, tuple[str, ...]]] = (
     "Visit Schedule",
     {"classes": ("collapse",), "fields": visit_schedule_only_fields},
 )

edc_visit_schedule/management/commands/find_invalid_onschedules.py

@@ -27,7 +27,7 @@ class Command(BaseCommand):
         for visit_schedule in site_visit_schedules.visit_schedules.values():
             for schedule in visit_schedule.schedules.values():
                 try:
-                    onschedule_model_cls = getattr(schedule, "onschedule_model_cls")
+                    onschedule_model_cls = schedule.onschedule_model_cls
                 except LookupError:
                     pass
                 else:

edc_visit_schedule/model_mixins/off_schedule_model_mixin.py

@@ -89,4 +89,6 @@ class OffScheduleModelMixin(UniqueSubjectIdentifierFieldMixin, models.Model):
 
     class Meta:
         abstract = True
-        indexes = [models.Index(fields=["subject_identifier", "offschedule_datetime", "site"])]
+        indexes = (
+            models.Index(fields=["subject_identifier", "offschedule_datetime", "site"]),
+        )

edc_visit_schedule/model_mixins/on_schedule_model_mixin.py

@@ -89,4 +89,4 @@ class OnScheduleModelMixin(UniqueSubjectIdentifierFieldMixin, models.Model):
 
     class Meta:
         abstract = True
-        indexes = [models.Index(fields=["subject_identifier", "onschedule_datetime", "site"])]
+        indexes = (models.Index(fields=["subject_identifier", "onschedule_datetime", "site"]),)

edc_visit_schedule/modelform_mixins/__init__.py

@@ -3,7 +3,7 @@ from .off_schedule_modelform_mixin import OffScheduleModelFormMixin
 from .visit_schedule_non_crf_modelform_mixin import VisitScheduleNonCrfModelFormMixin
 
 __all__ = [
-    "VisitScheduleCrfModelFormMixin",
     "OffScheduleModelFormMixin",
+    "VisitScheduleCrfModelFormMixin",
     "VisitScheduleNonCrfModelFormMixin",
 ]

edc_visit_schedule/modelform_mixins/off_schedule_modelform_mixin.py

@@ -43,8 +43,7 @@ class OffScheduleModelFormMixin(VisitScheduleNonCrfModelFormMixin):
     def offschedule_datetime(self) -> datetime | None:
         if self.offschedule_datetime_field_attr in self.cleaned_data:
             return to_utc(self.cleaned_data.get(self.offschedule_datetime_field_attr))
-        else:
-            return getattr(self.instance, self.offschedule_datetime_field_attr)
+        return getattr(self.instance, self.offschedule_datetime_field_attr)
 
     @property
     def offschedule_compare_dates_as_datetimes(self):

edc_visit_schedule/models/subject_schedule_history.py

@@ -108,5 +108,6 @@ class SubjectScheduleHistory(
             )
         ]
         indexes = (
-            BaseUuidModel.Meta.indexes + NonUniqueSubjectIdentifierFieldMixin.Meta.indexes
+            *BaseUuidModel.Meta.indexes,
+            *NonUniqueSubjectIdentifierFieldMixin.Meta.indexes,
         )

edc_visit_schedule/models/visit_schedule.py

@@ -56,7 +56,7 @@ class VisitSchedule(VisitScheduleMethodsModelMixin, edc_models.BaseUuidModel):
             ("visit_schedule_name", "schedule_name", "visit_code"),
             ("visit_schedule_name", "schedule_name", "timepoint"),
         )
-        indexes = [
+        indexes = (
             models.Index(
                 fields=[
                     "visit_schedule_name",
@@ -67,4 +67,4 @@ class VisitSchedule(VisitScheduleMethodsModelMixin, edc_models.BaseUuidModel):
                 ]
             ),
             models.Index(fields=["visit_schedule_name", "schedule_name", "timepoint"]),
-        ]
+        )

edc_visit_schedule/schedule/schedule.py

@@ -4,7 +4,7 @@ import re
 from copy import deepcopy
 from datetime import datetime
 from decimal import Decimal
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
 
@@ -64,7 +64,7 @@ class Schedule:
 
     name_regex = r"[a-z0-9\_\-]+$"
     visit_cls = Visit
-    visit_collection_cls: Type[VisitCollection] = VisitCollection
+    visit_collection_cls: type[VisitCollection] = VisitCollection
     window_cls = Window
 
     def __init__(
@@ -87,8 +87,7 @@ class Schedule:
                 f"Invalid name. Got '{name}'. May only contains numbers, "
                 "lower case letters and '_'."
             )
-        else:
-            self.name = name
+        self.name = name
 
         self.consent_definitions = consent_definitions
 
@@ -250,8 +249,8 @@ class Schedule:
         if schedule.name != self.name:
             raise ValueError(
                 f"Site visit schedules return the wrong schedule object. "
-                f"Expected {repr(self)} for onschedule_model={self.onschedule_model}. "
-                f"Got {repr(schedule)}."
+                f"Expected {self!r} for onschedule_model={self.onschedule_model}. "
+                f"Got {schedule!r}."
             )
         return SubjectSchedule(
             subject_identifier, visit_schedule=visit_schedule, schedule=self
@@ -283,7 +282,7 @@ class Schedule:
         ]
         if not consent_definition:
             raise ScheduleError(
-                "Consent definition may not be None. Expected one of " f"{formatted_cdefs}."
+                f"Consent definition may not be None. Expected one of {formatted_cdefs}."
             )
 
         if consent_definition not in self.consent_definitions:
@@ -324,11 +323,11 @@ class Schedule:
         return self.window_cls(name=self.name, visits=self.visits, **kwargs).datetime_in_window
 
     @property
-    def onschedule_model_cls(self) -> Type[OnSchedule]:
+    def onschedule_model_cls(self) -> type[OnSchedule]:
         return django_apps.get_model(self.onschedule_model)
 
     @property
-    def offschedule_model_cls(self) -> Type[OffSchedule]:
+    def offschedule_model_cls(self) -> type[OffSchedule]:
         return django_apps.get_model(self.offschedule_model)
 
     @property
@@ -340,15 +339,15 @@ class Schedule:
         return self.loss_to_followup_model_cls
 
     @property
-    def history_model_cls(self) -> Type[SubjectScheduleHistory]:
+    def history_model_cls(self) -> type[SubjectScheduleHistory]:
         return django_apps.get_model(self.history_model)
 
     @property
-    def appointment_model_cls(self) -> Type[Appointment]:
+    def appointment_model_cls(self) -> type[Appointment]:
         return django_apps.get_model(self.appointment_model)
 
     @property
-    def visit_model_cls(self) -> Type[RelatedVisitModel]:
+    def visit_model_cls(self) -> type[RelatedVisitModel]:
         return self.appointment_model_cls.related_visit_model_cls()
 
     def get_consent_definition(

edc_visit_schedule/schedule/visit_collection.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 from datetime import datetime
 from typing import TYPE_CHECKING
 
+from edc_utils import to_local
+
 from ..ordered_collection import OrderedCollection
 
 if TYPE_CHECKING:
@@ -33,11 +35,10 @@ class VisitCollection(OrderedCollection):
         timepoint_dates = {}
         for visit in self.values():
             try:
-                timepoint_datetime = dt + visit.rbase
+                timepoint_datetime = to_local(dt) + visit.rbase
             except TypeError as e:
                 raise VisitCollectionError(
-                    f"Invalid visit.rbase. visit.rbase={visit.rbase}. "
-                    f"See {repr(visit)}. Got {e}."
+                    f"Invalid visit.rbase. visit.rbase={visit.rbase}. See {visit!r}. Got {e}."
                 )
             else:
                 visit.timepoint_datetime = timepoint_datetime

edc_visit_schedule/schedule/window.py

@@ -2,8 +2,13 @@ from dateutil.relativedelta import relativedelta
 from django.conf import settings
 from django.utils.translation import gettext as _
 
-from edc_utils import convert_php_dateformat, floor_secs, formatted_date, to_utc
-from edc_utils.date import to_local
+from edc_utils import (
+    ceil_secs,
+    convert_php_dateformat,
+    floor_secs,
+    formatted_date,
+    to_local,
+)
 
 from ..exceptions import (
     ScheduledVisitWindowError,
@@ -30,11 +35,11 @@ class Window:
     ):
         self.name = name
         self.visits = visits
-        self.timepoint_datetime = to_utc(timepoint_datetime)
-        self.dt = to_utc(dt)
+        self.timepoint_datetime = to_local(timepoint_datetime)
+        self.dt = to_local(dt)
         self.visit_code = visit_code
         self.visit_code_sequence = visit_code_sequence
-        self.baseline_timepoint_datetime = to_utc(baseline_timepoint_datetime)
+        self.baseline_timepoint_datetime = to_local(baseline_timepoint_datetime)
 
     @property
     def datetime_in_window(self):
@@ -71,19 +76,21 @@ class Window:
         window period for a scheduled `visit` otherwise
         raises an exception.
 
+        Ensure all datetimes in UTC before comparison.
+
         In this case, `visit` is the object from schedule and
         not a model instance.
         """
         visit = self.visits.get(self.visit_code)
         visit.timepoint_datetime = self.timepoint_datetime
         gap_days = self.get_window_gap_days()
-        lower = floor_secs(to_utc(visit.dates.lower) - relativedelta(days=gap_days))
-        upper = floor_secs(to_utc(visit.dates.upper))
-        if not (lower <= floor_secs(to_utc(self.dt)) <= upper):
-            lower_date = to_local(visit.dates.lower).strftime(
+        lower = floor_secs(to_local(visit.dates.lower) - relativedelta(days=gap_days))
+        upper = ceil_secs(to_local(visit.dates.upper))
+        if not (lower <= floor_secs(to_local(self.dt)) <= upper):
+            lower_date = to_local(lower).strftime(
                 convert_php_dateformat(settings.SHORT_DATETIME_FORMAT)
             )
-            upper_date = to_local(visit.dates.upper).strftime(
+            upper_date = to_local(upper).strftime(
                 convert_php_dateformat(settings.SHORT_DATETIME_FORMAT)
             )
             dt = to_local(self.dt).strftime(
@@ -114,8 +121,8 @@ class Window:
             dt=self.baseline_timepoint_datetime
         ).get(next_visit)
         if not (
-            floor_secs(to_utc(self.dt))
-            < floor_secs(to_utc(next_timepoint_datetime - next_visit.rlower))
+            floor_secs(to_local(self.dt))
+            < floor_secs(to_local(next_timepoint_datetime - next_visit.rlower))
         ):
             dt_lower = formatted_date(next_timepoint_datetime - next_visit.rlower)
             dt = formatted_date(self.dt)

edc_visit_schedule/site_visit_schedules.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import copy
 import sys
-from typing import TYPE_CHECKING, Tuple
+from typing import TYPE_CHECKING
 
 from django.apps import apps as django_apps
 from django.core.exceptions import ObjectDoesNotExist
@@ -77,7 +77,7 @@ class SiteVisitSchedules:
             visit_schedule_names = "', '".join(self.registry.keys())
             raise SiteVisitScheduleError(
                 f"Invalid visit schedule name. Got '{visit_schedule_name}'. "
-                f"Expected one of '{visit_schedule_names}'. See {repr(self)}."
+                f"Expected one of '{visit_schedule_names}'. See {self!r}."
             )
         return visit_schedule
 
@@ -116,7 +116,7 @@ class SiteVisitSchedules:
             raise SiteVisitScheduleError(
                 f"Schedule not found. No schedule exists for {attr}={cdef}."
             )
-        elif len(ret) > 1:
+        if len(ret) > 1:
             raise SiteVisitScheduleError(
                 f"Schedule is ambiguous. More than one schedule exists for "
                 f"{attr}={cdef}. Got {ret}"
@@ -126,7 +126,7 @@ class SiteVisitSchedules:
 
     def get_by_onschedule_model(
         self, onschedule_model: str = None
-    ) -> Tuple[VisitSchedule, Schedule]:
+    ) -> tuple[VisitSchedule, Schedule]:
         """Returns a tuple of (visit_schedule, schedule)
         for the given onschedule model.
 
@@ -136,7 +136,7 @@ class SiteVisitSchedules:
 
     def get_by_offschedule_model(
         self, offschedule_model: str = None
-    ) -> Tuple[VisitSchedule, Schedule]:
+    ) -> tuple[VisitSchedule, Schedule]:
         """Returns a tuple of visit_schedule, schedule
         for the given offschedule model.
 
@@ -146,7 +146,7 @@ class SiteVisitSchedules:
 
     def get_by_loss_to_followup_model(
         self, loss_to_followup_model: str = None
-    ) -> Tuple[VisitSchedule, Schedule]:
+    ) -> tuple[VisitSchedule, Schedule]:
         """Returns a tuple of visit_schedule, schedule
         for the given loss_to_followup model.
 
@@ -156,7 +156,7 @@ class SiteVisitSchedules:
 
     def get_by_model(
         self, attr: str = None, model: str = None
-    ) -> Tuple[VisitSchedule, Schedule]:
+    ) -> tuple[VisitSchedule, Schedule]:
         ret = []
         model = model.lower()
         for visit_schedule in self.visit_schedules.values():
@@ -173,7 +173,7 @@ class SiteVisitSchedules:
             raise SiteVisitScheduleError(
                 f"Schedule not found. No schedule exists for {attr}={model}."
             )
-        elif len(ret) > 1:
+        if len(ret) > 1:
             raise SiteVisitScheduleError(
                 f"Schedule is ambiguous. More than one schedule exists for "
                 f"{attr}={model}. Got {ret}"
@@ -313,7 +313,7 @@ class SiteVisitSchedules:
                     before_import_registry = copy.copy(site_visit_schedules._registry)
                     import_module(f"{app}.{module_name}")
                     if verbose:
-                        sys.stdout.write("   - registered visit schedule from " f"'{app}'\n")
+                        sys.stdout.write(f"   - registered visit schedule from '{app}'\n")
                 except Exception as e:
                     if f"No module named '{app}.{module_name}'" not in str(e):
                         raise