move doi handling for update to celery task

Author: asmacdo

dandiapi/api/doi.py

@@ -101,6 +101,39 @@ def _create_dandiset_draft_doi(draft_version: Version) -> None:
     draft_version.save()
 
 
+def _update_draft_version_doi(draft_version: Version) -> None:
+    """
+    Update or create a Draft DOI for a dandiset with the latest metadata.
+
+    This is called when a draft version's metadata is updated for a dandiset
+    that has never been published.
+
+    Args:
+        draft_version: The draft version of the dandiset with updated metadata.
+    """
+    # Skip for dandisets that have published versions
+    if draft_version.dandiset.versions.exclude(version='draft').exists():
+        return
+
+    # Generate DOI payload with updated metadata
+    dandiset_doi, dandiset_doi_payload = generate_doi_data(
+        draft_version,
+        version_doi=False,  # Generate a Dandiset DOI, not a Version DOI
+        event=None,  # Keep as Draft DOI
+    )
+
+    # Create or update the DOI
+    create_or_update_doi(dandiset_doi_payload)
+
+    # If the version doesn't have a DOI yet, store it
+    if draft_version.doi is None:
+        draft_version.doi = dandiset_doi
+        draft_version.save()
+        logger.info('Created new Draft DOI %s', dandiset_doi)
+    else:
+        logger.info('Updated Draft DOI %s with new metadata', draft_version.doi)
+
+
 def _handle_publication_dois(version_id: int) -> None:
     """
     Create and update DOIs for a published version.

dandiapi/api/services/dandiset/__init__.py

@@ -132,36 +132,3 @@ def unstar_dandiset(*, user, dandiset: Dandiset) -> int:
 
     DandisetStar.objects.filter(user=user, dandiset=dandiset).delete()
     return dandiset.star_count
-
-
-def update_draft_version_doi(draft_version: Version) -> None:
-    """
-    Update or create a Draft DOI for a dandiset with the latest metadata.
-
-    This is called when a draft version's metadata is updated for a dandiset
-    that has never been published.
-
-    Args:
-        draft_version: The draft version of the dandiset with updated metadata.
-    """
-    # Skip for dandisets that have published versions
-    if draft_version.dandiset.versions.exclude(version='draft').exists():
-        return
-
-    # Generate DOI payload with updated metadata
-    dandiset_doi, dandiset_doi_payload = doi.generate_doi_data(
-        draft_version,
-        version_doi=False,  # Generate a Dandiset DOI, not a Version DOI
-        event=None,  # Keep as Draft DOI
-    )
-
-    # Create or update the DOI
-    doi.create_or_update_doi(dandiset_doi_payload)
-
-    # If the version doesn't have a DOI yet, store it
-    if draft_version.doi is None:
-        draft_version.doi = dandiset_doi
-        draft_version.save()
-        logger.info('Created new Draft DOI %s', dandiset_doi)
-    else:
-        logger.info('Updated Draft DOI %s with new metadata', draft_version.doi)

dandiapi/api/tasks/__init__.py

@@ -125,3 +125,15 @@ def create_dandiset_draft_doi_task(version_id: int) -> None:
     except Exception:
         # Log error but allow dandiset creation to proceed
         logger.exception('Failed to create Draft DOI for dandiset %s', version.dandiset.identifier)
+
+
+@shared_task(soft_time_limit=60)
+def update_draft_version_doi_task(version_id: int) -> None:
+    from dandiapi.api.doi import _update_draft_version_doi
+
+    version = Version.objects.get(id=version_id)
+    try:
+        _update_draft_version_doi(version)
+    except Exception:
+        # Log error but allow version update to proceed
+        logger.exception('Failed to update Draft DOI for dandiset %s', version.dandiset.identifier)

dandiapi/api/tests/test_audit.py

@@ -123,7 +123,6 @@ def test_audit_update_metadata(api_client, draft_version, user, mocker):
     dandiset = draft_version.dandiset
     add_dandiset_owner(dandiset, user)
 
-    mock_update_doi = mocker.patch('dandiapi.api.views.version.update_draft_version_doi')
     # Edit its metadata.
     metadata = draft_version.metadata
     metadata['foo'] = 'bar'
@@ -145,7 +144,6 @@ def test_audit_update_metadata(api_client, draft_version, user, mocker):
     metadata = rec.details['metadata']
     assert metadata['name'] == 'baz'
     assert metadata['foo'] == 'bar'
-    mock_update_doi.assert_called_once()
 
 
 @pytest.mark.django_db

dandiapi/api/tests/test_dandiset.py

@@ -8,7 +8,6 @@
 
 from dandiapi.api.asset_paths import add_asset_paths, add_version_asset_paths
 from dandiapi.api.models import Dandiset, Version
-from dandiapi.api.services.dandiset import update_draft_version_doi
 from dandiapi.api.services.permissions.dandiset import (
     add_dandiset_owner,
     get_dandiset_owners,
@@ -1356,69 +1355,3 @@ def test_dandiset_list_starred(api_client, user, dandiset_factory):
 def test_dandiset_list_starred_unauthenticated(api_client):
     response = api_client.get('/api/dandisets/', {'starred': True})
     assert response.status_code == 401
-
-
-@pytest.mark.django_db
-def test_update_draft_version_doi_no_previous_doi(draft_version, mocker):
-    """Test updating a draft DOI when none exists yet."""
-    # Set up mocks
-    mock_generate_doi = mocker.patch('dandiapi.api.doi.generate_doi_data')
-    mock_generate_doi.return_value = ('10.48324/dandi.000123', {'data': {'attributes': {}}})
-
-    mock_create_doi = mocker.patch('dandiapi.api.doi.create_or_update_doi')
-    mock_create_doi.return_value = '10.48324/dandi.000123'
-
-    update_draft_version_doi(draft_version)
-
-    # Verify the mocks were called correctly
-    mock_generate_doi.assert_called_once_with(
-        draft_version,
-        version_doi=False,
-        event=None
-    )
-    mock_create_doi.assert_called_once_with({'data': {'attributes': {}}})
-
-    # Verify the DOI was stored in the draft version
-    assert draft_version.doi == '10.48324/dandi.000123'
-
-
-@pytest.mark.django_db
-def test_update_draft_version_doi_existing_doi(draft_version, mocker):
-    """Test updating a draft DOI when one already exists."""
-    # Set existing DOI
-    draft_version.doi = '10.48324/dandi.000123'
-    draft_version.save()
-
-    # Set up mocks
-    mock_generate_doi = mocker.patch('dandiapi.api.doi.generate_doi_data')
-    mock_generate_doi.return_value = ('10.48324/dandi.000123', {'data': {'attributes': {}}})
-
-    mock_create_doi = mocker.patch('dandiapi.api.doi.create_or_update_doi')
-    mock_create_doi.return_value = '10.48324/dandi.000123'
-
-    update_draft_version_doi(draft_version)
-
-    # Verify the mocks were called correctly
-    mock_generate_doi.assert_called_once_with(
-        draft_version,
-        version_doi=False,
-        event=None
-    )
-    mock_create_doi.assert_called_once_with({'data': {'attributes': {}}})
-
-    # Verify the DOI is still the same
-    assert draft_version.doi == '10.48324/dandi.000123'
-
-
-@pytest.mark.django_db
-def test_update_draft_version_doi_published_version(draft_version, published_version, mocker):
-    """Test that update_draft_version_doi is a no-op for dandisets with published versions."""
-    # Set up mocks
-    mock_generate_doi = mocker.patch('dandiapi.api.doi.generate_doi_data')
-    mock_create_doi = mocker.patch('dandiapi.api.doi.create_or_update_doi')
-
-    update_draft_version_doi(draft_version)
-
-    # Verify no DOI operations were performed
-    mock_generate_doi.assert_not_called()
-    mock_create_doi.assert_not_called()

dandiapi/api/tests/test_doi.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from dandiapi.api.doi import _create_dandiset_draft_doi
+from dandiapi.api.doi import _create_dandiset_draft_doi, _update_draft_version_doi
 
 
 @pytest.mark.django_db
@@ -27,4 +27,70 @@ def test__create_dandiset_draft_doi(draft_version, mocker):
     mock_create_doi.assert_called_once_with({'data': {'attributes': {}}})
 
     # Verify the DOI was stored in the draft version
-    assert draft_version.doi == '10.48324/dandi.000123'
+    assert draft_version.doi == '10.48324/dandi.000123'
+
+
+@pytest.mark.django_db
+def test_update_draft_version_doi_no_previous_doi(draft_version, mocker):
+    """Test updating a draft DOI when none exists yet."""
+    # Set up mocks
+    mock_generate_doi = mocker.patch('dandiapi.api.doi.generate_doi_data')
+    mock_generate_doi.return_value = ('10.48324/dandi.000123', {'data': {'attributes': {}}})
+
+    mock_create_doi = mocker.patch('dandiapi.api.doi.create_or_update_doi')
+    mock_create_doi.return_value = '10.48324/dandi.000123'
+
+    _update_draft_version_doi(draft_version)
+
+    # Verify the mocks were called correctly
+    mock_generate_doi.assert_called_once_with(
+        draft_version,
+        version_doi=False,
+        event=None
+    )
+    mock_create_doi.assert_called_once_with({'data': {'attributes': {}}})
+
+    # Verify the DOI was stored in the draft version
+    assert draft_version.doi == '10.48324/dandi.000123'
+
+
+@pytest.mark.django_db
+def test_update_draft_version_doi_existing_doi(draft_version, mocker):
+    """Test updating a draft DOI when one already exists."""
+    # Set existing DOI
+    draft_version.doi = '10.48324/dandi.000123'
+    draft_version.save()
+
+    # Set up mocks
+    mock_generate_doi = mocker.patch('dandiapi.api.doi.generate_doi_data')
+    mock_generate_doi.return_value = ('10.48324/dandi.000123', {'data': {'attributes': {}}})
+
+    mock_create_doi = mocker.patch('dandiapi.api.doi.create_or_update_doi')
+    mock_create_doi.return_value = '10.48324/dandi.000123'
+
+    _update_draft_version_doi(draft_version)
+
+    # Verify the mocks were called correctly
+    mock_generate_doi.assert_called_once_with(
+        draft_version,
+        version_doi=False,
+        event=None
+    )
+    mock_create_doi.assert_called_once_with({'data': {'attributes': {}}})
+
+    # Verify the DOI is still the same
+    assert draft_version.doi == '10.48324/dandi.000123'
+
+
+@pytest.mark.django_db
+def test_update_draft_version_doi_published_version(draft_version, published_version, mocker):
+    """Test that update_draft_version_doi is a no-op for dandisets with published versions."""
+    # Set up mocks
+    mock_generate_doi = mocker.patch('dandiapi.api.doi.generate_doi_data')
+    mock_create_doi = mocker.patch('dandiapi.api.doi.create_or_update_doi')
+
+    _update_draft_version_doi(draft_version)
+
+    # Verify no DOI operations were performed
+    mock_generate_doi.assert_not_called()
+    mock_create_doi.assert_not_called()