Merge branch 'master' into devendorize

# Conflicts:
#	dandischema/models.py

Author: candleindark

.github/workflows/lint.yml

@@ -10,7 +10,7 @@ jobs:
 
     steps:
     - name: Set up environment
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:  # no need for the history
         fetch-depth: 1
     - name: Set up Python

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
       auto-version: ${{ steps.auto-version.outputs.version }}
     steps:
       - name: Checkout source
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           # A full checkout is required so that auto will have access to tag
           # information.
@@ -44,7 +44,7 @@ jobs:
     if: needs.release-check.outputs.auto-version != ''
     steps:
       - name: Checkout source
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           path: dandischema
@@ -74,7 +74,7 @@ jobs:
           echo "SCHEMA_VERSION=$SCHEMA_VERSION" >> "$GITHUB_ENV"
 
       - name: Checkout dandi/schema
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: dandi/schema
           path: schema

.github/workflows/test-dandi-cli.yml

@@ -79,7 +79,7 @@ jobs:
         run: echo DANDI_DEVEL=1 >> "$GITHUB_ENV"
 
       - name: Check out dandischema
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           # Fetch all commits so that versioningit will return something
           # compatible with semantic-version

.github/workflows/test-nonetwork.yml

@@ -25,7 +25,7 @@ jobs:
           - '3.12'
     steps:
       - name: Set up environment
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           # Fetch all commits so that versioningit will return something
           # compatible with semantic-version

.github/workflows/test-schema.yml

@@ -11,7 +11,7 @@ jobs:
     if: contains(github.event.pull_request.labels.*.name, 'release')
     steps:
       - name: Checkout this repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0  # Need history for `git describe`
           path: dandischema
@@ -26,7 +26,7 @@ jobs:
         working-directory: dandischema
 
       - name: Checkout dandi/schema
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: dandi/schema
           path: schema

.github/workflows/test.yml

@@ -37,7 +37,7 @@ jobs:
             instance_name: EMBER-DANDI
     steps:
     - name: Set up environment
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         # Fetch all commits so that versioningit will return something
         # compatible with semantic-version

.github/workflows/typing.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

dandischema/models.py

@@ -26,8 +26,10 @@
     EmailStr,
     Field,
     GetJsonSchemaHandler,
+    SerializerFunctionWrapHandler,
     StringConstraints,
     ValidationInfo,
+    field_serializer,
     field_validator,
     model_validator,
 )
@@ -47,6 +49,13 @@
 from .types import ByteSizeJsonSchema
 from .utils import name2title
 
+try:
+    from anys import AnyBase
+except ImportError:
+    _has_anys = False
+else:
+    _has_anys = True
+
 # Load needed configurations into constants
 _INSTANCE_CONFIG = get_instance_config()
 
@@ -549,6 +558,14 @@ def json_dict(self) -> dict:
         )
         return self.model_dump(mode="json", exclude_none=True)
 
+    if _has_anys:
+
+        @field_serializer("*", mode="wrap")
+        def preserve_anys_values(
+            self, value: Any, handler: SerializerFunctionWrapHandler
+        ) -> Any:
+            return value if isinstance(value, AnyBase) else handler(value)
+
     @field_validator("schemaKey")
     @classmethod
     def ensure_schemakey(cls, val: str) -> str:

dandischema/tests/test_models.py

@@ -3,6 +3,7 @@
 from inspect import isclass
 from typing import Any, Dict, List, Literal, Optional, Tuple, Type, Union, cast
 
+import anys
 import pydantic
 from pydantic import BaseModel, ConfigDict, Field, ValidationError
 import pytest
@@ -40,6 +41,39 @@
 _INSTANCE_CONFIG = get_instance_config()
 
 
+@pytest.mark.parametrize(
+    ("y_type", "anys_value"),
+    [
+        (int, anys.ANY_INT),
+        (str, anys.ANY_STR),
+        (list, anys.ANY_LIST),
+        (dict, anys.ANY_DICT),
+    ],
+)
+def test_serialize_anys_values(y_type: type, anys_value: anys.AnyBase) -> None:
+    """
+    Test the serialization of invalid model instances constructed with the
+    `model_construct` method containing `anys` values.
+    """
+
+    class NewModel(DandiBaseModel):
+        x: int
+        y: y_type  # type: ignore[valid-type]
+
+    m = NewModel.model_construct(x=42, y=anys_value)
+
+    m_serialized = m.model_dump()
+    x = m_serialized["x"]
+    y = m_serialized["y"]
+
+    # Verify that `x` serialized as expected, as an int of value 42
+    assert type(x) is int
+    assert x == 42
+
+    # Verify that `y` serialized as itself
+    assert y is anys_value
+
+
 def test_dandiset() -> None:
     assert Dandiset.model_construct()  # type: ignore[call-arg]
 

setup.cfg

@@ -53,6 +53,7 @@ style =
     flake8
     pre-commit
 test =
+    anys
     mypy
     pytest
     pytest-cov