feat: better check

Author: Windsland52

.github/workflows/check.yml

@@ -19,18 +19,31 @@ on:
 
 jobs:
   resource:
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      # pip install maafw
+      - name: Use Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+
+      - name: Run maa-checker
+        run: |
+          npx @nekosu/maa-checker@latest ./assets/interface.json --github=.
+
       - name: Install maafw
         run: |
-            python -m pip install --upgrade pip
-            python -m pip install --upgrade maafw --pre
+          python -m pip install --upgrade pip
+          python -m pip install --upgrade maafw --pre
 
       - name: Check Resource
         run: |
-            python ./check_resource.py ./assets/resource/
+          python ./check_resource.py ./assets/resource/
+
+      - name: Validate JSON Schema
+        run: |
+          python -m pip install jsonschema==4.26.0 referencing==0.37.0
+          python tools/validate_schema.py --schema-dir deps/tools --resource-dirs assets/resource --exclude-dirs assets/resource/announcement --interface-files assets/interface.json

assets/interface.json

@@ -85,6 +85,7 @@
     ],
     "option": {
         "任务选项1": {
+            "type": "select",
             "cases": [
                 {
                     "name": "文本1",
@@ -105,4 +106,4 @@
             ]
         }
     }
-}
+}

assets/resource/pipeline/my_task.json

@@ -7,5 +7,6 @@
         "custom_recognition": "my_reco_222",
         "action": "Custom",
         "custom_action": "my_action_111"
-    }
+    },
+    "OcrTask": {}
 }

deps/tools/custom.action.schema.json

@@ -0,0 +1,7 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "Custom Action Schema",
+    "description": "Schema for custom actions in MaaFramework pipeline",
+    "type": "object",
+    "additionalProperties": true
+}

deps/tools/custom.recognition.schema.json

@@ -0,0 +1,7 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "title": "Custom Recognition Schema",
+    "description": "Schema for custom recognitions in MaaFramework pipeline",
+    "type": "object",
+    "additionalProperties": true
+}

deps/tools/pipeline.schema.json

@@ -994,9 +994,9 @@
                 },
                 "expected": {
                     "title": "Expected Property",
-                    "description": "期望的结果，支持正则。必选。",
+                    "description": "期望的结果，支持正则。可选，默认匹配所有结果。",
                     "$ref": "#/$defs/jsonRegexOrList",
-                    "markdownDescription": "*string* | *list<string, >*\n\n期望的结果，支持正则。必选。"
+                    "markdownDescription": "*string* | *list<string, >*\n\n期望的结果，支持正则。可选，默认匹配所有结果。"
                 },
                 "threshold": {
                     "title": "Threshold Property",
@@ -1043,19 +1043,7 @@
                     "type": "string",
                     "markdownDescription": "*string*\n\n模型 **文件夹** 路径。使用 `model/ocr` 文件夹的相对路径。可选，默认为空。\n\n若为空，则为 `model/ocr` 根目录下的模型文件。\n\n文件夹中需要包含 `rec.onnx`, `det.onnx`, `keys.txt` 三个文件。"
                 }
-            },
-            "anyOf": [
-                {
-                    "required": [
-                        "expected"
-                    ]
-                },
-                {
-                    "required": [
-                        "expected_code"
-                    ]
-                }
-            ]
+            }
         },
         "OcrV1": {
             "properties": {
@@ -1115,9 +1103,9 @@
                 },
                 "expected": {
                     "title": "Expected Property",
-                    "description": "期望的分类下标。必选。",
+                    "description": "期望的分类下标。可选，默认匹配所有结果。",
                     "$ref": "#/$defs/jsonInt32OrList",
-                    "markdownDescription": "*int* | *list<int, >*\n\n期望的分类下标。必选。"
+                    "markdownDescription": "*int* | *list<int, >*\n\n期望的分类下标。可选，默认匹配所有结果。"
                 },
                 "order_by": {
                     "title": "Order By Property",
@@ -1142,26 +1130,12 @@
             "anyOf": [
                 {
                     "required": [
-                        "model",
-                        "expected"
-                    ]
-                },
-                {
-                    "required": [
-                        "model_code",
-                        "expected_code"
+                        "model"
                     ]
                 },
                 {
                     "required": [
-                        "model_code",
-                        "expected"
-                    ]
-                },
-                {
-                    "required": [
-                        "model",
-                        "expected_code"
+                        "model_code"
                     ]
                 }
             ]
@@ -1224,9 +1198,9 @@
                 },
                 "expected": {
                     "title": "Expected Property",
-                    "description": "期望的分类下标。必选。",
+                    "description": "期望的分类下标。可选，默认匹配所有结果。",
                     "$ref": "#/$defs/jsonInt32OrList",
-                    "markdownDescription": "*int* | *list<int, >*\n\n期望的分类下标。"
+                    "markdownDescription": "*int* | *list<int, >*\n\n期望的分类下标。可选，默认匹配所有结果。"
                 },
                 "threshold": {
                     "title": "Threshold Property",
@@ -1259,26 +1233,12 @@
             "anyOf": [
                 {
                     "required": [
-                        "model",
-                        "expected"
-                    ]
-                },
-                {
-                    "required": [
-                        "model_code",
-                        "expected_code"
-                    ]
-                },
-                {
-                    "required": [
-                        "model_code",
-                        "expected"
+                        "model"
                     ]
                 },
                 {
                     "required": [
-                        "model",
-                        "expected_code"
+                        "model_code"
                     ]
                 }
             ]