Skip to content

Commit 3bef5c1

Browse files
KAMO030markpollack
authored andcommitted
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.
1 parent 6bd059a commit 3bef5c1

File tree

1 file changed

+13
-15
lines changed

1 file changed

+13
-15
lines changed

models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiChatModel.java

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,9 @@
1515
*/
1616
package org.springframework.ai.openai;
1717

18-
import java.util.ArrayList;
19-
import java.util.Base64;
20-
import java.util.HashMap;
21-
import java.util.HashSet;
22-
import java.util.List;
23-
import java.util.Map;
24-
import java.util.Set;
25-
import java.util.concurrent.ConcurrentHashMap;
26-
import java.util.stream.Collectors;
27-
18+
import io.micrometer.observation.Observation;
19+
import io.micrometer.observation.ObservationRegistry;
20+
import io.micrometer.observation.contextpropagation.ObservationThreadLocalAccessor;
2821
import org.slf4j.Logger;
2922
import org.slf4j.LoggerFactory;
3023
import org.springframework.ai.chat.messages.AssistantMessage;
@@ -70,13 +63,19 @@
7063
import org.springframework.util.MimeType;
7164
import org.springframework.util.MultiValueMap;
7265
import org.springframework.util.StringUtils;
73-
74-
import io.micrometer.observation.Observation;
75-
import io.micrometer.observation.ObservationRegistry;
76-
import io.micrometer.observation.contextpropagation.ObservationThreadLocalAccessor;
7766
import reactor.core.publisher.Flux;
7867
import reactor.core.publisher.Mono;
7968

69+
import java.util.ArrayList;
70+
import java.util.Base64;
71+
import java.util.HashMap;
72+
import java.util.HashSet;
73+
import java.util.List;
74+
import java.util.Map;
75+
import java.util.Set;
76+
import java.util.concurrent.ConcurrentHashMap;
77+
import java.util.stream.Collectors;
78+
8079
/**
8180
* {@link ChatModel} and {@link StreamingChatModel} implementation for {@literal OpenAI}
8281
* backed by {@link OpenAiApi}.
@@ -390,7 +389,6 @@ private ChatResponseMetadata from(OpenAiApi.ChatCompletion result, RateLimit rat
390389
.withId(result.id() != null ? result.id() : "")
391390
.withUsage(result.usage() != null ? OpenAiUsage.from(result.usage()) : new EmptyUsage())
392391
.withModel(result.model() != null ? result.model() : "")
393-
.withRateLimit(rateLimit)
394392
.withKeyValue("created", result.created() != null ? result.created() : 0L)
395393
.withKeyValue("system-fingerprint", result.systemFingerprint() != null ? result.systemFingerprint() : "");
396394
if (rateLimit != null) {

0 commit comments

Comments
 (0)