Fix NPE in AnthropicApi StreamHelper

models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/api/StreamHelper.java

@@ -20,6 +20,9 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.springframework.ai.anthropic.api.AnthropicApi.ChatCompletionResponse;
 import org.springframework.ai.anthropic.api.AnthropicApi.ContentBlock;
 import org.springframework.ai.anthropic.api.AnthropicApi.ContentBlock.Type;
@@ -56,6 +59,8 @@
  */
 public class StreamHelper {
 
+	private static final Logger logger = LoggerFactory.getLogger(StreamHelper.class);
+
 	public boolean isToolUseStart(StreamEvent event) {
 		if (event == null || event.type() == null || event.type() != EventType.CONTENT_BLOCK_START) {
 			return false;
@@ -216,7 +221,11 @@ else if (event.type().equals(EventType.MESSAGE_STOP)) {
 		}
 		else {
 			// Any other event types that should propagate upwards without content
+			if (contentBlockReference.get() == null) {
+				contentBlockReference.set(new ChatCompletionResponseBuilder());
+			}
 			contentBlockReference.get().withType(event.type().name()).withContent(List.of());
+			logger.warn("Unhandled event type: {}", event.type().name());
 		}
 
 		return contentBlockReference.get().build();

models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/api/StreamHelperTests.java

@@ -0,0 +1,27 @@
+package org.springframework.ai.anthropic.api;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.ai.anthropic.api.StreamHelper.ChatCompletionResponseBuilder;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Ilayaperumal Gopinathan
+ */
+class StreamHelperTest {
+
+	@Test
+	void testErrorEventTypeWithEmptyContentBlock() {
+		AnthropicApi.ErrorEvent errorEvent = new AnthropicApi.ErrorEvent(AnthropicApi.EventType.ERROR,
+				new AnthropicApi.ErrorEvent.Error("error", "error message"));
+		AtomicReference<ChatCompletionResponseBuilder> contentBlockReference = new AtomicReference<>();
+		StreamHelper streamHelper = new StreamHelper();
+		AnthropicApi.ChatCompletionResponse response = streamHelper.eventToChatCompletionResponse(errorEvent,
+				contentBlockReference);
+		assertThat(response).isNotNull();
+	}
+
+}