merge main

Signed-off-by: lambochen <[email protected]>

Author: lambochen

.github/workflows/auto-cherry-pick.yml

@@ -0,0 +1,13 @@
+name: Auto Cherry-Pick
+
+on:
+  push:
+    branches:
+      - main
+      - '*.x'
+
+jobs:
+  cherry-pick-commit:
+    uses: spring-io/spring-github-workflows/.github/workflows/spring-cherry-pick.yml@v5
+    secrets:
+      GH_ACTIONS_REPO_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}

.github/workflows/backport-issue.yml

@@ -0,0 +1,12 @@
+name: Backport Issue
+
+on:
+  push:
+    branches:
+      - '*.x'
+
+jobs:
+  backport-issue:
+    uses: spring-io/spring-github-workflows/.github/workflows/spring-backport-issue.yml@v5
+    secrets:
+      GH_ACTIONS_REPO_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}

.gitignore

@@ -45,3 +45,5 @@ shell.log
 
 **/.claude/settings.local.json
 .devcontainer
+
+qodana.yaml

CONTRIBUTING.adoc

@@ -7,7 +7,7 @@ what kind of changes are likely to be accepted; and what to expect from the Spri
 Please refer back to this document as a checklist before issuing any pull request; this will save time for everyone!
 
 == Code of Conduct
-This project adheres to the Contributor Covenant link:CODE_OF_CONDUCT.adoc[code of conduct].
+This project adheres to the Contributor Covenant https://github.com/spring-projects/spring-ai#coc-ov-file[code of conduct].
 By participating, you  are expected to uphold this code. Please report unacceptable behavior to
 [email protected].
 
@@ -77,17 +77,17 @@ project to which you’re trying to contribute but that you don’t maintain."_
 
 == Keeping your Local Code in Sync
 * As mentioned above, you should always work on topic branches (since 'main' is a moving target). However, you do want
-to always keep your own 'origin' main branch in synch with the 'upstream' main.
+to always keep your own 'origin' main branch in sync with the 'upstream' main.
 * Within your local working directory, you can sync up all remotes' branches with: `git fetch --all`
 * While on your own local main branch: `git pull upstream main` (which is the equivalent of fetching upstream/main
 and merging that into the branch you are in currently)
-* Now that you're in synch, switch to the topic branch where you plan to work, e.g.: `git checkout -b GH-123`
+* Now that you're in sync, switch to the topic branch where you plan to work, e.g.: `git checkout -b GH-123`
 * When you get to a stopping point: `git commit`
-* If changes have occurred on the upstream/main while you were working you can synch again:
+* If changes have occurred on the upstream/main while you were working you can sync again:
 - Switch back to main: `git checkout main`
 - Then: `git pull upstream main`
 - Switch back to the topic branch: `git checkout GH-123` (no -b needed since the branch already exists)
-- Rebase the topic branch to minimize the distance between it and your recently synched main branch: `git rebase main`
+- Rebase the topic branch to minimize the distance between it and your recently synced main branch: `git rebase main`
 (Again, for more detail see https://git-scm.com/book/en/Git-Branching-Rebasing[the Pro Git section on rebasing]).
 * **Note** You cannot rebase if you have already pushed your branch to your remote because you'd be rewriting history
 (see **'The Perils of Rebasing'** in the article).
@@ -133,6 +133,25 @@ This command, will provide the following output, which in this case shows a nice
 If you see intersecting lines, that usually means that you forgot to rebase you branch.
 As mentioned earlier, **please rebase against main** before issuing a pull request.
 
+== Enabling Checkstyle
+
+Checkstyles are currently disabled in the project.
+However, we encourage all PR contributors to run checkstyles by enabling them before submitting a PR.
+
+You can enable them by doing the following:
+
+```shell
+./mvnw clean package -DskipTests -Ddisable.checks=false
+```
+
+=== Source Code Style
+
+Spring AI source code checkstyle tries to follow the checkstyle guidelines used by the core Spring Framework project with some exceptions.
+The wiki pages
+[Code Style](https://github.com/spring-projects/spring-framework/wiki/Code-Style) and
+[IntelliJ IDEA Editor Settings](https://github.com/spring-projects/spring-framework/wiki/IntelliJ-IDEA-Editor-Settings)
+define the source file coding standards we use along with some IDEA editor settings we customize.
+
 == Mind the whitespace
 
 Please carefully follow the whitespace and formatting conventions already present in the framework.
@@ -265,4 +284,4 @@ Also by using specific
 https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword[keywords]
 you can link to a GitHub issue like so:
 
-    Closes #10
+    Closes #10

README.md

@@ -115,23 +115,36 @@ To build the docs
 
 The docs are then in the directory `spring-ai-docs/target/antora/site/index.html`
 
+### Formatting the Source Code
+
 To reformat using the [java-format plugin](https://github.com/spring-io/spring-javaformat)
 ```shell
 ./mvnw spring-javaformat:apply
 ```
+### Updating License Headers
 
 To update the year on license headers using the [license-maven-plugin](https://oss.carbou.me/license-maven-plugin/#goals)
 ```shell
 ./mvnw license:update-file-header -Plicense
 ```
+### Javadocs
 
 To check javadocs using the [javadoc:javadoc](https://maven.apache.org/plugins/maven-javadoc-plugin/)
 ```shell
 ./mvnw javadoc:javadoc -Pjavadoc
 ```
+### Enabling Checkstyle
 
-To build with checkstyles enabled.
 Checkstyles are currently disabled, but you can enable them by doing the following:
+
 ```shell
 ./mvnw clean package -DskipTests -Ddisable.checks=false
 ```
+
+#### Source Code Style
+
+Spring AI source code checkstyle tries to follow the checkstyle guidelines used by the core Spring Framework project with some exceptions.
+The wiki pages
+[Code Style](https://github.com/spring-projects/spring-framework/wiki/Code-Style) and
+[IntelliJ IDEA Editor Settings](https://github.com/spring-projects/spring-framework/wiki/IntelliJ-IDEA-Editor-Settings)
+define the source file coding standards we use along with some IDEA editor settings we customize.

document-readers/pdf-reader/src/main/java/org/springframework/ai/reader/pdf/config/ParagraphManager.java

@@ -140,11 +140,13 @@ private int getPageNumber(PDOutlineItem current) throws IOException {
 			return -1;
 		}
 		PDPage currentPage = current.findDestinationPage(this.document);
-		PDPageTree pages = this.document.getDocumentCatalog().getPages();
-		for (int i = 0; i < pages.getCount(); i++) {
-			var page = pages.get(i);
-			if (page.equals(currentPage)) {
-				return i + 1;
+		if (currentPage != null) {
+			PDPageTree pages = this.document.getDocumentCatalog().getPages();
+			for (int i = 0; i < pages.getCount(); i++) {
+				var page = pages.get(i);
+				if (page.equals(currentPage)) {
+					return i + 1;
+				}
 			}
 		}
 		return -1;

document-readers/pdf-reader/src/main/java/org/springframework/ai/reader/pdf/layout/CharacterFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 the original author or authors.
+ * Copyright 2023-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -94,7 +94,7 @@ private double numberOfSpacesBetweenTwoCharacters(final TextPosition textPositio
 
 	private char getCharacterFromTextPosition(final TextPosition textPosition) {
 		String string = textPosition.getUnicode();
-		char character = string.charAt(0);
+		char character = !string.isEmpty() ? string.charAt(0) : '\0';
 		return character;
 	}
 

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

@@ -241,6 +241,16 @@ public Flux<ChatCompletionResponse> chatCompletionStream(ChatCompletionRequest c
 	public enum ChatModel implements ChatModelDescription {
 
 		// @formatter:off
+		/**
+		 * The claude-opus-4-0 model.
+		 */
+		CLAUDE_OPUS_4("claude-opus-4-0"),
+
+		/**
+		 * The claude-sonnet-4-0 model.
+		 */
+		CLAUDE_SONNET_4("claude-sonnet-4-0"),
+
 		/**
 		 * The claude-3-7-sonnet-latest model.
 		 */

models/spring-ai-ollama/src/main/java/org/springframework/ai/ollama/OllamaChatModel.java

@@ -84,6 +84,7 @@
  * @author Jihoon Kim
  * @author Alexandros Pappas
  * @author Ilayaperumal Gopinathan
+ * @author Sun Yuhan
  * @author lambochen
  * @since 1.0.0
  * @see ToolCallingChatOptions
@@ -172,18 +173,21 @@ static ChatResponseMetadata from(OllamaApi.ChatResponse response, ChatResponse p
 		Duration totalDuration = response.getTotalDuration();
 
 		if (previousChatResponse != null && previousChatResponse.getMetadata() != null) {
-			if (previousChatResponse.getMetadata().get(METADATA_EVAL_DURATION) != null) {
-				evalDuration = evalDuration.plus(previousChatResponse.getMetadata().get(METADATA_EVAL_DURATION));
+			Object metadataEvalDuration = previousChatResponse.getMetadata().get(METADATA_EVAL_DURATION);
+			if (metadataEvalDuration != null && evalDuration != null) {
+				evalDuration = evalDuration.plus((Duration) metadataEvalDuration);
 			}
-			if (previousChatResponse.getMetadata().get(METADATA_PROMPT_EVAL_DURATION) != null) {
-				promptEvalDuration = promptEvalDuration
-					.plus(previousChatResponse.getMetadata().get(METADATA_PROMPT_EVAL_DURATION));
+			Object metadataPromptEvalDuration = previousChatResponse.getMetadata().get(METADATA_PROMPT_EVAL_DURATION);
+			if (metadataPromptEvalDuration != null && promptEvalDuration != null) {
+				promptEvalDuration = promptEvalDuration.plus((Duration) metadataPromptEvalDuration);
 			}
-			if (previousChatResponse.getMetadata().get(METADATA_LOAD_DURATION) != null) {
-				loadDuration = loadDuration.plus(previousChatResponse.getMetadata().get(METADATA_LOAD_DURATION));
+			Object metadataLoadDuration = previousChatResponse.getMetadata().get(METADATA_LOAD_DURATION);
+			if (metadataLoadDuration != null && loadDuration != null) {
+				loadDuration = loadDuration.plus((Duration) metadataLoadDuration);
 			}
-			if (previousChatResponse.getMetadata().get(METADATA_TOTAL_DURATION) != null) {
-				totalDuration = totalDuration.plus(previousChatResponse.getMetadata().get(METADATA_TOTAL_DURATION));
+			Object metadataTotalDuration = previousChatResponse.getMetadata().get(METADATA_TOTAL_DURATION);
+			if (metadataTotalDuration != null && totalDuration != null) {
+				totalDuration = totalDuration.plus((Duration) metadataTotalDuration);
 			}
 			if (previousChatResponse.getMetadata().getUsage() != null) {
 				promptTokens += previousChatResponse.getMetadata().getUsage().getPromptTokens();

models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/OllamaChatModelTests.java

@@ -37,8 +37,7 @@
 import org.springframework.ai.ollama.management.ModelManagementOptions;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author Jihoon Kim
@@ -146,4 +145,28 @@ void buildChatResponseMetadataAggregationWithNonEmptyMetadata() {
 		assertEquals(promptEvalCount + 66, (Integer) metadata.get("prompt-eval-count"));
 	}
 
+	@Test
+	void buildChatResponseMetadataAggregationWithNonEmptyMetadataButEmptyEval() {
+
+		OllamaApi.ChatResponse response = new OllamaApi.ChatResponse("model", Instant.now(), null, null, null, null,
+				null, null, null, null, null);
+
+		ChatResponse previousChatResponse = ChatResponse.builder()
+			.generations(List.of())
+			.metadata(ChatResponseMetadata.builder()
+				.usage(new DefaultUsage(66, 99))
+				.keyValue("eval-duration", Duration.ofSeconds(2))
+				.keyValue("prompt-eval-duration", Duration.ofSeconds(2))
+				.build())
+			.build();
+
+		ChatResponseMetadata metadata = OllamaChatModel.from(response, previousChatResponse);
+
+		assertNull(metadata.get("eval-duration"));
+		assertNull(metadata.get("prompt-eval-duration"));
+		assertEquals(Integer.valueOf(99), metadata.get("eval-count"));
+		assertEquals(Integer.valueOf(66), metadata.get("prompt-eval-count"));
+
+	}
+
 }