fixup linting

Author: asmacdo

dandiapi/api/datacite.py

@@ -31,16 +31,15 @@
 logger = logging.getLogger(__name__)
 
 
-
 def block_during_test(fn):
-    """
-    Datacite API should not be called
-    """
+    """Datacite API should not be called."""
+
     @wraps(fn)
     def wrapper(*args, **kwargs):
-        if "pytest" in sys.modules:
-            raise RuntimeError(f"DOI calls to {fn.__name__} blocked during test.")
+        if 'pytest' in sys.modules:
+            raise RuntimeError(f'DOI calls to {fn.__name__} blocked during test.')
         return fn(*args, **kwargs)
+
     return wrapper
 
 
@@ -73,13 +72,13 @@ def format_doi(self, dandiset_id: str, version_id: str | None = None) -> str:
             Formatted DOI string.
         """
         if version_id:
-            # TODO(asmaco) replace "dandi" with non-hardcoded ID_PATTERN
+            # TODO(asmaco): replace "dandi" with non-hardcoded ID_PATTERN
             # https://github.com/dandi/dandi-schema/pull/294/files#diff-43c9cc813638d87fd33e527a7baccb2fd7dff85595a7e686bfaf61f0409bd403R47
             return f'{self.api_prefix}/dandi.{dandiset_id}/{version_id}'
         return f'{self.api_prefix}/dandi.{dandiset_id}'
 
     def generate_doi_data(
-        self, version: Version, version_doi: bool = True, event: str | None = None
+        self, version: Version, *, version_doi: bool = True, event: str | None = None
     ) -> tuple[str, dict]:
         """
         Generate DOI data for a version or dandiset.
@@ -95,8 +94,9 @@ def generate_doi_data(
         Returns:
             Tuple of (doi_string, datacite_payload)
         """
-        # TODO(asmacdo) if not datacite configured make sure we dont save any dois to model
+        # TODO(asmacdo): if not datacite configured make sure we dont save any dois to model
         from dandischema.datacite import to_datacite
+
         dandiset_id = version.dandiset.identifier
         version_id = version.version
         metadata = copy.deepcopy(version.metadata)
@@ -158,7 +158,7 @@ def create_or_update_doi(self, original_datacite_payload: dict) -> str | None:
             )
             response.raise_for_status()
             # Return early on success
-            return doi
+            return doi  # noqa: TRY300
         except requests.exceptions.HTTPError as e:
             # HTTP 422 status code means DOI already exists
             already_exists_code = 422
@@ -174,8 +174,7 @@ def create_or_update_doi(self, original_datacite_payload: dict) -> str | None:
                         timeout=self.timeout,
                     )
                     update_response.raise_for_status()
-                    # Success with update
-                    return doi
+                    return doi  # noqa: TRY300
                 except Exception:
                     error_details = f'Failed to update existing DOI {doi}'
                     if e.response and hasattr(e.response, 'text'):
@@ -259,5 +258,3 @@ def delete_or_hide_doi(self, doi: str) -> None:
                 return
             logger.exception('Failed to delete or hide DOI %s', doi)
             raise
-
-

dandiapi/api/doi.py

@@ -10,8 +10,6 @@
 import logging
 from typing import TYPE_CHECKING
 
-from django.conf import settings
-
 from dandiapi.api.datacite import DataCiteClient
 
 if TYPE_CHECKING:
@@ -111,7 +109,7 @@ def _handle_publication_dois(version_id: int) -> None:
     draft_version = version.dandiset.draft_version
 
     # Check if this is the first publication (no prior DOI in draft version)
-    # TODO(asmacdo) not true anymore, we need to check the db.
+    # TODO(asmacdo): not true anymore, we need to check the db.
     # if draft_version.dandiset.versions.exclude(version='draft').exists():
     is_first_publication = draft_version.doi is None
 
@@ -137,7 +135,7 @@ def _handle_publication_dois(version_id: int) -> None:
         )
 
     # Create or update the DOIs
-    # TODO(asmacdo) we need to try:except here, so dandiset doi doesnt block version doi
+    # TODO(asmacdo): we need to try:except here, so dandiset doi doesn't block version doi
     datacite_client.create_or_update_doi(dandiset_doi_payload)
     datacite_client.create_or_update_doi(version_doi_payload)
 

dandiapi/api/services/dandiset/__init__.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-import logging
-
 from django.db import transaction
 
 from dandiapi.api import doi
@@ -19,8 +17,6 @@
 from dandiapi.api.services.version.metadata import _normalize_version_metadata
 from dandiapi.api.tasks import create_dandiset_draft_doi_task
 
-logger = logging.getLogger(__name__)
-
 
 def create_dandiset(
     *,

dandiapi/api/services/publish/__init__.py

@@ -8,7 +8,6 @@
 from django.db import transaction
 from more_itertools import ichunked
 
-from dandiapi.api import doi
 from dandiapi.api.asset_paths import add_version_asset_paths
 from dandiapi.api.models import Asset, Dandiset, Version
 from dandiapi.api.services import audit

dandiapi/api/tests/test_dandiset.py

@@ -756,7 +756,9 @@ def test_dandiset_rest_create_with_invalid_identifier(api_client, admin_user):
         (Dandiset.EmbargoStatus.UNEMBARGOING, False, '10.48324/dandi.000123'),
     ],
 )
-def test_dandiset_rest_delete(api_client, draft_version_factory, user, embargo_status, success, doi, mocker):
+def test_dandiset_rest_delete(
+    api_client, draft_version_factory, user, embargo_status, success, doi, mocker
+):
     api_client.force_authenticate(user=user)
 
     mock_delete_doi = mocker.patch('dandiapi.api.doi.delete_or_hide_doi')

dandiapi/api/tests/test_datacite.py

@@ -1,13 +1,12 @@
 from __future__ import annotations
 
-import pytest
-import requests
 from django.conf import settings
+import pytest
 from requests.exceptions import HTTPError
 
-from dandiapi.api.datacite import DataCiteClient, DANDI_DOI_SETTINGS
+from dandiapi.api.datacite import DataCiteClient
+
 
-# Mock individual HTTP methods for safety
 @pytest.fixture(autouse=True)
 def mock_requests(mocker):
     """Mock individual request methods for all tests to prevent actual HTTP calls."""
@@ -31,9 +30,7 @@ def datacite_client():
 
 @pytest.fixture
 def datacite_client_unsafe():
-    """
-    Bypass safety feature that prevents API calls to datacite during tests.
-    """
+    """Bypass safety feature that prevents API calls to datacite during tests."""
     client = DataCiteClient()
     if hasattr(client.create_or_update_doi, '__wrapped__'):
         client.create_or_update_doi = client.create_or_update_doi.__wrapped__.__get__(client)
@@ -96,7 +93,9 @@ def test_generate_doi_data(datacite_client, published_version, mocker):
     assert doi_string == expected_doi
     assert 'doi' in published_version.metadata
     # Make sure metadata is copied, not modified
-    assert id(published_version.metadata) != id(datacite_client.generate_doi_data(published_version)[1])
+    assert id(published_version.metadata) != id(
+        datacite_client.generate_doi_data(published_version)[1]
+    )
 
     # Test Dandiset DOI
     doi_string, payload = datacite_client.generate_doi_data(published_version, version_doi=False)
@@ -123,10 +122,12 @@ def test_create_or_update_doi_not_configured(datacite_client_unsafe, mock_reques
     mock_logger.warning.assert_called_once()
 
 
-def test_create_or_update_doi_publish_disabled_event_publish(datacite_client_unsafe, mock_requests, mocker):
+def test_create_or_update_doi_publish_disabled_event_publish(
+    datacite_client_unsafe, mock_requests, mocker
+):
     """Test create_or_update_doi when DANDI_DOI_PUBLISH is False."""
     mocker.patch.object(datacite_client_unsafe, 'is_configured', return_value=True)
-    mocker.patch.object(settings, 'DANDI_DOI_PUBLISH', False)
+    mocker.patch.object(settings, 'DANDI_DOI_PUBLISH', new=False)
     mock_logger = mocker.patch('dandiapi.api.datacite.logger')
 
     # Configure mock response
@@ -165,7 +166,7 @@ def test_create_or_update_doi_publish_disabled_event_publish(datacite_client_uns
 def test_create_or_update_doi_new_doi(datacite_client_unsafe, mock_requests, mocker):
     """Test creating a new DOI successfully."""
     mocker.patch.object(datacite_client_unsafe, 'is_configured', return_value=True)
-    mocker.patch.object(settings, 'DANDI_DOI_PUBLISH', True)
+    mocker.patch.object(settings, 'DANDI_DOI_PUBLISH', new=True)
 
     # Configure mock response
     mock_response = mocker.Mock()
@@ -191,11 +192,11 @@ def test_create_or_update_doi_new_doi(datacite_client_unsafe, mock_requests, moc
 def test_create_or_update_doi_existing_doi(datacite_client_unsafe, mock_requests, mocker):
     """Test updating an existing DOI."""
     mocker.patch.object(datacite_client_unsafe, 'is_configured', return_value=True)
-    mocker.patch.object(settings, 'DANDI_DOI_PUBLISH', True)
+    mocker.patch.object(settings, 'DANDI_DOI_PUBLISH', new=True)
 
     # Mock POST to fail with 422 (already exists)
     mock_post_response = mocker.Mock()
-    http_error = HTTPError("DOI already exists")
+    http_error = HTTPError('DOI already exists')
     http_error.response = mocker.Mock()
     http_error.response.status_code = 422
     mock_post_response.raise_for_status.side_effect = http_error
@@ -225,10 +226,10 @@ def test_create_or_update_doi_post_error(datacite_client_unsafe, mock_requests,
     mock_logger = mocker.patch('dandiapi.api.datacite.logger')
 
     # Mock POST to fail with 400
-    http_error = HTTPError("Bad request")
+    http_error = HTTPError('Bad request')
     http_error.response = mocker.Mock()
     http_error.response.status_code = 400
-    http_error.response.text = "Bad request"
+    http_error.response.text = 'Bad request'
     mock_requests.post.side_effect = http_error
 
     payload = {'data': {'attributes': {'doi': '10.12345/test'}}}
@@ -250,16 +251,16 @@ def test_create_or_update_doi_put_error(datacite_client_unsafe, mock_requests, m
 
     # Mock POST to fail with 422 (already exists)
     mock_post_response = mocker.Mock()
-    http_error = HTTPError("DOI already exists")
+    http_error = HTTPError('DOI already exists')
     http_error.response = mocker.Mock()
     http_error.response.status_code = 422
     mock_post_response.raise_for_status.side_effect = http_error
     mock_requests.post.return_value = mock_post_response
 
     # Mock PUT to fail
-    put_error = HTTPError("Update failed")
+    put_error = HTTPError('Update failed')
     put_error.response = mocker.Mock()
-    put_error.response.text = "Update failed"
+    put_error.response.text = 'Update failed'
     mock_requests.put.side_effect = put_error
 
     payload = {'data': {'attributes': {'doi': '10.12345/test'}}}
@@ -298,9 +299,7 @@ def test_delete_or_hide_doi_draft(datacite_client_unsafe, mock_requests, mocker)
 
     # Mock GET to return a draft DOI
     mock_get_response = mocker.Mock()
-    mock_get_response.json.return_value = {
-        'data': {'attributes': {'state': 'draft'}}
-    }
+    mock_get_response.json.return_value = {'data': {'attributes': {'state': 'draft'}}}
     mock_get_response.raise_for_status = mocker.Mock()
     mock_requests.get.return_value = mock_get_response
 
@@ -324,14 +323,12 @@ def test_delete_or_hide_doi_draft(datacite_client_unsafe, mock_requests, mocker)
 def test_delete_or_hide_doi_findable_publish_enabled(datacite_client_unsafe, mock_requests, mocker):
     """Test hiding a findable DOI when DANDI_DOI_PUBLISH is True."""
     mocker.patch.object(datacite_client_unsafe, 'is_configured', return_value=True)
-    mocker.patch.object(settings, 'DANDI_DOI_PUBLISH', True)
+    mocker.patch.object(settings, 'DANDI_DOI_PUBLISH', new=True)
     mock_logger = mocker.patch('dandiapi.api.datacite.logger')
 
     # Mock GET to return a findable DOI
     mock_get_response = mocker.Mock()
-    mock_get_response.json.return_value = {
-        'data': {'attributes': {'state': 'findable'}}
-    }
+    mock_get_response.json.return_value = {'data': {'attributes': {'state': 'findable'}}}
     mock_get_response.raise_for_status = mocker.Mock()
     mock_requests.get.return_value = mock_get_response
 
@@ -354,17 +351,17 @@ def test_delete_or_hide_doi_findable_publish_enabled(datacite_client_unsafe, moc
     mock_logger.info.assert_called_once()
 
 
-def test_delete_or_hide_doi_findable_publish_disabled(datacite_client_unsafe, mock_requests, mocker):
+def test_delete_or_hide_doi_findable_publish_disabled(
+    datacite_client_unsafe, mock_requests, mocker
+):
     """Test not hiding a findable DOI when DANDI_DOI_PUBLISH is False."""
     mocker.patch.object(datacite_client_unsafe, 'is_configured', return_value=True)
-    mocker.patch.object(settings, 'DANDI_DOI_PUBLISH', False)
+    mocker.patch.object(settings, 'DANDI_DOI_PUBLISH', new=False)
     mock_logger = mocker.patch('dandiapi.api.datacite.logger')
 
     # Mock GET to return a findable DOI
     mock_get_response = mocker.Mock()
-    mock_get_response.json.return_value = {
-        'data': {'attributes': {'state': 'findable'}}
-    }
+    mock_get_response.json.return_value = {'data': {'attributes': {'state': 'findable'}}}
     mock_get_response.raise_for_status = mocker.Mock()
     mock_requests.get.return_value = mock_get_response
 
@@ -384,7 +381,7 @@ def test_delete_or_hide_doi_nonexistent(datacite_client_unsafe, mock_requests, m
     mock_logger = mocker.patch('dandiapi.api.datacite.logger')
 
     # Mock GET to fail with 404
-    get_error = HTTPError("Not found")
+    get_error = HTTPError('Not found')
     get_error.response = mocker.Mock()
     get_error.response.status_code = 404
     mock_requests.get.side_effect = get_error
@@ -405,7 +402,7 @@ def test_delete_or_hide_doi_get_error(datacite_client_unsafe, mock_requests, moc
     mock_logger = mocker.patch('dandiapi.api.datacite.logger')
 
     # Mock GET to fail with 500
-    get_error = HTTPError("Server error")
+    get_error = HTTPError('Server error')
     get_error.response = mocker.Mock()
     get_error.response.status_code = 500
     mock_requests.get.side_effect = get_error

dandiapi/api/tests/test_doi.py

@@ -22,7 +22,7 @@ def test__create_dandiset_draft_doi(draft_version, mocker):
     mock_generate_doi.assert_called_once_with(
         draft_version,
         version_doi=False,
-        event=None  # Draft DOI
+        event=None,  # Draft DOI
     )
     mock_create_doi.assert_called_once_with({'data': {'attributes': {}}})
 
@@ -43,11 +43,7 @@ def test_update_draft_version_doi_no_previous_doi(draft_version, mocker):
     _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_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
@@ -71,11 +67,7 @@ def test_update_draft_version_doi_existing_doi(draft_version, mocker):
     _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_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
@@ -93,4 +85,4 @@ def test_update_draft_version_doi_published_version(draft_version, published_ver
 
     # Verify no DOI operations were performed
     mock_generate_doi.assert_not_called()
-    mock_create_doi.assert_not_called()
+    mock_create_doi.assert_not_called()

dandiapi/api/tests/test_version.py

@@ -636,9 +636,7 @@ def test_version_rest_update(api_client, user, draft_version):
 
 @pytest.mark.django_db
 def test_version_rest_update_embargoed(api_client, user, draft_version_factory):
-    draft_version = draft_version_factory(
-        dandiset__embargo_status=Dandiset.EmbargoStatus.EMBARGOED
-    )
+    draft_version = draft_version_factory(dandiset__embargo_status=Dandiset.EmbargoStatus.EMBARGOED)
     add_dandiset_owner(draft_version.dandiset, user)
     api_client.force_authenticate(user=user)