Merge pull request #97 from dandi/fix/pattern

fix: raise validation error on mismatched name
dandi · Jan 10, 2022 · 7e53e9f · 7e53e9f
2 parents 435fc13 + 8d1a5e4
commit 7e53e9f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/dandischema/consts.py b/dandischema/consts.py
@@ -1,17 +1,18 @@
-DANDI_SCHEMA_VERSION = "0.6.0"
-ALLOWED_INPUT_SCHEMAS = [
-    "0.4.4",
-    "0.5.1",
-    "0.5.2",
-]
+DANDI_SCHEMA_VERSION = "0.6.1"
+ALLOWED_INPUT_SCHEMAS = ["0.4.4", "0.5.1", "0.5.2", "0.6.0"]
 
 # ATM we allow only for a single target version which is current
 # migrate has a guard now for this since it cannot migrate to anything but current
 # version
 ALLOWED_TARGET_SCHEMAS = [DANDI_SCHEMA_VERSION]
 # This allows multiple schemas for validation, whereas target schemas focus on
 # migration.
-ALLOWED_VALIDATION_SCHEMAS = ALLOWED_TARGET_SCHEMAS + ["0.4.4", "0.5.1", "0.5.2"]
+ALLOWED_VALIDATION_SCHEMAS = ALLOWED_TARGET_SCHEMAS + [
+    "0.4.4",
+    "0.5.1",
+    "0.5.2",
+    "0.6.0",
+]
 
 if DANDI_SCHEMA_VERSION not in ALLOWED_INPUT_SCHEMAS:
     ALLOWED_INPUT_SCHEMAS.append(DANDI_SCHEMA_VERSION)
diff --git a/dandischema/models.py b/dandischema/models.py
@@ -45,7 +45,7 @@
     HttpUrl = AnyHttpUrl  # noqa: F811
 
 
-NAME_PATTERN = r"^([\w\s\-]+)?,\s+([\w\s\-\.]+)?$"
+NAME_PATTERN = r"^([\w\s\-]+),\s+([\w\s\-\.]+)$"
 UUID_PATTERN = (
     "[a-f0-9]{8}[-]*[a-f0-9]{4}[-]*" "[a-f0-9]{4}[-]*[a-f0-9]{4}[-]*[a-f0-9]{12}$"
 )
@@ -293,7 +293,7 @@ class BaseType(DandiBaseModel):
         None,
         description="The identifier can be any url or a compact URI, preferably"
         " supported by identifiers.org.",
-        regex=r"^[a-zA-Z0-9]+:[a-zA-Z0-9-/\._]+$",
+        regex=r"^[a-zA-Z0-9-]+:[a-zA-Z0-9-/\._]+$",
         nskey="schema",
     )
     name: Optional[str] = Field(

diff --git a/dandischema/tests/test_metadata.py b/dandischema/tests/test_metadata.py
@@ -54,6 +54,7 @@ def test_pydantic_validation(schema_dir):
         validate({})
 
 
+@skipif_no_network
 def test_json_schemakey_validation():
     with pytest.raises(JsonschemaValidationError) as exc:
         validate(

diff --git a/dandischema/tests/test_models.py b/dandischema/tests/test_models.py
@@ -447,6 +447,9 @@ class TempKlass(DandiBaseModel):
             "includeInCitation": True,
         },
     ]
+    with pytest.raises(pydantic.ValidationError):
+        TempKlass(contributor=contributor)
+    contributor[0]["name"] = ", "
     with pytest.raises(pydantic.ValidationError):
         TempKlass(contributor=contributor)
     contributor[0]["name"] = "last, first"