From 3e800d90bbdc2a5964ad96e4d73f53b6f8502ea8 Mon Sep 17 00:00:00 2001 From: Hhd <17835559578@163.com> Date: Sat, 15 Mar 2025 19:22:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E4=BF=AE=E6=94=B9LlmNodeParser=EF=BC=8C?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=E6=A8=A1=E5=9E=8B=E5=8F=82=E6=95=B0=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E4=B8=8D=E5=88=B0=E6=97=B6=E6=8F=90=E4=BE=9B=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=8F=82=E6=95=B0=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=A4=A7?= =?UTF-8?q?=E6=A8=A1=E5=9E=8Bdemo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/parser/impl/LlmNodeParser.java | 6 +++--- .../demo/controller/WorkFlowController.java | 19 ++++--------------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/LlmNodeParser.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/LlmNodeParser.java index f489c75..ea8aebe 100644 --- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/LlmNodeParser.java +++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/LlmNodeParser.java @@ -37,9 +37,9 @@ public class LlmNodeParser extends BaseNodeParser { ChatOptions chatOptions = new ChatOptions(); - chatOptions.setTopK(data.getInteger("topK")); - chatOptions.setTopP(data.getFloat("topP")); - chatOptions.setTemperature(data.getFloat("temperature")); + chatOptions.setTopK(data.containsKey("topK") ? data.getInteger("topK") : 10); + chatOptions.setTopP(data.containsKey("topP") ? data.getFloat("topP") : 0.8F); + chatOptions.setTemperature(data.containsKey("temperature") ? data.getFloat("temperature") : 0.8F); llmNode.setChatOptions(chatOptions); LlmProvider llmProvider = tinyflow.getLlmProvider(); diff --git a/tinyflow-java-demo/src/main/java/com/tinyflow/demo/controller/WorkFlowController.java b/tinyflow-java-demo/src/main/java/com/tinyflow/demo/controller/WorkFlowController.java index edea0aa..5fb3153 100644 --- a/tinyflow-java-demo/src/main/java/com/tinyflow/demo/controller/WorkFlowController.java +++ b/tinyflow-java-demo/src/main/java/com/tinyflow/demo/controller/WorkFlowController.java @@ -1,7 +1,5 @@ package com.tinyflow.demo.controller; -import com.agentsflex.llm.openai.OpenAILlm; -import com.agentsflex.llm.openai.OpenAILlmConfig; import com.agentsflex.llm.qwen.QwenLlm; import com.agentsflex.llm.qwen.QwenLlmConfig; import com.alibaba.fastjson.JSONArray; @@ -48,23 +46,14 @@ public class WorkFlowController { public ResponseEntity> exe(@RequestBody JSONObject wf) { Tinyflow tinyflow = parseFlowParam(wf.getJSONObject("data").toJSONString()); Map variables = wf.getJSONObject("param").getInnerMap(); - Map result = tinyflow.executeForResult(variables); + Map result = tinyflow.toChain().executeForResult(variables); return new ResponseEntity<>(result, HttpStatus.OK); } private Tinyflow parseFlowParam(String graph) { JSONObject json = JSONObject.parseObject(graph); JSONArray nodeArr = json.getJSONArray("nodes"); - for (int i = 0; i < nodeArr.size(); i++) { - JSONObject node = nodeArr.getJSONObject(i); - if (node.getString("type").equals("llmNode")) { - node.getJSONObject("data").put("topK", 10); - node.getJSONObject("data").put("topP", 0.8); - node.getJSONObject("data").put("temperature", 0.8); - node.getJSONObject("data").put("maxTokens", 2048); - } - } - Tinyflow tinyflow = null; + Tinyflow tinyflow = new Tinyflow(json.toJSONString()); for (int i = 0; i < nodeArr.size(); i++) { JSONObject node = nodeArr.getJSONObject(i); switch (node.getString("type")) { @@ -72,9 +61,9 @@ public class WorkFlowController { JSONObject data = node.getJSONObject("data"); QwenLlmConfig qwenLlmConfig = new QwenLlmConfig(); // 千问apikey - qwenLlmConfig.setApiKey("sk-xxxxxxxxxxx"); + qwenLlmConfig.setApiKey("sk-197479f492be4559b1af52a3f7179dbc"); qwenLlmConfig.setModel("qwen-plus"); - tinyflow = new Tinyflow(id -> new QwenLlm(qwenLlmConfig), json.toJSONString()); + tinyflow.setLlmProvider(id -> new QwenLlm(qwenLlmConfig)); break; case "zsk": -- Gitee From b966b597676dee428513f1093eef7883d8b30f13 Mon Sep 17 00:00:00 2001 From: Hhd <17835559578@163.com> Date: Sat, 15 Mar 2025 19:24:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E4=BF=AE=E6=94=B9LlmNodeParser=EF=BC=8C?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=E6=A8=A1=E5=9E=8B=E5=8F=82=E6=95=B0=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E4=B8=8D=E5=88=B0=E6=97=B6=E6=8F=90=E4=BE=9B=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=8F=82=E6=95=B0=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=A4=A7?= =?UTF-8?q?=E6=A8=A1=E5=9E=8Bdemo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/tinyflow/demo/controller/WorkFlowController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tinyflow-java-demo/src/main/java/com/tinyflow/demo/controller/WorkFlowController.java b/tinyflow-java-demo/src/main/java/com/tinyflow/demo/controller/WorkFlowController.java index 5fb3153..45ef8d2 100644 --- a/tinyflow-java-demo/src/main/java/com/tinyflow/demo/controller/WorkFlowController.java +++ b/tinyflow-java-demo/src/main/java/com/tinyflow/demo/controller/WorkFlowController.java @@ -61,7 +61,7 @@ public class WorkFlowController { JSONObject data = node.getJSONObject("data"); QwenLlmConfig qwenLlmConfig = new QwenLlmConfig(); // 千问apikey - qwenLlmConfig.setApiKey("sk-197479f492be4559b1af52a3f7179dbc"); + qwenLlmConfig.setApiKey("sk-xxxxxxxxxxx"); qwenLlmConfig.setModel("qwen-plus"); tinyflow.setLlmProvider(id -> new QwenLlm(qwenLlmConfig)); break; -- Gitee