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

edc_dashboard/management/commands/update_search_slugs.py

@@ -6,7 +6,7 @@ style = color_style()
 
 
 class Command(BaseCommand):
-    help = "Update search slugs if 'get_slugs' " "method definitions have changed."
+    help = "Update search slugs if 'get_slugs' method definitions have changed."
 
     def add_arguments(self, parser):
         parser.add_argument(
@@ -31,9 +31,7 @@ class Command(BaseCommand):
             if "historical" not in model._meta.label_lower:
                 if hasattr(model, "update_search_slugs"):
                     self.stdout.write(
-                        self.style.WARNING(
-                            "Updating '{}' ...".format(model._meta.label_lower)
-                        ),
+                        self.style.WARNING(f"Updating '{model._meta.label_lower}' ..."),
                         ending="\r",
                     )
                     try:
@@ -42,20 +40,19 @@ class Command(BaseCommand):
                         if "update_search_slugs" in str(e):
                             raise CommandError(
                                 "Missing manager method 'update_search_slugs'. "
-                                "See model {}. Got {}".format(model._meta.label_lower, str(e))
+                                f"See model {model._meta.label_lower}. Got {e!s}"
                             )
-                        else:
-                            raise CommandError(e)
+                        raise CommandError(e)
                     except Exception as e:
                         raise CommandError(
-                            "An exception occurred when updating model {}. "
-                            "Got {}".format(model._meta.label_lower, e)
+                            f"An exception occurred when updating model {model._meta.label_lower}. "
+                            f"Got {e}"
                         )
                     else:
                         self.stdout.write(
                             self.style.SUCCESS(
-                                "Updating '{}' ... Done".format(model._meta.label_lower)
+                                f"Updating '{model._meta.label_lower}' ... Done"
                             )
                         )
                 else:
-                    self.stdout.write("------- {}".format(model._meta.label_lower))
+                    self.stdout.write(f"------- {model._meta.label_lower}")

edc_dashboard/templatetags/edc_dashboard_extras.py

@@ -58,7 +58,7 @@ def page_numbers(page, numpages):
         min_n = page - 5
         min_n = 1 if min_n <= 0 else min_n
         max_n = min_n + 9
-        max_n = numpages if max_n >= numpages else max_n
+        max_n = min(numpages, max_n)
         page_numbers_ = [x for x in range(min_n, max_n + 1)]
     return page_numbers_ or []
 

edc_dashboard/url_config.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from django.urls.conf import re_path
 
@@ -14,7 +14,7 @@ if TYPE_CHECKING:
 
     from .view_mixins import UrlRequestContextMixin
 
-    class View(UrlRequestContextMixin, BaseView): ...  # noqa
+    class View(UrlRequestContextMixin, BaseView): ...
 
 
 class UrlConfig:
@@ -22,7 +22,7 @@ class UrlConfig:
         self,
         url_name: str = None,
         namespace: str = None,
-        view_class: Type[View | UrlRequestContextMixin] = None,
+        view_class: type[View | UrlRequestContextMixin] = None,
         label: str = None,
         identifier_label: str = None,
         identifier_pattern: str = None,

edc_dashboard/utils.py

@@ -30,12 +30,11 @@ def splitall(path):
         if parts[0] == path:  # sentinel for absolute paths
             allparts.insert(0, parts[0])
             break
-        elif parts[1] == path:  # sentinel for relative paths
+        if parts[1] == path:  # sentinel for relative paths
             allparts.insert(0, parts[1])
             break
-        else:
-            path = parts[0]
-            allparts.insert(0, parts[1])
+        path = parts[0]
+        allparts.insert(0, parts[1])
     return allparts
 
 

edc_dashboard/views/dashboard_view.py

@@ -18,7 +18,7 @@ class DashboardView(UrlRequestContextMixin, TemplateRequestContextMixin, Templat
         if not self.dashboard_template and not self.dashboard_template_name:
             raise ImproperlyConfigured(
                 f"Both 'dashboard_template' and 'dashboard_template_name' "
-                f"cannot be None. See {repr(self)}."
+                f"cannot be None. See {self!r}."
             )
         super().__init__(**kwargs)
 

edc_data_manager/models/data_dictionary.py

@@ -11,7 +11,6 @@ class DataDictionaryManager(models.Manager):
 
 
 class DataDictionary(BaseUuidModel):
-
     # see edc_model_to_dataframe
     m2m_related_field = "model"
 
@@ -74,4 +73,4 @@ class DataDictionary(BaseUuidModel):
         verbose_name_plural = "Data Dictionary Items"
         default_permissions = ("view", "export")
         unique_together = (("model", "field_name"),)
-        indexes = [Index(fields=["model", "number", "prompt"])]
+        indexes = (Index(fields=["model", "number", "prompt"]),)

edc_data_manager/models/data_query.py

@@ -193,7 +193,7 @@ class DataQuery(DataQueryModelMixin, ActionModelMixin, SiteModelMixin, BaseUuidM
         verbose_name = "Data Query"
         verbose_name_plural = "Data Queries"
         unique_together = ["registered_subject", "rule_reference", "visit_schedule"]
-        indexes = [
+        indexes = (
             models.Index(
                 fields=[
                     "subject_identifier",
@@ -203,5 +203,5 @@ class DataQuery(DataQueryModelMixin, ActionModelMixin, SiteModelMixin, BaseUuidM
                     "registered_subject",
                     "visit_schedule",
                 ]
-            )
-        ]
+            ),
+        )

edc_data_manager/models/query_rule.py

@@ -207,7 +207,7 @@ class QueryRule(BaseUuidModel):
         super().save(*args, **kwargs)
 
     def natural_key(self):
-        return (self.title,)  # noqa
+        return (self.title,)
 
     natural_key.dependencies = [
         "edc_data_manager.CrfDataDictionary",
@@ -238,4 +238,4 @@ class QueryRule(BaseUuidModel):
     class Meta(BaseUuidModel.Meta):
         verbose_name = "Query Rule"
         verbose_name_plural = "Query Rules"
-        indexes = [models.Index(fields=["title", "active"])]
+        indexes = (models.Index(fields=["title", "active"]),)

edc_data_manager/tasks.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from celery import shared_task
 from django.conf import settings
 

edc_device/device.py

@@ -36,7 +36,7 @@ class Device:
                 f"Central server ID may not be included with node IDs. "
                 f"Got {self.central_server_id}, nodes={self.nodes}."
             )
-        elif central_server_id in self.middlemen:
+        if central_server_id in self.middlemen:
             raise DeviceIdError(
                 f"Central server ID may not be included with middleman IDs. "
                 f"Got {self.central_server_id}, middlemen={self.middlemen}."

edc_device/view_mixins.py

@@ -12,7 +12,7 @@ def get_client_ip(request):
         ip = request.META.get("REMOTE_ADDR")
     try:
         socket.inet_aton(ip)
-    except socket.error:
+    except OSError:
         return None
     else:
         return ip

edc_document_status/fieldsets.py

@@ -1,6 +1,4 @@
-from typing import Dict, Tuple
-
-document_status_fieldset_tuple: Tuple[str, Dict[str, Tuple[str, ...]]] = (
+document_status_fieldset_tuple: tuple[str, dict[str, tuple[str, ...]]] = (
     "Document status",
     {"classes": ("collapse",), "fields": ("document_status",)},
 )

edc_document_status/model_mixins.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 from django.db import models
 
@@ -26,7 +26,7 @@ class DocumentStatusModelMixin(models.Model):
         self.update_document_status_on_save(kwargs.get("update_fields"))
         super().save(*args, **kwargs)
 
-    def update_document_status_on_save(self, update_fields: Optional[list] = None) -> None:
+    def update_document_status_on_save(self, update_fields: list | None = None) -> None:
         """Updates `document_status` as complete unless field is listed
         in update_fields.
 

edc_document_status/modeladmin_mixins.py

@@ -1,7 +1,4 @@
-from typing import Tuple
-
-
 class DocumentStatusModelAdminMixin:
-    def get_readonly_fields(self, request, obj=None) -> Tuple[str, ...]:
+    def get_readonly_fields(self, request, obj=None) -> tuple[str, ...]:
         readonly_fields = super().get_readonly_fields(request, obj=obj)
         return tuple(set(readonly_fields + ("document_status",)))

edc_egfr/admin/egfr_drop_notification_admin_mixin.py

@@ -1,5 +1,3 @@
-from typing import Dict, Optional, Tuple
-
 from django.contrib import admin
 from django_audit_fields.admin import audit_fieldset_tuple
 
@@ -15,7 +13,7 @@ class EgfrDropNotificationAdminMixin:
 
     def get_fieldsets(
         self, request, obj=None
-    ) -> Tuple[Tuple[Optional[str], Dict[str, Tuple[str, ...]]], ...]:
+    ) -> tuple[tuple[str | None, dict[str, tuple[str, ...]]], ...]:
         fieldsets = [
             (None, {"fields": ("subject_visit", "report_datetime")}),
             (
@@ -40,7 +38,7 @@ class EgfrDropNotificationAdminMixin:
         fieldsets.append(audit_fieldset_tuple)
         return tuple(fieldsets)
 
-    def get_search_fields(self, request) -> Tuple[str, ...]:
+    def get_search_fields(self, request) -> tuple[str, ...]:
         fields = super().get_search_fields(request)
         custom_fields = (
             "subject_visit__subject_identifier",
@@ -48,7 +46,7 @@ class EgfrDropNotificationAdminMixin:
         )
         return tuple(f for f in fields if f not in custom_fields) + custom_fields
 
-    def get_readonly_fields(self, request, obj=None) -> Tuple[str, ...]:
+    def get_readonly_fields(self, request, obj=None) -> tuple[str, ...]:
         fields = super().get_readonly_fields(request, obj)
         return (
             "creatinine_date",
@@ -57,11 +55,11 @@ class EgfrDropNotificationAdminMixin:
             "egfr_percent_change",
         ) + fields
 
-    def get_list_filter(self, request) -> Tuple[str, ...]:
+    def get_list_filter(self, request) -> tuple[str, ...]:
         list_filter = super().get_list_filter(request)
         return ("report_status", "creatinine_date") + list_filter
 
-    def get_list_display(self, request) -> Tuple[str, ...]:
+    def get_list_display(self, request) -> tuple[str, ...]:
         list_display = super().get_list_display(request)
         custom_fields = (
             "report_status",

edc_egfr/egfr.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from datetime import date, datetime
 from decimal import Decimal
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any
 from zoneinfo import ZoneInfo
 
 from dateutil.relativedelta import relativedelta
@@ -63,8 +63,7 @@ class Egfr:
                 f"Invalid formula_name. Expected one of {list(self.calculators.keys())}. "
                 f"Got {formula_name}."
             )
-        else:
-            self.calculator_cls = self.calculators.get(formula_name)
+        self.calculator_cls = self.calculators.get(formula_name)
         self.age_in_years = age_in_years
         self.dob = dob
         self.weight_in_kgs = weight_in_kgs
@@ -153,7 +152,7 @@ class Egfr:
         return self._egfr_value
 
     @property
-    def egfr_grade(self) -> Optional[int]:
+    def egfr_grade(self) -> int | None:
         if self._egfr_grade is None:
             grading_data, _ = get_grade_for_value(
                 self.reference_range_collection,
@@ -178,11 +177,11 @@ class Egfr:
                 )
             else:
                 egfr_drop_value = 0.0000
-            self._egfr_drop_value = 0.0000 if egfr_drop_value < 0.0000 else egfr_drop_value
+            self._egfr_drop_value = max(egfr_drop_value, 0.0)
         return self._egfr_drop_value
 
     @property
-    def egfr_drop_grade(self) -> Optional[int]:
+    def egfr_drop_grade(self) -> int | None:
         if self._egfr_drop_grade is None:
             grading_data, _ = get_grade_for_value(
                 self.reference_range_collection,
@@ -198,7 +197,7 @@ class Egfr:
                 self._egfr_drop_grade = grading_data.grade
         return self._egfr_drop_grade
 
-    def get_weight_in_kgs(self) -> Optional[float]:
+    def get_weight_in_kgs(self) -> float | None:
         return self.weight_in_kgs
 
     def create_or_update_egfr_drop_notification(self):

edc_egfr/get_drop_notification_model.py

@@ -3,7 +3,7 @@ from django.conf import settings
 
 
 def get_egfr_drop_notification_model():
-    return getattr(settings, "EDC_EGFR_DROP_NOTIFICATION_MODEL")
+    return settings.EDC_EGFR_DROP_NOTIFICATION_MODEL
 
 
 def get_egfr_drop_notification_model_cls():

edc_egfr/model_mixins/egfr_drop_notification_model_mixin.py

@@ -44,8 +44,8 @@ class EgfrDropNotificationModelMixin(
 
     narrative = models.TextField(
         verbose_name="Narrative",
-        null=True,
         blank=True,
+        default="",
     )
 
     report_status = models.CharField(max_length=15, choices=REPORT_STATUS, default=NEW)

edc_export/archive_exporter.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from tempfile import mkdtemp
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING
 
 from edc_pdutils.df_exporters import CsvModelExporter
 from edc_sites.site import sites
@@ -32,9 +32,9 @@ class ArchiveExporter:
     """
 
     date_format: str = "%Y%m%d%H%M%S"
-    csv_exporter_cls: Type[CsvModelExporter] = CsvModelExporter
-    files_emailer_cls: Type[FilesEmailer] = FilesEmailer
-    files_archiver_cls: Type[FilesArchiver] = FilesArchiver
+    csv_exporter_cls: type[CsvModelExporter] = CsvModelExporter
+    files_emailer_cls: type[FilesEmailer] = FilesEmailer
+    files_archiver_cls: type[FilesArchiver] = FilesArchiver
 
     def __init__(
         self,
@@ -65,29 +65,28 @@ class ArchiveExporter:
             self.exported.append(csv_exporter.to_csv())
         if not self.exported:
             raise ArchiveExporterNothingExported(f"Nothing exported. Got models={models}.")
-        else:
-            if archive:
-                archiver = self.files_archiver_cls(
+        if archive:
+            archiver = self.files_archiver_cls(
+                path=tmp_folder,
+                user=user,
+                exported_datetime=self.exported_datetime,
+                date_format=self.date_format,
+            )
+            self.archive_filename = archiver.archive_filename
+            self.exported_datetime = archiver.exported_datetime
+        if email_to_user:
+            summary = [str(x) for x in self.exported]
+            summary.sort()
+            try:
+                self.files_emailer_cls(
                     path=tmp_folder,
                     user=user,
-                    exported_datetime=self.exported_datetime,
-                    date_format=self.date_format,
+                    file_ext=".zip" if archive else ".csv",
+                    summary="\n".join(summary),
                 )
-                self.archive_filename = archiver.archive_filename
-                self.exported_datetime = archiver.exported_datetime
-            if email_to_user:
-                summary = [str(x) for x in self.exported]
-                summary.sort()
-                try:
-                    self.files_emailer_cls(
-                        path=tmp_folder,
-                        user=user,
-                        file_ext=".zip" if archive else ".csv",
-                        summary="\n".join(summary),
-                    )
-                except FilesEmailerError as e:
-                    raise ArchiveExporterEmailError(e)
-                else:
-                    self.emailed_to = user.email
-                    self.emailed_datetime = get_utcnow()
-                    self.exported_datetime = self.exported_datetime or self.emailed_datetime
+            except FilesEmailerError as e:
+                raise ArchiveExporterEmailError(e)
+            else:
+                self.emailed_to = user.email
+                self.emailed_datetime = get_utcnow()
+                self.exported_datetime = self.exported_datetime or self.emailed_datetime

edc_export/exportables.py

@@ -42,9 +42,8 @@ class Exportable(OrderedDict):
                 self.historical_models.append(model_opts)
             elif model_opts.is_list_model:
                 self.list_models.append(model_opts)
-            else:
-                if not model._meta.proxy:
-                    self.models.append(model_opts)
+            elif not model._meta.proxy:
+                self.models.append(model_opts)
         self.models.sort(key=lambda x: x.verbose_name.title())
         self.historical_models.sort(key=lambda x: x.verbose_name.title())
         self.list_models.sort(key=lambda x: x.verbose_name.title())

edc_export/management/commands/import_receipts.py

@@ -31,7 +31,7 @@ class Command(BaseCommand):
         error_filepath = os.path.join(
             os.path.expanduser(self.export_plan.target_path) or "", self.error_filename
         )
-        with open(self.ack_filename, "r") as f, open(error_filepath, "w") as error_file:
+        with open(self.ack_filename) as f, open(error_filepath, "w") as error_file:
             rows = csv.reader(f, delimiter="|")
             writer = csv.writer(error_file, delimiter="|")
             for row in rows:
@@ -42,8 +42,8 @@ class Command(BaseCommand):
                 try:
                     export_uuid = row[header.index("export_UUID")]
                 except ValueError as e:
-                    writer.writerow("error reading file. Got {0}".format(e))
-                    print("Failed to process file {0}".format(self.ack_filename))
+                    writer.writerow(f"error reading file. Got {e}")
+                    print(f"Failed to process file {self.ack_filename}")
                     raise ValueError(e)
                 if ExportTransaction.objects.filter(export_uuid=export_uuid):
                     for export_transaction in ExportTransaction.objects.filter(
@@ -79,7 +79,7 @@ class Command(BaseCommand):
         except ValueError:
             CommandError(
                 "Invalid file name. Expected format xxx_app_label_objectname_timestamp.xxx. "
-                "Got {0}".format(self.ack_filename)
+                f"Got {self.ack_filename}"
             )
         return error_filename
 
@@ -91,9 +91,9 @@ class Command(BaseCommand):
             )
         except ExportPlan.DoesNotExist as e:
             CommandError(
-                "ExportPlan not found for {0}, {1}. "
+                f"ExportPlan not found for {self.app_label}, {self.object_name}. "
                 "Check filename format or create an ExportPlan. "
-                "Got {2}".format(self.app_label, self.object_name, e)
+                f"Got {e}"
             )
         return export_plan
 

edc_export/model_exporter/file_history_updater.py

@@ -29,7 +29,7 @@ class FileHistoryUpdater:
     def update(self):
         exported_pks = []
         export_uuids = []
-        with open(self.path, "r") as f:
+        with open(self.path) as f:
             csv_reader = csv.DictReader(f, delimiter=self.delimiter)
             for row in csv_reader:
                 exported_pks.append(row["id"])

edc_export/model_exporter/model_exporter.py

@@ -33,7 +33,7 @@ class AdditionalValues:
         self.export_change_type = None
 
 
-class ModelExporter(object):
+class ModelExporter:
     delimiter = "|"
     file_history_updater_cls = FileHistoryUpdater
     object_history_helper_cls = ObjectHistoryHelper

edc_export/model_exporter/value_getter.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import string
-from typing import TYPE_CHECKING, Any, Type
+from typing import TYPE_CHECKING, Any
 
 from django.core.exceptions import ValidationError
 from django.db.models import Manager
@@ -16,7 +16,7 @@ if TYPE_CHECKING:
             pass
 
 
-__all__ = ["ValueGetter", "ValueGetterUnknownField", "ValueGetterInvalidLookup"]
+__all__ = ["ValueGetter", "ValueGetterInvalidLookup", "ValueGetterUnknownField"]
 
 
 class ValueGetterUnknownField(ValidationError):
@@ -82,7 +82,7 @@ class ValueGetter:
             self._value = self.strip_value(self._value)
         return self._value
 
-    def _get_field_value(self, model_obj: Type[MyModel] = None, field_name: str = None) -> Any:
+    def _get_field_value(self, model_obj: type[MyModel] = None, field_name: str = None) -> Any:
         """Returns a field value.
 
         1. Tries to access a field as a model instance attribute;
@@ -105,7 +105,7 @@ class ValueGetter:
                     value = self.get_lookup_value(model_obj=model_obj, field_name=field_name)
                 else:
                     raise ValueGetterUnknownField(
-                        f"Unknown field name. Perhaps add a lookup. " f"Got {field_name}.",
+                        f"Unknown field name. Perhaps add a lookup. Got {field_name}.",
                         code=field_name,
                     )
             if isinstance(value, Manager):
@@ -117,7 +117,7 @@ class ValueGetter:
                     )
         return value
 
-    def get_lookup_value(self, model_obj: Type[MyModel] = None, field_name: str = None) -> Any:
+    def get_lookup_value(self, model_obj: type[MyModel] = None, field_name: str = None) -> Any:
         """Returns the field value by following the lookup string
         to a related instance.
         """
@@ -137,7 +137,7 @@ class ValueGetter:
         """Returns the list of m2m field names for this model."""
         return [m2m.name for m2m in self.model_cls._meta.many_to_many]
 
-    def get_m2m_value(self, model_obj: Type[MyModel] = None, field_name: str = None) -> str:
+    def get_m2m_value(self, model_obj: type[MyModel] = None, field_name: str = None) -> str:
         """Returns an m2m field value as a delimited string."""
         return self.m2m_delimiter.join(
             [value.name for value in getattr(model_obj, field_name).all()]

edc_export/model_mixins/notification_model_mixin.py

@@ -9,11 +9,11 @@ class NotificationMixin(models.Model):
 
     subject = models.CharField(max_length=200)
 
-    recipient_list = models.TextField(null=True)
+    recipient_list = models.TextField(null=True, default="")
 
-    cc_list = models.TextField(null=True)
+    cc_list = models.TextField(null=True, default="")
 
-    body = models.TextField(null=True)
+    body = models.TextField(null=True, default="")
 
     status = models.CharField(
         max_length=15,
@@ -27,4 +27,4 @@ class NotificationMixin(models.Model):
 
     class Meta:
         abstract = True
-        indexes = [Index(fields=["notification_datetime"])]
+        indexes = (Index(fields=["notification_datetime"]),)

edc_export/models/data_request.py

@@ -13,14 +13,14 @@ from ..model_options import ModelOptions
 class DataRequest(SiteModelMixin, BaseUuidModel):
     name = models.CharField(max_length=25)
 
-    description = models.TextField(null=True)
+    description = models.TextField(default="")
 
     decrypt = models.BooleanField(default=False)
 
     export_format = models.CharField(max_length=25, choices=EXPORT_FORMATS, default=CSV)
 
     models = models.TextField(
-        help_text='List one table per line, no commas. Use "label lower" format.'
+        default="", help_text='List one table per line, no commas. Use "label lower" format.'
     )
 
     history = HistoricalRecords()
@@ -41,4 +41,4 @@ class DataRequest(SiteModelMixin, BaseUuidModel):
         return [ModelOptions(x) for x in models_as_list]
 
     class Meta:
-        indexes = [Index(fields=["name"])]
+        indexes = (Index(fields=["name"]),)

edc_export/models/data_request_history.py

@@ -18,11 +18,11 @@ class DataRequestHistory(SiteModelMixin, BaseUuidModel):
 
     emailed_datetime = models.DateTimeField(null=True)
 
-    summary = models.TextField(null=True)
+    summary = models.TextField(default="")
 
     exported_datetime = models.DateTimeField(default=get_utcnow)
 
     class Meta:
         verbose_name = "Data Request History"
         verbose_name_plural = "Data Request History"
-        indexes = [Index(fields=["exported_datetime"])]
+        indexes = (Index(fields=["exported_datetime"]),)

edc_export/models/export_receipt.py

@@ -33,4 +33,4 @@ class ExportReceipt(BaseUuidModel):
         return (self.export_uuid,)
 
     class Meta(BaseUuidModel.Meta):
-        indexes = [Index(fields=["timestamp"])]
+        indexes = (Index(fields=["timestamp"]),)

edc_export/models/file_history.py

@@ -23,11 +23,11 @@ class FileHistory(BaseUuidModel):
     model = models.CharField(max_length=50)
 
     export_uuid_list = models.TextField(
-        null=True, help_text="list of export_uuid's of model app_label.model_name"
+        default="", help_text="list of export_uuid's of model app_label.model_name"
     )
 
     pk_list = models.TextField(
-        null=True, help_text="list of pk's of model app_label.model_name"
+        default="", help_text="list of pk's of model app_label.model_name"
     )
 
     exit_message = models.CharField(
@@ -41,14 +41,14 @@ class FileHistory(BaseUuidModel):
     filename = models.CharField(max_length=250, help_text="original filename on export")
 
     file_contents = models.TextField(
-        null=True, help_text="save contents of file as a list of rows"
+        default="", help_text="save contents of file as a list of rows"
     )
 
     exported = models.BooleanField(default=False, help_text="exported to a file")
 
     exported_datetime = models.DateTimeField(null=True)
 
-    notification_plan_name = models.CharField(max_length=50, null=True)
+    notification_plan_name = models.CharField(max_length=50, default="")
 
     sent = models.BooleanField(default=False, help_text="export file sent to recipient")
 
@@ -78,4 +78,4 @@ class FileHistory(BaseUuidModel):
         return (self.history_uuid,)
 
     class Meta(BaseUuidModel.Meta):
-        indexes = [Index(fields=["sent_datetime"])]
+        indexes = (Index(fields=["sent_datetime"]),)