fix(taskprocessing): fix OpenAPI error and generate specs

Signed-off-by: Julien Veyssier <julien-nc@posteo.net>

diff --git a/core/ResponseDefinitions.php b/core/ResponseDefinitions.php
index 10386748c8dd33926890429321e3f8c707d09354..7afddbe820a0fb6ea48c986ced039cf31a1f7b58 100644 (file)
--- a/core/ResponseDefinitions.php
+++ b/core/ResponseDefinitions.php
@@ -176,10 +176,10 @@ use OCP\TaskProcessing\ShapeEnumValue;
  *     description: string,
  *     inputShape: CoreTaskProcessingShape[],
  *     inputShapeEnumValues: array{name: string, value: string}[][],
- *     inputShapeDefaults: array<array-key, numeric|string>,
+ *     inputShapeDefaults: array<string, numeric|string>,
  *     optionalInputShape: CoreTaskProcessingShape[],
  *     optionalInputShapeEnumValues: array{name: string, value: string}[][],
- *     optionalInputShapeDefaults: array<array-key, numeric|string>,
+ *     optionalInputShapeDefaults: array<string, numeric|string>,
  *     outputShape: CoreTaskProcessingShape[],
  *     outputShapeEnumValues: array{name: string, value: string}[][],
  *     optionalOutputShape: CoreTaskProcessingShape[],

diff --git a/core/openapi-full.json b/core/openapi-full.json
index a90cc1efaafb5d38c8e8732d751de5ec2f18c60b..e52b62d6fa60d4552d7f3d377f07aaf5e6d3d1fb 100644 (file)
--- a/core/openapi-full.json
+++ b/core/openapi-full.json
@@ -496,8 +496,7 @@
                 "required": [
                     "name",
                     "description",
-                    "type",
-                    "mandatory"
+                    "type"
                 ],
                 "properties": {
                     "name": {
@@ -515,6 +514,7 @@
                             "Image",
                             "Video",
                             "File",
+                            "Enum",
                             "ListOfNumbers",
                             "ListOfTexts",
                             "ListOfImages",
@@ -522,9 +522,6 @@
                             "ListOfVideos",
                             "ListOfFiles"
                         ]
-                    },
-                    "mandatory": {
-                        "type": "boolean"
                     }
                 }
             },
@@ -602,7 +599,15 @@
                     "name",
                     "description",
                     "inputShape",
-                    "outputShape"
+                    "inputShapeEnumValues",
+                    "inputShapeDefaults",
+                    "optionalInputShape",
+                    "optionalInputShapeEnumValues",
+                    "optionalInputShapeDefaults",
+                    "outputShape",
+                    "outputShapeEnumValues",
+                    "optionalOutputShape",
+                    "optionalOutputShapeEnumValues"
                 ],
                 "properties": {
                     "name": {
@@ -617,11 +622,133 @@
                             "$ref": "#/components/schemas/TaskProcessingShape"
                         }
                     },
+                    "inputShapeEnumValues": {
+                        "type": "array",
+                        "items": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "required": [
+                                    "name",
+                                    "value"
+                                ],
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "inputShapeDefaults": {
+                        "type": "object",
+                        "additionalProperties": {
+                            "oneOf": [
+                                {
+                                    "type": "number"
+                                },
+                                {
+                                    "type": "string"
+                                }
+                            ]
+                        }
+                    },
+                    "optionalInputShape": {
+                        "type": "array",
+                        "items": {
+                            "$ref": "#/components/schemas/TaskProcessingShape"
+                        }
+                    },
+                    "optionalInputShapeEnumValues": {
+                        "type": "array",
+                        "items": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "required": [
+                                    "name",
+                                    "value"
+                                ],
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "optionalInputShapeDefaults": {
+                        "type": "object",
+                        "additionalProperties": {
+                            "oneOf": [
+                                {
+                                    "type": "number"
+                                },
+                                {
+                                    "type": "string"
+                                }
+                            ]
+                        }
+                    },
                     "outputShape": {
                         "type": "array",
                         "items": {
                             "$ref": "#/components/schemas/TaskProcessingShape"
                         }
+                    },
+                    "outputShapeEnumValues": {
+                        "type": "array",
+                        "items": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "required": [
+                                    "name",
+                                    "value"
+                                ],
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "optionalOutputShape": {
+                        "type": "array",
+                        "items": {
+                            "$ref": "#/components/schemas/TaskProcessingShape"
+                        }
+                    },
+                    "optionalOutputShapeEnumValues": {
+                        "type": "array",
+                        "items": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "required": [
+                                    "name",
+                                    "value"
+                                ],
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    }
+                                }
+                            }
+                        }
                     }
                 }
             },

diff --git a/core/openapi.json b/core/openapi.json
index 869bc4ef2c5fe01bc3ff5c080ce9aa7e991d7039..d597796f94e24e3e9dc15aa160373b21d1082c52 100644 (file)
--- a/core/openapi.json
+++ b/core/openapi.json
@@ -496,8 +496,7 @@
                 "required": [
                     "name",
                     "description",
-                    "type",
-                    "mandatory"
+                    "type"
                 ],
                 "properties": {
                     "name": {
@@ -515,6 +514,7 @@
                             "Image",
                             "Video",
                             "File",
+                            "Enum",
                             "ListOfNumbers",
                             "ListOfTexts",
                             "ListOfImages",
@@ -522,9 +522,6 @@
                             "ListOfVideos",
                             "ListOfFiles"
                         ]
-                    },
-                    "mandatory": {
-                        "type": "boolean"
                     }
                 }
             },
@@ -602,7 +599,15 @@
                     "name",
                     "description",
                     "inputShape",
-                    "outputShape"
+                    "inputShapeEnumValues",
+                    "inputShapeDefaults",
+                    "optionalInputShape",
+                    "optionalInputShapeEnumValues",
+                    "optionalInputShapeDefaults",
+                    "outputShape",
+                    "outputShapeEnumValues",
+                    "optionalOutputShape",
+                    "optionalOutputShapeEnumValues"
                 ],
                 "properties": {
                     "name": {
@@ -617,11 +622,133 @@
                             "$ref": "#/components/schemas/TaskProcessingShape"
                         }
                     },
+                    "inputShapeEnumValues": {
+                        "type": "array",
+                        "items": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "required": [
+                                    "name",
+                                    "value"
+                                ],
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "inputShapeDefaults": {
+                        "type": "object",
+                        "additionalProperties": {
+                            "oneOf": [
+                                {
+                                    "type": "number"
+                                },
+                                {
+                                    "type": "string"
+                                }
+                            ]
+                        }
+                    },
+                    "optionalInputShape": {
+                        "type": "array",
+                        "items": {
+                            "$ref": "#/components/schemas/TaskProcessingShape"
+                        }
+                    },
+                    "optionalInputShapeEnumValues": {
+                        "type": "array",
+                        "items": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "required": [
+                                    "name",
+                                    "value"
+                                ],
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "optionalInputShapeDefaults": {
+                        "type": "object",
+                        "additionalProperties": {
+                            "oneOf": [
+                                {
+                                    "type": "number"
+                                },
+                                {
+                                    "type": "string"
+                                }
+                            ]
+                        }
+                    },
                     "outputShape": {
                         "type": "array",
                         "items": {
                             "$ref": "#/components/schemas/TaskProcessingShape"
                         }
+                    },
+                    "outputShapeEnumValues": {
+                        "type": "array",
+                        "items": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "required": [
+                                    "name",
+                                    "value"
+                                ],
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    "optionalOutputShape": {
+                        "type": "array",
+                        "items": {
+                            "$ref": "#/components/schemas/TaskProcessingShape"
+                        }
+                    },
+                    "optionalOutputShapeEnumValues": {
+                        "type": "array",
+                        "items": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "required": [
+                                    "name",
+                                    "value"
+                                ],
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    }
+                                }
+                            }
+                        }
                     }
                 }
             },