Misc. Django/Python improvements

dandiapi/api/dashboard.py

@@ -2,7 +2,7 @@
 from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
 from django.contrib.auth.models import User
 from django.core.exceptions import PermissionDenied
-from django.db.models import Exists, OuterRef, Q
+from django.db.models import Exists, OuterRef
 from django.shortcuts import get_object_or_404, render
 from django.views.decorators.http import require_http_methods
 from django.views.generic.base import TemplateView
@@ -60,7 +60,7 @@ def _non_valid_assets(self):
                 has_version=Exists(Version.objects.filter(assets=OuterRef('id')))
             )
             .filter(has_version=True)
-            .filter(~Q(status=Asset.Status.VALID))
+            .exclude(status=Asset.Status.VALID)
         )
 
     def _uploads(self):

dandiapi/api/mail.py

@@ -1,5 +1,6 @@
+from __future__ import annotations
+
 import logging
-from typing import Optional, Union
 
 from allauth.socialaccount.models import SocialAccount
 from django.conf import settings
@@ -19,7 +20,7 @@
 ADMIN_EMAIL = 'info@dandiarchive.org'
 
 
-def build_message(subject: str, message: str, to: list[str], html_message: Optional[str] = None):
+def build_message(subject: str, message: str, to: list[str], html_message: str | None = None):
     message = mail.EmailMultiAlternatives(subject=subject, body=message, to=to)
     if html_message is not None:
         message.attach_alternative(html_message, 'text/html')
@@ -165,7 +166,7 @@ def send_rejected_user_message(user: User, socialaccount: SocialAccount):
         connection.send_messages(messages)
 
 
-def build_pending_users_message(users: Union[QuerySet, list[User]]):
+def build_pending_users_message(users: QuerySet | list[User]):
     render_context = {**BASE_RENDER_CONTEXT, 'users': users}
     return build_message(
         subject='DANDI: new user registrations to review',
@@ -174,7 +175,7 @@ def build_pending_users_message(users: Union[QuerySet, list[User]]):
     )
 
 
-def send_pending_users_message(users: Union[QuerySet, list[User]]):
+def send_pending_users_message(users: QuerySet | list[User]):
     logger.info(f'Sending pending users message to admins at {ADMIN_EMAIL}')
     messages = [build_pending_users_message(users)]
     with mail.get_connection() as connection:

dandiapi/api/management/commands/migrate_published_version_metadata.py

@@ -2,7 +2,6 @@
 from pprint import pformat
 
 from dandischema import migrate
-from django.db.models import Q
 import djclick as click
 
 from dandiapi.api.models import Version
@@ -17,7 +16,7 @@ def migrate_published_version_metadata(dandiset: str, published_version: str, to
     click.echo(
         f'Migrating published version {dandiset}/{published_version} metadata to version {to_version}'  # noqa: E501
     )
-    version = Version.objects.filter(~Q(version='draft')).get(
+    version = Version.objects.exclude(version='draft').get(
         dandiset=dandiset, version=published_version
     )
     metadata = version.metadata

dandiapi/api/models/dandiset.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import Optional
-
 from django.db import models
 from django_extensions.db.models import TimeStampedModel
 from guardian.shortcuts import assign_perm, get_objects_for_user, get_users_with_perms, remove_perm
@@ -55,7 +53,7 @@ class Meta:
         permissions = [('owner', 'Owns the dandiset')]
 
     @property
-    def identifier(self) -> Optional[str]:
+    def identifier(self) -> str | None:
         # Compare against None, to allow id 0
         return f'{self.id:06}' if self.id is not None else ''
 

dandiapi/api/models/version.py

@@ -71,7 +71,7 @@ def valid(self) -> bool:
         from .asset import Asset
 
         # Return False if any asset is not VALID
-        return not self.assets.filter(~models.Q(status=Asset.Status.VALID)).exists()
+        return not self.assets.exclude(status=Asset.Status.VALID).exists()
 
     @property
     def publish_status(self) -> Version.Status:
@@ -81,7 +81,7 @@ def publish_status(self) -> Version.Status:
         # Import here to avoid dependency cycle
         from .asset import Asset
 
-        invalid_asset = self.assets.filter(~models.Q(status=Asset.Status.VALID)).first()
+        invalid_asset = self.assets.exclude(status=Asset.Status.VALID).first()
         if invalid_asset:
             return Version.Status.INVALID
 

dandiapi/api/models/zarr.py

@@ -3,7 +3,6 @@
 from datetime import timedelta
 import logging
 from pathlib import Path
-from typing import Optional
 from urllib.parse import urlparse, urlunparse
 from uuid import uuid4
 
@@ -193,7 +192,7 @@ def upload_in_progress(self) -> bool:
         return self.active_uploads.exists()
 
     @property
-    def checksum(self) -> Optional[str]:
+    def checksum(self) -> str | None:
         try:
             return self.get_checksum()
         except ValidationError:

dandiapi/api/tasks/zarr.py

@@ -1,6 +1,7 @@
+from __future__ import annotations
+
 from datetime import datetime
 from pathlib import Path
-from typing import Optional
 
 import boto3
 from celery import shared_task
@@ -43,7 +44,7 @@ def get_client():
     return storage.connection.meta.client
 
 
-def yield_files(bucket: str, prefix: Optional[str] = None):
+def yield_files(bucket: str, prefix: str | None = None):
     """Get all objects in the bucket, through repeated object listing."""
     client = get_client()
     common_options = {'Bucket': bucket}
@@ -98,7 +99,7 @@ def __init__(self, *args, session_start: datetime, **kwargs):
         # Set the start of when new files may have been written
         self._session_start = session_start
 
-    def read_checksum_file(self) -> Optional[ZarrChecksumListing]:
+    def read_checksum_file(self) -> ZarrChecksumListing | None:
         """Load a checksum listing from the checksum file."""
         storage = self.zarr_archive.storage
         checksum_path = self.checksum_file_path

dandiapi/api/views/asset.py

@@ -17,10 +17,9 @@
 from urllib.parse import urlencode
 
 from django.core.paginator import EmptyPage, Page, Paginator
-from django.db import models, transaction
+from django.db import transaction
 from django.http import HttpResponseRedirect
 from django.http.response import Http404
-from django.shortcuts import get_object_or_404
 from django.urls import reverse
 from django.utils.decorators import method_decorator
 from django_filters import rest_framework as filters
@@ -29,6 +28,7 @@
 from rest_framework import serializers, status
 from rest_framework.decorators import action
 from rest_framework.exceptions import NotAuthenticated, PermissionDenied, ValidationError
+from rest_framework.generics import get_object_or_404
 from rest_framework.response import Response
 from rest_framework.viewsets import GenericViewSet, ReadOnlyModelViewSet
 from rest_framework_extensions.mixins import DetailSerializerMixin, NestedViewSetMixin
@@ -450,7 +450,7 @@ def update(self, request, versions__dandiset__pk, versions__version, **kwargs):
             # Verify we aren't changing path to the same value as an existing asset
             if (
                 version.assets.filter(path=new_asset.path)
-                .filter(~models.Q(asset_id=old_asset.asset_id))
+                .exclude(asset_id=old_asset.asset_id)
                 .exists()
             ):
                 return Response(

dandiapi/api/views/dandiset.py

@@ -5,10 +5,9 @@
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.exceptions import ObjectDoesNotExist
-from django.db.models import Count, OuterRef, Q, Subquery, Sum
+from django.db.models import Count, OuterRef, Subquery, Sum
 from django.db.utils import IntegrityError
 from django.http import Http404
-from django.shortcuts import get_object_or_404
 from django.utils.decorators import method_decorator
 from drf_yasg.utils import no_body, swagger_auto_schema
 from guardian.decorators import permission_required_or_403
@@ -17,6 +16,7 @@
 from rest_framework import filters, status
 from rest_framework.decorators import action
 from rest_framework.exceptions import NotAuthenticated, PermissionDenied
+from rest_framework.generics import get_object_or_404
 from rest_framework.request import Request
 from rest_framework.response import Response
 from rest_framework.serializers import ValidationError
@@ -270,7 +270,7 @@ def destroy(self, request, dandiset__pk):
         """
         dandiset: Dandiset = self.get_object()
 
-        if dandiset.versions.filter(~Q(version='draft')).exists():
+        if dandiset.versions.exclude(version='draft').exists():
             return Response(
                 'Cannot delete dandisets with published versions.',
                 status=status.HTTP_403_FORBIDDEN,

dandiapi/api/views/version.py

@@ -1,11 +1,11 @@
 from django.db import transaction
-from django.shortcuts import get_object_or_404
 from django.utils.decorators import method_decorator
 from drf_yasg.utils import no_body, swagger_auto_schema
 from guardian.decorators import permission_required_or_403
 from rest_framework import status
 from rest_framework.decorators import action
 from rest_framework.exceptions import NotAuthenticated, PermissionDenied, ValidationError
+from rest_framework.generics import get_object_or_404
 from rest_framework.response import Response
 from rest_framework.viewsets import ReadOnlyModelViewSet
 from rest_framework_extensions.mixins import DetailSerializerMixin, NestedViewSetMixin

dandiapi/api/views/zarr.py

@@ -6,14 +6,14 @@
 from django.core.exceptions import PermissionDenied
 from django.db import IntegrityError, transaction
 from django.http.response import HttpResponseRedirect
-from django.shortcuts import get_object_or_404
 from django.urls import reverse
 from drf_yasg import openapi
 from drf_yasg.utils import no_body, swagger_auto_schema
 from minio_storage.storage import MinioStorage
 from rest_framework import serializers, status
 from rest_framework.decorators import action, api_view
 from rest_framework.exceptions import ValidationError
+from rest_framework.generics import get_object_or_404
 from rest_framework.response import Response
 from rest_framework.viewsets import ReadOnlyModelViewSet
 from storages.backends.s3boto3 import S3Boto3Storage

dandiapi/api/zarr_checksums.py

@@ -4,7 +4,7 @@
 from contextlib import AbstractContextManager
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from django.conf import settings
 from django.core.files.base import ContentFile
@@ -75,7 +75,7 @@ def checksum_listing(self) -> ZarrChecksumListing:
             raise ValueError('This method is only valid when used by a context manager')
         return self._serializer.generate_listing(self._checksums)
 
-    def read_checksum_file(self) -> Optional[ZarrChecksumListing]:
+    def read_checksum_file(self) -> ZarrChecksumListing | None:
         """Load a checksum listing from the checksum file."""
         storage = self.zarr_archive.storage
         checksum_path = self.checksum_file_path