Commit f61a7f81 authored by Jaden's avatar Jaden Committed by Samuel GAIST

[schema][algorithm] update param default schema & add tests

Also cleans up the schema a bit.
Note that there's still a test that isnt passing
parent ad49b287
......@@ -64,43 +64,87 @@
"minItems": 1
},
"uint_constraint": { "type": "integer", "minimum": 0 },
"int_constraint": { "type": "integer" },
"float_constraint": { "type": "number" },
"uint_range": {
"type": "array",
"items": { "type": "integer", "minimum": 0 },
"items": { "$ref": "#/definitions/uint_constraint" },
"minItems": 2,
"maxItems": 2
},
"int_range": {
"type": "array",
"items": { "type": "integer" },
"items": { "$ref": "#/definitions/int_constraint" },
"minItems": 2,
"maxItems": 2
},
"float_range": {
"type": "array",
"items": { "type": "number" },
"items": { "$ref": "#/definitions/float_constraint" },
"minItems": 2,
"maxItems": 2
},
"choice": {
"type": "array",
"items": { "$ref": "../common/1.json#/definitions/value" },
"minItems": 3
"string_choice": {
"type": "array",
"items": { "type": "string" },
"minItems": 3
},
"uint_choice": {
"type": "array",
"items": { "$ref": "#/definitions/uint_constraint" },
"minItems": 3
},
"int_choice": {
"type": "array",
"items": { "$ref": "#/definitions/int_constraint" },
"minItems": 3
},
"float_choice": {
"type": "array",
"items": { "$ref": "#/definitions/float_constraint" },
"minItems": 3
},
"parameter": {
"type": "object",
"properties": {
"type": { "$ref": "../common/1.json#/definitions/basetype" },
"default": { "$ref": "../common/1.json#/definitions/value" },
"default": true,
"description": { "type": "string" }
},
"required": [
"type"
],
"allOf": [
{
"if": { "properties": { "type": { "const": "bool" } } },
"then": { "properties": { "default": { "type": "bool" } } }
},
{
"if": { "properties": { "type": { "const": "string" } } },
"then": { "properties": { "default": { "type": "string" } } }
},
{
"if": { "properties": { "type": { "$ref": "../common/1.json#/definitions/uint_basetype" } } },
"then": { "properties": { "default": { "$ref": "#/definitions/uint_constraint" } } }
},
{
"if": { "properties": { "type": { "$ref": "../common/1.json#/definitions/int_basetype" } } },
"then": { "properties": { "default": { "$ref": "#/definitions/int_constraint" } } }
},
{
"if": { "properties": { "type": { "$ref": "../common/1.json#/definitions/float_basetype" } } },
"then": { "properties": { "default": { "$ref": "#/definitions/float_constraint" } } }
}
],
"additionalProperties": false
},
......@@ -108,9 +152,9 @@
"type": "object",
"properties": {
"type": { "$ref": "../common/1.json#/definitions/basetype" },
"default": { "$ref": "../common/1.json#/definitions/value" },
"default": true,
"description": { "type": "string" },
"range": { "$ref": "#/definitions/float_range" }
"range": true
},
"required": [
"type",
......@@ -129,24 +173,25 @@
},
"allOf": [
{
"if": { "properties": { "type": {
"type": "string", "enum": [
"uint8",
"uint16",
"uint32",
"uint64"
] } } },
"then": { "properties": { "range": { "$ref": "#/definitions/uint_range" } } }
"if": { "properties": { "type": { "$ref": "../common/1.json#/definitions/uint_basetype" } } },
"then": { "properties": {
"default": { "$ref": "#/definitions/uint_constraint" },
"range": { "$ref": "#/definitions/uint_range" }
} }
},
{
"if": { "properties": { "type": { "$ref": "../common/1.json#/definitions/int_basetype" } } },
"then": { "properties": {
"default": { "$ref": "#/definitions/int_constraint" },
"range": { "$ref": "#/definitions/int_range" }
} }
},
{
"if": { "properties": { "type": {
"type": "string", "enum": [
"int8",
"int16",
"int32",
"int64"
] } } },
"then": { "properties": { "range": { "$ref": "#/definitions/int_range" } } }
"if": { "properties": { "type": { "$ref": "../common/1.json#/definitions/float_basetype" } } },
"then": { "properties": {
"default": { "$ref": "#/definitions/float_constraint" },
"range": { "$ref": "#/definitions/float_range" }
} }
}
],
"additionalProperties": false
......@@ -177,56 +222,31 @@
"allOf": [
{
"if": { "properties": { "type": { "const": "string" } } },
"then": { "properties": { "default": { "type": "string" } } },
"else": { "properties": { "default": { "type": "number" } } }
},
{
"if": { "properties": { "type": { "const": "string" } } },
"then": { "properties": { "choice": {
"type": "array",
"items": { "type": "string" },
"minItems": 3
} } }
"then": { "properties": {
"default": { "type": "string" },
"choice": { "$ref": "#/definitions/string_choice" }
} }
},
{
"if": { "properties": { "type": {
"type": "string", "enum": [
"uint8",
"uint16",
"uint32",
"uint64"
] } } },
"then": { "properties": { "choice": {
"type": "array",
"items": { "type": "integer", "minimum": 0 },
"minItems": 3
} } }
"if": { "properties": { "type": { "$ref": "../common/1.json#/definitions/uint_basetype" } } },
"then": { "properties": {
"default": { "$ref": "#/definitions/uint_constraint" },
"choice": { "$ref": "#/definitions/uint_choice" }
} }
},
{
"if": { "properties": { "type": {
"type": "string", "enum": [
"int8",
"int16",
"int32",
"int64"
] } } },
"then": { "properties": { "choice": {
"type": "array",
"items": { "type": "integer" },
"minItems": 3
} } }
"if": { "properties": { "type": { "$ref": "../common/1.json#/definitions/int_basetype" } } },
"then": { "properties": {
"default": { "$ref": "#/definitions/int_constraint" },
"choice": { "$ref": "#/definitions/int_choice" }
} }
},
{
"if": { "properties": { "type": {
"type": "string", "enum": [
"float32",
"float64"
] } } },
"then": { "properties": { "choice": {
"type": "array",
"items": { "type": "number" },
"minItems": 3
} } }
"if": { "properties": { "type": { "$ref": "../common/1.json#/definitions/float_basetype" } } },
"then": { "properties": {
"default": { "$ref": "#/definitions/float_constraint" },
"choice": { "$ref": "#/definitions/float_choice" }
} }
}
],
......
......@@ -10,24 +10,49 @@
"pattern": "^[a-zA-Z_][a-zA-Z0-9_-]*/[a-zA-Z0-9_-]+/[0-9]+$"
},
"basetype": {
"uint_basetype": {
"type": "string",
"enum": [
"int8",
"int16",
"int32",
"int64",
"uint8",
"uint16",
"uint32",
"uint64",
"uint64"
]
},
"int_basetype": {
"type": "string",
"enum": [
"int8",
"int16",
"int32",
"int64"
]
},
"float_basetype": {
"type": "string",
"enum": [
"float32",
"float64",
"bool",
"string"
"float64"
]
},
"basetype": {
"anyOf": [
{ "$ref": "#/definitions/uint_basetype" },
{ "$ref": "#/definitions/int_basetype" },
{ "$ref": "#/definitions/float_basetype" },
{
"type": "string",
"enum": [
"bool",
"string"
]
}
]
},
"value": {
"oneOf": [
{ "type": "string" },
......
{
"api_version": 2,
"schema_version": 3,
"splittable": false,
"type": "sequential",
"uses": {},
"description": "this is an example of an algorithm with a normal, float-typed parameter with an invalid default",
"groups": [
{
"name": "group",
"inputs": {
"input": {
"type": "user/single_integer/1"
}
},
"outputs": {
"output": {
"type": "user/single_integer/1"
}
}
}
],
"language": "python",
"parameters": {
"testparam": {
"type": "float64",
"default": "a"
}
}
}
#!/usr/bin/env python
# vim: set fileencoding=utf-8 :
###################################################################################
# #
# Copyright (c) 2019 Idiap Research Institute, http://www.idiap.ch/ #
# Contact: beat.support@idiap.ch #
# #
# Redistribution and use in source and binary forms, with or without #
# modification, are permitted provided that the following conditions are met: #
# #
# 1. Redistributions of source code must retain the above copyright notice, this #
# list of conditions and the following disclaimer. #
# #
# 2. Redistributions in binary form must reproduce the above copyright notice, #
# this list of conditions and the following disclaimer in the documentation #
# and/or other materials provided with the distribution. #
# #
# 3. Neither the name of the copyright holder nor the names of its contributors #
# may be used to endorse or promote products derived from this software without #
# specific prior written permission. #
# #
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND #
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED #
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE #
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE #
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL #
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR #
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER #
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, #
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE #
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #
# #
###################################################################################
class Algorithm:
def process(self, inputs, outputs):
return True
{
"api_version": 2,
"schema_version": 3,
"splittable": false,
"type": "sequential",
"uses": {},
"description": "this is an example of an algorithm with a normal, int-typed parameter with an invalid default",
"groups": [
{
"name": "group",
"inputs": {
"input": {
"type": "user/single_integer/1"
}
},
"outputs": {
"output": {
"type": "user/single_integer/1"
}
}
}
],
"language": "python",
"parameters": {
"testparam": {
"type": "int16",
"default": -1.1
}
}
}
#!/usr/bin/env python
# vim: set fileencoding=utf-8 :
###################################################################################
# #
# Copyright (c) 2019 Idiap Research Institute, http://www.idiap.ch/ #
# Contact: beat.support@idiap.ch #
# #
# Redistribution and use in source and binary forms, with or without #
# modification, are permitted provided that the following conditions are met: #
# #
# 1. Redistributions of source code must retain the above copyright notice, this #
# list of conditions and the following disclaimer. #
# #
# 2. Redistributions in binary form must reproduce the above copyright notice, #
# this list of conditions and the following disclaimer in the documentation #
# and/or other materials provided with the distribution. #
# #
# 3. Neither the name of the copyright holder nor the names of its contributors #
# may be used to endorse or promote products derived from this software without #
# specific prior written permission. #
# #
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND #
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED #
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE #
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE #
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL #
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR #
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER #
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, #
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE #
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #
# #
###################################################################################
class Algorithm:
def process(self, inputs, outputs):
return True
{
"api_version": 2,
"schema_version": 3,
"splittable": false,
"type": "sequential",
"uses": {},
"description": "this is an example of an algorithm with a normal, uint-typed parameter with an invalid default",
"groups": [
{
"name": "group",
"inputs": {
"input": {
"type": "user/single_integer/1"
}
},
"outputs": {
"output": {
"type": "user/single_integer/1"
}
}
}
],
"language": "python",
"parameters": {
"testparam": {
"type": "uint8",
"default": -1
}
}
}
#!/usr/bin/env python
# vim: set fileencoding=utf-8 :
###################################################################################
# #
# Copyright (c) 2019 Idiap Research Institute, http://www.idiap.ch/ #
# Contact: beat.support@idiap.ch #
# #
# Redistribution and use in source and binary forms, with or without #
# modification, are permitted provided that the following conditions are met: #
# #
# 1. Redistributions of source code must retain the above copyright notice, this #
# list of conditions and the following disclaimer. #
# #
# 2. Redistributions in binary form must reproduce the above copyright notice, #
# this list of conditions and the following disclaimer in the documentation #
# and/or other materials provided with the distribution. #
# #
# 3. Neither the name of the copyright holder nor the names of its contributors #
# may be used to endorse or promote products derived from this software without #
# specific prior written permission. #
# #
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND #
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED #
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE #
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE #
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL #
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR #
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER #
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, #
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE #
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #
# #
###################################################################################
class Algorithm:
def process(self, inputs, outputs):
return True
{
"api_version": 2,
"schema_version": 3,
"splittable": false,
"type": "sequential",
"uses": {},
"description": "this is an example of an algorithm with a normal, string-typed parameter with an invalid default",
"groups": [
{
"name": "group",
"inputs": {
"input": {
"type": "user/single_integer/1"
}
},
"outputs": {
"output": {
"type": "user/single_integer/1"
}
}
}
],
"language": "python",
"parameters": {
"testparam": {
"type": "string",
"default": 1
}
}
}
#!/usr/bin/env python
# vim: set fileencoding=utf-8 :
###################################################################################
# #
# Copyright (c) 2019 Idiap Research Institute, http://www.idiap.ch/ #
# Contact: beat.support@idiap.ch #
# #
# Redistribution and use in source and binary forms, with or without #
# modification, are permitted provided that the following conditions are met: #
# #
# 1. Redistributions of source code must retain the above copyright notice, this #
# list of conditions and the following disclaimer. #
# #
# 2. Redistributions in binary form must reproduce the above copyright notice, #
# this list of conditions and the following disclaimer in the documentation #
# and/or other materials provided with the distribution. #
# #
# 3. Neither the name of the copyright holder nor the names of its contributors #
# may be used to endorse or promote products derived from this software without #
# specific prior written permission. #
# #
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND #
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED #
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE #
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE #
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL #
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR #
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER #
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, #
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE #
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #
# #
###################################################################################
class Algorithm:
def process(self, inputs, outputs):
return True
{
"api_version": 2,
"schema_version": 3,
"splittable": false,
"type": "sequential",
"uses": {},
"description": "this is an example of an algorithm with a range, float-typed parameter with an invalid default",
"groups": [
{
"name": "group",
"inputs": {
"input": {
"type": "user/single_integer/1"
}
},
"outputs": {
"output": {
"type": "user/single_integer/1"
}
}
}
],
"language": "python",
"parameters": {
"testparam": {
"range": [
0.1,
1.1
],
"type": "float64",
"default": true
}
}
}
#!/usr/bin/env python
# vim: set fileencoding=utf-8 :
###################################################################################
# #
# Copyright (c) 2019 Idiap Research Institute, http://www.idiap.ch/ #
# Contact: beat.support@idiap.ch #
# #
# Redistribution and use in source and binary forms, with or without #
# modification, are permitted provided that the following conditions are met: #
# #
# 1. Redistributions of source code must retain the above copyright notice, this #
# list of conditions and the following disclaimer. #
# #
# 2. Redistributions in binary form must reproduce the above copyright notice, #
# this list of conditions and the following disclaimer in the documentation #
# and/or other materials provided with the distribution. #
# #
# 3. Neither the name of the copyright holder nor the names of its contributors #
# may be used to endorse or promote products derived from this software without #
# specific prior written permission. #
# #
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND #
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED #
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE #
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE #
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL #
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR #
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER #
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, #
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE #
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #
# #
###################################################################################
class Algorithm:
def process(self, inputs, outputs):
return True
{
"api_version": 2,
"schema_version": 3,
"splittable": false,
"type": "sequential",
"uses": {},
"description": "this is an example of an algorithm with a string choice parameter with an invalid default",
"groups": [
{
"name": "group",
"inputs": {
"input": {
"type": "user/single_integer/1"
}
},
"outputs": {
"output": {
"type": "user/single_integer/1"
}