improved ability to use openAiApi to support DeepSeek

Author: ricken07

models/spring-ai-openai/src/test/java/org/springframework/ai/openai/metadata/OpenAiUsageTests.java

@@ -74,7 +74,7 @@ void whenTotalTokensIsNull() {
 
 	@Test
 	void whenPromptAndCompletionTokensDetailsIsNull() {
-		OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300, null, null);
+		OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300, null, null, null, null);
 		OpenAiUsage usage = OpenAiUsage.from(openAiUsage);
 		assertThat(usage.getTotalTokens()).isEqualTo(300);
 		assertThat(usage.getCompletionTokenDetails().reasoningTokens()).isEqualTo(0);
@@ -85,7 +85,7 @@ void whenPromptAndCompletionTokensDetailsIsNull() {
 
 	@Test
 	void whenCompletionTokenDetailsIsNull() {
-		OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300, null, null);
+		OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300, null, null, null, null);
 		OpenAiUsage usage = OpenAiUsage.from(openAiUsage);
 		assertThat(usage.getTotalTokens()).isEqualTo(300);
 		assertThat(usage.getReasoningTokens()).isEqualTo(0);
@@ -94,15 +94,15 @@ void whenCompletionTokenDetailsIsNull() {
 	@Test
 	void whenReasoningTokensIsNull() {
 		OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300, null,
-				new OpenAiApi.Usage.CompletionTokenDetails(null, null, null, null));
+				new OpenAiApi.Usage.CompletionTokenDetails(null, null, null, null), null, null);
 		OpenAiUsage usage = OpenAiUsage.from(openAiUsage);
 		assertThat(usage.getReasoningTokens()).isEqualTo(0);
 	}
 
 	@Test
 	void whenCompletionTokenDetailsIsPresent() {
 		OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300, null,
-				new OpenAiApi.Usage.CompletionTokenDetails(50, null, null, null));
+				new OpenAiApi.Usage.CompletionTokenDetails(50, null, null, null), null, null);
 		OpenAiUsage usage = OpenAiUsage.from(openAiUsage);
 		assertThat(usage.getCompletionTokenDetails().reasoningTokens()).isEqualTo(50);
 		assertThat(usage.getCompletionTokenDetails().acceptedPredictionTokens()).isEqualTo(0);
@@ -113,7 +113,7 @@ void whenCompletionTokenDetailsIsPresent() {
 	@Test
 	void whenAcceptedPredictionTokensIsPresent() {
 		OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300, null,
-				new OpenAiApi.Usage.CompletionTokenDetails(null, 75, null, null));
+				new OpenAiApi.Usage.CompletionTokenDetails(null, 75, null, null), null, null);
 		OpenAiUsage usage = OpenAiUsage.from(openAiUsage);
 		assertThat(usage.getCompletionTokenDetails().reasoningTokens()).isEqualTo(0);
 		assertThat(usage.getCompletionTokenDetails().acceptedPredictionTokens()).isEqualTo(75);
@@ -124,7 +124,7 @@ void whenAcceptedPredictionTokensIsPresent() {
 	@Test
 	void whenAudioTokensIsPresent() {
 		OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300, null,
-				new OpenAiApi.Usage.CompletionTokenDetails(null, null, 125, null));
+				new OpenAiApi.Usage.CompletionTokenDetails(null, null, 125, null), null, null);
 		OpenAiUsage usage = OpenAiUsage.from(openAiUsage);
 		assertThat(usage.getCompletionTokenDetails().reasoningTokens()).isEqualTo(0);
 		assertThat(usage.getCompletionTokenDetails().acceptedPredictionTokens()).isEqualTo(0);
@@ -135,7 +135,7 @@ void whenAudioTokensIsPresent() {
 	@Test
 	void whenRejectedPredictionTokensIsNull() {
 		OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300, null,
-				new OpenAiApi.Usage.CompletionTokenDetails(null, null, null, null));
+				new OpenAiApi.Usage.CompletionTokenDetails(null, null, null, null), null, null);
 		OpenAiUsage usage = OpenAiUsage.from(openAiUsage);
 		assertThat(usage.getCompletionTokenDetails().reasoningTokens()).isEqualTo(0);
 		assertThat(usage.getCompletionTokenDetails().acceptedPredictionTokens()).isEqualTo(0);
@@ -147,7 +147,7 @@ void whenRejectedPredictionTokensIsNull() {
 	@Test
 	void whenRejectedPredictionTokensIsPresent() {
 		OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300, null,
-				new OpenAiApi.Usage.CompletionTokenDetails(null, null, null, 25));
+				new OpenAiApi.Usage.CompletionTokenDetails(null, null, null, 25), null, null);
 		OpenAiUsage usage = OpenAiUsage.from(openAiUsage);
 		assertThat(usage.getCompletionTokenDetails().reasoningTokens()).isEqualTo(0);
 		assertThat(usage.getCompletionTokenDetails().acceptedPredictionTokens()).isEqualTo(0);
@@ -158,7 +158,7 @@ void whenRejectedPredictionTokensIsPresent() {
 	@Test
 	void whenCacheTokensIsNull() {
 		OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300,
-				new OpenAiApi.Usage.PromptTokensDetails(null, null), null);
+				new OpenAiApi.Usage.PromptTokensDetails(null, null), null, null, null);
 		OpenAiUsage usage = OpenAiUsage.from(openAiUsage);
 		assertThat(usage.getPromptTokensDetails().audioTokens()).isEqualTo(0);
 		assertThat(usage.getPromptTokensDetails().cachedTokens()).isEqualTo(0);
@@ -167,7 +167,7 @@ void whenCacheTokensIsNull() {
 	@Test
 	void whenCacheTokensIsPresent() {
 		OpenAiApi.Usage openAiUsage = new OpenAiApi.Usage(100, 200, 300,
-				new OpenAiApi.Usage.PromptTokensDetails(99, 15), null);
+				new OpenAiApi.Usage.PromptTokensDetails(99, 15), null, null, null);
 		OpenAiUsage usage = OpenAiUsage.from(openAiUsage);
 		assertThat(usage.getPromptTokensDetails().audioTokens()).isEqualTo(99);
 		assertThat(usage.getPromptTokensDetails().cachedTokens()).isEqualTo(15);