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

edc_qareports/models/note.py

@@ -21,11 +21,11 @@ class Note(NonUniqueSubjectIdentifierFieldMixin, NoteModelMixin):
     class Meta(BaseUuidModel.Meta):
         verbose_name = "Note"
         verbose_name_plural = "Notes"
-        constraints = [
+        constraints = (
             UniqueConstraint(
                 fields=["report_model", "subject_identifier"],
                 name="%(app_label)s_%(class)s_report_model_subj_uniq",
-            )
-        ]
+            ),
+        )
         indexes = BaseUuidModel.Meta.indexes
-        default_permissions = default_permissions + ("viewallsites",)
+        default_permissions = *default_permissions, "viewallsites"

edc_qareports/models/qa_reports_log.py

@@ -1,7 +1,6 @@
 from django.contrib.sites.models import Site
 from django.db import models
-
-from edc_utils import get_utcnow
+from django.utils import timezone
 
 from ..model_mixins import qa_reports_permissions
 
@@ -10,7 +9,7 @@ class QaReportLog(models.Model):
     username = models.CharField(max_length=100)
     site = models.ForeignKey(Site, on_delete=models.CASCADE)
     report_model = models.CharField(max_length=100)
-    accessed = models.DateTimeField(default=get_utcnow)
+    accessed = models.DateTimeField(default=timezone.now)
 
     class Meta:
         verbose_name = "QA Report Log"

edc_randomization/admin.py

@@ -1,3 +1,5 @@
+import contextlib
+
 from django.conf import settings
 from django.contrib import admin
 from django.contrib.admin.sites import AlreadyRegistered
@@ -65,7 +67,8 @@ class RandomizationListModelAdmin(TemplatesModelAdminMixin, admin.ModelAdmin):
 
     def get_readonly_fields(self, request, obj=None):
         readonly_fields = super().get_readonly_fields(request, obj=obj)
-        readonly_fields += (
+        readonly_fields = (
+            *readonly_fields,
             "subject_identifier",
             "sid",
             "site_name",
@@ -75,7 +78,8 @@ class RandomizationListModelAdmin(TemplatesModelAdminMixin, admin.ModelAdmin):
             "allocated_datetime",
             "allocated_site",
             "randomizer_name",
-        ) + audit_fields
+            *audit_fields,
+        )
         return tuple(set(readonly_fields))
 
     def get_queryset(self, request):
@@ -90,7 +94,7 @@ class RandomizationListModelAdmin(TemplatesModelAdminMixin, admin.ModelAdmin):
         return qs
 
     def get_list_display(self, request) -> tuple[str, ...]:
-        list_display = [
+        fields = (
             "sid",
             "assignment",
             "site_name",
@@ -98,22 +102,24 @@ class RandomizationListModelAdmin(TemplatesModelAdminMixin, admin.ModelAdmin):
             "allocated_datetime",
             "allocated_site",
             "randomizer_name",
-        ]
+        )
+        if flds := site_randomizers.get_by_model(
+            self.model._meta.label_lower
+        ).get_extra_list_display():
+            fields = list(fields)
+            for pos, fname in flds:
+                fields.insert(pos, fname)
+            fields = tuple(fields)
         if user_is_blinded(request.user.username) or (
             not user_is_blinded(request.user.username)
             and RANDO_UNBLINDED not in [g.name for g in request.user.groups.all()]
         ):
-            list_display.remove("assignment")
-        if flds := site_randomizers.get_by_model(
-            self.model._meta.label_lower
-        ).get_extra_list_display():
-            for pos, fldname in flds:
-                list_display.insert(pos, fldname)
-        return tuple(list_display)
+            fields = tuple([fname for fname in fields if fname != "assignment"])
+        return fields
 
     @staticmethod
     def get_fieldnames(request) -> tuple[str, ...]:
-        fields = [
+        fields = (
             "subject_identifier",
             "sid",
             "assignment",
@@ -122,33 +128,35 @@ class RandomizationListModelAdmin(TemplatesModelAdminMixin, admin.ModelAdmin):
             "allocated_datetime",
             "allocated_site",
             "randomizer_name",
-        ]
+        )
         if user_is_blinded(request.user.username) or (
             not user_is_blinded(request.user.username)
             and RANDO_UNBLINDED not in [g.name for g in request.user.groups.all()]
         ):
-            fields.remove("assignment")
-        return tuple(fields)
+            fields = tuple([fname for fname in fields if fname != "assignment"])
+        return fields
 
     def get_list_filter(self, request) -> tuple[str, ...]:
-        list_filter = [
+        fields = (
             "assignment",
             "allocated_datetime",
             "allocated_site",
             "site_name",
             "randomizer_name",
-        ]
+        )
         if flds := site_randomizers.get_by_model(
             self.model._meta.label_lower
         ).get_extra_list_filter():
-            for pos, fldname in flds:
-                list_filter.insert(pos, fldname)
+            fields = list(fields)
+            for pos, fname in flds:
+                fields.insert(pos, fname)
+            fields = tuple(fields)
         if user_is_blinded(request.user.username) or (
             not user_is_blinded(request.user.username)
             and RANDO_UNBLINDED not in [g.name for g in request.user.groups.all()]
         ):
-            list_filter.remove("assignment")
-        return tuple(list_filter)
+            fields = tuple([fname for fname in fields if fname != "assignment"])
+        return fields
 
 
 def register_admin():
@@ -156,10 +164,8 @@ def register_admin():
     for randomizer_cls in site_randomizers._registry.values():
         model = randomizer_cls.model_cls()
         admin_cls = type(f"{model.__name__}ModelAdmin", (RandomizationListModelAdmin,), {})
-        try:
+        with contextlib.suppress(AlreadyRegistered):
             edc_randomization_admin.register(model, admin_cls)
-        except AlreadyRegistered:
-            pass
 
 
 register_admin()

edc_randomization/auths.py

@@ -9,11 +9,16 @@ from .auth_objects import (
     update_rando_group_permissions,
 )
 
-site_auths.add_post_update_func(
-    "edc_randomization", remove_default_model_permissions_from_edc_permissions
-)
 
-site_auths.add_group(get_rando_permissions_codenames, name=RANDO_BLINDED, view_only=True)
-site_auths.add_group(get_rando_permissions_codenames, name=RANDO_UNBLINDED, view_only=True)
-site_auths.add_post_update_func("edc_randomization", update_rando_group_permissions)
-site_auths.add_post_update_func("edc_randomization", make_randomizationlist_view_only)
+def update_site_auths() -> None:
+    site_auths.add_post_update_func(
+        "edc_randomization", remove_default_model_permissions_from_edc_permissions
+    )
+
+    site_auths.add_group(get_rando_permissions_codenames, name=RANDO_BLINDED, view_only=True)
+    site_auths.add_group(get_rando_permissions_codenames, name=RANDO_UNBLINDED, view_only=True)
+    site_auths.add_post_update_func("edc_randomization", update_rando_group_permissions)
+    site_auths.add_post_update_func("edc_randomization", make_randomizationlist_view_only)
+
+
+update_site_auths()

edc_randomization/decorators.py

@@ -8,7 +8,7 @@ class RegisterRandomizerError(Exception):
     pass
 
 
-def register(site=None, **kwargs) -> Any:  # noqa
+def register(site=None, **kwargs) -> Any:
     """Registers a randomizer class."""
     site = site or site_randomizers
 

edc_randomization/migrations/0001_initial.py

@@ -12,6 +12,7 @@ import django_revision.revision_field
 from django.db import migrations, models
 
 import edc_sites.models
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -38,14 +39,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (

edc_randomization/migrations/0002_historicalrandomizationlist.py

@@ -13,6 +13,7 @@ import django_revision.revision_field
 import simple_history.models
 from django.conf import settings
 from django.db import migrations, models
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -41,14 +42,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (

edc_randomization/migrations/0009_edcpermissions.py

@@ -7,6 +7,7 @@ import django_audit_fields.fields.uuid_auto_field
 import django_audit_fields.models.audit_model_mixin
 import django_revision.revision_field
 from django.db import migrations, models
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):
@@ -33,14 +34,14 @@ class Migration(migrations.Migration):
                     "created",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (
                     "modified",
                     models.DateTimeField(
                         blank=True,
-                        default=django_audit_fields.models.audit_model_mixin.utcnow,
+                        default=django.utils.timezone.now,
                     ),
                 ),
                 (

edc_randomization/migrations/0014_alter_edcpermissions_device_created_and_more.py

@@ -0,0 +1,141 @@
+# Generated by Django 5.2.6 on 2025-09-17 16:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("edc_randomization", "0013_alter_edcpermissions_revision_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="edcpermissions",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="edcpermissions",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="edcpermissions",
+            name="locale_created",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale created",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="edcpermissions",
+            name="locale_modified",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale modified",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalrandomizationlist",
+            name="allocated_user",
+            field=models.CharField(default="", max_length=50),
+        ),
+        migrations.AlterField(
+            model_name="historicalrandomizationlist",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalrandomizationlist",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalrandomizationlist",
+            name="locale_created",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale created",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalrandomizationlist",
+            name="locale_modified",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale modified",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalrandomizationlist",
+            name="verified_user",
+            field=models.CharField(default="", max_length=50),
+        ),
+        migrations.AlterField(
+            model_name="randomizationlist",
+            name="allocated_user",
+            field=models.CharField(default="", max_length=50),
+        ),
+        migrations.AlterField(
+            model_name="randomizationlist",
+            name="device_created",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device created"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="randomizationlist",
+            name="device_modified",
+            field=models.CharField(
+                blank=True, default="", max_length=10, verbose_name="Device modified"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="randomizationlist",
+            name="locale_created",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale created",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="randomizationlist",
+            name="locale_modified",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="Auto-updated by Modeladmin",
+                max_length=10,
+                verbose_name="Locale modified",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="randomizationlist",
+            name="verified_user",
+            field=models.CharField(default="", max_length=50),
+        ),
+    ]

edc_randomization/model_mixins.py

@@ -34,7 +34,7 @@ class RandomizationListModelMixin(models.Model):
 
     randomizer_name = models.CharField(max_length=50, default="default")
 
-    subject_identifier = models.CharField(
+    subject_identifier = models.CharField(  # noqa: DJ001
         verbose_name="Subject Identifier", max_length=50, null=True, unique=True
     )
 
@@ -48,7 +48,7 @@ class RandomizationListModelMixin(models.Model):
 
     allocated_datetime = models.DateTimeField(null=True)
 
-    allocated_user = models.CharField(max_length=50, null=True)
+    allocated_user = models.CharField(max_length=50, default="")
 
     allocated_site = models.ForeignKey(
         Site, null=True, on_delete=models.PROTECT, related_name="+"
@@ -58,7 +58,7 @@ class RandomizationListModelMixin(models.Model):
 
     verified_datetime = models.DateTimeField(null=True)
 
-    verified_user = models.CharField(max_length=50, null=True)
+    verified_user = models.CharField(max_length=50, default="")
 
     objects = RandomizationListManager()
 
@@ -74,14 +74,14 @@ class RandomizationListModelMixin(models.Model):
         try:
             self.assignment_description
         except RandomizationError as e:
-            raise RandomizationListModelError(e)
+            raise RandomizationListModelError(e) from e
         try:
             Site.objects.get(name=self.site_name)
-        except ObjectDoesNotExist:
+        except ObjectDoesNotExist as e:
             site_names = [obj.name for obj in Site.objects.all()]
             raise RandomizationListModelError(
                 f"Invalid site name. Got {self.site_name}. Expected one of {site_names}."
-            )
+            ) from e
         super().save(*args, **kwargs)
 
     @property
@@ -109,10 +109,10 @@ class RandomizationListModelMixin(models.Model):
 
     class Meta:
         abstract = True
-        constraints = [
+        constraints = (
             UniqueConstraint(
                 fields=["site_name", "sid"],
                 name="%(app_label)s_%(class)s_site_sid_uniq",
-            )
-        ]
+            ),
+        )
         permissions = (("display_assignment", "Can display assignment"),)

edc_randomization/randomizer.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import contextlib
 import warnings
 from datetime import datetime
 from pathlib import Path
@@ -8,6 +9,7 @@ from typing import TYPE_CHECKING, Any
 from django.apps import apps as django_apps
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
+from django.db.models import Q
 
 from edc_registration.utils import get_registered_subject_model_cls
 
@@ -25,15 +27,15 @@ if TYPE_CHECKING:
     from edc_registration.models import RegisteredSubject
 
 
-class InvalidAssignmentDescriptionMap(Exception):
+class InvalidAssignmentDescriptionMap(Exception):  # noqa: N818
     pass
 
 
-class RandomizationListFileNotFound(Exception):
+class RandomizationListFileNotFound(Exception):  # noqa: N818
     pass
 
 
-class RandomizationListNotLoaded(Exception):
+class RandomizationListNotLoaded(Exception):  # noqa: N818
     pass
 
 
@@ -41,7 +43,7 @@ class RandomizationError(Exception):
     pass
 
 
-class AlreadyRandomized(ValidationError):
+class AlreadyRandomized(ValidationError):  # noqa: N818
     pass
 
 
@@ -113,10 +115,10 @@ class Randomizer:
         subject_identifier: str | None = None,
         identifier_attr: str | None = None,
         identifier_object_name: str | None = None,
-        report_datetime: datetime = None,
-        site: Any = None,
-        user: str = None,
-        **kwargs,
+        report_datetime: datetime | None = None,
+        site: Any | None = None,
+        user: str | None = None,
+        **kwargs,  # noqa: ARG002
     ):
         self._model_obj = None
         self._registration_obj = None
@@ -208,8 +210,10 @@ class Randomizer:
     @property
     def sid(self):
         """Returns the SID."""
-        if self.model_obj.sid is None:
-            raise RandomizationError(f"SID cannot be None. See {self.model_obj}.")
+        if not self.model_obj.sid:
+            raise RandomizationError(
+                f"SID cannot be None. See {self.model_obj}. Got {self.model_obj.sid}"
+            )
         return self.model_obj.sid
 
     @property
@@ -233,7 +237,7 @@ class Randomizer:
         if not self._model_obj:
             try:
                 obj = self.model_cls().objects.get(**self.identifier_opts)
-            except ObjectDoesNotExist:
+            except ObjectDoesNotExist as e:
                 opts = dict(site_name=self.site.name, **self.extra_model_obj_options)
                 self._model_obj = (
                     self.model_cls()
@@ -245,7 +249,7 @@ class Randomizer:
                     fld_str = ", ".join([f"{k}=`{v}`" for k, v in opts.items()])
                     raise AllocationError(
                         f"Randomization failed. No additional SIDs available for {fld_str}."
-                    )
+                    ) from e
             else:
                 raise AlreadyRandomized(
                     f"{self.identifier_object_name.title()} already randomized. "
@@ -282,7 +286,7 @@ class Randomizer:
         Called by `registration_obj`.
         """
         return self.get_registration_model_cls().objects.get(
-            sid__isnull=True, **self.identifier_opts
+            (Q(sid__isnull=True) | Q(sid="")), **self.identifier_opts
         )
 
     @property
@@ -298,14 +302,14 @@ class Randomizer:
         if not self._registration_obj:
             try:
                 self._registration_obj = self.get_unallocated_registration_obj()
-            except ObjectDoesNotExist:
+            except ObjectDoesNotExist as e:
                 try:
                     obj = self.get_registration_model_cls().objects.get(**self.identifier_opts)
-                except ObjectDoesNotExist:
+                except ObjectDoesNotExist as e:
                     raise RandomizationError(
                         f"{self.identifier_object_name.title()} does not exist. "
                         f"Got {getattr(self, self.identifier_attr)}"
-                    )
+                    ) from e
                 else:
                     raise AlreadyRandomized(
                         f"{self.identifier_object_name.title()} already randomized. "
@@ -313,7 +317,7 @@ class Randomizer:
                         f"Got {getattr(obj, self.identifier_attr)} "
                         f"SID={obj.sid}",
                         code=self.get_registration_model_cls()._meta.label_lower,
-                    )
+                    ) from e
         return self._registration_obj
 
     @property
@@ -347,7 +351,7 @@ class Randomizer:
                 "Randomization list file not found. "
                 f"Got `{cls.get_randomizationlist_path()}`. See Randomizer {cls.name}."
             )
-        try:
+        with contextlib.suppress(RandomizationListAlreadyImported):
             result = cls.importer_cls(
                 assignment_map=cls.assignment_map,
                 randomizationlist_path=cls.get_randomizationlist_path(),
@@ -356,8 +360,6 @@ class Randomizer:
                 extra_csv_fieldnames=cls.extra_csv_fieldnames,
                 **kwargs,
             ).import_list(**kwargs)
-        except RandomizationListAlreadyImported:
-            pass
         return result
 
     @classmethod