Use new asset_validation_errors endpoint

Author: jjnesbitt

dandi/dandiapi.py

@@ -12,29 +12,29 @@
 
 from __future__ import annotations
 
+import json
+import os.path
+import posixpath
+import re
 from abc import ABC, abstractmethod
 from collections.abc import Callable, Iterable, Iterator, Sequence
 from concurrent.futures import ThreadPoolExecutor
 from dataclasses import dataclass
 from datetime import datetime
 from enum import Enum
 from fnmatch import fnmatchcase
-import json
-import os.path
 from pathlib import Path, PurePosixPath
-import posixpath
-import re
 from time import sleep, time
 from types import TracebackType
 from typing import TYPE_CHECKING, Any, Dict, List, Optional
 
 import click
-from dandischema import models
 import dandischema.consts
-from packaging.version import Version as PackagingVersion
-from pydantic import BaseModel, Field, PrivateAttr
 import requests
 import tenacity
+from dandischema import models
+from packaging.version import Version as PackagingVersion
+from pydantic import BaseModel, Field, PrivateAttr
 from yarl import URL
 
 from . import get_logger
@@ -695,8 +695,9 @@ def check_schema_version(self, schema_version: str | None = None) -> None:
                 "Server did not provide schema_version in /info/;"
                 f" returned {server_info!r}"
             )
-        server_ver, our_ver = PackagingVersion(server_schema_version), PackagingVersion(
-            schema_version
+        server_ver, our_ver = (
+            PackagingVersion(server_schema_version),
+            PackagingVersion(schema_version),
         )
         if server_ver > our_ver:
             # TODO: potentially adjust here if name would be different: see
@@ -840,7 +841,7 @@ class VersionInfo(Version):
     """
 
     asset_validation_errors: List[RemoteAssetValidationError]
-    version_validation_errors: List[RemoteValidationError]
+    validation_errors: List[RemoteValidationError]
 
 
 class RemoteDandisetData(APIBase):
@@ -1101,10 +1102,18 @@ def get_version(self, version_id: str) -> VersionInfo:
             `Version`.
         """
         try:
+            info_resp = self.client.get(
+                f"/dandisets/{self.identifier}/versions/{version_id}/info/"
+            )
+            asset_error_resp = self.client.get(
+                f"/dandisets/{self.identifier}/versions/{version_id}/asset_validation_errors/"
+            )
+
             return VersionInfo.model_validate(
-                self.client.get(
-                    f"/dandisets/{self.identifier}/versions/{version_id}/info/"
-                )
+                {
+                    **info_resp,
+                    "asset_validation_errors": asset_error_resp,
+                }
             )
         except HTTP404Error:
             raise NotFoundError(
@@ -1194,9 +1203,7 @@ def wait_until_valid(self, max_time: float = 120) -> None:
             "asset_validation_errors": [
                 e.json_dict() for e in v.asset_validation_errors
             ],
-            "version_validation_errors": [
-                e.json_dict() for e in v.version_validation_errors
-            ],
+            "validation_errors": [e.json_dict() for e in v.validation_errors],
         }
         raise ValueError(
             f"Dandiset {self.identifier} is {v.status.value}: {json.dumps(about, indent=4)}"