From e44cd5e74f882eca693784d495169c8752990b8f Mon Sep 17 00:00:00 2001 From: Abrar Mesbah Date: Wed, 26 Jul 2023 13:22:26 -0400 Subject: [PATCH 1/4] add timeout runner parameter --- schema/build/generate_schema.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/schema/build/generate_schema.py b/schema/build/generate_schema.py index 9b67777..a0cee58 100755 --- a/schema/build/generate_schema.py +++ b/schema/build/generate_schema.py @@ -49,6 +49,11 @@ def generate_component(op: str): ], "minLength": 1 }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } } }, { @@ -64,6 +69,11 @@ def generate_component(op: str): ], "minLength": 1 }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } } }, ] From d31de1921f5ddadf34b6cd334a39aaed60a8362f Mon Sep 17 00:00:00 2001 From: Abrar Mesbah Date: Wed, 26 Jul 2023 13:24:11 -0400 Subject: [PATCH 2/4] generate schema --- schema/operation.json | 1556 +++++++++++++++++++++++++++++++++++++---- schema/workflow.json | 6 +- 2 files changed, 1425 insertions(+), 137 deletions(-) diff --git a/schema/operation.json b/schema/operation.json index aa27932..370d57f 100644 --- a/schema/operation.json +++ b/schema/operation.json @@ -1,6 +1,6 @@ { "$schema": "https://json-schema.org/draft-07/schema", - "$id": "https://standards.ncats.io/operation/1.3.5/schema", + "$id": "https://standards.ncats.io/operation/1.4.5/schema", "anyOf": [ { "$ref": "#/$defs/OperationAnnotate" @@ -94,59 +94,6 @@ } ], "$defs": { - "AllowList": { - "type": "object", - "properties": { - "allowlist": { - "type": "array", - "items": { - "type": "string" - }, - "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", - "example": [ - "infores:aragorn" - ], - "minLength": 1 - } - }, - "additionalProperties": false - }, - "DenyList": { - "type": "object", - "properties": { - "denylist": { - "type": "array", - "items": { - "type": "string" - }, - "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", - "example": [ - "infores:aragorn" - ], - "minLength": 1 - } - }, - "additionalProperties": false - }, - "RunnerParameters": { - "type": "object", - "oneOf": [ - { - "$ref": "#/$defs/AllowList" - }, - { - "$ref": "#/$defs/DenyList" - } - ] - }, - "AscendingOrDescending": { - "description": "Indicates whether results should be sorted in ascending or descending order.", - "type": "string", - "enum": [ - "ascending", - "descending" - ] - }, "OperationAnnotate": { "type": "object", "description": "This operation adds attributes to knowledge graph elements.", @@ -159,7 +106,51 @@ }, "unique": true, "parameters": {}, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id" @@ -192,7 +183,51 @@ } } }, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id" @@ -225,7 +260,51 @@ } } }, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id" @@ -244,7 +323,51 @@ }, "unique": false, "parameters": {}, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id" @@ -263,7 +386,51 @@ }, "unique": false, "parameters": {}, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id" @@ -304,7 +471,51 @@ } } }, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id" @@ -379,7 +590,51 @@ } ] }, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id" @@ -398,35 +653,79 @@ }, "unique": false, "parameters": {}, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } - }, - "required": [ - "id" - ], - "additionalProperties": false - }, - "OperationFilterKgraphContinuousKedgeAttribute": { - "type": "object", - "description": "This operation removes kgraph edges based on the value of a continuous edge attribute. Edges without the given attribute are left alone.", - "properties": { - "id": { - "type": "string", - "enum": [ - "filter_kgraph_continuous_kedge_attribute" - ] - }, - "unique": false, - "parameters": { + "runner_parameters": { "type": "object", - "properties": { - "edge_attribute": { - "description": "The name of the edge attribute to filter on.", - "type": "string", - "example": "normalized_google_distance" - }, - "threshold": { - "description": "The value to compare attribute values to.", - "type": "number", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } + }, + "required": [ + "id" + ], + "additionalProperties": false + }, + "OperationFilterKgraphContinuousKedgeAttribute": { + "type": "object", + "description": "This operation removes kgraph edges based on the value of a continuous edge attribute. Edges without the given attribute are left alone.", + "properties": { + "id": { + "type": "string", + "enum": [ + "filter_kgraph_continuous_kedge_attribute" + ] + }, + "unique": false, + "parameters": { + "type": "object", + "properties": { + "edge_attribute": { + "description": "The name of the edge attribute to filter on.", + "type": "string", + "example": "normalized_google_distance" + }, + "threshold": { + "description": "The value to compare attribute values to.", + "type": "number", "example": 1.2 }, "remove_above_or_below": { @@ -465,7 +764,51 @@ "remove_above_or_below" ] }, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id", @@ -523,7 +866,51 @@ "remove_value" ] }, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id", @@ -570,7 +957,51 @@ "remove_value" ] }, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id", @@ -590,7 +1021,51 @@ }, "unique": false, "parameters": {}, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id" @@ -659,7 +1134,51 @@ "edge_attribute" ] }, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id", @@ -737,7 +1256,51 @@ "edge_attribute" ] }, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id", @@ -806,27 +1369,115 @@ "edge_attribute" ] }, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } - }, - "required": [ - "id", - "parameters" - ], - "additionalProperties": false - }, - "OperationFilterResults": { - "type": "object", - "description": "This operation allows the TRAPI server to remove elements from the list of results.", - "properties": { - "id": { - "type": "string", - "enum": [ - "filter_results" - ] - }, - "unique": false, - "parameters": {}, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } + }, + "required": [ + "id", + "parameters" + ], + "additionalProperties": false + }, + "OperationFilterResults": { + "type": "object", + "description": "This operation allows the TRAPI server to remove elements from the list of results.", + "properties": { + "id": { + "type": "string", + "enum": [ + "filter_results" + ] + }, + "unique": false, + "parameters": {}, + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id" @@ -858,7 +1509,51 @@ "max_results" ] }, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id", @@ -878,7 +1573,51 @@ }, "unique": true, "parameters": {}, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id" @@ -897,7 +1636,51 @@ }, "unique": true, "parameters": {}, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id" @@ -916,7 +1699,51 @@ }, "unique": false, "parameters": {}, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id" @@ -965,7 +1792,51 @@ "virtual_relation_label" ] }, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id", @@ -1009,7 +1880,51 @@ "qnode_keys" ] }, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id", @@ -1029,7 +1944,51 @@ }, "unique": false, "parameters": {}, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id" @@ -1077,7 +2036,51 @@ "virtual_relation_label" ] }, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id", @@ -1097,7 +2100,51 @@ }, "unique": true, "parameters": {}, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id" @@ -1116,7 +2163,51 @@ }, "unique": true, "parameters": {}, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id" @@ -1135,7 +2226,51 @@ }, "unique": false, "parameters": {}, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id" @@ -1161,7 +2296,14 @@ "type": "string", "example": "normalized_google_distance" }, - "ascending_or_descending": { "$ref": "#/$defs/AscendingOrDescending" }, + "ascending_or_descending": { + "description": "Indicates whether results should be sorted in ascending or descending order.", + "type": "string", + "enum": [ + "ascending", + "descending" + ] + }, "qedge_keys": { "description": "This indicates if you only want to consider edges with specific edge_keys. If not provided or empty, all edges will be looked at.", "type": "array", @@ -1178,7 +2320,51 @@ "ascending_or_descending" ] }, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id", @@ -1205,7 +2391,14 @@ "type": "string", "example": "normalized_google_distance" }, - "ascending_or_descending": { "$ref": "#/$defs/AscendingOrDescending" }, + "ascending_or_descending": { + "description": "Indicates whether results should be sorted in ascending or descending order.", + "type": "string", + "enum": [ + "ascending", + "descending" + ] + }, "qnode_keys": { "description": "This indicates if you only want to consider nodes with specific node_keys. If not provided or empty, all nodes will be looked at.", "type": "array", @@ -1222,7 +2415,51 @@ "ascending_or_descending" ] }, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id", @@ -1244,13 +2481,64 @@ "parameters": { "type": "object", "properties": { - "ascending_or_descending": { "$ref": "#/$defs/AscendingOrDescending" } + "ascending_or_descending": { + "description": "Indicates whether results should be sorted in ascending or descending order.", + "type": "string", + "enum": [ + "ascending", + "descending" + ] + } }, "required": [ "ascending_or_descending" ] }, - "runner_parameters": { "$ref": "#/$defs/RunnerParameters" } + "runner_parameters": { + "type": "object", + "oneOf": [ + { + "properties": { + "allowlist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may be used to complete operation. No others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the workflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + }, + { + "properties": { + "denylist": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of operation providers (by infores ID) that may not be used to complete operation. All others will be used. A full list of operation providers for each operation with infores ID's is available through the '/services' endpoint of the worflow runner.", + "example": [ + "infores:aragorn" + ], + "minLength": 1 + }, + "timeout": { + "type": "float", + "description": "Time allowed for this operation to completed by a service", + "example": 60.0 + } + } + } + ] + } }, "required": [ "id", @@ -1259,4 +2547,4 @@ "additionalProperties": false } } -} +} \ No newline at end of file diff --git a/schema/workflow.json b/schema/workflow.json index dcb788a..c6d9976 100644 --- a/schema/workflow.json +++ b/schema/workflow.json @@ -1,8 +1,8 @@ { "$schema": "https://json-schema.org/draft-07/schema", - "$id": "https://standards.ncats.io/workflow/1.3.5/schema", + "$id": "https://standards.ncats.io/workflow/1.4.5/schema", "type": "array", "items": { - "$ref": "https://standards.ncats.io/operation/1.3.5/schema" + "$ref": "https://standards.ncats.io/operation/1.4.5/schema" } -} +} \ No newline at end of file From bc154cda3096aa9cc0bb1efe84934ddff1185804 Mon Sep 17 00:00:00 2001 From: Abrar Mesbah Date: Wed, 26 Jul 2023 13:29:42 -0400 Subject: [PATCH 3/4] fix issues --- schema/build/generate_schema.py | 12 +- schema/operation.json | 362 +++++++++++++++++++++----------- schema/workflow.json | 4 +- 3 files changed, 251 insertions(+), 127 deletions(-) diff --git a/schema/build/generate_schema.py b/schema/build/generate_schema.py index a0cee58..66cff54 100755 --- a/schema/build/generate_schema.py +++ b/schema/build/generate_schema.py @@ -47,12 +47,14 @@ def generate_component(op: str): "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": True }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": True } } }, @@ -67,12 +69,14 @@ def generate_component(op: str): "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": True }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": True } } }, diff --git a/schema/operation.json b/schema/operation.json index 370d57f..7db8b7a 100644 --- a/schema/operation.json +++ b/schema/operation.json @@ -1,6 +1,6 @@ { "$schema": "https://json-schema.org/draft-07/schema", - "$id": "https://standards.ncats.io/operation/1.4.5/schema", + "$id": "https://standards.ncats.io/operation/1.5.5/schema", "anyOf": [ { "$ref": "#/$defs/OperationAnnotate" @@ -120,12 +120,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -140,12 +142,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -197,12 +201,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -217,12 +223,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -274,12 +282,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -294,12 +304,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -337,12 +349,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -357,12 +371,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -400,12 +416,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -420,12 +438,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -485,12 +505,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -505,12 +527,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -604,12 +628,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -624,12 +650,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -667,12 +695,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -687,12 +717,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -778,12 +810,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -798,12 +832,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -880,12 +916,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -900,12 +938,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -971,12 +1011,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -991,12 +1033,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -1035,12 +1079,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -1055,12 +1101,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -1148,12 +1196,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -1168,12 +1218,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -1270,12 +1322,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -1290,12 +1344,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -1383,12 +1439,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -1403,12 +1461,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -1447,12 +1507,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -1467,12 +1529,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -1523,12 +1587,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -1543,12 +1609,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -1587,12 +1655,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -1607,12 +1677,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -1650,12 +1722,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -1670,12 +1744,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -1713,12 +1789,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -1733,12 +1811,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -1806,12 +1886,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -1826,12 +1908,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -1894,12 +1978,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -1914,12 +2000,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -1958,12 +2046,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -1978,12 +2068,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -2050,12 +2142,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -2070,12 +2164,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -2114,12 +2210,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -2134,12 +2232,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -2177,12 +2277,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -2197,12 +2299,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -2240,12 +2344,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -2260,12 +2366,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -2334,12 +2442,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -2354,12 +2464,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -2429,12 +2541,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -2449,12 +2563,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } @@ -2508,12 +2624,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } }, @@ -2528,12 +2646,14 @@ "example": [ "infores:aragorn" ], - "minLength": 1 + "minLength": 1, + "nullable": true }, "timeout": { "type": "float", "description": "Time allowed for this operation to completed by a service", - "example": 60.0 + "example": 60.0, + "nullable": true } } } diff --git a/schema/workflow.json b/schema/workflow.json index c6d9976..f7b0e82 100644 --- a/schema/workflow.json +++ b/schema/workflow.json @@ -1,8 +1,8 @@ { "$schema": "https://json-schema.org/draft-07/schema", - "$id": "https://standards.ncats.io/workflow/1.4.5/schema", + "$id": "https://standards.ncats.io/workflow/1.5.5/schema", "type": "array", "items": { - "$ref": "https://standards.ncats.io/operation/1.4.5/schema" + "$ref": "https://standards.ncats.io/operation/1.5.5/schema" } } \ No newline at end of file From 803263b9251cb91c5359a1c32c2e5d5793769193 Mon Sep 17 00:00:00 2001 From: Abrar Mesbah Date: Wed, 26 Jul 2023 13:33:26 -0400 Subject: [PATCH 4/4] fix tests again --- schema/build/generate_schema.py | 4 +- schema/operation.json | 122 ++++++++++++++++---------------- schema/workflow.json | 4 +- 3 files changed, 65 insertions(+), 65 deletions(-) diff --git a/schema/build/generate_schema.py b/schema/build/generate_schema.py index 66cff54..0a8a7e2 100755 --- a/schema/build/generate_schema.py +++ b/schema/build/generate_schema.py @@ -51,7 +51,7 @@ def generate_component(op: str): "nullable": True }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": True @@ -73,7 +73,7 @@ def generate_component(op: str): "nullable": True }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": True diff --git a/schema/operation.json b/schema/operation.json index 7db8b7a..31981b4 100644 --- a/schema/operation.json +++ b/schema/operation.json @@ -1,6 +1,6 @@ { "$schema": "https://json-schema.org/draft-07/schema", - "$id": "https://standards.ncats.io/operation/1.5.5/schema", + "$id": "https://standards.ncats.io/operation/1.6.5/schema", "anyOf": [ { "$ref": "#/$defs/OperationAnnotate" @@ -124,7 +124,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -146,7 +146,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -205,7 +205,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -227,7 +227,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -286,7 +286,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -308,7 +308,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -353,7 +353,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -375,7 +375,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -420,7 +420,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -442,7 +442,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -509,7 +509,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -531,7 +531,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -632,7 +632,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -654,7 +654,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -699,7 +699,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -721,7 +721,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -814,7 +814,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -836,7 +836,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -920,7 +920,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -942,7 +942,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -1015,7 +1015,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -1037,7 +1037,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -1083,7 +1083,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -1105,7 +1105,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -1200,7 +1200,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -1222,7 +1222,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -1326,7 +1326,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -1348,7 +1348,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -1443,7 +1443,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -1465,7 +1465,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -1511,7 +1511,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -1533,7 +1533,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -1591,7 +1591,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -1613,7 +1613,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -1659,7 +1659,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -1681,7 +1681,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -1726,7 +1726,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -1748,7 +1748,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -1793,7 +1793,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -1815,7 +1815,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -1890,7 +1890,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -1912,7 +1912,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -1982,7 +1982,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -2004,7 +2004,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -2050,7 +2050,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -2072,7 +2072,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -2146,7 +2146,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -2168,7 +2168,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -2214,7 +2214,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -2236,7 +2236,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -2281,7 +2281,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -2303,7 +2303,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -2348,7 +2348,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -2370,7 +2370,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -2446,7 +2446,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -2468,7 +2468,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -2545,7 +2545,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -2567,7 +2567,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -2628,7 +2628,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true @@ -2650,7 +2650,7 @@ "nullable": true }, "timeout": { - "type": "float", + "type": "number", "description": "Time allowed for this operation to completed by a service", "example": 60.0, "nullable": true diff --git a/schema/workflow.json b/schema/workflow.json index f7b0e82..52fa6cc 100644 --- a/schema/workflow.json +++ b/schema/workflow.json @@ -1,8 +1,8 @@ { "$schema": "https://json-schema.org/draft-07/schema", - "$id": "https://standards.ncats.io/workflow/1.5.5/schema", + "$id": "https://standards.ncats.io/workflow/1.6.5/schema", "type": "array", "items": { - "$ref": "https://standards.ncats.io/operation/1.5.5/schema" + "$ref": "https://standards.ncats.io/operation/1.6.5/schema" } } \ No newline at end of file