diff --git a/pom.xml b/pom.xml index 7566cdce28ecc25776f3e70f70388273b93718c5..eba8344bfc040c4be0965e36db318aa40857ff35 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ dev.tinyflow tinyflow-java - 1.0.4 + 1.0.5 pom https://tinyflow.dev @@ -58,7 +58,6 @@ agents-flex-bom 1.0.7 - com.jfinal @@ -95,46 +94,8 @@ - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - Tinyflow - Tinyflow - private - false - true - true - -Xdoclint:none - true - 8 - - - - attach-javadocs - - jar - - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - verify - - sign - - - - + + org.sonatype.central diff --git a/tinyflow-java-core/pom.xml b/tinyflow-java-core/pom.xml index 256d4db1c14c26e09e0b63775182681f86941469..0f9e2b60774a1376265b9dcb973bc991901da5c8 100644 --- a/tinyflow-java-core/pom.xml +++ b/tinyflow-java-core/pom.xml @@ -6,7 +6,7 @@ dev.tinyflow tinyflow-java - 1.0.4 + 1.0.5 tinyflow-java-core @@ -22,8 +22,18 @@ com.agentsflex agents-flex-bom + + + com.alibaba + fastjson + + + + + com.alibaba.fastjson2 + fastjson2 + 2.0.57 - com.jfinal enjoy diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/node/HttpNode.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/node/HttpNode.java index 4401fe56f3b89840c325f471dc2459e38d4ab617..d2d6f586008cf28f66ee43fbae0fb91555f29437 100644 --- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/node/HttpNode.java +++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/node/HttpNode.java @@ -22,8 +22,8 @@ import com.agentsflex.core.chain.node.BaseNode; import com.agentsflex.core.llm.client.OkHttpClientUtil; import com.agentsflex.core.prompt.template.TextPromptTemplate; import com.agentsflex.core.util.StringUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import okhttp3.*; import java.io.IOException; diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/BaseNodeParser.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/BaseNodeParser.java index 5356b4765ca394b1a661c976b9f908dc9769144c..53e10251f4077a809a47d9ce2a5b1eec62d27c40 100644 --- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/BaseNodeParser.java +++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/BaseNodeParser.java @@ -20,8 +20,8 @@ import com.agentsflex.core.chain.DataType; import com.agentsflex.core.chain.Parameter; import com.agentsflex.core.chain.RefType; import com.agentsflex.core.chain.node.BaseNode; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import java.util.ArrayList; import java.util.Collections; diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/ChainParser.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/ChainParser.java index 470c4f3b1db2185dcdefa34e24d330156d328c67..624cd48ef9c656297350bbd9cec7f466df781808 100644 --- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/ChainParser.java +++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/ChainParser.java @@ -21,9 +21,9 @@ import com.agentsflex.core.chain.ChainNode; import com.agentsflex.core.chain.JavascriptStringCondition; import com.agentsflex.core.util.CollectionUtil; import com.agentsflex.core.util.StringUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import dev.tinyflow.core.Tinyflow; import dev.tinyflow.core.parser.impl.*; diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/NodeParser.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/NodeParser.java index 0a7d807a1e26f383979e4787e5c1664ee57262de..0a46376076f874fa7af07eaa9e829c2582207844 100644 --- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/NodeParser.java +++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/NodeParser.java @@ -16,7 +16,7 @@ package dev.tinyflow.core.parser; import com.agentsflex.core.chain.ChainNode; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import dev.tinyflow.core.Tinyflow; public interface NodeParser { diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/CodeNodeParser.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/CodeNodeParser.java index 51ab05c736bfe7fab27c68fcaa85377ccf110ce7..2a59e03a86419a041e21143cf48fbf5414f25cfa 100644 --- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/CodeNodeParser.java +++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/CodeNodeParser.java @@ -20,7 +20,7 @@ import com.agentsflex.chain.node.JsExecNode; import com.agentsflex.chain.node.QLExpressExecNode; import com.agentsflex.core.chain.ChainNode; import com.agentsflex.core.chain.node.CodeNode; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import dev.tinyflow.core.Tinyflow; import dev.tinyflow.core.parser.BaseNodeParser; diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/EndNodeParser.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/EndNodeParser.java index 9a079ef380ea32b0c1c76a86a9841ef7b6324032..13d9c6352054df67d55d5bd822d424dd53fb670e 100644 --- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/EndNodeParser.java +++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/EndNodeParser.java @@ -17,7 +17,7 @@ package dev.tinyflow.core.parser.impl; import com.agentsflex.core.chain.ChainNode; import com.agentsflex.core.chain.node.EndNode; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import dev.tinyflow.core.Tinyflow; import dev.tinyflow.core.parser.BaseNodeParser; diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/HttpNodeParser.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/HttpNodeParser.java index 23b75f364a8bcf6516f1071e1d7838c5eae06d6e..1795bf5e3715abc55c1469a38d81916f22a04cb8 100644 --- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/HttpNodeParser.java +++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/HttpNodeParser.java @@ -17,7 +17,7 @@ package dev.tinyflow.core.parser.impl; import com.agentsflex.core.chain.ChainNode; import com.agentsflex.core.chain.Parameter; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import dev.tinyflow.core.Tinyflow; import dev.tinyflow.core.node.HttpNode; import dev.tinyflow.core.parser.BaseNodeParser; diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/KnowledgeNodeParser.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/KnowledgeNodeParser.java index f46414606b52174af46603d15b0e523d0e4323c4..00a225a863396dc5cda5196053b124aad125a562 100644 --- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/KnowledgeNodeParser.java +++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/KnowledgeNodeParser.java @@ -16,7 +16,7 @@ package dev.tinyflow.core.parser.impl; import com.agentsflex.core.chain.ChainNode; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import dev.tinyflow.core.Tinyflow; import dev.tinyflow.core.node.KnowledgeNode; import dev.tinyflow.core.parser.BaseNodeParser; 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 2bc011fdb3b898cdd019a6f3a0639d8f4c89205d..164aa2b2b23590e7c932bde4395dc46ef15d7573 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 @@ -19,7 +19,7 @@ import com.agentsflex.core.chain.ChainNode; import com.agentsflex.core.chain.node.LlmNode; import com.agentsflex.core.llm.ChatOptions; import com.agentsflex.core.llm.Llm; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import dev.tinyflow.core.Tinyflow; import dev.tinyflow.core.parser.BaseNodeParser; import dev.tinyflow.core.provider.LlmProvider; diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/LoopNodeParser.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/LoopNodeParser.java index 421dbd1948b595d55feb1c0d80a62a03e7ff1b7c..04fcff792f02844cf988bcb7b95daab6268ad9a7 100644 --- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/LoopNodeParser.java +++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/LoopNodeParser.java @@ -18,9 +18,9 @@ package dev.tinyflow.core.parser.impl; import com.agentsflex.core.chain.Chain; import com.agentsflex.core.chain.ChainNode; import com.agentsflex.core.chain.Parameter; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; import dev.tinyflow.core.Tinyflow; import dev.tinyflow.core.node.LoopNode; import dev.tinyflow.core.parser.BaseNodeParser; diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/SearchEngineNodeParser.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/SearchEngineNodeParser.java index de6dd6212eb3a4d5378c6b216b468c21ce8d9fcb..4bbaa7a3332b983ffc34315576dbd216b3a20ea5 100644 --- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/SearchEngineNodeParser.java +++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/SearchEngineNodeParser.java @@ -16,7 +16,7 @@ package dev.tinyflow.core.parser.impl; import com.agentsflex.core.chain.ChainNode; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import dev.tinyflow.core.Tinyflow; import dev.tinyflow.core.node.SearchEngineNode; import dev.tinyflow.core.parser.BaseNodeParser; diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/StartNodeParser.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/StartNodeParser.java index 32b7132751cd49827286f54ec2548be931a48f35..7c7a8d7f9e2f7e6a20b28dad935eb56794c1adef 100644 --- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/StartNodeParser.java +++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/StartNodeParser.java @@ -17,7 +17,7 @@ package dev.tinyflow.core.parser.impl; import com.agentsflex.core.chain.ChainNode; import com.agentsflex.core.chain.node.StartNode; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import dev.tinyflow.core.Tinyflow; import dev.tinyflow.core.parser.BaseNodeParser; diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/TemplateNodeParser.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/TemplateNodeParser.java index 44eb9dba681d3dcf5c4e3d1df68973985c8bf307..13b92d301aaf0ad703f8b477fd935619e874be75 100644 --- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/TemplateNodeParser.java +++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/TemplateNodeParser.java @@ -16,7 +16,7 @@ package dev.tinyflow.core.parser.impl; import com.agentsflex.core.chain.ChainNode; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import dev.tinyflow.core.Tinyflow; import dev.tinyflow.core.node.TemplateNode; import dev.tinyflow.core.parser.BaseNodeParser;