Add JSON validation to extracted information schema (#493)
This commit is contained in:
@@ -46,6 +46,8 @@ function CreateNewTaskFormPage() {
|
||||
(parameter: WorkflowParameter) => parameter.key === "navigation_payload",
|
||||
).default_value;
|
||||
|
||||
const dataSchema = data.workflow_definition.blocks[0].data_schema;
|
||||
|
||||
return (
|
||||
<SavedTaskForm
|
||||
initialValues={{
|
||||
@@ -57,8 +59,7 @@ function CreateNewTaskFormPage() {
|
||||
navigationGoal: data.workflow_definition.blocks[0].navigation_goal,
|
||||
dataExtractionGoal:
|
||||
data.workflow_definition.blocks[0].data_extraction_goal,
|
||||
extractedInformationSchema:
|
||||
data.workflow_definition.blocks[0].data_schema,
|
||||
extractedInformationSchema: JSON.stringify(dataSchema, null, 2),
|
||||
navigationPayload,
|
||||
}}
|
||||
/>
|
||||
|
||||
@@ -61,23 +61,39 @@ const savedTaskFormSchema = z
|
||||
navigationPayload: z.string().or(z.null()).optional(),
|
||||
extractedInformationSchema: z.string().or(z.null()).optional(),
|
||||
})
|
||||
.superRefine(({ navigationGoal, dataExtractionGoal }, ctx) => {
|
||||
if (!navigationGoal && !dataExtractionGoal) {
|
||||
ctx.addIssue({
|
||||
code: z.ZodIssueCode.custom,
|
||||
message:
|
||||
"At least one of navigation goal or data extraction goal must be provided",
|
||||
path: ["navigationGoal"],
|
||||
});
|
||||
ctx.addIssue({
|
||||
code: z.ZodIssueCode.custom,
|
||||
message:
|
||||
"At least one of navigation goal or data extraction goal must be provided",
|
||||
path: ["dataExtractionGoal"],
|
||||
});
|
||||
return z.NEVER;
|
||||
}
|
||||
});
|
||||
.superRefine(
|
||||
(
|
||||
{ navigationGoal, dataExtractionGoal, extractedInformationSchema },
|
||||
ctx,
|
||||
) => {
|
||||
if (!navigationGoal && !dataExtractionGoal) {
|
||||
ctx.addIssue({
|
||||
code: z.ZodIssueCode.custom,
|
||||
message:
|
||||
"At least one of navigation goal or data extraction goal must be provided",
|
||||
path: ["navigationGoal"],
|
||||
});
|
||||
ctx.addIssue({
|
||||
code: z.ZodIssueCode.custom,
|
||||
message:
|
||||
"At least one of navigation goal or data extraction goal must be provided",
|
||||
path: ["dataExtractionGoal"],
|
||||
});
|
||||
return z.NEVER;
|
||||
}
|
||||
if (extractedInformationSchema) {
|
||||
try {
|
||||
JSON.parse(extractedInformationSchema);
|
||||
} catch (e) {
|
||||
ctx.addIssue({
|
||||
code: z.ZodIssueCode.custom,
|
||||
message: "Invalid JSON",
|
||||
path: ["extractedInformationSchema"],
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
export type SavedTaskFormValues = z.infer<typeof savedTaskFormSchema>;
|
||||
|
||||
@@ -105,6 +121,17 @@ function createTaskRequestObject(formValues: SavedTaskFormValues) {
|
||||
}
|
||||
|
||||
function createTaskTemplateRequestObject(values: SavedTaskFormValues) {
|
||||
let extractedInformationSchema = null;
|
||||
if (values.extractedInformationSchema) {
|
||||
try {
|
||||
extractedInformationSchema = JSON.parse(
|
||||
values.extractedInformationSchema,
|
||||
);
|
||||
} catch (e) {
|
||||
extractedInformationSchema = values.extractedInformationSchema;
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
title: values.title,
|
||||
description: values.description,
|
||||
@@ -126,7 +153,7 @@ function createTaskTemplateRequestObject(values: SavedTaskFormValues) {
|
||||
url: values.url,
|
||||
navigation_goal: values.navigationGoal,
|
||||
data_extraction_goal: values.dataExtractionGoal,
|
||||
data_schema: values.extractedInformationSchema,
|
||||
data_schema: extractedInformationSchema,
|
||||
},
|
||||
],
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user