Revert "feat: implement JSON schema validation and error handling in configuration modal"

This reverts commit 9cac14b04148ea399297f353a14004f4f95fac3c.

web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-config.tsx

@@ -9,7 +9,7 @@ import { useTranslation } from 'react-i18next'
 import Button from '@/app/components/base/button'
 import VisualEditor from './visual-editor'
 import SchemaEditor from './schema-editor'
-import { getValidationErrorMessage, jsonToSchema, validateSchemaAgainstDraft7 } from '../../utils'
+import { jsonToSchema } from '../../utils'
 import { MittProvider, VisualEditorContextProvider } from './visual-editor/context'
 import ErrorMessage from './error-message'
 
@@ -59,15 +59,15 @@ const JsonSchemaConfig: FC<JsonSchemaConfigProps> = ({
       try {
         const schema = JSON.parse(json)
         setParseError(null)
-        const ajvError = validateSchemaAgainstDraft7(schema)
+        // const ajvError = validateSchemaAgainstDraft7(schema)
-        if (ajvError.length > 0) {
+        // if (ajvError.length > 0) {
-          setValidationError(getValidationErrorMessage(ajvError))
+        //   setValidationError(getValidationErrorMessage(ajvError))
-          return
+        //   return
-        }
+        // }
-        else {
+        // else {
-          setJsonSchema(schema)
+        setJsonSchema(schema)
-          setValidationError('')
+        setValidationError('')
-        }
+        // }
       }
       catch (error) {
         setValidationError('')
@@ -117,15 +117,15 @@ const JsonSchemaConfig: FC<JsonSchemaConfigProps> = ({
       try {
         schema = JSON.parse(json)
         setParseError(null)
-        const ajvError = validateSchemaAgainstDraft7(schema)
+        // const ajvError = validateSchemaAgainstDraft7(schema)
-        if (ajvError.length > 0) {
+        // if (ajvError.length > 0) {
-          setValidationError(getValidationErrorMessage(ajvError))
+        //   setValidationError(getValidationErrorMessage(ajvError))
-          return
+        //   return
-        }
+        // }
-        else {
+        // else {
-          setJsonSchema(schema)
+        setJsonSchema(schema)
-          setValidationError('')
+        setValidationError('')
-        }
+        // }
       }
       catch (error) {
         setValidationError('')

web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-generator/generated-result.tsx

@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next'
 import Button from '@/app/components/base/button'
 import CodeEditor from '../code-editor'
 import ErrorMessage from '../error-message'
-import { getValidationErrorMessage, validateSchemaAgainstDraft7 } from '../../../utils'
+// import { getValidationErrorMessage, validateSchemaAgainstDraft7 } from '../../../utils'
 
 type GeneratedResultProps = {
   schema: SchemaRoot
@@ -44,14 +44,14 @@ const GeneratedResult: FC<GeneratedResultProps> = ({
   const jsonSchema = useMemo(() => formatJSON(schema), [schema])
 
   const handleApply = useCallback(() => {
-    const ajvError = validateSchemaAgainstDraft7(schema)
+    // const ajvError = validateSchemaAgainstDraft7(schema)
-    if (ajvError.length > 0) {
+    // if (ajvError.length > 0) {
-      setValidationError(getValidationErrorMessage(ajvError))
+    //   setValidationError(getValidationErrorMessage(ajvError))
-    }
+    // }
-    else {
+    // else {
-      onApply()
+    onApply()
-      setValidationError('')
+    setValidationError('')
-    }
+    // }
   }, [schema, onApply])
 
   return (

web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/advanced-options.tsx

@@ -55,7 +55,7 @@ const AdvancedOptions: FC<AdvancedOptionsProps> = ({
               value={enumValue}
               onChange={handleEnumChange}
               onBlur={handleEnumBlur}
-              placeholder={'abcd, 1, 1.5, etc.'}
+              placeholder={'\'abcd\', 1, 1.5, \'etc\''}
             />
           </div>
         </div>

web/app/components/workflow/nodes/llm/utils.ts

@@ -1,7 +1,8 @@
 import { ArrayType, Type } from './types'
 import type { ArrayItems, Field, LLMNodeType } from './types'
-import Ajv, { type ErrorObject } from 'ajv'
+// import Ajv, { type ErrorObject } from 'ajv'
-import produce from 'immer'
+// import draft7MetaSchema from 'ajv/dist/refs/json-schema-draft-07.json'
+// import produce from 'immer'
 
 export const checkNodeValid = (payload: LLMNodeType) => {
   return true
@@ -82,281 +83,29 @@ export const findPropertyWithPath = (target: any, path: string[]) => {
   return current
 }
 
-const draft7MetaSchema = {
+// const ajv = new Ajv({
-  $schema: 'http://json-schema.org/draft-07/schema#',
+//   allErrors: true,
-  $id: 'http://json-schema.org/draft-07/schema#',
+//   verbose: true,
-  title: 'Core schema meta-schema',
+//   validateSchema: true,
-  definitions: {
+//   meta: false,
-    schemaArray: {
+// })
-      type: 'array',
+// ajv.addMetaSchema(draft7MetaSchema)
-      minItems: 1,
-      items: {
-        $ref: '#',
-      },
-    },
-    nonNegativeInteger: {
-      type: 'integer',
-      minimum: 0,
-    },
-    nonNegativeIntegerDefault0: {
-      allOf: [
-        {
-          $ref: '#/definitions/nonNegativeInteger',
-        },
-        {
-          default: 0,
-        },
-      ],
-    },
-    simpleTypes: {
-      enum: [
-        'array',
-        'boolean',
-        'integer',
-        'null',
-        'number',
-        'object',
-        'string',
-      ],
-    },
-    stringArray: {
-      type: 'array',
-      items: {
-        type: 'string',
-      },
-      uniqueItems: true,
-      default: [],
-    },
-  },
-  type: [
-    'object',
-    'boolean',
-  ],
-  properties: {
-    $id: {
-      type: 'string',
-      format: 'uri-reference',
-    },
-    $schema: {
-      type: 'string',
-      format: 'uri',
-    },
-    $ref: {
-      type: 'string',
-      format: 'uri-reference',
-    },
-    $comment: {
-      type: 'string',
-    },
-    title: {
-      type: 'string',
-    },
-    description: {
-      type: 'string',
-    },
-    default: true,
-    readOnly: {
-      type: 'boolean',
-      default: false,
-    },
-    writeOnly: {
-      type: 'boolean',
-      default: false,
-    },
-    examples: {
-      type: 'array',
-      items: true,
-    },
-    multipleOf: {
-      type: 'number',
-      exclusiveMinimum: 0,
-    },
-    maximum: {
-      type: 'number',
-    },
-    exclusiveMaximum: {
-      type: 'number',
-    },
-    minimum: {
-      type: 'number',
-    },
-    exclusiveMinimum: {
-      type: 'number',
-    },
-    maxLength: {
-      $ref: '#/definitions/nonNegativeInteger',
-    },
-    minLength: {
-      $ref: '#/definitions/nonNegativeIntegerDefault0',
-    },
-    pattern: {
-      type: 'string',
-      format: 'regex',
-    },
-    additionalItems: {
-      $ref: '#',
-    },
-    items: {
-      anyOf: [
-        {
-          $ref: '#',
-        },
-        {
-          $ref: '#/definitions/schemaArray',
-        },
-      ],
-      default: true,
-    },
-    maxItems: {
-      $ref: '#/definitions/nonNegativeInteger',
-    },
-    minItems: {
-      $ref: '#/definitions/nonNegativeIntegerDefault0',
-    },
-    uniqueItems: {
-      type: 'boolean',
-      default: false,
-    },
-    contains: {
-      $ref: '#',
-    },
-    maxProperties: {
-      $ref: '#/definitions/nonNegativeInteger',
-    },
-    minProperties: {
-      $ref: '#/definitions/nonNegativeIntegerDefault0',
-    },
-    required: {
-      $ref: '#/definitions/stringArray',
-    },
-    additionalProperties: {
-      $ref: '#',
-    },
-    definitions: {
-      type: 'object',
-      additionalProperties: {
-        $ref: '#',
-      },
-      default: {
 
-      },
+// export const validateSchemaAgainstDraft7 = (schemaToValidate: any) => {
-    },
+//   const schema = produce(schemaToValidate, (draft: any) => {
-    properties: {
+//   // Make sure the schema has the $schema property for draft-07
-      type: 'object',
+//     if (!draft.$schema)
-      additionalProperties: {
+//       draft.$schema = 'http://json-schema.org/draft-07/schema#'
-        $ref: '#',
+//   })
-      },
-      default: {
 
-      },
+//   const valid = ajv.validateSchema(schema)
-    },
-    patternProperties: {
-      type: 'object',
-      additionalProperties: {
-        $ref: '#',
-      },
-      propertyNames: {
-        format: 'regex',
-      },
-      default: {
 
-      },
+//   return valid ? [] : ajv.errors || []
-    },
+// }
-    dependencies: {
-      type: 'object',
-      additionalProperties: {
-        anyOf: [
-          {
-            $ref: '#',
-          },
-          {
-            $ref: '#/definitions/stringArray',
-          },
-        ],
-      },
-    },
-    propertyNames: {
-      $ref: '#',
-    },
-    const: true,
-    enum: {
-      type: 'array',
-      items: true,
-      minItems: 1,
-      uniqueItems: true,
-    },
-    type: {
-      anyOf: [
-        {
-          $ref: '#/definitions/simpleTypes',
-        },
-        {
-          type: 'array',
-          items: {
-            $ref: '#/definitions/simpleTypes',
-          },
-          minItems: 1,
-          uniqueItems: true,
-        },
-      ],
-    },
-    format: {
-      type: 'string',
-    },
-    contentMediaType: {
-      type: 'string',
-    },
-    contentEncoding: {
-      type: 'string',
-    },
-    if: {
-      $ref: '#',
-    },
-    then: {
-      $ref: '#',
-    },
-    else: {
-      $ref: '#',
-    },
-    allOf: {
-      $ref: '#/definitions/schemaArray',
-    },
-    anyOf: {
-      $ref: '#/definitions/schemaArray',
-    },
-    oneOf: {
-      $ref: '#/definitions/schemaArray',
-    },
-    not: {
-      $ref: '#',
-    },
-  },
-  default: true,
-}
 
-const ajv = new Ajv({
+// export const getValidationErrorMessage = (errors: ErrorObject[]) => {
-  allErrors: true,
+//   const message = errors.map((error) => {
-  verbose: true,
+//     return `Error: ${error.instancePath} ${error.message} Details: ${JSON.stringify(error.params)}`
-  validateSchema: true,
+//   }).join('; ')
-  meta: false,
+//   return message
-})
+// }
-ajv.addMetaSchema(draft7MetaSchema)
-
-export const validateSchemaAgainstDraft7 = (schemaToValidate: any) => {
-  const schema = produce(schemaToValidate, (draft: any) => {
-  // Make sure the schema has the $schema property for draft-07
-    if (!draft.$schema)
-      draft.$schema = 'http://json-schema.org/draft-07/schema#'
-  })
-
-  const valid = ajv.validateSchema(schema)
-
-  return valid ? [] : ajv.errors || []
-}
-
-export const getValidationErrorMessage = (errors: ErrorObject[]) => {
-  const message = errors.map((error) => {
-    return `Error: ${error.instancePath} ${error.message} Details: ${JSON.stringify(error.params)}`
-  }).join('; ')
-  return message
-}

web/package.json

@@ -55,7 +55,6 @@
     "@tanstack/react-query": "^5.60.5",
     "@tanstack/react-query-devtools": "^5.60.5",
     "ahooks": "^3.8.4",
-    "ajv": "^8.17.1",
     "class-variance-authority": "^0.7.0",
     "classnames": "^2.5.1",
     "copy-to-clipboard": "^3.3.3",

web/pnpm-lock.yaml

@@ -103,9 +103,6 @@ importers:
       ahooks:
         specifier: ^3.8.4
         version: 3.8.4(react@19.0.0)
-      ajv:
-        specifier: ^8.17.1
-        version: 8.17.1
       class-variance-authority:
         specifier: ^0.7.0
         version: 0.7.0