Upgrade djangorestframework

Author: brianhelba

dandiapi/urls.py

@@ -45,13 +45,13 @@
     .register(
         r'versions',
         VersionViewSet,
-        basename='version',
+        basename='dandiset-version',
         parents_query_lookups=[f'dandiset__{DandisetViewSet.lookup_field}'],
     )
     .register(
         r'assets',
         NestedAssetViewSet,
-        basename='asset',
+        basename='dandiset-version-asset',
         parents_query_lookups=[
             f'versions__dandiset__{DandisetViewSet.lookup_field}',
             f'versions__{VersionViewSet.lookup_field}',

dandiapi/zarr/tests/test_zarr.py

@@ -57,12 +57,12 @@ def test_zarr_rest_dandiset_malformed(authenticated_api_client, user):
 
 
 @pytest.mark.django_db
-def test_zarr_rest_create_not_an_owner(authenticated_api_client, zarr_archive):
+def test_zarr_rest_create_not_an_owner(authenticated_api_client, dandiset):
     resp = authenticated_api_client.post(
         '/api/zarr/',
         {
-            'name': zarr_archive.name,
-            'dandiset': zarr_archive.dandiset.identifier,
+            'name': 'New Zarr',
+            'dandiset': dandiset.identifier,
         },
     )
     assert resp.status_code == 403
@@ -79,7 +79,9 @@ def test_zarr_rest_create_duplicate(authenticated_api_client, user, zarr_archive
         },
     )
     assert resp.status_code == 400
-    assert resp.json() == ['Zarr already exists']
+    assert resp.json() == {
+        'non_field_errors': ['The fields dandiset, name must make a unique set.']
+    }
 
 
 @pytest.mark.django_db

dandiapi/zarr/views/__init__.py

@@ -3,12 +3,12 @@
 import logging
 from typing import TYPE_CHECKING
 
-from django.db import IntegrityError, transaction
+from django.db import transaction
 from django.http import HttpResponseRedirect
 from drf_yasg.utils import no_body, swagger_auto_schema
 from rest_framework import serializers, status
 from rest_framework.decorators import action
-from rest_framework.exceptions import PermissionDenied, ValidationError
+from rest_framework.exceptions import PermissionDenied
 from rest_framework.generics import get_object_or_404
 from rest_framework.response import Response
 from rest_framework.utils.urls import replace_query_param
@@ -151,16 +151,9 @@ def create(self, request):
                 http_status_code=status.HTTP_400_BAD_REQUEST,
             )
 
-        zarr_archive: ZarrArchive = ZarrArchive(name=name, dandiset=dandiset)
-        with transaction.atomic():
-            # Use nested transaction block to prevent zarr creation race condition
-            try:
-                with transaction.atomic():
-                    zarr_archive.save()
-            except IntegrityError as e:
-                raise ValidationError('Zarr already exists') from e
-
-            audit.create_zarr(dandiset=dandiset, user=request.user, zarr_archive=zarr_archive)
+        zarr_archive: ZarrArchive = ZarrArchive.objects.create(name=name, dandiset=dandiset)
+
+        audit.create_zarr(dandiset=dandiset, user=request.user, zarr_archive=zarr_archive)
 
         serializer = ZarrSerializer(instance=zarr_archive)
         return Response(serializer.data, status=status.HTTP_200_OK)

pyproject.toml

@@ -27,9 +27,7 @@ dependencies = [
   "django-resonant-settings[allauth,celery]",
   "django-resonant-utils",
   "django-stubs-ext",
-  # TODO: pin djangorestframework until we figure out what the cause of
-  # https://github.com/dandi/dandi-archive/issues/1896 is.
-  "djangorestframework<3.15.0",
+  "djangorestframework",
   "drf-extensions",
   "drf-yasg",
   "fsspec[http]",