Boost dandischema to 0.8.0 to get newer DANDI_SCHEMA_VERSION 0.6.4 supported #1524
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@yarikoptic are there any changes to the JSON Schema (i.e. the |
yes: diff -Naur releases/0.6.{3,4} -- but only very minor to dandiset metadata level I believe --- more text is allowed:diff -Naur releases/0.6.3/asset.json releases/0.6.4/asset.json
--- releases/0.6.3/asset.json 2022-06-29 16:42:26.373670014 -0400
+++ releases/0.6.4/asset.json 2023-03-09 11:29:40.274186717 -0500
@@ -17,7 +17,7 @@
},
"schemaVersion": {
"title": "Schema Version",
- "default": "0.6.3",
+ "default": "0.6.4",
"readOnly": true,
"nskey": "schema",
"type": "string"
@@ -98,7 +98,7 @@
"items": {
"type": "string",
"minLength": 1,
- "maxLength": 2083,
+ "maxLength": 65536,
"format": "uri"
}
},
@@ -194,7 +194,7 @@
{
"type": "string",
"minLength": 1,
- "maxLength": 2083,
+ "maxLength": 65536,
"format": "uri"
},
{
@@ -242,7 +242,7 @@
"items": {
"type": "string",
"minLength": 1,
- "maxLength": 2083,
+ "maxLength": 65536,
"format": "uri"
}
},
@@ -305,7 +305,7 @@
"items": {
"type": "string",
"minLength": 1,
- "maxLength": 2083,
+ "maxLength": 65536,
"format": "uri"
}
}
@@ -1232,6 +1232,12 @@
"schemaKey": {
"title": "Schema Key",
"default": "Activity",
+ "enum": [
+ "Activity",
+ "Project",
+ "Session",
+ "PublishActivity"
+ ],
"type": "string",
"const": "Activity"
},
@@ -1448,7 +1454,7 @@
{
"type": "string",
"minLength": 1,
- "maxLength": 2083,
+ "maxLength": 65536,
"format": "uri"
}
],
diff -Naur releases/0.6.3/dandiset.json releases/0.6.4/dandiset.json
--- releases/0.6.3/dandiset.json 2022-06-29 16:42:26.373670014 -0400
+++ releases/0.6.4/dandiset.json 2023-03-09 11:29:40.274186717 -0500
@@ -18,7 +18,7 @@
},
"schemaVersion": {
"title": "Schema Version",
- "default": "0.6.3",
+ "default": "0.6.4",
"readOnly": true,
"nskey": "schema",
"type": "string"
@@ -102,7 +102,7 @@
"items": {
"type": "string",
"minLength": 1,
- "maxLength": 2083,
+ "maxLength": 65536,
"format": "uri"
}
},
@@ -218,7 +218,7 @@
"items": {
"type": "string",
"minLength": 1,
- "maxLength": 2083,
+ "maxLength": 65536,
"format": "uri"
}
},
diff -Naur releases/0.6.3/published-asset.json releases/0.6.4/published-asset.json
--- releases/0.6.3/published-asset.json 2022-06-29 16:42:26.373670014 -0400
+++ releases/0.6.4/published-asset.json 2023-03-09 11:29:40.278186708 -0500
@@ -25,7 +25,7 @@
{
"type": "string",
"minLength": 1,
- "maxLength": 2083,
+ "maxLength": 65536,
"format": "uri"
},
{
@@ -43,7 +43,7 @@
},
"schemaVersion": {
"title": "Schema Version",
- "default": "0.6.3",
+ "default": "0.6.4",
"readOnly": true,
"nskey": "schema",
"type": "string"
@@ -124,7 +124,7 @@
"items": {
"type": "string",
"minLength": 1,
- "maxLength": 2083,
+ "maxLength": 65536,
"format": "uri"
}
},
@@ -220,7 +220,7 @@
{
"type": "string",
"minLength": 1,
- "maxLength": 2083,
+ "maxLength": 65536,
"format": "uri"
},
{
@@ -268,7 +268,7 @@
"items": {
"type": "string",
"minLength": 1,
- "maxLength": 2083,
+ "maxLength": 65536,
"format": "uri"
}
},
@@ -331,7 +331,7 @@
"items": {
"type": "string",
"minLength": 1,
- "maxLength": 2083,
+ "maxLength": 65536,
"format": "uri"
}
}
@@ -1344,6 +1344,12 @@
"schemaKey": {
"title": "Schema Key",
"default": "Activity",
+ "enum": [
+ "Activity",
+ "Project",
+ "Session",
+ "PublishActivity"
+ ],
"type": "string",
"const": "Activity"
},
@@ -1560,7 +1566,7 @@
{
"type": "string",
"minLength": 1,
- "maxLength": 2083,
+ "maxLength": 65536,
"format": "uri"
}
],
diff -Naur releases/0.6.3/published-dandiset.json releases/0.6.4/published-dandiset.json
--- releases/0.6.3/published-dandiset.json 2022-06-29 16:42:26.373670014 -0400
+++ releases/0.6.4/published-dandiset.json 2023-03-09 11:29:40.278186708 -0500
@@ -25,7 +25,7 @@
{
"type": "string",
"minLength": 1,
- "maxLength": 2083,
+ "maxLength": 65536,
"format": "uri"
},
{
@@ -43,7 +43,7 @@
},
"schemaVersion": {
"title": "Schema Version",
- "default": "0.6.3",
+ "default": "0.6.4",
"readOnly": true,
"nskey": "schema",
"type": "string"
@@ -127,7 +127,7 @@
"items": {
"type": "string",
"minLength": 1,
- "maxLength": 2083,
+ "maxLength": 65536,
"format": "uri"
}
},
@@ -166,9 +166,11 @@
"url": {
"title": "URL",
"description": "Permalink to the Dandiset.",
- "pattern": "^.*/dandiset/\\d{6}/\\d+\\.\\d+\\.\\d+$",
"readOnly": true,
"nskey": "schema",
+ "minLength": 1,
+ "maxLength": 1000,
+ "format": "uri",
"type": "string"
},
"repository": {
@@ -241,7 +243,7 @@
"items": {
"type": "string",
"minLength": 1,
- "maxLength": 2083,
+ "maxLength": 65536,
"format": "uri"
}
},
|
|
It looks like the new schema changes don't impact the frontend typescript types, so no changes are needed there.
We now pull the |
mvandenburgh
approved these changes
Mar 9, 2023
|
🚀 PR was released in |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #1520
Should be done soonish since otherwise we would end up with situation where users can't upload after they get their dandischema upgraded somehow (pip is not strict enough at times) and they start to try uploading with newer version of schema which archive does not support.
If I got it right there is no need for explicit specification of DANDI_SCHEMA_VERSION to be 0.6.4 , if that is not true -- please share how it should be done.