Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -607,8 +607,11 @@ private List<Part> toParts(AiMessage aiMessage) {
});
return parts;
} else {
Part part = Part.builder().text(aiMessage.text()).build();
return List.of(part);
String text = aiMessage.text();
if (text == null) {
return List.of();
}
return List.of(Part.builder().text(text).build());
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -970,4 +970,27 @@ void testNoUsageMetadataWithoutEstimator() {
// IMPORTANT: usageMetadata should be empty when no TokenUsage and no estimator
assertThat(response.usageMetadata()).isEmpty();
}

@Test
@DisplayName("Should handle null AiMessage text without throwing NPE")
void testGenerateContentWithNullAiMessageText() {
// Given
final LlmRequest llmRequest =
LlmRequest.builder().contents(List.of(Content.fromParts(Part.fromText("Hello")))).build();

final ChatResponse chatResponse = mock(ChatResponse.class);
final AiMessage aiMessage = mock(AiMessage.class);
when(aiMessage.text()).thenReturn(null);
when(aiMessage.hasToolExecutionRequests()).thenReturn(false);
when(chatResponse.aiMessage()).thenReturn(aiMessage);
when(chatModel.chat(any(ChatRequest.class))).thenReturn(chatResponse);

// When
final Flowable<LlmResponse> responseFlowable = langChain4j.generateContent(llmRequest, false);
final LlmResponse response = responseFlowable.blockingFirst();
// Then - no NPE thrown, and content has no text parts
assertThat(response).isNotNull();
assertThat(response.content()).isPresent();
assertThat(response.content().get().parts().orElse(List.of())).isEmpty();
}
}