[fel] normalize fel and waterflow modules #150

loveTsong · 2025-05-30T08:14:26Z

🔗 相关问题 / Related Issue

Issue 链接 / Issue Link: #51

我已经创建了相关 Issue 并进行了讨论 / I have created and discussed the related issue
这是一个微小的修改（如错别字），不需要 Issue / This is a trivial change (like typo fix) that doesn't need an issue

📋 变更类型 / Type of Change

🐛 Bug 修复 / Bug fix (non-breaking change which fixes an issue)
✨ 新功能 / New feature (non-breaking change which adds functionality)
💥 破坏性变更 / Breaking change (fix or feature that would cause existing functionality to not work as expected)
📚 文档更新 / Documentation update
🔧 重构 / Refactoring (no functional changes)
⚡ 性能优化 / Performance improvement
🧹 代码清理 / Code cleanup

📝 变更目的 / Purpose of the Change

合并 fel 和 waterflow 的代码 / Merge code from fel and waterflow.

📋 主要变更 / Brief Changelog

合并 fel 代码 / Merge fel code.
合并 waterflow 代码 / Merge waterflow code.
修复合并代码后碰到的问题，详情参考 issue 中的内容 / Fix issues encountered after merging, see issue details for reference.

🧪 验证变更 / Verifying this Change

部署后能够使用配置了大模型的应用进行正常对话 / After deployment, the application configured with the large language model should be able to conduct normal conversations.

测试步骤 / Test Steps

流水线出包 / Pipeline packaging.
安装部署 / Installation and deployment.
在部署后的平台中创建应用，能够使用大模型进行正常对话 / Create an application on the deployed platform that can use the large language model for normal conversations.

测试覆盖 / Test Coverage

我已经添加了单元测试 / I have added unit tests
所有现有测试都通过 / All existing tests pass
我已经进行了手动测试 / I have performed manual testing

📸 截图 / Screenshots

✅ 贡献者检查清单 / Contributor Checklist

请确保你的 Pull Request 符合以下要求 / Please ensure your Pull Request meets the following requirements:

基本要求 / Basic Requirements:

确保有 GitHub Issue 对应这个变更（微小变更如错别字除外）/ Make sure there is a Github issue filed for the change (trivial changes like typos excluded)
你的 Pull Request 只解决一个 Issue，没有包含其他不相关的变更 / Your PR addresses just this issue, without pulling in other changes - one PR resolves one issue
PR 中的每个 commit 都有有意义的主题行和描述 / Each commit in the PR has a meaningful subject line and body

代码质量 / Code Quality:

我的代码遵循项目的代码规范 / My code follows the project's coding standards
我已经进行了自我代码审查 / I have performed a self-review of my code
我已经为复杂的代码添加了必要的注释 / I have commented my code, particularly in hard-to-understand areas

测试要求 / Testing Requirements:

我已经编写了必要的单元测试来验证逻辑正确性 / I have written necessary unit-tests to verify the logic correction
当存在跨模块依赖时，我尽量使用了 mock / I have used mocks when cross-module dependencies exist
基础检查通过：mvn -B clean package -Dmaven.test.skip=true，elsa README 中的编译检查 / Basic checks pass
单元测试通过：mvn clean install / Unit tests pass

文档和兼容性 / Documentation and Compatibility:

我已经更新了相应的文档 / I have made corresponding changes to the documentation
如果有破坏性变更，我已经在 PR 描述中详细说明 / If there are breaking changes, I have documented them in detail
我已经考虑了向后兼容性 / I have considered backward compatibility

📋 附加信息 / Additional Notes

审查者注意事项 / Reviewer Notes:

...community/model-openai/src/main/java/modelengine/fel/community/model/openai/OpenAiModel.java

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

framework/fel/java/fel-core/src/main/java/modelengine/fel/core/chat/ChatOption.java

...va/fel-core/src/main/java/modelengine/fel/core/document/support/RerankDocumentProcessor.java

...src/main/java/modelengine/fit/waterflow/domain/context/repo/flowsession/FlowSessionRepo.java

...low/java/waterflow-core/src/main/java/modelengine/fit/waterflow/domain/flow/ProcessFlow.java

...terflow/java/waterflow-core/src/main/java/modelengine/fit/waterflow/domain/states/State.java

...flow/java/waterflow-core/src/main/java/modelengine/fit/waterflow/domain/stream/nodes/To.java

...flow/java/waterflow-core/src/main/java/modelengine/fit/waterflow/domain/utils/FlowDebug.java

...work/waterflow/java/waterflow-common/src/main/java/modelengine/fit/waterflow/ErrorCodes.java

.../waterflow/java/waterflow-common/src/main/java/modelengine/fit/waterflow/utils/Entities.java

- Fix null session in AiDataStart delivery - Prevent premature session cleanup during emission - Fix single-item termination in delegate subflows - Add complete handling for subflow emitter data - Fix listener leaks in delegate subflow connections - Add session completion detection mechanism - Ensure session order inheritance in flatMap startSession - Fix missing startSession in FlowPattern delegate flows - Remove deprecated windows in FlatMapSourceWindow - Prevent interference in FlowPattern subflow listeners - Enable default conversation ordering in fel

…multi-subscribed subflows

* [fel] chore: merge fel codebase * [fel] chore: update pom configuration * [fel] chore: adapt build directory * [fel] feat: add context passing for agent interface * [fel] refactor: optimize chat option validation position * [fel] refactor: replace LLM emitter streaming with reduce * [waterflow] fix: multiple critical issues - Fix null session in AiDataStart delivery - Prevent premature session cleanup during emission - Fix single-item termination in delegate subflows - Add complete handling for subflow emitter data - Fix listener leaks in delegate subflow connections - Add session completion detection mechanism - Ensure session order inheritance in flatMap startSession - Fix missing startSession in FlowPattern delegate flows - Remove deprecated windows in FlatMapSourceWindow - Prevent interference in FlowPattern subflow listeners - Enable default conversation ordering in fel * [waterflow] if data is null, the next session is useless. * [waterflow] fix fake stream for FitBoundedEmitter * [waterflow] fix the wrong usage of session for the process operator * [waterflow] refactor: adapt emitter in SimpleFlowPattern * [fel] fix: enforce ordering in AbstractFlowPattern sync calls * [fel] feat: adapt delegate AiProcessFlow scenarios * [waterflow] clean processingSessions * [fel] support multi offer for the one conversation * [waterflow] fix the acc group order leak * [waterflow] ensure thread safety for emitter listeners * [waterflow] replace direct completion check with callback-based window done handling * [waterflow] support multi onDoneHandlers for window * [waterflow] less lock scope for to listeners * [fel] apply onDone to AbstractFlowPattern * [fel] enable agent tool call * [fel] remove nonNull * [fel] adapter llm stream output * [waterflow] fix: flatMap-reduce occasionally not terminating * [waterflow] chore: remove unused consumeAction * [fel] refactor: unify FlowPattern handling and fix listener leaks in multi-subscribed subflows * [fel] remove logs and more * [fel] unique h2 version * [fel] adapter llm chat reasoning_content * [fel] add null check for isLatest field * [waterflow] fix: concurrent resource cleanup at termination nodes * [waterflow] fix: memory leak in ConditionFrom * [waterflow] remove useless dependency * [waterflow] fix: clean flow locks * [fel] handle toolCalls when extracting reasoningContent * [fel] should not sync the code node tools code * [fel] fix: adapter JacksonObjectSerializer modification * [fel] clean code * [waterflow] clean code * [waterflow] clean code * [waterflow] clean code --------- Co-authored-by: songyongtan <271667068@qq.com>

loveTsong self-assigned this May 30, 2025

loveTsong changed the base branch from main to 3.5.x May 30, 2025 08:15

CodeCasterX added type: enhancement A general enhancement in: fel Issues in FEL(FIT Expression for LLM) modules in: waterflow Issues in Waterflow modules type: task A general task and removed type: enhancement A general enhancement labels May 31, 2025

CodeCasterX added this to Nova May 31, 2025

CodeCasterX added this to the 3.5.0 milestone May 31, 2025

CodeCasterX changed the title ~~[fel waterflow] unique fel waterflow~~ [fel] normalize fel and waterflow modules May 31, 2025

loveTsong linked an issue Jun 4, 2025 that may be closed by this pull request

适配最新的waterflow和FEL框架 #51

Closed

loveTsong force-pushed the improvement-unique-fel-waterflow branch from 4b8559d to 0f28ecc Compare June 9, 2025 01:15

CodeCasterX reviewed Jun 9, 2025

View reviewed changes

loveTsong added 16 commits June 10, 2025 10:58

[fel] chore: merge fel codebase

062e6dd

[fel] chore: update pom configuration

88e5a06

[fel] chore: adapt build directory

eee38e7

[fel] feat: add context passing for agent interface

f80f926

[fel] refactor: optimize chat option validation position

afbf98d

[fel] refactor: replace LLM emitter streaming with reduce

e6eef35

[waterflow] if data is null, the next session is useless.

384611b

[waterflow] fix fake stream for FitBoundedEmitter

748047f

[waterflow] fix the wrong usage of session for the process operator

e216a53

[waterflow] refactor: adapt emitter in SimpleFlowPattern

7643946

[fel] fix: enforce ordering in AbstractFlowPattern sync calls

0e074dd

[fel] feat: adapt delegate AiProcessFlow scenarios

ef45ca7

[waterflow] clean processingSessions

dd4c257

[fel] support multi offer for the one conversation

7bc5fa4

[waterflow] fix the acc group order leak

7876846

loveTsong added 20 commits June 10, 2025 11:27

[fel] apply onDone to AbstractFlowPattern

e0507a5

[fel] enable agent tool call

2a648e2

[fel] remove nonNull

36be8db

[fel] adapter llm stream output

a6c7dd4

[waterflow] fix: flatMap-reduce occasionally not terminating

31be73f

[waterflow] chore: remove unused consumeAction

e707293

[fel] refactor: unify FlowPattern handling and fix listener leaks in …

a8bed1a

…multi-subscribed subflows

[fel] remove logs and more

fb02892

[fel] unique h2 version

483b894

[fel] adapter llm chat reasoning_content

5ad00d0

[fel] add null check for isLatest field

37ded1e

[waterflow] fix: concurrent resource cleanup at termination nodes

f3834c8

[waterflow] fix: memory leak in ConditionFrom

99bc30f

[waterflow] remove useless dependency

06ced6b

[waterflow] fix: clean flow locks

6a228d9

[fel] handle toolCalls when extracting reasoningContent

dc05d1f

[fel] should not sync the code node tools code

f801b57

[fel] fix: adapter JacksonObjectSerializer modification

69c2892

[fel] clean code

2e5ebc5

[waterflow] clean code

788fbe2

loveTsong force-pushed the improvement-unique-fel-waterflow branch from 3de458d to 788fbe2 Compare June 10, 2025 06:25

loveTsong removed a link to an issue Jun 10, 2025

适配最新的waterflow和FEL框架 #51

Closed

loveTsong linked an issue Jun 10, 2025 that may be closed by this pull request

framework仓整合fel和waterflow #157

Closed

4 tasks

loveTsong added 2 commits June 10, 2025 14:48

[waterflow] clean code

cbbdbaa

[waterflow] clean code

59c6aaa

loveTsong force-pushed the improvement-unique-fel-waterflow branch from 8c208b3 to 59c6aaa Compare June 10, 2025 07:13

CodeCasterX approved these changes Jun 10, 2025

View reviewed changes

CodeCasterX merged commit 33a5736 into ModelEngine-Group:3.5.x Jun 10, 2025
1 check passed

github-project-automation bot moved this to Done in Nova Jun 10, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[fel] normalize fel and waterflow modules #150

[fel] normalize fel and waterflow modules #150

Uh oh!

loveTsong commented May 30, 2025 •

edited by CodeCasterX

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

[fel] normalize fel and waterflow modules #150

[fel] normalize fel and waterflow modules #150

Uh oh!

Conversation

loveTsong commented May 30, 2025 • edited by CodeCasterX Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🔗 相关问题 / Related Issue

📋 变更类型 / Type of Change

📝 变更目的 / Purpose of the Change

📋 主要变更 / Brief Changelog

🧪 验证变更 / Verifying this Change

测试步骤 / Test Steps

测试覆盖 / Test Coverage

📸 截图 / Screenshots

✅ 贡献者检查清单 / Contributor Checklist

📋 附加信息 / Additional Notes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

loveTsong commented May 30, 2025 •

edited by CodeCasterX

Loading