Improved schema validation

* Added debug Dockerfile/Makefile
* Validation of examples in docs

senpy/schemas/dimensions.json

@@ -0,0 +1,9 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "properties": {
+    "name": {"type": "string"},
+    "maxValue": {"type": "number"},
+    "minValue": {"type": "number"}
+  },
+  "required": ["name", "maxValue", "minValue"]
+}

senpy/schemas/emotionAnalysis.json

@@ -0,0 +1,18 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "description": "Senpy Emotion analysis",
+  "type": "object",
+  "allOf": [
+    {"$ref": "analysis.json"},
+    {"properties":
+     {
+       "onyx:hasEmotionModel": {
+         "anyOf": [
+           {"type": "string"},
+           {"$ref": "emotionModel.json"}
+         ]
+       }
+     },
+     "required": ["onyx:hasEmotionModel"]
+    }]
+}

senpy/schemas/emotionModel.json

@@ -8,17 +8,20 @@
       "description": "Piece of context that contains the Sentiment",
       "type": "string"
     },
-    "onyx:hasEmotion": {
+    "onyx:hasDimension": {
+      "type": "array",
+      "items": {
+        "$ref": "dimensions.json"
+      },
+      "uniqueItems": true
+    },
+    "onyx:hasEmotionCategory": {
       "type": "array",
       "items": {
         "$ref": "emotion.json"
       },
       "default": []
-    },
-    "prov:wasGeneratedBy": {
-      "type": "string",
-      "description": "The ID of the analysis that generated this Emotion. The full object should be included in the \"analysis\" property of the root object"
     }
   },
-  "required": ["@id", "prov:wasGeneratedBy", "onyx:hasEmotion"]
+  "required": ["@id", "onyx:hasEmotion"]
 }

senpy/schemas/plugins.json

@@ -1,11 +1,18 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "properties": {
-    "plugins": {
-      "type": "array",
-      "items": {
-        "$ref": "plugin.json"
+  "allOf": [
+    {"$ref": "response.json"},
+    {
+      "properties": {
+        "plugins": {
+          "type": "array",
+          "items": {
+            "$ref": "plugin.json"
+          }
+        },
+        "@type": {
+        }
       }
     }
-  }
+  ]
 }

senpy/schemas/response.json

@@ -1,4 +1,9 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "type": "object"
+  "type": "object",
+  "properties": {
+    "@type": {"type": "string"}
+  },
+  "required": ["@type"]
+
 }

senpy/schemas/results.json

@@ -1,31 +1,39 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Results",
-  "description": "The results of an analysis",
-  "type": "object",
-  "properties": {
-    "@context": {
-      "$ref": "context.json"
-    },
-    "@id": {
-      "description": "ID of the analysis",
-      "type": "string"
-    },
-    "analysis": {
-      "type": "array",
-      "default": [],
-      "items": {
-        "$ref": "analysis.json"
-      }
-    },
-    "entries": {
-      "type": "array",
-      "default": [],
-      "items": {
-        "$ref": "entry.json"
-      }
+  "allOf": [
+    {"$ref": "response.json"},
+    {
+      "title": "Results",
+      "description": "The results of an analysis",
+      "type": "object",
+      "properties": {
+        "@context": {
+          "$ref": "context.json"
+        },
+        "@type": {
+          "default": "results"
+        },
+        "@id": {
+          "description": "ID of the analysis",
+          "type": "string"
+        },
+        "analysis": {
+          "type": "array",
+          "default": [],
+          "items": {
+            "$ref": "analysis.json"
+          }
+        },
+        "entries": {
+          "type": "array",
+          "default": [],
+          "items": {
+            "$ref": "entry.json"
+          }
+        }
+
+      },
+      "required": ["@id", "analysis", "entries"]
     }
-    
-  },
-  "required": ["@id", "analysis", "entries"]
+  ]
 }