From 03d39a946810f1ea74386aaf0893b50652f413e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Bliault?= Date: Fri, 13 Dec 2024 15:06:52 +0100 Subject: [PATCH 1/2] Input details --- schemas/workflowExecutionMatrix.schema.json | 40 +++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/schemas/workflowExecutionMatrix.schema.json b/schemas/workflowExecutionMatrix.schema.json index 76553c8..2a7e271 100644 --- a/schemas/workflowExecutionMatrix.schema.json +++ b/schemas/workflowExecutionMatrix.schema.json @@ -4,6 +4,33 @@ "title": "Schema for the workflow execution matrix", "type": "object", "definitions": { + "inputDetails": { + "type": "array", + "items": { + "type": "object", + "properties": { + "seriesDescription": { + "type": "string" + }, + "sliceThickness": { + "type": "number" + }, + "pixelSpacing": { + "type": "array", + "items": { + "type": "number" + } + }, + "dim": { + "type": "array", + "items": { + "type": "number" + } + } + }, + "additionalProperties": false + } + }, "configuration": { "type": "object", "properties": { @@ -996,6 +1023,9 @@ }, "matrix": { "$ref": "#/definitions/matrix" + }, + "inputDetails": { + "$ref": "#definitions/inputDetails" } }, "required": [ @@ -1007,7 +1037,8 @@ "statistics", "inputConfig", "creationDate", - "modificationDate" + "modificationDate", + "inputDetails" ] }, "getWorkflowExecutionMatrixStep4Response": { @@ -1111,6 +1142,10 @@ } ] }, + + "inputDetails": { + "$ref": "#definitions/inputDetails" + }, "completion": { "type": "object", "properties": { @@ -1146,7 +1181,8 @@ "inputConfig", "creationDate", "modificationDate", - "completion" + "completion", + "inputDetails" ] }, "getWorkflowExecutionMatrixStep1Response": { From a215fa65bd62b4bed9a08330f2653c03c6cd05ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Bliault?= Date: Fri, 13 Dec 2024 16:29:45 +0100 Subject: [PATCH 2/2] wip --- schemas/workflowExecutionMatrix.schema.json | 51 +++++++++++---------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/schemas/workflowExecutionMatrix.schema.json b/schemas/workflowExecutionMatrix.schema.json index 2a7e271..c7bcf75 100644 --- a/schemas/workflowExecutionMatrix.schema.json +++ b/schemas/workflowExecutionMatrix.schema.json @@ -5,30 +5,32 @@ "type": "object", "definitions": { "inputDetails": { - "type": "array", - "items": { - "type": "object", - "properties": { - "seriesDescription": { - "type": "string" - }, - "sliceThickness": { - "type": "number" - }, - "pixelSpacing": { - "type": "array", - "items": { - "type": "number" + "type": "object", + "patternProperties": { + ".": { + "type": "object", + "properties": { + "seriesDescription": { + "type": ["string", "null"] + }, + "sliceThickness": { + "type": ["number", "null"] + }, + "pixelSpacing": { + "type": ["array", "null"], + "items": { + "type": "number" + } + }, + "dim": { + "type": ["array","null"], + "items": { + "type": "number" + } } }, - "dim": { - "type": "array", - "items": { - "type": "number" - } - } - }, - "additionalProperties": false + "additionalProperties": false + } } }, "configuration": { @@ -1025,7 +1027,7 @@ "$ref": "#/definitions/matrix" }, "inputDetails": { - "$ref": "#definitions/inputDetails" + "$ref": "#/definitions/inputDetails" } }, "required": [ @@ -1142,9 +1144,8 @@ } ] }, - "inputDetails": { - "$ref": "#definitions/inputDetails" + "$ref": "#/definitions/inputDetails" }, "completion": { "type": "object",