fixed merge with main

Author: Claudio-code

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

@@ -55,14 +55,6 @@
 import org.springframework.web.reactive.function.client.WebClient;
 
 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 com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
 
 /**
  * The Anthropic API client.
@@ -777,9 +769,9 @@ public record ContentBlock(
 		@JsonProperty("content") String content,
 
 		// cache object
-		@JsonProperty("cache_control") CacheControl cacheControl
+		@JsonProperty("cache_control") CacheControl cacheControl,
 
-    // Thinking only
+    	// Thinking only
 		@JsonProperty("signature") String signature,
 		@JsonProperty("thinking") String thinking,
 
@@ -819,11 +811,11 @@ public ContentBlock(Source source) {
 		 * @param text The text of the content.
 		 */
 		public ContentBlock(String text) {
-			this(Type.TEXT, null, text, null, null, null, null, null, null, null);
+			this(Type.TEXT, null, text, null, null, null, null, null, null, null, null, null, null);
 		}
 
 		public ContentBlock(String text, CacheControl cache) {
-			this(Type.TEXT, null, text, null, null, null, null, null, null, cache null, null);
+			this(Type.TEXT, null, text, null, null, null, null, null, null, cache, null, null, null);
 		}
 
 		// Tool result

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

@@ -159,7 +159,7 @@ else if (event.type().equals(EventType.CONTENT_BLOCK_START)) {
 			}
 			else if (contentBlockStartEvent.contentBlock() instanceof ContentBlockThinking thinkingBlock) {
 				ContentBlock cb = new ContentBlock(Type.THINKING, null, null, contentBlockStartEvent.index(), null,
-						null, null, null, null, null, thinkingBlock.thinking(), null);
+						null, null, null, null, null, null, thinkingBlock.thinking(), null);
 				contentBlockReference.get().withType(event.type().name()).withContent(List.of(cb));
 			}
 			else {
@@ -176,12 +176,12 @@ else if (event.type().equals(EventType.CONTENT_BLOCK_DELTA)) {
 			}
 			else if (contentBlockDeltaEvent.delta() instanceof ContentBlockDeltaThinking thinking) {
 				ContentBlock cb = new ContentBlock(Type.THINKING_DELTA, null, null, contentBlockDeltaEvent.index(),
-						null, null, null, null, null, null, thinking.thinking(), null);
+						null, null, null, null, null, null,null, thinking.thinking(), null);
 				contentBlockReference.get().withType(event.type().name()).withContent(List.of(cb));
 			}
 			else if (contentBlockDeltaEvent.delta() instanceof ContentBlockDeltaSignature sig) {
 				ContentBlock cb = new ContentBlock(Type.SIGNATURE_DELTA, null, null, contentBlockDeltaEvent.index(),
-						null, null, null, null, null, sig.signature(), null, null);
+						null, null, null, null, null, null, sig.signature(), null, null);
 				contentBlockReference.get().withType(event.type().name()).withContent(List.of(cb));
 			}
 			else {

spring-ai-model/src/main/java/org/springframework/ai/chat/messages/UserMessage.java

@@ -65,7 +65,7 @@ public UserMessage(Resource resource, String cache) {
 	}
 
 	public UserMessage(String textContent, List<Media> media) {
-		this(MessageType.USER, textContent, media, Map.of());
+		this(MessageType.USER, textContent, media, Map.of(), null);
   }
 
 	@Override
@@ -100,12 +100,6 @@ public List<Media> getMedia(String... dummy) {
 		return this.media;
 	}
 
-	@Override
-	public String toString() {
-		return "UserMessage{" + "content='" + getText() + '\'' + ", properties=" + this.metadata + ", messageType="
-				+ this.messageType + '}';
-  }
-
   public Builder mutate() {
 		return new Builder().text(getText()).media(List.copyOf(getMedia())).metadata(Map.copyOf(getMetadata()));
 	}