feat: define VERSION_NUM_PATTERN and use it

candleindark · candleindark · commit 230b4c349ad7 · 2026-01-22T14:59:56.000-08:00
diff --git a/dandischema/models.py b/dandischema/models.py
@@ -85,7 +85,8 @@
     "[a-f0-9]{8}[-]*[a-f0-9]{4}[-]*" "[a-f0-9]{4}[-]*[a-f0-9]{4}[-]*[a-f0-9]{12}$"
 )
 ASSET_UUID_PATTERN = r"^dandiasset:" + UUID_PATTERN
-VERSION_PATTERN = r"\d{6}/\d+\.\d+\.\d+"
+VERSION_NUM_PATTERN = r"\d+\.\d+\.\d+"
+VERSION_PATTERN = rf"\d{{6}}/{VERSION_NUM_PATTERN}"
 _INNER_DANDI_DOI_PATTERN = (
     rf"{DOI_PREFIX_PATTERN}/{ID_PATTERN.lower()}\.{VERSION_PATTERN}"
 )
@@ -1666,7 +1667,7 @@ def contributor_musthave_contact(
     id: str = Field(
         description="Uniform resource identifier",
         pattern=(
-            rf"^({ID_PATTERN}|{ID_PATTERN.lower()}):\d{{6}}(/(draft|\d+\.\d+\.\d+))$"
+            rf"^({ID_PATTERN}|{ID_PATTERN.lower()}):\d{{6}}(/(draft|{VERSION_NUM_PATTERN}))$"
         ),
         json_schema_extra={"readOnly": True},
     )

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,8 @@`
`85`	`85`	`"[a-f0-9]{8}[-][a-f0-9]{4}[-]" "[a-f0-9]{4}[-][a-f0-9]{4}[-][a-f0-9]{12}$"`
`86`	`86`	`)`
`87`	`87`	`ASSET_UUID_PATTERN = r"^dandiasset:" + UUID_PATTERN`
`88`		`-VERSION_PATTERN = r"\d{6}/\d+\.\d+\.\d+"`
	`88`	`+VERSION_NUM_PATTERN = r"\d+\.\d+\.\d+"`
	`89`	`+VERSION_PATTERN = rf"\d{{6}}/{VERSION_NUM_PATTERN}"`
`89`	`90`	`_INNER_DANDI_DOI_PATTERN = (`
`90`	`91`	`rf"{DOI_PREFIX_PATTERN}/{ID_PATTERN.lower()}\.{VERSION_PATTERN}"`
`91`	`92`	`)`
`@@ -1666,7 +1667,7 @@ def contributor_musthave_contact(`
`1666`	`1667`	`id: str = Field(`
`1667`	`1668`	`description="Uniform resource identifier",`
`1668`	`1669`	`pattern=(`
`1669`		`- rf"^({ID_PATTERN}\|{ID_PATTERN.lower()}):\d{{6}}(/(draft\|\d+\.\d+\.\d+))$"`
	`1670`	`+ rf"^({ID_PATTERN}\|{ID_PATTERN.lower()}):\d{{6}}(/(draft\|{VERSION_NUM_PATTERN}))$"`
`1670`	`1671`	`),`
`1671`	`1672`	`json_schema_extra={"readOnly": True},`
`1672`	`1673`	`)`