[fel] remove logs and more

Author: loveTsong

examples/fel-example/05-retrieval/src/main/java/modelengine/example/ai/chat/retrieval/RetrievalExampleController.java

@@ -67,13 +67,12 @@ public class RetrievalExampleController {
 
     public RetrievalExampleController(ChatModel chatModel, EmbedModel embedModel, ObjectSerializer serializer,
             @Value("${example.model.chat}") String chatModelName,
-            @Value("${example.model.embed}") String embedModelName,
-            @Value("${fel.openai.apiKey}") String apiKey) {
+            @Value("${example.model.embed}") String embedModelName) {
         DocumentEmbedModel documentEmbedModel =
                 new DefaultDocumentEmbedModel(embedModel, EmbedOption.custom().model(embedModelName).build());
         VectorStore vectorStore = new MemoryVectorStore(documentEmbedModel);
         ChatFlowModel chatFlowModel =
-                new ChatFlowModel(chatModel, ChatOption.custom().model(chatModelName).apiKey(apiKey).stream(false).build());
+                new ChatFlowModel(chatModel, ChatOption.custom().model(chatModelName).stream(false).build());
 
         AiProcessFlow<Tip, Content> retrieveFlow = AiFlows.<Tip>create()
                 .runnableParallel(history(), passThrough())
@@ -96,10 +95,7 @@ public RetrievalExampleController(ChatModel chatModel, EmbedModel embedModel, Ob
         indexFlow.converse().offer(file);
 
         this.ragFlow = AiFlows.<String>create()
-                .map(query -> {
-                    System.out.println("query");
-                    return Tip.from("query", query);
-                })
+                .map(query -> Tip.from("query", query))
                 .runnableParallel(value("context", retrieveFlow), passThrough())
                 .prompt(Prompts.history(), Prompts.human(CHAT_PROMPT))
                 .generate(chatFlowModel)

examples/fel-example/05-retrieval/src/main/resources/application.yml

@@ -1,8 +1,8 @@
 fel:
   openai:
-    api-base: 'https://api.siliconflow.cn/v1'
-    api-key: 'sk-jujmjfaevrwyxtsyyrvpwlkwrbwwoxrjsdfpjcokwobflxqy'
+    api-base: '${api-base}'
+    api-key: '${your-api-key}'
 example:
   model:
-    chat: 'Qwen/Qwen2.5-72B-Instruct'
-    embed: 'BAAI/bge-large-zh-v1.5'
+    chat: '${model-name}'
+    embed: '${model-name}'

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

@@ -198,7 +198,6 @@ private HttpClassicClient getHttpClient() {
                    return value;
                }));
 
-        log.info("Create custom HTTPS config: {}", this.serializer.serialize(custom));
         return this.httpClientFactory.create(HttpClassicClientFactory.Config.builder()
                 .socketTimeout(this.clientConfig.socketTimeout())
                 .connectTimeout(this.clientConfig.connectTimeout())
@@ -212,7 +211,6 @@ private HttpClassicClient getHttpClient(SecureConfig secureConfig) {
         }
 
         Map<String, Object> custom = buildHttpsConfig(secureConfig);
-        log.info("Create custom HTTPS config: {}", this.serializer.serialize(custom));
         return this.httpClientFactory.create(HttpClassicClientFactory.Config.builder()
                 .socketTimeout(this.clientConfig.socketTimeout())
                 .connectTimeout(this.clientConfig.connectTimeout())

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

@@ -8,7 +8,6 @@
 
 import modelengine.fel.core.tool.ToolInfo;
 import modelengine.fel.core.model.http.SecureConfig;
-import modelengine.fitframework.inspection.Nonnull;
 import modelengine.fitframework.pattern.builder.BuilderFactory;
 
 import java.util.List;
@@ -26,7 +25,6 @@ public interface ChatOption {
      *
      * @return 表示模型名字的 {@link String}。
      */
-    @Nonnull
     String model();
 
     /**
@@ -37,7 +35,6 @@ public interface ChatOption {
      *
      * @return 表示是否使用流式接口的 {@code boolean}。
      */
-    @Nonnull
     Boolean stream();
 
     /**

framework/fel/java/fel-core/src/main/java/modelengine/fel/core/tool/ToolCall.java

@@ -21,7 +21,6 @@ public interface ToolCall {
      *
      * @return 表示工具调用唯一编号的 {@link String}。
      */
-    @Nonnull
     String id();
 
     /**
@@ -36,15 +35,13 @@ public interface ToolCall {
      *
      * @return 表示工具名称的 {@link String}。
      */
-    @Nonnull
     String name();
 
     /**
      * 获取工具调用参数。
      *
      * @return 表示工具调用参数的 {@link String}。
      */
-    @Nonnull
     String arguments();
 
     /**

framework/fel/java/fel-core/src/main/java/modelengine/fel/core/tool/ToolInfo.java

@@ -1,8 +1,8 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) 2024 Huawei Technologies Co., Ltd. All rights reserved.
- *  This file is a part of the ModelEngine Project.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
+/*
+ * Copyright (c) 2024-2025 Huawei Technologies Co., Ltd. All rights reserved.
+ * This file is a part of the ModelEngine Project.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ */
 
 package modelengine.fel.core.tool;
 

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

@@ -561,7 +561,6 @@ public <M extends ChatMessage> AiState<M, D, O, RF, F> generate(BlockModel<O, M>
     public <M extends ChatMessage> AiState<ChatMessage, D, O, RF, F> generate(FlowModel<O, M> model) {
         Validation.notNull(model, "Streaming Model operator cannot be null.");
         Processor<O, ChatMessage> processor = this.publisher().flatMap(input -> {
-            System.out.println("generate");
             return Flows.source(AiFlowSession.applyPattern(model, input.getData(), input.getSession()));
         }, null).displayAs("generate");
         return new AiState<>(new State<>(processor, this.flow().origin()), this.flow());
@@ -593,7 +592,6 @@ public final AiState<Tip, D, Tip, RF, F> runnableParallel(Pattern<O, Tip>... pat
         }
 
         AiState<Tip, D, Tip, RF, F> state = aiFork.join(Tip::new, (acc, data) -> {
-            System.out.println(String.format("[%s][runnableParallel] acc=%s, input=%s", Thread.currentThread().getId(), acc, data));
             acc.merge(data);
             return acc;
         });
@@ -603,10 +601,6 @@ public final AiState<Tip, D, Tip, RF, F> runnableParallel(Pattern<O, Tip>... pat
 
     private Processor<O, Tip> getPatternProcessor(Pattern<O, Tip> pattern, AiState<O, D, O, RF, F> node) {
         return node.publisher()
-                .map(input -> {
-                    Tip tip = AiFlowSession.applyPattern(pattern, input.getData(), input.getSession());
-                    System.out.println(String.format("[%s][getPatternProcessor.tip] tip=%s", Thread.currentThread().getId(), tip));
-                    return tip;
-                    }, null);
+                .map(input -> AiFlowSession.applyPattern(pattern, input.getData(), input.getSession()), null);
     }
 }

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

@@ -103,15 +103,11 @@ public Publisher<O> publisher() {
 
     @Override
     public void register(EmitterListener<O, FlowSession> handler) {
-        if (handler != null) {
-            this.state.register(handler);
-        }
+        this.state.register(handler);
     }
 
     public void unregister(EmitterListener<O, FlowSession> listener) {
-        if (listener != null) {
-            this.state.unregister(listener);
-        }
+        this.state.unregister(listener);
     }
 
     @Override

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

@@ -44,9 +44,8 @@ public void handle(D data, FlowSession session) {
     @Override
     public void register(EmitterListener<R, FlowSession> listener) {
         if (listener != null) {
-            // this.origin().register((data, token) -> listener.handle(ObjectUtils.cast(data), new FlowSession(token)));
             EmitterListener<Object, FlowSession> wrapperHandler =
-                    (data, token) -> listener.handle(ObjectUtils.cast(data), token);
+                    (data, session) -> listener.handle(ObjectUtils.cast(data), session);
             this.listeners.put(listener, wrapperHandler);
             this.origin().register(wrapperHandler);
         }

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

@@ -63,12 +63,8 @@ public Conversation(AiProcessFlow<D, R> flow, FlowSession session) {
     @SafeVarargs
     public final ConverseLatch<R> offer(D... data) {
         ConverseLatch<R> latch = setListener(this.flow);
-        FlowSession newSession = new FlowSession(this.session);
+        FlowSession newSession = FlowSession.newRootSession(this.session, this.session.preserved());
         newSession.getWindow().setFrom(null);
-        System.out.println(String.format("[%s][Conversation.offer] session=%s, windowId=%s, newWindowId=%s",
-                Thread.currentThread().getId(), this.session.getId(), this.session.getWindow().id(),
-                newSession.getWindow().id()
-        ));
         this.flow.start().offer(data, newSession);
         newSession.getWindow().complete();
         return latch;
@@ -87,35 +83,12 @@ public ConverseLatch<R> offer(String nodeId, List<?> data) {
         Validation.notBlank(nodeId, "invalid nodeId.");
         ConverseLatch<R> latch = setListener(this.flow);
         FlowSession newSession = new FlowSession(this.session);
+        newSession.getWindow().setFrom(null);
         this.flow.origin().offer(nodeId, data.toArray(new Object[0]), newSession);
         newSession.getWindow().complete();
         return latch;
     }
 
-    /**
-     * 当前会话订阅一个发射源，由发射源驱动会话执行，会话结束后会注销本次订阅。
-     * <p>注意发射源的 {@link Source#emit(Object, FlowSession)} 传入的 {@link FlowSession} 的状态数据，会被当前会话的各类
-     * {@code bind} 方法覆盖， 如 {@link Conversation#bind(String, Object)}、 {@link Conversation#bind(Memory)} 等。</p>
-     *
-     * @param source 表示发射源的 {@link Source}{@code <}{@link D}{@code >}。
-     * @return 表示线程同步器的 {@link ConverseLatch}{@code <}{@link R}{@code >}。
-     * @throws IllegalArgumentException 当 {@code source} 为 {@code null} 时。
-     */
-    // public ConverseLatch<R> offer(Source<D> source) {
-    //     Validation.notNull(source, "Source can not be null.");
-    //
-    //     FlowSession sessionClone = new FlowSession(this.session);
-    //     AiProcessFlow<D, R> processFlow = AiFlows.<D>create().just((data, ctx) -> {
-    //         FlowContext<D> flowContext = ObjectUtils.cast(ctx);
-    //         flowContext.getSession().copySessionState(sessionClone);
-    //     }).delegate(this.flow).close();
-    //     processFlow.offer(source);
-    //
-    //     Action finallyCb = this.callBackBuilder.getFinallyCb();
-    //     this.callBackBuilder.doOnFinally(finallyCb.andThen(() -> source.unregister(processFlow)));
-    //     return setListener(processFlow);
-    // }
-
     /**
      * 绑定大模型超参数到对话上下文，用于流程后续的大模型节点。
      *
@@ -228,7 +201,6 @@ public Conversation<D, R> doOnFinally(Action finallyAction) {
 
     private ConverseLatch<R> setListener(AiProcessFlow<D, R> currFlow) {
         ConverseLatch<R> latch = new ConverseLatch<>();
-        System.out.println(String.format("[Conversation][setListener] latchId=%s", latch.getId()));
         Predictable<R> predictable = new Predictable<>(currFlow, this.callBackBuilder.build(), latch);
         ConverseListener<R> listener = this.converseListener.getAndSet(predictable);
         if (listener != null && !listener.isCompleted()) {