@shenghuabi/workflow 1.1.2 → 1.1.3

package/index.js

@@ -424,119 +424,80 @@ var v7 = __toESM(require("valibot"), 1);
 var import_view_angular_core5 = require("@piying/view-angular-core");
 var ResponseList = ["json", "markdown", "yaml"];
 var ResponseFormat = ["text", "json_object", "json_schema"];
-var CHAT_NODE_DEFINE = v7.looseObject({
-  data: v7.looseObject({
-    config: v7.pipe(
-      v7.object({
-        llm: v7.optional(llmModelConfig()),
-        /** 处理时解析 */
-        responseFormat: v7.pipe(
-          v7.optional(v7.picklist(ResponseFormat)),
-          import_view_angular_core5.actions.inputs.patch({
-            options: [
-              // 有输入json时
-              {
-                label: "自动",
-                value: void 0,
-                description: `传入JsonSchema时为[json_schema],否则为[text]`
-              },
-              { label: "文本", value: "text" },
-              {
-                label: "JSON对象",
-                value: "json_object",
-                description: "只限制返回类型为JSON对象,不对字段进行限制"
-              },
-              {
-                label: "JSON格式定义",
-                value: "json_schema",
-                description: "限制返回类型为JSON对象,同时限制字段,不建议手动指定,传入JsonSchema后自动启用"
-              }
-            ]
-          }),
-          v7.title("响应格式")
-        ),
-        /** 处理后解析 */
-        parseBy: v7.pipe(
-          v7.optional(v7.picklist(ResponseList)),
-          import_view_angular_core5.actions.inputs.patch({
-            options: [
-              { label: "直接返回", value: void 0 },
-              {
-                label: "json",
-                value: "json",
-                description: `将返回的json代码块内容或原始内容解析为对象`
-              },
-              {
-                label: "markdown",
-                value: "markdown",
-                description: `[需要提示词约束]将返回其中的markdown代码块内容或原始内容`
-              },
-              {
-                label: "yaml",
-                value: "yaml",
-                description: `[需要提示词约束]将返回的yaml代码块内容或原始内容解析为对象`
-              }
-            ]
-          }),
-          v7.title("返回解析"),
-          (0, import_view_angular_core5.valueChange)((fn) => {
-            fn({ list: [["..", "responseFormat"]] }).subscribe(
-              ({ list: [value], field }) => {
-                if ((value ?? "").startsWith("json")) {
-                  if (!field.form.control.value) {
-                    field.form.control.updateValue("json");
-                  }
-                }
-              }
-            );
-          })
-        ),
-        examples: EXAMPLES_DEFINE
+var CHAT_NODE_DEFINE = v7.pipe(
+  v7.object({
+    llm: v7.optional(llmModelConfig()),
+    /** 处理时解析 */
+    responseFormat: v7.pipe(
+      v7.optional(v7.picklist(ResponseFormat)),
+      import_view_angular_core5.actions.inputs.patch({
+        options: [
+          // 有输入json时
+          {
+            label: "自动",
+            value: void 0,
+            description: `传入JsonSchema时为[json_schema],否则为[text]`
+          },
+          { label: "文本", value: "text" },
+          {
+            label: "JSON对象",
+            value: "json_object",
+            description: "只限制返回类型为JSON对象,不对字段进行限制"
+          },
+          {
+            label: "JSON格式定义",
+            value: "json_schema",
+            description: "限制返回类型为JSON对象,同时限制字段,不建议手动指定,传入JsonSchema后自动启用"
+          }
+        ]
       }),
-      import_view_angular_core5.actions.wrappers.patch(["div"]),
-      import_view_angular_core5.actions.class.top("grid auto-rows-auto gap-2")
+      v7.title("响应格式")
     ),
+    /** 处理后解析 */
+    parseBy: v7.pipe(
+      v7.optional(v7.picklist(ResponseList)),
+      import_view_angular_core5.actions.inputs.patch({
+        options: [
+          { label: "直接返回", value: void 0 },
+          {
+            label: "json",
+            value: "json",
+            description: `将返回的json代码块内容或原始内容解析为对象`
+          },
+          {
+            label: "markdown",
+            value: "markdown",
+            description: `[需要提示词约束]将返回其中的markdown代码块内容或原始内容`
+          },
+          {
+            label: "yaml",
+            value: "yaml",
+            description: `[需要提示词约束]将返回的yaml代码块内容或原始内容解析为对象`
+          }
+        ]
+      }),
+      v7.title("返回解析"),
+      (0, import_view_angular_core5.valueChange)((fn) => {
+        fn({ list: [["..", "responseFormat"]] }).subscribe(
+          ({ list: [value], field }) => {
+            if ((value ?? "").startsWith("json")) {
+              if (!field.form.control.value) {
+                field.form.control.updateValue("json");
+              }
+            }
+          }
+        );
+      })
+    ),
+    examples: EXAMPLES_DEFINE,
     value: v7.pipe(
       v7.custom(Boolean),
       (0, import_view_angular_core5.setComponent)("prompt-list")
-      // valueChange((fn) => {
-      //   fn({ list: [undefined] }).subscribe(({ list: [value], field }) => {
-      //     if (!Array.isArray(value)) {
-      //       return;
-      //     }
-      //     const inputValue: ChatMessageListInputType = value ?? [];
-      //     // field.context
-      //     //   .parseTemplate(
-      //     //     inputValue.flatMap((item) =>
-      //     //       item.content.map((item) =>
-      //     //         item.type === 'text' ? item.text : '',
-      //     //       ),
-      //     //     ),
-      //     //   )
-      //     //   .then((value: any) => {
-      //     //     if (!value) {
-      //     //       return;
-      //     //     }
-      //     //     field.context.changeHandleData(field, 'input', 1, value);
-      //     //   });
-      //     // const list = inputValue
-      //     //   .flatMap((item) =>
-      //     //     item.content.map((item) =>
-      //     //       item.type === 'image_url' ? item.image_url.url : undefined,
-      //     //     ),
-      //     //   )
-      //     //   .filter(Boolean)
-      //     //   .map((item) => ({
-      //     //     value: `${item}`,
-      //     //     label: `${item}`,
-      //     //     inputType: `image` as const,
-      //     //   }));
-      //     // field.context.changeHandleData(field, 'input', 3, list ?? []);
-      //   });
-      // }),
     )
-  })
-});
+  }),
+  import_view_angular_core5.actions.wrappers.patch(["div"]),
+  import_view_angular_core5.actions.class.top("grid auto-rows-auto gap-2")
+);
 
 // packages/workflow/inline/node/chat/main/llm.runner.ts
 var import_static_injector5 = require("static-injector");
@@ -698,11 +659,11 @@ var NodeRunnerBase = class {
     ) : this.#modelConfig;
   }
   getParsedNode(schema) {
-    const result = v8.safeParse(schema, this.node);
+    const result = v8.safeParse(schema, this.node.data.config);
     if (result.success) {
       return result.output;
     }
-    if (!PROD_ENV) {
+    if (typeof PROD_ENV === "undefined" || !PROD_ENV) {
       console.log(result.issues);
     }
     throw new Error(JSON.stringify(result.issues));
@@ -829,9 +790,9 @@ var LlmRunner = class extends NodeRunnerBase {
     const { metadataList, obj } = await this.getInputChat();
     const inputJsonSchema = this.inputParams.get(DEFAULT_CHAT_SCHEMA_KEY);
     const nodeResult = this.getParsedNode(CHAT_NODE_DEFINE);
-    const config = nodeResult.data.config;
+    const config = nodeResult;
     const examples = config.examples;
-    const list = nodeResult.data.value;
+    const list = nodeResult.value;
     const historyList = list.map((item) => {
       const content = this.#format.interpolate(
         item.content.map((item2) => item2.type === "text" ? item2.text : "").join("\n"),