Skip to content

Commit 5527c80

Browse files
CodeCasterXCodeCasterX
authored
Prepare to release Waterflow and FEL (#162)
* optimize FEL javadoc and pom
1 parent 6e174d2 commit 5527c80

File tree

105 files changed

+1169
-688
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+1169
-688
lines changed

‎framework/fit/java/fit-dependency/pom.xml‎ renamed to ‎framework/dependency/pom.xml‎

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@
2828
<role>Maintainer</role>
2929
</roles>
3030
</developer>
31+
<developer>
32+
<name>Song Yongtan</name>
33+
<email>[email protected]</email>
34+
<roles>
35+
<role>Committer</role>
36+
</roles>
37+
</developer>
3138
</developers>
3239

3340
<scm>
@@ -44,6 +51,16 @@
4451
<!-- FIT version -->
4552
<fit.version>3.5.0-SNAPSHOT</fit.version>
4653

54+
<!-- Third-party versions -->
55+
<byte-buddy.version>1.17.5</byte-buddy.version>
56+
<druid.version>1.2.20</druid.version>
57+
<fastjson.version>1.2.83</fastjson.version>
58+
<guava.version>32.0.1-jre</guava.version>
59+
<hanlp.version>portable-1.8.4</hanlp.version>
60+
<lombok.version>1.18.36</lombok.version>
61+
<jackson.version>2.18.2</jackson.version>
62+
<mybatis.version>3.5.13</mybatis.version>
63+
4764
<!-- Test framework versions -->
4865
<assertj.version>3.27.3</assertj.version>
4966
<junit5.version>5.12.2</junit5.version>
@@ -380,6 +397,110 @@
380397
<artifactId>fit-mybatis-common</artifactId>
381398
<version>${fit.version}</version>
382399
</dependency>
400+
401+
<!-- WaterFlow -->
402+
<dependency>
403+
<groupId>org.fitframework.waterflow</groupId>
404+
<artifactId>waterflow-bridge-fit-reactor</artifactId>
405+
<version>${fit.version}</version>
406+
</dependency>
407+
<dependency>
408+
<groupId>org.fitframework.waterflow</groupId>
409+
<artifactId>waterflow-core</artifactId>
410+
<version>${fit.version}</version>
411+
</dependency>
412+
<dependency>
413+
<groupId>org.fitframework.waterflow</groupId>
414+
<artifactId>waterflow-common</artifactId>
415+
<version>${fit.version}</version>
416+
</dependency>
417+
418+
<!-- FEL -->
419+
<dependency>
420+
<groupId>org.fitframework.fel</groupId>
421+
<artifactId>fel-core</artifactId>
422+
<version>${fit.version}</version>
423+
</dependency>
424+
<dependency>
425+
<groupId>org.fitframework.fel</groupId>
426+
<artifactId>tool-service</artifactId>
427+
<version>${fit.version}</version>
428+
</dependency>
429+
<dependency>
430+
<groupId>org.fitframework.fel</groupId>
431+
<artifactId>tool-info</artifactId>
432+
<version>${fit.version}</version>
433+
</dependency>
434+
<dependency>
435+
<groupId>org.fitframework.fel</groupId>
436+
<artifactId>tool-mcp-common</artifactId>
437+
<version>${fit.version}</version>
438+
</dependency>
439+
<dependency>
440+
<groupId>org.fitframework.fel</groupId>
441+
<artifactId>tool-mcp-client-service</artifactId>
442+
<version>${fit.version}</version>
443+
</dependency>
444+
445+
<!-- Ohscript -->
446+
<dependency>
447+
<groupId>org.fitframework.ohscript</groupId>
448+
<artifactId>ohscript</artifactId>
449+
<version>${fit.version}</version>
450+
</dependency>
451+
452+
<!-- Third-party -->
453+
<dependency>
454+
<groupId>com.alibaba</groupId>
455+
<artifactId>druid</artifactId>
456+
<version>${druid.version}</version>
457+
</dependency>
458+
<dependency>
459+
<groupId>com.alibaba</groupId>
460+
<artifactId>fastjson</artifactId>
461+
<version>${fastjson.version}</version>
462+
</dependency>
463+
<dependency>
464+
<groupId>com.fasterxml.jackson.core</groupId>
465+
<artifactId>jackson-annotations</artifactId>
466+
<version>${jackson.version}</version>
467+
</dependency>
468+
<dependency>
469+
<groupId>com.fasterxml.jackson.core</groupId>
470+
<artifactId>jackson-core</artifactId>
471+
<version>${jackson.version}</version>
472+
</dependency>
473+
<dependency>
474+
<groupId>com.fasterxml.jackson.core</groupId>
475+
<artifactId>jackson-databind</artifactId>
476+
<version>${jackson.version}</version>
477+
</dependency>
478+
<dependency>
479+
<groupId>com.google.guava</groupId>
480+
<artifactId>guava</artifactId>
481+
<version>${guava.version}</version>
482+
</dependency>
483+
<dependency>
484+
<groupId>com.hankcs</groupId>
485+
<artifactId>hanlp</artifactId>
486+
<version>${hanlp.version}</version>
487+
</dependency>
488+
<dependency>
489+
<groupId>net.bytebuddy</groupId>
490+
<artifactId>byte-buddy</artifactId>
491+
<version>${byte-buddy.version}</version>
492+
</dependency>
493+
<dependency>
494+
<groupId>org.projectlombok</groupId>
495+
<artifactId>lombok</artifactId>
496+
<version>${lombok.version}</version>
497+
<scope>provided</scope>
498+
</dependency>
499+
<dependency>
500+
<groupId>org.mybatis</groupId>
501+
<artifactId>mybatis</artifactId>
502+
<version>${mybatis.version}</version>
503+
</dependency>
383504
</dependencies>
384505
</dependencyManagement>
385506

‎framework/fel/java/fel-community/model-openai/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
<artifactId>fel-model-openai-plugin</artifactId>
1313

14+
<name>FEL Model OpenAI</name>
15+
1416
<dependencies>
1517
<!-- FIT -->
1618
<dependency>

‎framework/fel/java/fel-community/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<artifactId>fel-community-parent</artifactId>
1313
<packaging>pom</packaging>
1414

15+
<name>FEL Community Parent</name>
16+
1517
<modules>
1618
<module>model-openai</module>
1719
<module>tokenizer-hanlp</module>

‎framework/fel/java/fel-community/tokenizer-hanlp/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
<artifactId>fel-tokenizer-hanlp-plugin</artifactId>
1313

14+
<name>FEL Tokenizer HanLP</name>
15+
1416
<dependencies>
1517
<!-- FIT -->
1618
<dependency>

‎framework/fel/java/fel-core/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
<artifactId>fel-core</artifactId>
1313

14+
<name>FEL Core</name>
15+
1416
<dependencies>
1517
<!-- FIT -->
1618
<dependency>

‎framework/fel/java/fel-flow/pom.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
<artifactId>fel-flow</artifactId>
1313

14+
<name>FEL Flow</name>
15+
1416
<dependencies>
1517
<!-- FIT -->
1618
<dependency>
@@ -47,6 +49,12 @@
4749
<artifactId>waterflow-bridge-fit-reactor</artifactId>
4850
</dependency>
4951

52+
<!-- Third-party -->
53+
<dependency>
54+
<groupId>org.projectlombok</groupId>
55+
<artifactId>lombok</artifactId>
56+
</dependency>
57+
5058
<!-- Test Plugins -->
5159
<dependency>
5260
<groupId>org.fitframework.plugin</groupId>

‎framework/fel/java/fel-flow/src/main/java/modelengine/fel/engine/activities/AiActivity.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ protected AiActivity(F flow) {
3232
this.flow = Validation.notNull(flow, "Flow cannot be null.");
3333
}
3434

35+
/**
36+
* 获取 AI 节点所对应的流程对象。
37+
*
38+
* @return AI 节点所对应的流程对象。
39+
*/
3540
public F flow() {
3641
return this.flow;
3742
}

‎framework/fel/java/fel-flow/src/main/java/modelengine/fel/engine/activities/AiMatchHappen.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ public class AiMatchHappen<O, D, I, RF extends Flow<D>, F extends AiFlow<D, RF>>
3030

3131
private final F flow;
3232

33+
/**
34+
* 创建一个 AI 流程匹配发生器。
35+
*
36+
* @param matchHappen 匹配发生器。
37+
* @param flow AI 流程。
38+
*/
3339
public AiMatchHappen(MatchHappen<O, D, I, RF> matchHappen, F flow) {
3440
this.matchHappen = Validation.notNull(matchHappen, "MatchHappen cannot be null.");
3541
this.flow = Validation.notNull(flow, "Flow cannot be null.");

‎framework/fel/java/fel-flow/src/main/java/modelengine/fel/engine/activities/AiMatchToHappen.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ public class AiMatchToHappen<D, I, RF extends Flow<D>, F extends AiFlow<D, RF>>
3131

3232
private final F flow;
3333

34+
/**
35+
* 创建一个 {@link AiMatchToHappen} 对象。
36+
*
37+
* @param matchToHappen 匹配条件。
38+
* @param flow AI 流程。
39+
*/
3440
public AiMatchToHappen(MatchToHappen<D, I, RF> matchToHappen, F flow) {
3541
this.matchToHappen = Validation.notNull(matchToHappen, "matchToHappen cannot be null.");
3642
this.flow = Validation.notNull(flow, "Flow cannot be null.");
@@ -75,8 +81,8 @@ public <O> AiMatchHappen<O, D, I, RF, F> match(Operators.Whether<I> whether,
7581
/**
7682
* 提供一个默认的处理逻辑，并结束条件节点。
7783
*
78-
* @param processor 表示分支处理器的 {@link AiBranchProcessor}{@code <}{@link O}{@code , }{@link D}{@code ,
79-
* }{@link ?}{@code , }{@link RF}{@code , }{@link F}{@code >}。
84+
* @param processor 表示分支处理器的 {@link AiBranchProcessor}{@code <}{@link O}{@code , }{@link D}{@code ,?,
85+
* }{@link RF}{@code , }{@link F}{@code >}。
8086
* @param <O> 表示第一个条件分支指定的返回类型。
8187
* @return 表示条件节点的 {@link AiState}{@code <}{@link O}{@code , }{@link D}{@code , }{@link O}{@code ,
8288
* }{@link RF}{@code , }{@link F}{@code >}。

‎framework/fel/java/fel-flow/src/main/java/modelengine/fel/engine/activities/AiParallel.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public AiParallel(Parallel<D, I, RF> parallel, F flow) {
4040
/**
4141
* 生成平行节点的子分支。
4242
*
43+
* @param <O> 表示分支处理器的输入参数的类型。
4344
* @param processor 表示分支处理器的 {@link AiBranchProcessor}{@code <}{@link O}{@code , }{@link D}{@code ,
4445
* }{@link I}{@code , }{@link RF}{@code , }{@link F}{@code >}。
4546
* @return 表示平行节点子分支的 {@link AiFork}{@code <}{@link O}{@code , }{@link D}{@code , }{@link I}{@code ,

0 commit comments

Comments
 (0)