Mercurial > hg > piper
changeset 137:6839d4ab952a
Merge from branch outputid-string-in-featureset
| author | Chris Cannam <c.cannam@qmul.ac.uk> |
|---|---|
| date | Mon, 19 Sep 2016 14:46:42 +0100 |
| parents | bc6c2a090268 (current diff) 9f009d879594 (diff) |
| children | 500a2a0a46e7 |
| files | |
| diffstat | 6 files changed, 26 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/examples/featureset.json Mon May 23 16:09:05 2016 +0100 +++ b/examples/featureset.json Mon Sep 19 14:46:42 2016 +0100 @@ -1,1 +1,1 @@ -{"0": [{"b64values": "AACAPwAAAEAEAEBAAACAQAAAoEAAAMBAAADQQAAA4EA", "label": "A feature", "timestamp": {"n": 141590000, "s": 3}}]} +{"outputid": [{"b64values": "AACAPwAAAEAEAEBAAACAQAAAoEAAAMBAAADQQAAA4EA", "label": "A feature", "timestamp": {"n": 141590000, "s": 3}}]}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/processresponse.json Mon Sep 19 14:46:42 2016 +0100 @@ -0,0 +1,2 @@ +{"pluginHandle":12345,"features":{"outputid": [{"b64values": "AACAPwAAAEAEAEBAAACAQAAAoEAAAMBAAADQQAAA4EA", "label": "A feature", "timestamp": {"n": 141590000, "s": 3}}]}} +
--- a/schema/configurationresponse.json Mon May 23 16:09:05 2016 +0100 +++ b/schema/configurationresponse.json Mon Sep 19 14:46:42 2016 +0100 @@ -1,9 +1,12 @@ { "id": "http://vamp-plugins.org/json/schema/configurationresponse#", "$schema": "http://json-schema.org/draft-04/schema#", - "description": "schema for a serialised response to a request to configure a Vamp plugin; normally served as the response field of an object matching the plain response schema", + "description": "schema for a serialised response to a request to configure a Vamp plugin; normally served as the content field of an object matching the plain response schema", "type": "object", "properties": { + "pluginHandle": { + "type": "number" + }, "outputList": { "type": "array", "items": { "$ref": "http://vamp-plugins.org/json/schema/outputdescriptor#" }
--- a/schema/featureset.json Mon May 23 16:09:05 2016 +0100 +++ b/schema/featureset.json Mon Sep 19 14:46:42 2016 +0100 @@ -4,7 +4,7 @@ "description": "schema for a Vamp::Plugin::FeatureSet serialisation", "type": "object", "patternProperties": { - "^[0-9]+$": { + "^[a-zA-Z0-9_-]+$": { "type": "array", "items": { "$ref": "http://vamp-plugins.org/json/schema/feature#" } }
--- a/schema/loadresponse.json Mon May 23 16:09:05 2016 +0100 +++ b/schema/loadresponse.json Mon Sep 19 14:46:42 2016 +0100 @@ -1,7 +1,7 @@ { "id": "http://vamp-plugins.org/json/schema/loadresponse#", "$schema": "http://json-schema.org/draft-04/schema#", - "description": "schema for a serialised response to a load request for a Vamp Plugin; normally served as the response field of an object matching the plain response schema", + "description": "schema for a serialised response to a load request for a Vamp Plugin; normally served as the content field of an object matching the plain response schema", "type": "object", "properties": { "pluginHandle": {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/processresponse.json Mon Sep 19 14:46:42 2016 +0100 @@ -0,0 +1,17 @@ +{ + "id": "http://vamp-plugins.org/json/schema/processresponse#", + "$schema": "http://json-schema.org/draft-04/schema#", + "description": "schema for a serialised response from processing a data block using a Vamp plugin; normally served as the content field of an object matching the plain response schema", + "type": "object", + "properties": { + "pluginHandle": { + "type": "number" + }, + "features": { + "$ref": "http://vamp-plugins.org/json/schema/featureset#" + } + }, + "required": [ "pluginHandle", "features" ], + "additionalProperties": false +} +