spring-projects#690 choices can be null look at OpenAiApi.java:606

Signed-off-by: JoeHitHard <josephmeghanath@gmail.com>
bmoussaud · May 27, 2024 · a77d11c · a77d11c
1 parent f3dc3fd
commit a77d11c
Showing 1 changed file with 7 additions and 1 deletion.
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
@@ -151,7 +151,13 @@ public ChatResponse call(Prompt prompt) {
 
 			RateLimit rateLimits = OpenAiResponseHeaderExtractor.extractAiResponseHeaders(completionEntity);
 
-			List<Generation> generations = chatCompletion.choices().stream().map(choice -> {
+			List<Choice> choices = chatCompletion.choices();
+			if (choices == null) {
+				logger.warn("No choices returned for prompt: {}", prompt);
+				return new ChatResponse(List.of());
+			}
+
+			List<Generation> generations = choices.stream().map(choice -> {
 				return new Generation(choice.message().content(), toMap(chatCompletion.id(), choice))
 					.withGenerationMetadata(ChatGenerationMetadata.from(choice.finishReason().name(), null));
 			}).toList();