Merge pull request #125 from kba/stricter-param-checking

ocrd ocrd-tool .. tool parse-params does validation now

CHANGELOG.md

@@ -13,6 +13,11 @@ Added:
   * CLI: `ocrd workspace set-id MODS_IDENTIFIER_PURL` to set mods:identifier
   * CLI: `ocrd workspace get-id` to get mods:identifier
 
+Fixed:
+
+  * CLI: `cord ocrd-tool tool parse-params` validate as well as merges with default
+  * Parameter validation: Check whether parameter is `required: true`
+
 ## [0.3.1] - 2018-06-18
 
 Added

ocrd/cli/ocrd_tool.py

@@ -1,5 +1,6 @@
 from json import dumps, loads
 import codecs
+import sys
 
 import click
 
@@ -124,7 +125,10 @@ def ocrd_tool_tool_parse_params(ctx, parameters, json):
         with open(parameters, 'r') as f:
             parameters = loads(f.read())
     parameterValidator = ParameterValidator(ctx.json['tools'][ctx.tool_name])
-    parameterValidator.validate(parameters)
+    report = parameterValidator.validate(parameters)
+    if not report.is_valid:
+        print(report.to_xml())
+        sys.exit(1)
     if json:
         print(dumps(parameters))
     else:

ocrd/validator.py

@@ -98,9 +98,17 @@ class ParameterValidator(JsonValidator):
 
     def __init__(self, ocrd_tool):
         # TODO grep required properties
+        required = []
+        p = ocrd_tool['parameters']
+        for n in p:
+            if 'required' in p[n]:
+                if p[n]['required']:
+                    required.append(n)
+                del(p[n]['required'])
         super(ParameterValidator, self).__init__({
             "type": "object",
-            "properties": ocrd_tool['parameters']
+            "required": required,
+            "properties": p
         }, DefaultValidatingDraft4Validator)