Fix OpenAiChatModel NPE

devholic22 · tzolov · commit 9f56a9165756 · 2024-06-28T11:54:31.000+02:00
* Fix OpenAiChatModel NPE using getOrDefault
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
@@ -215,7 +215,7 @@ public Flux<ChatResponse> stream(Prompt prompt) {
 							}
 							String finish = (choice.finishReason() != null ? choice.finishReason().name() : "");
 							var generation = new Generation(choice.message().content(),
-									Map.of("id", id, "role", roleMap.get(id), "finishReason", finish));
+									Map.of("id", id, "role", roleMap.getOrDefault(id, ""), "finishReason", finish));
 							if (choice.finishReason() != null) {
 								generation = generation.withGenerationMetadata(
 										ChatGenerationMetadata.from(choice.finishReason().name(), null));

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ public Flux<ChatResponse> stream(Prompt prompt) {`
`215`	`215`	`}`
`216`	`216`	`String finish = (choice.finishReason() != null ? choice.finishReason().name() : "");`
`217`	`217`	`var generation = new Generation(choice.message().content(),`
`218`		`- Map.of("id", id, "role", roleMap.get(id), "finishReason", finish));`
	`218`	`+ Map.of("id", id, "role", roleMap.getOrDefault(id, ""), "finishReason", finish));`
`219`	`219`	`if (choice.finishReason() != null) {`
`220`	`220`	`generation = generation.withGenerationMetadata(`
`221`	`221`	`ChatGenerationMetadata.from(choice.finishReason().name(), null));`