Skip to content

Commit 3de458d

Browse files
committed
[fel] clean code
1 parent a4dfa22 commit 3de458d

File tree

21 files changed

+196
-184
lines changed

21 files changed

+196
-184
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
import java.util.HashMap;
6161
import java.util.List;
6262
import java.util.Map;
63-
import java.util.concurrent.ConcurrentHashMap;
6463
import java.util.concurrent.atomic.AtomicReference;
6564
import java.util.stream.Collectors;
6665

@@ -166,7 +165,7 @@ public List<Media> generate(String prompt, ImageOption option) {
166165
.map(entity -> entity.object().media())
167166
.orElseThrow(() -> new FitException("The response body is abnormal."));
168167
} catch (IOException e) {
169-
throw new FitException(e);
168+
throw new IllegalStateException("Failed to close response.", e);
170169
}
171170
}
172171

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,6 @@
5656
<artifactId>h2</artifactId>
5757
<scope>test</scope>
5858
</dependency>
59-
60-
<!-- Third-party -->
61-
<dependency>
62-
<groupId>org.projectlombok</groupId>
63-
<artifactId>lombok</artifactId>
64-
</dependency>
6559
</dependencies>
6660

6761
<build>

framework/fel/java/fel-core/src/main/java/modelengine/fel/core/chat/support/FlatChatMessage.java

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

77
package modelengine.fel.core.chat.support;
88

9-
import lombok.Data;
10-
import lombok.NoArgsConstructor;
119
import modelengine.fel.core.chat.ChatMessage;
1210
import modelengine.fel.core.chat.MessageType;
1311
import modelengine.fel.core.tool.ToolCall;
@@ -26,8 +24,6 @@
2624
* @author 易文渊
2725
* @since 2024-04-12
2826
*/
29-
@Data
30-
@NoArgsConstructor
3127
public class FlatChatMessage implements ChatMessage {
3228
private String id;
3329
private String type;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@ private RerankResponse rerankExchange(HttpClassicClientRequest request) {
9292
.map(ObjectEntity::object)
9393
.orElseThrow(() -> new FitException("The response body is abnormal.")));
9494
} catch (IOException e) {
95-
log.error("Failed to request rerank model.", e);
96-
throw new FitException(e);
95+
throw new IllegalStateException("Failed to request rerank model.", e);
9796
}
9897
}
9998
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ public void register(EmitterListener<O, FlowSession> handler) {
106106
this.state.register(handler);
107107
}
108108

109+
@Override
109110
public void unregister(EmitterListener<O, FlowSession> listener) {
110111
this.state.unregister(listener);
111112
}

framework/fel/java/fel-flow/src/main/java/modelengine/fel/engine/flows/AiProcessFlow.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public void register(EmitterListener<R, FlowSession> listener) {
5151
}
5252
}
5353

54+
@Override
5455
public void unregister(EmitterListener<R, FlowSession> listener) {
5556
EmitterListener<Object, FlowSession> target = this.listeners.remove(listener);
5657
if (target != null) {

framework/fel/java/fel-flow/src/main/java/modelengine/fel/engine/operators/patterns/AbstractAgent.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ public abstract class AbstractAgent extends AbstractFlowPattern<Prompt, ChatMess
3434
private static final String AGENT_MEMORY = "agent_memory";
3535
private static final String CHECK_POINT = "check_point";
3636

37-
@Getter
3837
private final ChatFlowModel model;
3938
private final String memoryId;
4039

@@ -64,6 +63,15 @@ protected AbstractAgent(ChatFlowModel flowModel, String memoryId) {
6463
this.memoryId = notBlank(memoryId, "The agent message key cannot be blank.");
6564
}
6665

66+
/**
67+
* 获取配置的模型对象。
68+
*
69+
* @return 配置的模型对象。
70+
*/
71+
public ChatFlowModel getModel() {
72+
return model;
73+
}
74+
6775
/**
6876
* 执行工具调用。
6977
*

framework/fel/java/fel-flow/src/main/java/modelengine/fel/engine/operators/patterns/AbstractFlowPattern.java

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@ public Flow<I> origin() {
105105
}
106106

107107
/**
108-
* built the flow session for starting the conversation.
108+
* Built the flow session for starting the conversation.
109109
*
110-
* @param emitter the {@link FlowEmitter}{@code <}{@link O}{@code >} representing output emitter.
111-
* @return {@link FlowSession}.
112-
* @param <O> the output data type.
110+
* @param emitter The {@link FlowEmitter}{@code <}{@link O}{@code >} representing output emitter.
111+
* @return The new {@link FlowSession}.
112+
* @param <O> The output data type.
113113
*/
114114
protected static <O> FlowSession buildFlowSession(FlowEmitter<O> emitter) {
115115
FlowSession mainSession = AiFlowSession.require();
@@ -124,12 +124,18 @@ private AiProcessFlow<I, O> getFlow() {
124124
return Validation.notNull(this.flowSupplier.get(), "The flow cannot be null.");
125125
}
126126

127+
/**
128+
* A functional interface defining an action to be performed with processed results.
129+
* Implementations handle both the result data and its associated flow session context.
130+
*
131+
* @param <O> The type of result data to be processed.
132+
*/
127133
protected interface ResultAction<O> {
128134
/**
129-
* process the result.
135+
* Process the result.
130136
*
131-
* @param data the result of {@link O}.
132-
* @param flowSession the result flow session of {@link FlowSession}.
137+
* @param data The result of {@link O}.
138+
* @param flowSession The result flow session of {@link FlowSession}.
133139
*/
134140
void process(O data, FlowSession flowSession);
135141
}

framework/fel/java/fel-flow/src/main/java/modelengine/fel/engine/operators/patterns/FlowNodeSupportable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*
1919
* @param <I> 表示输入数据的类型。
2020
* @param <O> 表示流程处理完成的数据类型。
21-
* @author songyongtan
21+
* @author 宋永坦
2222
* @since 2025-05-16
2323
*/
2424
public class FlowNodeSupportable<I, O> extends AbstractFlowPattern<I, O> {

framework/fel/java/services/fel-pipeline-service/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@
2121
<groupId>org.fitframework</groupId>
2222
<artifactId>fit-util</artifactId>
2323
</dependency>
24-
25-
<!-- Lombok -->
26-
<dependency>
27-
<groupId>org.projectlombok</groupId>
28-
<artifactId>lombok</artifactId>
29-
</dependency>
3024
</dependencies>
3125

3226
<build>

0 commit comments

Comments
 (0)