Skip to content

Refactor: Add null check, optimize string joining, and add JavaDocs #3663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 2, 2025
Merged

Refactor: Add null check, optimize string joining, and add JavaDocs #3663

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
399e419
Refactor: Add null check, optimize string joining, and add JavaDocs
KoreaNirsa Jun 25, 2025
08b73ce
Style: restore standard import order
KoreaNirsa Jun 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,7 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Consumer;
import java.util.function.Predicate;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import java.util.stream.Collectors;

import org.springframework.ai.model.ApiKey;
import org.springframework.ai.model.ChatModelDescription;
Expand All @@ -50,6 +42,16 @@
import org.springframework.web.client.RestClient;
import org.springframework.web.reactive.function.client.WebClient;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;

import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

/**
* Single class implementation of the
* <a href="https://platform.openai.com/docs/api-reference/chat">OpenAI Chat Completion
Expand Down Expand Up @@ -144,11 +146,20 @@ public OpenAiApi(String baseUrl, ApiKey apiKey, MultiValueMap<String, String> he
.build(); // @formatter:on
}

/**
* Returns a string containing all text values from the given media content list. Only
* elements of type "text" are processed and concatenated in order.
* @param content The list of {@link ChatCompletionMessage.MediaContent}
* @return a string containing all text values from "text" type elements
* @throws IllegalArgumentException if content is null
*/
public static String getTextContent(List<ChatCompletionMessage.MediaContent> content) {
Assert.notNull(content, "content cannot be null");

return content.stream()
.filter(c -> "text".equals(c.type()))
.map(ChatCompletionMessage.MediaContent::text)
.reduce("", (a, b) -> a + b);
.collect(Collectors.joining());
}

/**
Expand Down