From 3bef5c12bfdfadab6b49e8f5551baaa2d6c96208 Mon Sep 17 00:00:00 2001
From: KAMOsama <837080904@qq.com>
Date: Mon, 12 Aug 2024 09:38:43 +0800
Subject: [PATCH] Remove redundant withRateLimit call from OpenAiChatModel.

The withRateLimit call is redundant as rateLimit is already handled conditionally elsewhere. Its removal helps simplify the code and improves maintainability.
---
 .../ai/openai/OpenAiChatModel.java            | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiChatModel.java b/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiChatModel.java
index 25f7e81221..b2b76854ed 100644
--- a/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiChatModel.java
+++ b/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiChatModel.java
@@ -15,16 +15,9 @@
  */
 package org.springframework.ai.openai;
 
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-
+import io.micrometer.observation.Observation;
+import io.micrometer.observation.ObservationRegistry;
+import io.micrometer.observation.contextpropagation.ObservationThreadLocalAccessor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.ai.chat.messages.AssistantMessage;
@@ -70,13 +63,19 @@
 import org.springframework.util.MimeType;
 import org.springframework.util.MultiValueMap;
 import org.springframework.util.StringUtils;
-
-import io.micrometer.observation.Observation;
-import io.micrometer.observation.ObservationRegistry;
-import io.micrometer.observation.contextpropagation.ObservationThreadLocalAccessor;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
 /**
  * {@link ChatModel} and {@link StreamingChatModel} implementation for {@literal OpenAI}
  * backed by {@link OpenAiApi}.
@@ -390,7 +389,6 @@ private ChatResponseMetadata from(OpenAiApi.ChatCompletion result, RateLimit rat
 			.withId(result.id() != null ? result.id() : "")
 			.withUsage(result.usage() != null ? OpenAiUsage.from(result.usage()) : new EmptyUsage())
 			.withModel(result.model() != null ? result.model() : "")
-			.withRateLimit(rateLimit)
 			.withKeyValue("created", result.created() != null ? result.created() : 0L)
 			.withKeyValue("system-fingerprint", result.systemFingerprint() != null ? result.systemFingerprint() : "");
 		if (rateLimit != null) {