#177 Sync fork (mar 10 week)

.copier-answers.resonant.yml

@@ -1,8 +1,9 @@
-_commit: v0.41.0
+_commit: v0.47.1
 _src_path: gh:kitware-resonant/cookiecutter-resonant
 core_app_name: api
 include_example_code: false
 project_name: DANDI Archive
 project_slug: dandiapi
 python_package_name: dandiapi
 site_domain: api.dandiarchive.org
+use_asgi: false

.editorconfig

@@ -7,21 +7,28 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 charset = utf-8
 
-[*.py]
-indent_size = 4
-max_line_length = 100
+[*.{css,pcss}]
+indent_size = 2
 
 [*.html]
 indent_size = 2
 
-[*.css]
+[*.ini]
+indent_size = 4
+
+[*.{js,ts,vue}]
 indent_size = 2
+max_line_length = 100
 
-[{*.yml,*.yaml}]
+[*.{json,jsonc,json5}]
 indent_size = 2
 
-[*.ini]
+[*.py]
 indent_size = 4
+max_line_length = 100
+
+[*.toml]
+indent_size = 2
 
-[*.sh]
+[*.{yml,yaml}]
 indent_size = 2

.github/workflows/cli-integration.yml

@@ -68,19 +68,15 @@ jobs:
         if: matrix.dandi-version == 'release'
         run: >
           uvx --with dandi[test]
-          pytest --pyargs -v --dandi-api --deselect=tests/test_keyring.py::test_dandi_authenticate_no_env_var dandi
-          # TODO: Revert back to
-          # pytest --pyargs -v --dandi-api dandi
+          pytest --pyargs -v -s --dandi-api dandi
         env:
           DANDI_TESTS_PERSIST_DOCKER_COMPOSE: "1"
 
       - name: Run dandi-api tests in dandi-cli
         if: matrix.dandi-version == 'prod'
         run: >
           uvx --with "dandi[test] @ git+https://github.com/dandi/dandi-cli"
-          pytest --pyargs -v --dandi-api --deselect=tests/test_keyring.py::test_dandi_authenticate_no_env_var dandi
-          # TODO: Revert back to
-          # pytest --pyargs -v --dandi-api dandi
+          pytest --pyargs -v -s --dandi-api dandi
         env:
           DANDI_TESTS_PERSIST_DOCKER_COMPOSE: "1"
 

CHANGELOG.md

@@ -1,3 +1,101 @@
+# v0.21.8 (Fri Mar 06 2026)
+
+#### 🐛 Bug Fix
+
+- Upgrade to Resonant v0.47 [#2692](https://github.com/dandi/dandi-archive/pull/2692) ([@brianhelba](https://github.com/brianhelba))
+
+#### Authors: 1
+
+- Brian Helba ([@brianhelba](https://github.com/brianhelba))
+
+---
+
+# v0.21.7 (Fri Mar 06 2026)
+
+#### 🐛 Bug Fix
+
+- Add scrollbar to meditor component for overflowing content [#2724](https://github.com/dandi/dandi-archive/pull/2724) ([@kabilar](https://github.com/kabilar))
+- Don't return `null` names or usernames from user search endpoint [#2681](https://github.com/dandi/dandi-archive/pull/2681) ([@jjnesbitt](https://github.com/jjnesbitt))
+
+#### Authors: 2
+
+- Jacob Nesbitt ([@jjnesbitt](https://github.com/jjnesbitt))
+- Kabilar Gunalan ([@kabilar](https://github.com/kabilar))
+
+---
+
+# v0.21.6 (Wed Feb 18 2026)
+
+#### 🐛 Bug Fix
+
+- Properly unembargo blobs when asset is updated [#2713](https://github.com/dandi/dandi-archive/pull/2713) ([@jjnesbitt](https://github.com/jjnesbitt))
+
+#### Authors: 1
+
+- Jacob Nesbitt ([@jjnesbitt](https://github.com/jjnesbitt))
+
+---
+
+# v0.21.5 (Tue Feb 17 2026)
+
+:tada: This release contains work from a new contributor! :tada:
+
+Thank you, Heberto Mayorquin ([@h-mayorquin](https://github.com/h-mayorquin)), for all your work!
+
+#### 🐛 Bug Fix
+
+- Fix propagation of embargoed date from dandisets to assets [#2698](https://github.com/dandi/dandi-archive/pull/2698) ([@h-mayorquin](https://github.com/h-mayorquin) [@jjnesbitt](https://github.com/jjnesbitt))
+- bf: fix GarbageCollectionEvent.__str__ referencing nonexistent field [#2710](https://github.com/dandi/dandi-archive/pull/2710) ([@yarikoptic](https://github.com/yarikoptic) [@jjnesbitt](https://github.com/jjnesbitt))
+- Add "How to Cite" Tab to Dandiset Landing Page [#2671](https://github.com/dandi/dandi-archive/pull/2671) ([@bendichter](https://github.com/bendichter) [@jjnesbitt](https://github.com/jjnesbitt))
+
+#### 📝 Documentation
+
+- Fixes of minor inconsistencies in docs claude identified [#2709](https://github.com/dandi/dandi-archive/pull/2709) ([@yarikoptic](https://github.com/yarikoptic))
+
+#### 🧪 Tests
+
+- Revert "bf(test): test_nwb2asset_remote_asset which might be stalling here" [#2708](https://github.com/dandi/dandi-archive/pull/2708) ([@yarikoptic](https://github.com/yarikoptic))
+- ci(tests): pass -s to pytest  and skip hanging test_nwb2asset_remote_asset [#2662](https://github.com/dandi/dandi-archive/pull/2662) ([@yarikoptic](https://github.com/yarikoptic))
+
+#### Authors: 4
+
+- Ben Dichter ([@bendichter](https://github.com/bendichter))
+- Heberto Mayorquin ([@h-mayorquin](https://github.com/h-mayorquin))
+- Jacob Nesbitt ([@jjnesbitt](https://github.com/jjnesbitt))
+- Yaroslav Halchenko ([@yarikoptic](https://github.com/yarikoptic))
+
+---
+
+# v0.21.4 (Thu Feb 05 2026)
+
+#### 🐛 Bug Fix
+
+- Update copyright year in footer [#2701](https://github.com/dandi/dandi-archive/pull/2701) ([@kabilar](https://github.com/kabilar))
+
+#### Authors: 1
+
+- Kabilar Gunalan ([@kabilar](https://github.com/kabilar))
+
+---
+
+# v0.21.3 (Mon Feb 02 2026)
+
+:tada: This release contains work from a new contributor! :tada:
+
+Thank you, William Allen ([@williamjallen](https://github.com/williamjallen)), for all your work!
+
+#### 🐛 Bug Fix
+
+- Update URL for user support [#2688](https://github.com/dandi/dandi-archive/pull/2688) ([@kabilar](https://github.com/kabilar))
+- Fix dandiset ID parsing during upload initialization [#2696](https://github.com/dandi/dandi-archive/pull/2696) ([@williamjallen](https://github.com/williamjallen))
+
+#### Authors: 2
+
+- Kabilar Gunalan ([@kabilar](https://github.com/kabilar))
+- William Allen ([@williamjallen](https://github.com/williamjallen))
+
+---
+
 # v0.21.2 (Tue Jan 13 2026)
 
 #### 🐛 Bug Fix

DEVELOPMENT.md

@@ -147,7 +147,7 @@ For frequent deployment administration tasks, `django-extensions` provides a con
 ### create_dev_dandiset
 
 ```
-python manage.py create_dev_dandiset --owner $(git config user.email) --name My Dummy Dandiset
+./manage.py create_dev_dandiset --owner $(git config user.email) --name My Dummy Dandiset
 ```
 
 This creates a dummy dandiset with valid metadata and a single dummy asset.

dandiapi/api/management/commands/cleanup_blobs.py

@@ -1,35 +1,28 @@
 from __future__ import annotations
 
-from django.conf import settings
+from django.core.files.storage import default_storage
 import djclick as click
-from storages.backends.s3 import S3Storage
 
 from dandiapi.api.models.upload import AssetBlob
 
-BUCKET = settings.DANDI_DANDISETS_BUCKET_NAME
-
-
-def s3_client():
-    storage = S3Storage(bucket_name=BUCKET)
-    return storage.connection.meta.client
-
 
 @click.command()
 @click.option('--delete', is_flag=True, default=False)
 def cleanup_blobs(*, delete: bool):
-    client = s3_client()
+    client = default_storage.s3_client
+    bucket_name = default_storage.bucket_name
     # Ignore pagination for now, hopefully there aren't enough objects to matter
-    objs = client.list_object_versions(Bucket=BUCKET, Prefix='dev/')
+    objs = client.list_object_versions(Bucket=bucket_name, Prefix='dev/')
     for version in objs['Versions']:
         if not AssetBlob.objects.filter(etag=version['ETag'][1:-1]).exists():
             click.echo(f'Deleting version {version["Key"]}')
             if delete:
                 client.delete_object(
-                    Bucket=BUCKET, Key=version['Key'], VersionId=version['VersionId']
+                    Bucket=bucket_name, Key=version['Key'], VersionId=version['VersionId']
                 )
     for delete_marker in objs['DeleteMarkers']:
         click.echo(f'Deleting delete marker {delete_marker["Key"]}')
         if delete:
             client.delete_object(
-                Bucket=BUCKET, Key=delete_marker['Key'], VersionId=delete_marker['VersionId']
+                Bucket=bucket_name, Key=delete_marker['Key'], VersionId=delete_marker['VersionId']
             )

dandiapi/api/management/commands/createsuperuser.py

@@ -3,10 +3,11 @@
 from typing import TYPE_CHECKING
 
 from django.db.models.signals import post_init, post_save
-from resonant_settings.allauth_support.management.commands import createsuperuser
 
 from dandiapi.api.models.user import UserMetadata
 
+from resonant_settings.allauth_support.management.commands import createsuperuser
+
 if TYPE_CHECKING:
     from resonant_settings.allauth_support.createsuperuser import EmailAsUsernameProxyUser
 

dandiapi/api/migrations/0001_default_site.py

@@ -10,7 +10,7 @@
     from django.db.migrations.state import StateApps
 
 
-def update_default_site(apps: StateApps, schema_editor: BaseDatabaseSchemaEditor):
+def update_default_site(apps: StateApps, schema_editor: BaseDatabaseSchemaEditor) -> None:
     Site = apps.get_model('sites', 'Site')
 
     # A default site object may or may not exist.
@@ -27,7 +27,7 @@ def update_default_site(apps: StateApps, schema_editor: BaseDatabaseSchemaEditor
     )
 
 
-def rollback_default_site(apps: StateApps, schema_editor: BaseDatabaseSchemaEditor):
+def rollback_default_site(apps: StateApps, schema_editor: BaseDatabaseSchemaEditor) -> None:
     Site = apps.get_model('sites', 'Site')
 
     # This is the initial value of the default site object, as populated by the sites app.
@@ -42,5 +42,5 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(update_default_site, rollback_default_site),
+        migrations.RunPython(update_default_site, rollback_default_site, elidable=False),
     ]

dandiapi/api/models/asset.py

@@ -13,14 +13,21 @@
 from django.core.exceptions import ValidationError
 from django.core.validators import RegexValidator
 from django.db import models
-from django.db.models import Q
+from django.db.models import CharField, DateField, Min, Q
+from django.db.models.functions import Cast
 from django.urls import reverse
 from django_extensions.db.models import TimeStampedModel
 
+from dandiapi.api.models.dandiset import Dandiset
 from dandiapi.api.models.metadata import PublishableMetadataMixin
 
 from .version import Version
 
+
+class EmbargoedAssetWithinOpenDandisetError(Exception):
+    """Raised when an embargoed asset exists in an open dandiset."""
+
+
 ASSET_CHARS_REGEX = r'[A-z0-9(),&\s#+~_=-]'
 ASSET_PATH_REGEX = rf'^({ASSET_CHARS_REGEX}?\/?\.?{ASSET_CHARS_REGEX})+$'
 ASSET_COMPUTED_FIELDS = [
@@ -236,23 +243,72 @@ def is_different_from(
     def dandi_asset_id(asset_id: str | uuid.UUID):
         return f'dandiasset:{asset_id}'
 
+    def access_metadata(self):
+        # Default to open access
+        embargoed = self.is_embargoed
+        access = {
+            'schemaKey': 'AccessRequirements',
+            'status': AccessType.EmbargoedAccess.value
+            if embargoed
+            else AccessType.OpenAccess.value,
+        }
+
+        # Nothing else to do if not embargoed
+        if not embargoed:
+            return access
+
+        # For zarr assets, is_embargoed is based on the dandiset directly, and a zarr can
+        # only be associated with one dandiset, so we know this dandiset is embargoed
+        if self.zarr is not None:
+            draft_version = self.zarr.dandiset.draft_version
+
+            # EmbargoedUntil isn't guaranteed to be set
+            embargo_end_date: str | None = draft_version.metadata['access'][0].get('embargoedUntil')
+            if embargo_end_date is not None:
+                access['embargoedUntil'] = embargo_end_date
+
+            return access
+
+        # In the blob case, we need to consider all dandisets this blob might be associated with,
+        # and take the minimum embargo end date
+
+        # This blob should only be associated with embargoed dandisets
+        open_dandisets = self.blob.assets.filter(
+            versions__dandiset__embargo_status=Dandiset.EmbargoStatus.OPEN
+        )
+        if open_dandisets.exists():
+            raise EmbargoedAssetWithinOpenDandisetError(
+                'Embargoed asset contained within OPEN dandiset'
+            )
+
+        # Retrieve the minimum embargo end date, across all dandisets
+        embargo_end_date: datetime.date | None = (
+            self.blob.assets.filter(versions__isnull=False)
+            .annotate(
+                embargo_end_date=Cast(
+                    Cast('versions__metadata__access__0__embargoedUntil', output_field=CharField()),
+                    output_field=DateField(),
+                )
+            )
+            .aggregate(min_embargo_end_date=Min('embargo_end_date'))['min_embargo_end_date']
+        )
+
+        if embargo_end_date is not None:
+            access['embargoedUntil'] = embargo_end_date.isoformat()
+
+        return access
+
     @property
     def full_metadata(self):
         download_url = settings.DANDI_API_URL + reverse(
             'asset-download',
             kwargs={'asset_id': str(self.asset_id)},
         )
+
         metadata = {
             **self.metadata,
             'id': self.dandi_asset_id(self.asset_id),
-            'access': [
-                {
-                    'schemaKey': 'AccessRequirements',
-                    'status': AccessType.EmbargoedAccess.value
-                    if self.is_embargoed
-                    else AccessType.OpenAccess.value,
-                }
-            ],
+            'access': [self.access_metadata()],
             'path': self.path,
             'identifier': str(self.asset_id),
             'contentUrl': [download_url, self.s3_url],

dandiapi/api/models/garbage_collection.py

@@ -10,7 +10,7 @@ class GarbageCollectionEvent(models.Model):
     )
 
     def __str__(self) -> str:
-        return f'{self.type} ({self.created})'
+        return f'{self.type} ({self.timestamp})'
 
 
 class GarbageCollectionEventRecord(models.Model):