Merge remote-tracking branch 'origin/main'

Author: StudiousXiaoYu

models/spring-ai-hunyuan/pom.xml

@@ -101,16 +101,7 @@
 			<artifactId>activation</artifactId>
 			<version>1.1.1</version>
 		</dependency>
-		<dependency>
-			<groupId>com.alibaba.fastjson2</groupId>
-			<artifactId>fastjson2</artifactId>
-			<version>${fastjson.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>
+
     </dependencies>
 
 </project>

models/spring-ai-hunyuan/src/main/java/org/springframework/ai/hunyuan/HunYuanChatModel.java

@@ -168,7 +168,7 @@ private static Generation buildGeneration(Choice choice, Map<String, Object> met
 					.toList();
 
 		var assistantMessage = new AssistantMessage(choice.message().content(), metadata, toolCalls);
-		String finishReason = (choice.finishReason() != null ? choice.finishReason().name() : "");
+		String finishReason = (choice.finishReason() != null ? choice.finishReason(): "");
 		var generationMetadata = ChatGenerationMetadata.builder().finishReason(finishReason).build();
 		return new Generation(assistantMessage, generationMetadata);
 	}
@@ -208,7 +208,7 @@ public ChatResponse call(Prompt prompt) {
 					Map<String, Object> metadata = Map.of(
 							"id", chatCompletion.id(),
 							"role", choice.message().role() != null ? choice.message().role().name() : "",
-							"finishReason", choice.finishReason() != null ? choice.finishReason().name() : ""
+							"finishReason", choice.finishReason() != null ? choice.finishReason() : ""
 					);
 					// @formatter:on
 					return buildGeneration(choice, metadata);
@@ -222,7 +222,7 @@ public ChatResponse call(Prompt prompt) {
 			});
 
 		if (!isProxyToolCalls(prompt, this.defaultOptions)
-				&& isToolCall(response, Set.of(HunYuanApi.ChatCompletionFinishReason.TOOL_CALLS.name(),
+				&& isToolCall(response, Set.of(HunYuanApi.ChatCompletionFinishReason.TOOL_CALLS.getJsonValue(),
 						HunYuanApi.ChatCompletionFinishReason.STOP.name()))) {
 			var toolCallConversation = handleToolCalls(prompt, response);
 			// Recursively call the call method with the tool call message
@@ -277,7 +277,7 @@ public Flux<ChatResponse> stream(Prompt prompt) {
 							Map<String, Object> metadata = Map.of(
 								"id", chatCompletion2.id(),
 								"role", roleMap.getOrDefault(id, ""),
-								"finishReason", choice.finishReason() != null ? choice.finishReason().name() : ""
+								"finishReason", choice.finishReason() != null ? choice.finishReason() : ""
 							);
 							// @formatter:on
 							return buildGeneration(choice, metadata);
@@ -294,7 +294,7 @@ public Flux<ChatResponse> stream(Prompt prompt) {
 
 			Flux<ChatResponse> flux = chatResponse.flatMap(response -> {
 				if (!isProxyToolCalls(prompt, this.defaultOptions) && isToolCall(response,
-						Set.of(ChatCompletionFinishReason.TOOL_CALLS.name(), ChatCompletionFinishReason.STOP.name()))) {
+						Set.of(ChatCompletionFinishReason.TOOL_CALLS.getJsonValue(), ChatCompletionFinishReason.STOP.getJsonValue()))) {
 					var toolCallConversation = handleToolCalls(prompt, response);
 					// Recursively call the stream method with the tool call message
 					// conversation that contains the call responses.
@@ -327,14 +327,14 @@ private ChatResponseMetadata from(ChatCompletionRequest request, ChatCompletion
 	 */
 	private ChatCompletion chunkToChatCompletion(ChatCompletionChunk chunk) {
 		List<ChatCompletion.Choice> choices = chunk.choices().stream().map(cc -> {
-			ChatCompletionMessage delta = cc.delta();
+			ChatCompletionMessage delta = cc.message();
 			if (delta == null) {
 				delta = new ChatCompletionMessage("", ChatCompletionMessage.Role.assistant);
 			}
 			return new ChatCompletion.Choice(cc.index(), delta, cc.finishReason(),null);
 		}).toList();
 
-		return new ChatCompletion(chunk.id(), null, chunk.created(), chunk.model(), choices, null, null, null, null, null, null);
+		return new ChatCompletion(chunk.id(), null, chunk.created(), chunk.note(), choices, null, null, null, null, null, null);
 	}
 
 	/**

models/spring-ai-hunyuan/src/main/java/org/springframework/ai/hunyuan/api/HunYuanApi.java

@@ -22,13 +22,14 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import com.alibaba.fastjson2.JSONObject;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.ai.hunyuan.api.auth.HunYuanAuthApi;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.MultiValueMap;
@@ -57,6 +58,8 @@
  */
 public class HunYuanApi {
 
+	private static final Logger logger = LoggerFactory.getLogger(HunYuanApi.class);
+
 	public static final String DEFAULT_CHAT_MODEL = ChatModel.HUNYUAN_PRO.getValue();
 
 	private static final Predicate<String> SSE_DONE_PREDICATE = "[DONE]"::equals;
@@ -69,7 +72,6 @@ public class HunYuanApi {
 
 	private final HunYuanStreamFunctionCallingHelper chunkMerger = new HunYuanStreamFunctionCallingHelper();
 
-	private final ObjectMapper objectMapper;
 	/**
 	 * Create a new client api with DEFAULT_BASE_URL
 	 * @param secretId Hunyuan SecretId.
@@ -103,7 +105,6 @@ public HunYuanApi(String baseUrl, String secretId, String secretKey, RestClient.
 			headers.setContentType(MediaType.APPLICATION_JSON);
 		};
 		hunyuanAuthApi = new HunYuanAuthApi(secretId, secretKey);
-		this.objectMapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 		this.restClient = restClientBuilder.baseUrl(baseUrl)
 			.defaultHeaders(jsonContentHeaders)
 			.defaultStatusHandler(responseErrorHandler)
@@ -121,7 +122,6 @@ public HunYuanApi(String baseUrl, String secretId, String secretKey, RestClient.
 	public ResponseEntity<ChatCompletionResponse> chatCompletionEntity(ChatCompletionRequest chatRequest) {
 
 		Assert.notNull(chatRequest, "The request body can not be null.");
-//		Assert.isTrue(!chatRequest.stream(), "Request must set the stream property to false.");
 		String service = HunYuanConstants.DEFAULT_SERVICE;
 		String host = HunYuanConstants.DEFAULT_CHAT_HOST;
 //		String region = "ap-guangzhou";
@@ -136,12 +136,8 @@ public ResponseEntity<ChatCompletionResponse> chatCompletionEntity(ChatCompletio
 				.retrieve()
 				.toEntity(String.class);
 		// 使用 ObjectMapper 将响应体字符串转换为 ChatCompletionResponse 对象
-		ChatCompletionResponse chatCompletionResponse = null;
-		try {
-			chatCompletionResponse = objectMapper.readValue(retrieve.getBody(), ChatCompletionResponse.class);
-		} catch (JsonProcessingException e) {
-			throw new RuntimeException(e);
-		}
+		logger.info("Response body: {}", retrieve.getBody());
+		ChatCompletionResponse chatCompletionResponse = ModelOptionsUtils.jsonToObject(retrieve.getBody(), ChatCompletionResponse.class);
 		return ResponseEntity.ok(chatCompletionResponse);
 	}
 
@@ -155,17 +151,27 @@ public Flux<ChatCompletionChunk> chatCompletionStream(ChatCompletionRequest chat
 		Assert.notNull(chatRequest, "The request body can not be null.");
 		Assert.isTrue(chatRequest.stream(), "Request must set the steam property to true.");
 		AtomicBoolean isInsideTool = new AtomicBoolean(false);
-
+		String service = HunYuanConstants.DEFAULT_SERVICE;
+		String host = HunYuanConstants.DEFAULT_CHAT_HOST;
+//		String region = "ap-guangzhou";
+		String action = HunYuanConstants.DEFAULT_CHAT_ACTION;
+		MultiValueMap<String, String> jsonContentHeaders = hunyuanAuthApi.getHttpHeadersConsumer(host, action, service, chatRequest);
 		return this.webClient.post()
-			.uri("/v1/chat/completions")
+			.uri("/")
+			.headers(headers -> {
+				headers.addAll(jsonContentHeaders);
+			})
 			.body(Mono.just(chatRequest), ChatCompletionRequest.class)
 			.retrieve()
 			.bodyToFlux(String.class)
 			// cancels the flux stream after the "[DONE]" is received.
 			.takeUntil(SSE_DONE_PREDICATE)
 			// filters out the "[DONE]" message.
 			.filter(SSE_DONE_PREDICATE.negate())
-			.map(content -> ModelOptionsUtils.jsonToObject(content, ChatCompletionChunk.class))
+			.map(content ->{
+//				logger.info(content);
+				return ModelOptionsUtils.jsonToObject(content, ChatCompletionChunk.class);
+			})
 			// Detect is the chunk is part of a streaming function call.
 			.map(chunk -> {
 				if (this.chunkMerger.isStreamingToolFunctionCall(chunk)) {
@@ -188,7 +194,7 @@ public Flux<ChatCompletionChunk> chatCompletionStream(ChatCompletionRequest chat
 			// Flux<Flux<ChatCompletionChunk>> -> Flux<Mono<ChatCompletionChunk>>
 			.concatMapIterable(window -> {
 				Mono<ChatCompletionChunk> monoChunk = window.reduce(
-						new ChatCompletionChunk(null, null, null, null, null),
+						new ChatCompletionChunk(null, null,null,null,null,null,null,null, null, null, null),
 						(previous, current) -> this.chunkMerger.merge(previous, current));
 				return List.of(monoChunk);
 			})
@@ -225,8 +231,16 @@ public enum ChatCompletionFinishReason {
 		 * Only for compatibility with Mistral AI API.
 		 */
 		@JsonProperty("tool_call")
-		TOOL_CALL
+		TOOL_CALL;
+
+		private final String jsonValue;
 
+		ChatCompletionFinishReason() {
+			this.jsonValue = this.name().toLowerCase();
+		}
+		public String getJsonValue() {
+			return this.jsonValue;
+		}
 	}
 
 	/**
@@ -455,7 +469,7 @@ public static Object function(String functionName) {
 	 * @param rawContent The raw contents of the message.
 	 * @param role The role of the message's author. Could be one of the {@link Role}
 	 * types.
-	 * @param name The name of the message's author.
+	 * @param chatContent The name of the message's author.
 	 * @param toolCallId The ID of the tool call associated with the message.
 	 * @param toolCalls The list of tool calls associated with the message.
 	 */
@@ -464,7 +478,7 @@ public record ChatCompletionMessage(
 	// @formatter:off
 		@JsonProperty("Content") Object rawContent,
 		@JsonProperty("Role") Role role,
-		@JsonProperty("Contents") List<ChatContent> name,
+		@JsonProperty("Contents") List<ChatContent> chatContents,
 		@JsonProperty("ToolCallId") String toolCallId,
 		@JsonProperty("ToolCalls") List<ToolCall> toolCalls
 	// @formatter:on
@@ -480,6 +494,10 @@ public ChatCompletionMessage(Object content, Role role) {
 			this(content, role, null, null, null);
 		}
 
+		public ChatCompletionMessage(Role role,List<ChatContent> chatContent) {
+			this(null, role, chatContent, null, null);
+		}
+
 		/**
 		 * Get message content as String.
 		 */
@@ -533,14 +551,20 @@ public enum Role {
 		 * @param function The function definition.
 		 */
 		@JsonInclude(Include.NON_NULL)
-		public record ToolCall(@JsonProperty("id") String id, @JsonProperty("type") String type, @JsonProperty("Index") Integer index,
-				@JsonProperty("function") ChatCompletionFunction function) {
+		public record ToolCall(@JsonProperty("Id") String id, @JsonProperty("Type") String type, @JsonProperty("Index") Integer index,
+				@JsonProperty("Function") ChatCompletionFunction function) {
 
 		}
 
 		@JsonInclude(Include.NON_NULL)
 		public record ChatContent(@JsonProperty("Type") String type, @JsonProperty("Text") String text,
 							   @JsonProperty("ImageUrl") ImageUrl imageUrl) {
+			public ChatContent(String type, String text) {
+				this(type, text, null);
+			}
+			public ChatContent(String type, ImageUrl imageUrl) {
+				this(type, null, imageUrl);
+			}
 
 		}
 		@JsonInclude(Include.NON_NULL)
@@ -704,29 +728,18 @@ public record Choice(
 		// @formatter:off
 			@JsonProperty("Index") Integer index,
 			@JsonProperty("Message") ChatCompletionMessage message,
-			@JsonProperty("FinishReason") ChatCompletionFinishReason finishReason,
-			@JsonProperty("Delta") ChatCompletionDelta chatCompletionDelta
+			@JsonProperty("FinishReason") String finishReason,
+			@JsonProperty("Delta") ChatCompletionDelta delta
 		) {
 			 // @formatter:on
 		}
 
 		@JsonInclude(Include.NON_NULL)
 		public record ChatCompletionDelta(
 				// @formatter:off
-				@JsonProperty("Role") String role,
+				@JsonProperty("Role") ChatCompletionMessage.Role role,
 				@JsonProperty("Content") String content,
-				@JsonProperty("ToolCalls") ChatCompletionToolCall chatCompletionToolCall
-		) {
-			// @formatter:on
-		}
-
-		@JsonInclude(Include.NON_NULL)
-		public record ChatCompletionToolCall(
-				// @formatter:off
-				@JsonProperty("Id") String role,
-				@JsonProperty("Type") String content,
-				@JsonProperty("Function") ChatCompletionMessage.ChatCompletionFunction chatCompletionToolCall,
-				@JsonProperty("Index") Integer index
+				@JsonProperty("ToolCalls") List<ChatCompletionMessage.ToolCall> toolCalls
 		) {
 			// @formatter:on
 		}
@@ -758,33 +771,17 @@ public record ErrorMsg(
 	@JsonInclude(Include.NON_NULL)
 	public record ChatCompletionChunk(
 	// @formatter:off
-		@JsonProperty("id") String id,
-		@JsonProperty("object") String object,
-		@JsonProperty("created") Long created,
-		@JsonProperty("model") String model,
-		@JsonProperty("choices") List<ChunkChoice> choices) {
-		 // @formatter:on
-
-		/**
-		 * Chat completion choice.
-		 *
-		 * @param index The index of the choice in the list of choices.
-		 * @param delta A chat completion delta generated by streamed model responses.
-		 * @param finishReason The reason the model stopped generating tokens.
-		 * @param usage Usage statistics for the completion request.
-		 */
-		@JsonInclude(Include.NON_NULL)
-		public record ChunkChoice(
-		// @formatter:off
-			@JsonProperty("index") Integer index,
-			@JsonProperty("delta") ChatCompletionMessage delta,
-			@JsonProperty("finish_reason") ChatCompletionFinishReason finishReason,
-			@JsonProperty("usage") Usage usage
-		// @formatter:on
-		) {
-
-		}
-
+	@JsonProperty("Id") String id,
+	@JsonProperty("Error") ChatCompletion.ErrorMsg errorMsg,
+	@JsonProperty("Created") Long created,
+	@JsonProperty("Note") String note,
+	@JsonProperty("Choices") List<ChatCompletion.Choice> choices,
+	@JsonProperty("Usage") Usage usage,
+	@JsonProperty("ModerationLevel") String moderationLevel,
+	@JsonProperty("SearchInfo") ChatCompletion.SearchInfo searchInfo,
+	@JsonProperty("Replaces") List<ChatCompletion.Replace>  replaces,
+	@JsonProperty("RecommendedQuestions") List<String> recommendedQuestions,
+	@JsonProperty("RequestId") String requestId) {
 	}
 
 	/**