remove unnecessary compatability layer

Author: asmacdo

dandiapi/api/doi.py

@@ -24,42 +24,6 @@
 datacite_client = DataCiteClient()
 
 
-def generate_doi_data(
-    version: Version, version_doi: bool = True, event: str | None = None
-) -> tuple[str, dict]:
-    """
-    Generate DOI data for a version or dandiset.
-
-    Args:
-        version: Version object containing metadata.
-        version_doi: If True, generate a Version DOI, otherwise generate a Dandiset DOI.
-        event: The DOI event type.
-            - None: Creates a Draft DOI.
-            - "publish": Creates or promotes to a Findable DOI.
-            - "hide": Converts to a Registered DOI.
-
-    Returns:
-        Tuple of (doi_string, datacite_payload)
-    """
-    return datacite_client.generate_doi_data(version, version_doi, event)
-
-
-def create_or_update_doi(datacite_payload: dict) -> str | None:
-    """
-    Create or update a DOI with the DataCite API.
-
-    Args:
-        datacite_payload: The DOI payload to send to DataCite.
-
-    Returns:
-        The DOI string on success, None on failure when not configured.
-
-    Raises:
-        requests.exceptions.HTTPError: If the API request fails.
-    """
-    return datacite_client.create_or_update_doi(datacite_payload)
-
-
 def delete_or_hide_doi(doi: str) -> None:
     """
     Delete a draft DOI or hide a findable DOI depending on its state.
@@ -87,14 +51,14 @@ def _create_dandiset_draft_doi(draft_version: Version) -> None:
         draft_version: The draft version of the dandiset.
     """
     # Generate a Draft DOI (event=None)
-    dandiset_doi, dandiset_doi_payload = generate_doi_data(
+    dandiset_doi, dandiset_doi_payload = datacite_client.generate_doi_data(
         draft_version,
         version_doi=False,
         event=None,  # Draft DOI
     )
 
     # Create the DOI
-    create_or_update_doi(dandiset_doi_payload)
+    datacite_client.create_or_update_doi(dandiset_doi_payload)
 
     # Store the DOI in the draft version
     draft_version.doi = dandiset_doi
@@ -116,14 +80,14 @@ def _update_draft_version_doi(draft_version: Version) -> None:
         return
 
     # Generate DOI payload with updated metadata
-    dandiset_doi, dandiset_doi_payload = generate_doi_data(
+    dandiset_doi, dandiset_doi_payload = datacite_client.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)
+    datacite_client.create_or_update_doi(dandiset_doi_payload)
 
     # If the version doesn't have a DOI yet, store it
     if draft_version.doi is None:
@@ -152,30 +116,30 @@ def _handle_publication_dois(version_id: int) -> None:
     is_first_publication = draft_version.doi is None
 
     # Create Version DOI as Findable
-    version_doi, version_doi_payload = generate_doi_data(
+    version_doi, version_doi_payload = datacite_client.generate_doi_data(
         version, version_doi=True, event='publish'
     )
 
     # Either create or update the Dandiset DOI based on whether it's the first publication
     if is_first_publication:
         # For first publication: generate Dandiset DOI and promote from Draft to Findable
-        dandiset_doi, dandiset_doi_payload = generate_doi_data(
+        dandiset_doi, dandiset_doi_payload = datacite_client.generate_doi_data(
             version,
             version_doi=False,
             event='publish',  # Promote to Findable on first publication
         )
     else:
         # For subsequent publications: update the metadata but keep as Findable
-        dandiset_doi, dandiset_doi_payload = generate_doi_data(
+        dandiset_doi, dandiset_doi_payload = datacite_client.generate_doi_data(
             version,
             version_doi=False,
             event='publish',  # Update existing Findable DOI
         )
 
     # Create or update the DOIs
     # TODO(asmacdo) we need to try:except here, so dandiset doi doesnt block version doi
-    create_or_update_doi(dandiset_doi_payload)
-    create_or_update_doi(version_doi_payload)
+    datacite_client.create_or_update_doi(dandiset_doi_payload)
+    datacite_client.create_or_update_doi(version_doi_payload)
 
     # Store the DOI values
     version.doi = version_doi

dandiapi/api/tests/test_doi.py

@@ -9,10 +9,10 @@
 def test__create_dandiset_draft_doi(draft_version, mocker):
     """Test the _create_dandiset_draft_doi function directly."""
     # Set up mocks
-    mock_generate_doi = mocker.patch('dandiapi.api.doi.generate_doi_data')
+    mock_generate_doi = mocker.patch('dandiapi.api.doi.datacite_client.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 = mocker.patch('dandiapi.api.doi.datacite_client.create_or_update_doi')
     mock_create_doi.return_value = '10.48324/dandi.000123'
 
     # Call the function directly
@@ -34,10 +34,10 @@ def test__create_dandiset_draft_doi(draft_version, mocker):
 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 = mocker.patch('dandiapi.api.doi.datacite_client.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 = mocker.patch('dandiapi.api.doi.datacite_client.create_or_update_doi')
     mock_create_doi.return_value = '10.48324/dandi.000123'
 
     _update_draft_version_doi(draft_version)
@@ -62,10 +62,10 @@ def test_update_draft_version_doi_existing_doi(draft_version, mocker):
     draft_version.save()
 
     # Set up mocks
-    mock_generate_doi = mocker.patch('dandiapi.api.doi.generate_doi_data')
+    mock_generate_doi = mocker.patch('dandiapi.api.doi.datacite_client.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 = mocker.patch('dandiapi.api.doi.datacite_client.create_or_update_doi')
     mock_create_doi.return_value = '10.48324/dandi.000123'
 
     _update_draft_version_doi(draft_version)
@@ -86,8 +86,8 @@ def test_update_draft_version_doi_existing_doi(draft_version, mocker):
 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')
+    mock_generate_doi = mocker.patch('dandiapi.api.doi.datacite_client.generate_doi_data')
+    mock_create_doi = mocker.patch('dandiapi.api.doi.datacite_client.create_or_update_doi')
 
     _update_draft_version_doi(draft_version)