Add published schema endpoints and refactor to reduce code duplication

Extends the schema API to support both regular and published models:

New endpoints:
- /api/schema/latest/published-dandiset/
- /api/schema/<version>/published-dandiset/
- /api/schema/latest/published-asset/
- /api/schema/<version>/published-asset/

Refactoring improvements:
- Extract common logic into _schema_view_impl() helper function
- Update URL patterns and view exports

Testing enhancements:
- Extend parametrized tests to cover published schema endpoints

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>

Author: yarikoptic

dandiapi/api/tests/test_schema.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from dandischema.models import Asset, Dandiset
+from dandischema.models import Asset, Dandiset, PublishedAsset, PublishedDandiset
 from dandischema.utils import TransitionalGenerateJsonSchema
 from django.conf import settings
 from django.urls import reverse
@@ -14,6 +14,13 @@
         ('schema-dandiset-latest', Dandiset, {}),
         ('schema-asset-latest', Asset, {}),
         ('schema-dandiset', Dandiset, {'version': settings.DANDI_SCHEMA_VERSION}),
+        ('schema-published-dandiset-latest', PublishedDandiset, {}),
+        ('schema-published-asset-latest', PublishedAsset, {}),
+        (
+            'schema-published-dandiset',
+            PublishedDandiset,
+            {'version': settings.DANDI_SCHEMA_VERSION},
+        ),
     ],
 )
 def test_schema_latest(api_client, endpoint, model, kwargs):
@@ -33,7 +40,13 @@ def test_schema_latest(api_client, endpoint, model, kwargs):
     assert schema == expected_schema
 
     # Also compare against the original GitHub schema content
-    schema_type = endpoint.split('-')[1]  # Extract 'dandiset' or 'asset' from endpoint name
+    # Extract schema type from endpoint name (e.g., 'dandiset', 'published-dandiset')
+    endpoint_parts = endpoint.split('-')
+    if endpoint.endswith('-latest'):
+        schema_type = '-'.join(endpoint_parts[1:-1])  # Remove 'schema' prefix and 'latest' suffix
+    else:
+        schema_type = '-'.join(endpoint_parts[1:])  # Remove only 'schema' prefix
+
     github_url = (
         'https://raw.githubusercontent.com/dandi/schema/master/'
         f'releases/{settings.DANDI_SCHEMA_VERSION}/{schema_type}.json'
@@ -59,6 +72,8 @@ def test_schema_latest(api_client, endpoint, model, kwargs):
     [
         'schema-dandiset',
         'schema-asset',
+        'schema-published-dandiset',
+        'schema-published-asset',
     ],
 )
 def test_schema_invalid_version(api_client, endpoint):

dandiapi/api/views/__init__.py

@@ -7,7 +7,12 @@
 from .info import info_view
 from .robots import robots_txt_view
 from .root import root_content_view
-from .schema import asset_schema_view, dandiset_schema_view
+from .schema import (
+    asset_schema_view,
+    dandiset_schema_view,
+    published_asset_schema_view,
+    published_dandiset_schema_view,
+)
 from .stats import stats_view
 from .upload import (
     blob_read_view,
@@ -30,6 +35,8 @@
     'blob_read_view',
     'dandiset_schema_view',
     'mailchimp_csv_view',
+    'published_asset_schema_view',
+    'published_dandiset_schema_view',
     'upload_initialize_view',
     'upload_complete_view',
     'upload_validate_view',

dandiapi/api/views/schema.py

@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, Any
 
-from dandischema.models import Asset, Dandiset
+from dandischema.models import Asset, Dandiset, PublishedAsset, PublishedDandiset
 from dandischema.utils import TransitionalGenerateJsonSchema
 from django.conf import settings
 from django.http import HttpRequest, JsonResponse
@@ -31,6 +31,31 @@ def generate_model_schema(model_class: type[BaseModel]) -> dict[str, Any]:
     return model_class.model_json_schema(schema_generator=TransitionalGenerateJsonSchema)
 
 
+def _schema_view_impl(
+    request: HttpRequest,
+    model_class: type[BaseModel],
+    version: str | None = None,
+) -> JsonResponse:
+    """
+    Implement generic schema endpoint logic.
+
+    Args:
+        request: HTTP request object
+        model_class: Pydantic model class to generate schema for
+        version: Schema version (optional)
+
+    Returns:
+        JsonResponse containing the JSON schema
+    """
+    if version and version not in {settings.DANDI_SCHEMA_VERSION, 'latest'}:
+        raise NotFound(f'Schema version {version} not found')
+
+    # Generate the schema JSON using the same approach as dandischema
+    schema = generate_model_schema(model_class)
+
+    return JsonResponse(schema)
+
+
 @swagger_auto_schema(
     method='GET',
     operation_summary='Get schema for Dandiset',
@@ -48,13 +73,7 @@ def dandiset_schema_view(request: HttpRequest, version: str | None = None) -> Js
     If a version is provided and does not match the current version, a 404 is returned.
     In the future, multiple versions could be supported.
     """
-    if version and version not in {settings.DANDI_SCHEMA_VERSION, 'latest'}:
-        raise NotFound(f'Schema version {version} not found')
-
-    # Generate the schema JSON using the same approach as dandischema
-    schema = generate_model_schema(Dandiset)
-
-    return JsonResponse(schema)
+    return _schema_view_impl(request, Dandiset, version)
 
 
 @swagger_auto_schema(
@@ -74,10 +93,46 @@ def asset_schema_view(request: HttpRequest, version: str | None = None) -> JsonR
     If a version is provided and does not match the current version, a 404 is returned.
     In the future, multiple versions could be supported.
     """
-    if version and version not in {settings.DANDI_SCHEMA_VERSION, 'latest'}:
-        raise NotFound(f'Schema version {version} not found')
+    return _schema_view_impl(request, Asset, version)
 
-    # Generate the schema JSON using the same approach as dandischema
-    schema = generate_model_schema(Asset)
 
-    return JsonResponse(schema)
+@swagger_auto_schema(
+    method='GET',
+    operation_summary='Get schema for Published Dandiset',
+    operation_description='Returns the JSONSchema for Published Dandiset metadata',
+)
+@api_view(['GET'])
+def published_dandiset_schema_view(
+    request: HttpRequest, version: str | None = None
+) -> JsonResponse:
+    """
+    Return the JSONSchema for Published Dandiset metadata.
+
+    This endpoint provides the currently configured schema based on the application's
+    DANDI_SCHEMA_VERSION setting. Published Dandisets have additional required fields
+    and constraints compared to draft Dandisets.
+
+    If a version is provided and does not match the current version, a 404 is returned.
+    In the future, multiple versions could be supported.
+    """
+    return _schema_view_impl(request, PublishedDandiset, version)
+
+
+@swagger_auto_schema(
+    method='GET',
+    operation_summary='Get schema for Published Asset',
+    operation_description='Returns the JSONSchema for Published Asset metadata',
+)
+@api_view(['GET'])
+def published_asset_schema_view(request: HttpRequest, version: str | None = None) -> JsonResponse:
+    """
+    Return the JSONSchema for Published Asset metadata.
+
+    This endpoint provides the currently configured schema based on the application's
+    DANDI_SCHEMA_VERSION setting. Published Assets have additional required fields
+    and constraints compared to draft Assets.
+
+    If a version is provided and does not match the current version, a 404 is returned.
+    In the future, multiple versions could be supported.
+    """
+    return _schema_view_impl(request, PublishedAsset, version)

dandiapi/urls.py

@@ -22,6 +22,8 @@
     dandiset_schema_view,
     info_view,
     mailchimp_csv_view,
+    published_asset_schema_view,
+    published_dandiset_schema_view,
     robots_txt_view,
     root_content_view,
     stats_view,
@@ -70,6 +72,26 @@
     path('api/schema/<str:version>/dandiset/', dandiset_schema_view, name='schema-dandiset'),
     path('api/schema/latest/asset/', asset_schema_view, name='schema-asset-latest'),
     path('api/schema/<str:version>/asset/', asset_schema_view, name='schema-asset'),
+    path(
+        'api/schema/latest/published-dandiset/',
+        published_dandiset_schema_view,
+        name='schema-published-dandiset-latest',
+    ),
+    path(
+        'api/schema/<str:version>/published-dandiset/',
+        published_dandiset_schema_view,
+        name='schema-published-dandiset',
+    ),
+    path(
+        'api/schema/latest/published-asset/',
+        published_asset_schema_view,
+        name='schema-published-asset-latest',
+    ),
+    path(
+        'api/schema/<str:version>/published-asset/',
+        published_asset_schema_view,
+        name='schema-published-asset',
+    ),
     path('api/uploads/initialize/', upload_initialize_view, name='upload-initialize'),
     re_path(
         r'api/uploads/(?P<upload_id>[0-9a-f\-]{36})/complete/',