Use function to supply default license value

Author: jjnesbitt

dandiapi/api/management/commands/create_dev_dandiset.py

@@ -2,7 +2,6 @@
 
 from uuid import uuid4
 
-from dandischema.conf import get_instance_config
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.files.uploadedfile import SimpleUploadedFile
@@ -11,7 +10,11 @@
 from dandiapi.api.models import AssetBlob
 from dandiapi.api.services.asset import add_asset_to_version
 from dandiapi.api.services.dandiset import create_open_dandiset
-from dandiapi.api.services.metadata import validate_asset_metadata, validate_version_metadata
+from dandiapi.api.services.metadata import (
+    get_default_license,
+    validate_asset_metadata,
+    validate_version_metadata,
+)
 from dandiapi.api.services.permissions.dandiset import add_dandiset_owner
 from dandiapi.api.tasks import calculate_sha256
 
@@ -31,12 +34,9 @@
 def create_dev_dandiset(*, name: str, email: str, num_extra_owners: int):
     owner = User.objects.get(email=email)
 
-    # The licenses field is a set, sort values to ensure consistent behavior
-    licenses = sorted(x.value for x in get_instance_config().licenses)
-
     version_metadata = {
         'description': 'An informative description',
-        'license': licenses[0],
+        'license': get_default_license(),
     }
     dandiset, draft_version = create_open_dandiset(
         user=owner, version_name=name, version_metadata=version_metadata

dandiapi/api/services/metadata/__init__.py

@@ -25,6 +25,10 @@
 logger = get_task_logger(__name__)
 
 
+def get_default_license() -> str:
+    return sorted(x.value for x in get_instance_config().licenses)[0]
+
+
 def _encode_pydantic_error(error) -> dict[str, str]:
     return {'field': error['loc'][0], 'message': error['msg']}
 

dandiapi/api/tests/factories.py

@@ -20,6 +20,7 @@
     UserMetadata,
     Version,
 )
+from dandiapi.api.services.metadata import get_default_license
 from dandiapi.api.services.permissions.dandiset import add_dandiset_owner
 
 
@@ -129,7 +130,7 @@ def metadata(self) -> dict:
                     'schemaKey': 'Person',
                 }
             ],
-            'license': ['spdx:CC0-1.0'],
+            'license': [get_default_license()],
         }
         # Remove faked data that might conflict with the schema types
         for key in ['about']:

dandiapi/api/tests/test_dandiset.py

@@ -9,6 +9,8 @@
 from django.utils import timezone
 import pytest
 
+from dandiapi.api.services.metadata import get_default_license
+
 if TYPE_CHECKING:
     from rest_framework.test import APIClient
 
@@ -725,7 +727,11 @@ def test_dandiset_rest_create_embargoed(api_client, user):
 @pytest.mark.django_db
 def test_dandiset_rest_create_embargoed_with_award_info(authenticated_api_client: APIClient):
     name = 'Test Embargoed Dandiset'
-    metadata = {'name': name, 'description': 'Test embargoed dandiset', 'license': ['spdx:CC0-1.0']}
+    metadata = {
+        'name': name,
+        'description': 'Test embargoed dandiset',
+        'license': [get_default_license()],
+    }
 
     # Create embargoed dandiset with funding and award info
     embargo_end_date = (timezone.now().date() + datetime.timedelta(days=365)).isoformat()
@@ -771,7 +777,11 @@ def test_dandiset_rest_create_embargoed_with_award_info(authenticated_api_client
 def test_dandiset_rest_create_embargoed_no_funding_info(authenticated_api_client: APIClient):
     """Test creating embargoed dandiset with no funding source or award number (should succeed)."""
     name = 'Test Embargoed Dandiset - No Funding'
-    metadata = {'name': name, 'description': 'Test embargoed dandiset', 'license': ['spdx:CC0-1.0']}
+    metadata = {
+        'name': name,
+        'description': 'Test embargoed dandiset',
+        'license': [get_default_license()],
+    }
 
     # Create embargoed dandiset without funding info
     query_params = {'embargo': 'true'}
@@ -814,7 +824,11 @@ def test_dandiset_rest_create_embargoed_no_funding_info(authenticated_api_client
 def test_dandiset_rest_create_embargoed_funding_no_award(authenticated_api_client: APIClient):
     """Test creating embargoed dandiset with funding source but no award number (should fail)."""
     name = 'Test Embargoed Dandiset - Funding Only'
-    metadata = {'name': name, 'description': 'Test embargoed dandiset', 'license': ['spdx:CC0-1.0']}
+    metadata = {
+        'name': name,
+        'description': 'Test embargoed dandiset',
+        'license': [get_default_license()],
+    }
 
     # Create embargoed dandiset with funding source but no award number
     query_params = {
@@ -832,7 +846,11 @@ def test_dandiset_rest_create_embargoed_funding_no_award(authenticated_api_clien
 def test_dandiset_rest_create_embargoed_award_no_funding(authenticated_api_client: APIClient):
     """Test creating embargoed dandiset with award number but no funding source (should fail)."""
     name = 'Test Embargoed Dandiset - Award Only'
-    metadata = {'name': name, 'description': 'Test embargoed dandiset', 'license': ['spdx:CC0-1.0']}
+    metadata = {
+        'name': name,
+        'description': 'Test embargoed dandiset',
+        'license': [get_default_license()],
+    }
 
     # Create embargoed dandiset with award number but no funding source
     query_params = {