diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/Tinyflow.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/Tinyflow.java
index 66ffc1d33a49e7c739c8ccb845c4e0515e72e1eb..1a0e3a7430dbd705a33def60eeabf1bd9646749d 100644
--- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/Tinyflow.java
+++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/Tinyflow.java
@@ -27,6 +27,11 @@ public class Tinyflow {
private Chain chain;
private LlmProvider llmProvider;
+ public Tinyflow(LlmProvider llmProvider, String flowData) {
+ setLlmProvider(llmProvider);
+ this.data = flowData;
+ this.chain = ChainParser.parse(this);
+ }
public Tinyflow(String flowData) {
this.data = flowData;
diff --git a/tinyflow-java-demo/pom.xml b/tinyflow-java-demo/pom.xml
index 0a91f104b6f736169927818c788bff712441040c..b8bedd437aba153c3ccb96e4c54ec3a6c2b46661 100644
--- a/tinyflow-java-demo/pom.xml
+++ b/tinyflow-java-demo/pom.xml
@@ -38,16 +38,27 @@
lombok
provided
+
+
+
+
+
+
dev.tinyflow
- tinyflow-java
- 0.0.1
+ tinyflow-java-core
+ 0.0.2
com.agentsflex
agents-flex-bom
1.0.0-rc.6
+
+ com.squareup.okhttp3
+ okhttp
+ 4.12.0
+
diff --git a/tinyflow-java-demo/src/main/java/com/tinyflow/demo/common/Result.java b/tinyflow-java-demo/src/main/java/com/tinyflow/demo/common/Result.java
deleted file mode 100644
index 95708ba941cd1775d1df99fa1fc593db787723ac..0000000000000000000000000000000000000000
--- a/tinyflow-java-demo/src/main/java/com/tinyflow/demo/common/Result.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.tinyflow.demo.common;
-
-public class Result {
-
- private final Integer code;
- private final String msg;
- private final Object data;
-
- public Result(int code, String msg, Object data) {
- this.code = code;
- this.msg = msg;
- this.data = data;
- }
-
- public static Result success(Object data) {
- return new Result(200, "成功", data);
- }
-
- public static Result success() {
- return success(null);
- }
-}
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 51b21588f2487836354b07d1bfc77965540591f2..edea0aa0086172accd469863804588439108fff6 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,5 +1,10 @@
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;
import com.alibaba.fastjson.JSONObject;
import com.tinyflow.demo.service.IWorkFlowService;
import dev.tinyflow.core.Tinyflow;
@@ -41,10 +46,44 @@ public class WorkFlowController {
@PostMapping("/workflow/exe")
public ResponseEntity> exe(@RequestBody JSONObject wf) {
- Tinyflow tinyflow = new Tinyflow(wf.getJSONObject("data").toJSONString());
+ Tinyflow tinyflow = parseFlowParam(wf.getJSONObject("data").toJSONString());
Map variables = wf.getJSONObject("param").getInnerMap();
Map result = tinyflow.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;
+ for (int i = 0; i < nodeArr.size(); i++) {
+ JSONObject node = nodeArr.getJSONObject(i);
+ switch (node.getString("type")) {
+ case "llmNode":
+ JSONObject data = node.getJSONObject("data");
+ QwenLlmConfig qwenLlmConfig = new QwenLlmConfig();
+ // 千问apikey
+ qwenLlmConfig.setApiKey("sk-xxxxxxxxxxx");
+ qwenLlmConfig.setModel("qwen-plus");
+ tinyflow = new Tinyflow(id -> new QwenLlm(qwenLlmConfig), json.toJSONString());
+ break;
+ case "zsk":
+
+ break;
+ default:
+ break;
+ }
+ }
+ return tinyflow;
+ }
+
}
diff --git a/tinyflow-java-demo/src/main/resources/static/workflow.html b/tinyflow-java-demo/src/main/resources/static/workflow.html
index f7ff355e7ad64b009a8f2cd7c956204aeb2ec4e2..98aa842648e667735fec3eeae56f6302d1743082 100644
--- a/tinyflow-java-demo/src/main/resources/static/workflow.html
+++ b/tinyflow-java-demo/src/main/resources/static/workflow.html
@@ -83,7 +83,40 @@
if (paramArr[i].type === 'startNode') {
var params = paramArr[i].data.parameters;
for (var key in params) {
- paramsObj[params[key].name] = document.getElementById(key).value;
+ var param = params[key];
+ var element = document.getElementById(key);
+ if (!element) {
+ console.error('未找到元素:', key);
+ continue;
+ }
+ var value;
+ switch (param.dataType) {
+ case 'Boolean':
+ // 假设使用checkbox，获取checked属性
+ value = element.checked;
+ break;
+ case 'Number':
+ // 转换为数字，无效值转为NaN
+ value = Number(element.value);
+ break;
+ case 'File':
+ // 获取文件对象
+ value = element.files[0] || null;
+ break;
+ case 'Object':
+ case 'Array':
+ // 尝试解析JSON
+ try {
+ value = JSON.parse(element.value);
+ } catch (e) {
+ console.error(`参数“${param.name}”的JSON解析失败:`, e);
+ value = element.value; // 保留原始值或根据需求处理
+ }
+ break;
+ default: // String及其他未指定类型
+ value = element.value;
+ }
+ paramsObj[param.name] = value;
}
break;
}
@@ -143,7 +176,16 @@
.then(wf => {
tinyflow = new Tinyflow.Tinyflow({
element: '#app',
- data: JSON.parse(wf.graph)
+ data: JSON.parse(wf.graph),
+ provider: {
+ llm: () => [
+ {
+ value: 'llm',
+ label: 'llm',
+ }
+ ],
+ knowledge: () => []
+ }
});
})
.catch(error => {
@@ -176,15 +218,71 @@
});
}
function showResult(result) {
- var resultText = document.getElementById('resultText');
- resultText.innerHTML = ''; // 清空之前的文本
- for (var key in result) {
- var div = document.createElement('div');
- div.textContent = `${key}: ${result[key]}`;
- resultText.appendChild(div);
+ const resultText = document.getElementById('resultText');
+ resultText.innerHTML = ''; // 清空容器
+
+ // 类型检查增强
+ if (!isValidInput(result)) {
+ resultText.innerHTML = '错误：参数必须是对象或数组
';
+ return;
}
+
+ // 安全遍历自身可枚举属性
+ Object.keys(result).forEach(key => {
+ try {
+ const div = document.createElement('div');
+ div.innerHTML = `
+ ${escapeHtml(key)}:
+ ${formatValue(result[key])}
+ `;
+ resultText.appendChild(div);
+ } catch (e) {
+ console.error(`渲染属性 ${key} 时出错:`, e);
+ }
+ });
}
+ // 类型校验函数
+ const isValidInput = (input) => {
+ const type = Object.prototype.toString.call(input);
+ return type === '[object Object]' || type === '[object Array]';
+ };
+
+ // 值格式化函数（核心改进）
+ const formatValue = (value) => {
+ if (value === null) return 'null';
+ if (value === undefined) return 'undefined';
+
+ switch (typeof value) {
+ case 'object':
+ // 处理特殊对象类型
+ if (Array.isArray(value)) {
+ return `[ ${value.map(item => formatValue(item)).join(', ')} ]`;
+ } else if (value instanceof Date) {
+ return ``;
+ }
+ // 简单对象处理（限制递归深度可在此添加）
+ return `{ ${Object.keys(value).map(k =>
+ `${k}: ${formatValue(value[k])}`
+ ).join(', ')} }`;
+ case 'string':
+ return `"${escapeHtml(value)}"`;
+ case 'number':
+ return `${value}`;
+ case 'boolean':
+ return `${value.toString()}`;
+ default:
+ return escapeHtml(String(value));
+ }
+ };
+
+ // HTML转义防止XSS
+ const escapeHtml = (str) => {
+ const div = document.createElement('div');
+ div.textContent = str;
+ return div.innerHTML;
+ };
+
function load() {
// 使用方法
id = getQueryParam('id');