From a76fe829375a5b882f5d40d314bba7f56a5a6cef Mon Sep 17 00:00:00 2001 From: shown Date: Sat, 14 Jun 2025 12:19:59 +0800 Subject: [PATCH] chore: Modify `// @formatter` label position and add a blank line to the file Signed-off-by: shown --- .../springframework/ai/zhipuai/ZhiPuAiChatModel.java | 10 +++++----- .../src/main/resources/META-INF/spring/aot.factories | 2 +- .../src/test/resources/prompts/system-message.st | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/models/spring-ai-zhipuai/src/main/java/org/springframework/ai/zhipuai/ZhiPuAiChatModel.java b/models/spring-ai-zhipuai/src/main/java/org/springframework/ai/zhipuai/ZhiPuAiChatModel.java index 408666fdc34..fefab446ae1 100644 --- a/models/spring-ai-zhipuai/src/main/java/org/springframework/ai/zhipuai/ZhiPuAiChatModel.java +++ b/models/spring-ai-zhipuai/src/main/java/org/springframework/ai/zhipuai/ZhiPuAiChatModel.java @@ -244,6 +244,7 @@ public ChatResponse call(Prompt prompt) { .provider(ZhiPuApiConstants.PROVIDER_NAME) .build(); + // @formatter:off ChatResponse response = ChatModelObservationDocumentation.CHAT_MODEL_OPERATION .observation(this.observationConvention, DEFAULT_OBSERVATION_CONVENTION, () -> observationContext, this.observationRegistry) @@ -262,13 +263,11 @@ public ChatResponse call(Prompt prompt) { List choices = chatCompletion.choices(); List generations = choices.stream().map(choice -> { - // @formatter:off Map metadata = Map.of( "id", chatCompletion.id(), "role", choice.message().role() != null ? choice.message().role().name() : "", "finishReason", choice.finishReason() != null ? choice.finishReason().name() : "" ); - // @formatter:on return buildGeneration(choice, metadata); }).toList(); @@ -278,6 +277,7 @@ public ChatResponse call(Prompt prompt) { return chatResponse; }); + // @formatter:on if (this.toolExecutionEligibilityPredicate.isToolExecutionRequired(requestPrompt.getOptions(), response)) { var toolExecutionResult = this.toolCallingManager.executeToolCalls(requestPrompt, response); if (toolExecutionResult.returnDirect()) { @@ -326,12 +326,13 @@ public Flux stream(Prompt prompt) { observation.parentObservation(contextView.getOrDefault(ObservationThreadLocalAccessor.KEY, null)).start(); + // @formatter:off Flux chatResponse = completionChunks.map(this::chunkToChatCompletion) .switchMap(chatCompletion -> Mono.just(chatCompletion).map(chatCompletion2 -> { try { String id = chatCompletion2.id(); - // @formatter:off + List generations = chatCompletion2.choices().stream().map(choice -> { if (choice.message().role() != null) { roleMap.putIfAbsent(id, choice.message().role().name()); @@ -353,8 +354,7 @@ public Flux stream(Prompt prompt) { } })); - - // @formatter:off + Flux flux = chatResponse.flatMap(response -> { if (this.toolExecutionEligibilityPredicate.isToolExecutionRequired(requestPrompt.getOptions(), response)) { return Flux.defer(() -> { diff --git a/models/spring-ai-zhipuai/src/main/resources/META-INF/spring/aot.factories b/models/spring-ai-zhipuai/src/main/resources/META-INF/spring/aot.factories index 5fc5cb0a7d1..9471e3e8811 100644 --- a/models/spring-ai-zhipuai/src/main/resources/META-INF/spring/aot.factories +++ b/models/spring-ai-zhipuai/src/main/resources/META-INF/spring/aot.factories @@ -1,2 +1,2 @@ org.springframework.aot.hint.RuntimeHintsRegistrar=\ - org.springframework.ai.zhipuai.aot.ZhiPuAiRuntimeHints \ No newline at end of file + org.springframework.ai.zhipuai.aot.ZhiPuAiRuntimeHints diff --git a/models/spring-ai-zhipuai/src/test/resources/prompts/system-message.st b/models/spring-ai-zhipuai/src/test/resources/prompts/system-message.st index 579febd8d9b..d946c71b6d6 100644 --- a/models/spring-ai-zhipuai/src/test/resources/prompts/system-message.st +++ b/models/spring-ai-zhipuai/src/test/resources/prompts/system-message.st @@ -1,3 +1,3 @@ You are an AI assistant that helps people find information. Your name is {name}. -You should reply to the user's request with your name and also in the style of a {voice}. \ No newline at end of file +You should reply to the user's request with your name and also in the style of a {voice}.