chore: update oneof

instill-ai · Aug 19, 2024 · a65b73d · a65b73d
1 parent d0c1dfa
commit a65b73d
Show file tree

Hide file tree

Showing 2 changed files with 79 additions and 42 deletions.
diff --git a/schema/ai-tasks.json b/schema/ai-tasks.json
@@ -40,32 +40,84 @@
                                                     "type": "object",
                                                     "properties": {
                                                         "text": {
-                                                            "description": "Text message",
-                                                            "instillShortDescription": "Text message",
+                                                            "title": "Text message",
+                                                            "description": "Text message.",
+                                                            "instillShortDescription": "Text message.",
                                                             "instillAcceptFormats": [
                                                                 "string"
                                                             ],
                                                             "type": "string"
+                                                        },
+                                                        "type": {
+                                                            "title": "Content type",
+                                                            "description": "Input content type.",
+                                                            "instillShortDescription": "Input content type.",
+                                                            "instillAcceptFormats": [
+                                                                "string"
+                                                            ],
+                                                            "type": "string",
+                                                            "const": "text"
                                                         }
                                                     },
                                                     "required": [
-                                                        "text"
+                                                        "text",
+                                                        "type"
                                                     ]
                                                 },
                                                 {
                                                     "type": "object",
                                                     "properties": {
-                                                        "datauri": {
-                                                            "description": "Image message with either url or base64 encoded string",
-                                                            "instillShortDescription": "Image message with either url or base64 encoded string",
+                                                        "image-url": {
+                                                            "title": "Image url",
+                                                            "description": "Image message url.",
+                                                            "instillShortDescription": "Image message url.",
                                                             "instillAcceptFormats": [
                                                                 "string"
                                                             ],
                                                             "type": "string"
+                                                        },
+                                                        "type": {
+                                                            "title": "Content type",
+                                                            "description": "Input content type",
+                                                            "instillShortDescription": "Input content type",
+                                                            "instillAcceptFormats": [
+                                                                "string"
+                                                            ],
+                                                            "type": "string",
+                                                            "const": "image-url"
+                                                        }
+                                                    },
+                                                    "required": [
+                                                        "image-url",
+                                                        "type"
+                                                    ]
+                                                },
+                                                {
+                                                    "type": "object",
+                                                    "properties": {
+                                                        "image-base64": {
+                                                            "title": "Image base64",
+                                                            "description": "Image base64 encoded string.",
+                                                            "instillShortDescription": "Image base64 encoded string.",
+                                                            "instillAcceptFormats": [
+                                                                "string"
+                                                            ],
+                                                            "type": "string"
+                                                        },
+                                                        "type": {
+                                                            "title": "Content type",
+                                                            "description": "Input content type",
+                                                            "instillShortDescription": "Input content type",
+                                                            "instillAcceptFormats": [
+                                                                "string"
+                                                            ],
+                                                            "type": "string",
+                                                            "const": "image-base64"
                                                         }
                                                     },
                                                     "required": [
-                                                        "datauri"
+                                                        "image-base64",
+                                                        "type"
                                                     ]
                                                 }
                                             ]

diff --git a/schema/schema.json b/schema/schema.json
@@ -17,46 +17,31 @@
                     },
                     "image": {
                         "title": "Input image",
-                        "type": "object",
-                        "oneOf": [
-                            {
-                                "type": "object",
-                                "properties": {
-                                    "image-url": {
-                                        "description": "Image url",
-                                        "instillShortDescription": "Image url",
-                                        "instillAcceptFormats": [
-                                            "string"
-                                        ],
-                                        "type": "string"
-                                    }
-                                },
-                                "required": [
-                                    "image-url"
-                                ]
-                            },
-                            {
-                                "type": "object",
-                                "properties": {
-                                    "image-base64": {
-                                        "description": "Image base64 encoded string",
-                                        "instillShortDescription": "Image base64 encoded string",
-                                        "instillAcceptFormats": [
-                                            "string"
-                                        ],
-                                        "type": "string"
-                                    }
-                                },
-                                "required": [
-                                    "image-base64"
-                                ]
-                            }
+                        "description": "Input image data.",
+                        "instillShortDescription": "Input image data.",
+                        "instillAcceptFormats": [
+                            "string"
+                        ],
+                        "type": "string"
+                    },
+                    "type": {
+                        "title": "Input image type",
+                        "description": "Image url or image base64.",
+                        "instillShortDescription": "Image url or image base64.",
+                        "instillAcceptFormats": [
+                            "string"
+                        ],
+                        "type": "string",
+                        "enum": [
+                            "url",
+                            "base64"
                         ]
                     }
                 },
                 "required": [
                     "model",
-                    "image"
+                    "image",
+                    "type"
                 ]
             },
             "bounding-box": {