🔀 Merge branch 'main'

spring-projects · May 6, 2024 · 7ce90d0 · 7ce90d0
2 parents 00ef4ef + 1c93ae5
commit 7ce90d0
Show file tree

Hide file tree

Showing 207 changed files with 1,562 additions and 1,171 deletions.
diff --git a/...-anthropic/src/test/java/org/springframework/ai/anthropic/ChatCompletionRequestTests.java b/...-anthropic/src/test/java/org/springframework/ai/anthropic/ChatCompletionRequestTests.java
@@ -16,7 +16,6 @@
 package org.springframework.ai.anthropic;
 
 import org.junit.jupiter.api.Test;
-
 import org.springframework.ai.anthropic.api.AnthropicApi;
 import org.springframework.ai.chat.prompt.Prompt;
 

diff --git a/...zure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiChatOptions.java b/...zure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiChatOptions.java
@@ -15,23 +15,22 @@
  */
 package org.springframework.ai.azure.openai;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import org.springframework.ai.chat.prompt.ChatOptions;
 import org.springframework.ai.model.function.FunctionCallback;
 import org.springframework.ai.model.function.FunctionCallingOptions;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import org.springframework.util.Assert;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * The configuration information for a chat completions request. Completions support a
  * wide variety of tasks and generate text that continues from or "completes" provided

diff --git a/...-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiEmbeddingClient.java b/...-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiEmbeddingClient.java
@@ -15,17 +15,13 @@
  */
 package org.springframework.ai.azure.openai;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.azure.ai.openai.OpenAIClient;
 import com.azure.ai.openai.models.EmbeddingItem;
 import com.azure.ai.openai.models.Embeddings;
 import com.azure.ai.openai.models.EmbeddingsOptions;
 import com.azure.ai.openai.models.EmbeddingsUsage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.springframework.ai.document.Document;
 import org.springframework.ai.document.MetadataMode;
 import org.springframework.ai.embedding.AbstractEmbeddingClient;
@@ -37,6 +33,9 @@
 import org.springframework.ai.model.ModelOptionsUtils;
 import org.springframework.util.Assert;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class AzureOpenAiEmbeddingClient extends AbstractEmbeddingClient {
 
 	private static final Logger logger = LoggerFactory.getLogger(AzureOpenAiEmbeddingClient.class);
@@ -112,9 +111,10 @@ private EmbeddingResponse generateEmbeddingResponse(Embeddings embeddings) {
 	private List<Embedding> generateEmbeddingList(List<EmbeddingItem> nativeData) {
 		List<Embedding> data = new ArrayList<>();
 		for (EmbeddingItem nativeDatum : nativeData) {
-			List<Double> nativeDatumEmbedding = nativeDatum.getEmbedding();
+			List<Float> nativeDatumEmbedding = nativeDatum.getEmbedding();
 			int nativeIndex = nativeDatum.getPromptIndex();
-			Embedding embedding = new Embedding(nativeDatumEmbedding, nativeIndex);
+			Embedding embedding = new Embedding(nativeDatumEmbedding.stream().map(f -> f.doubleValue()).toList(),
+					nativeIndex);
 			data.add(embedding);
 		}
 		return data;

diff --git a/...openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiEmbeddingOptions.java b/...openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiEmbeddingOptions.java
@@ -16,7 +16,6 @@
 package org.springframework.ai.azure.openai;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import org.springframework.ai.embedding.EmbeddingOptions;
 
 /**

diff --git a/...openai/src/main/java/org/springframework/ai/azure/openai/aot/AzureOpenAiRuntimeHints.java b/...openai/src/main/java/org/springframework/ai/azure/openai/aot/AzureOpenAiRuntimeHints.java
@@ -18,7 +18,6 @@
 import com.azure.ai.openai.OpenAIAsyncClient;
 import com.azure.ai.openai.OpenAIClient;
 import com.azure.ai.openai.models.ChatChoice;
-
 import org.springframework.ai.aot.AiRuntimeHints;
 import org.springframework.aot.hint.MemberCategory;
 import org.springframework.aot.hint.RuntimeHints;

diff --git a/...in/java/org/springframework/ai/azure/openai/metadata/AzureOpenAiChatResponseMetadata.java b/...in/java/org/springframework/ai/azure/openai/metadata/AzureOpenAiChatResponseMetadata.java
@@ -16,7 +16,6 @@
 package org.springframework.ai.azure.openai.metadata;
 
 import com.azure.ai.openai.models.ChatCompletions;
-
 import org.springframework.ai.chat.metadata.ChatResponseMetadata;
 import org.springframework.ai.chat.metadata.PromptMetadata;
 import org.springframework.ai.chat.metadata.Usage;

diff --git a/...e-openai/src/main/java/org/springframework/ai/azure/openai/metadata/AzureOpenAiUsage.java b/...e-openai/src/main/java/org/springframework/ai/azure/openai/metadata/AzureOpenAiUsage.java
@@ -17,7 +17,6 @@
 
 import com.azure.ai.openai.models.ChatCompletions;
 import com.azure.ai.openai.models.CompletionsUsage;
-
 import org.springframework.ai.chat.metadata.Usage;
 import org.springframework.util.Assert;
 

diff --git a/...i/src/test/java/org/springframework/ai/azure/openai/AzureChatCompletionsOptionsTests.java b/...i/src/test/java/org/springframework/ai/azure/openai/AzureChatCompletionsOptionsTests.java
@@ -21,7 +21,6 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
-
 import org.springframework.ai.chat.prompt.Prompt;
 
 import java.util.stream.Stream;

diff --git a/...openai/src/test/java/org/springframework/ai/azure/openai/AzureEmbeddingsOptionsTests.java b/...openai/src/test/java/org/springframework/ai/azure/openai/AzureEmbeddingsOptionsTests.java
@@ -15,15 +15,14 @@
  */
 package org.springframework.ai.azure.openai;
 
-import java.util.List;
-
 import com.azure.ai.openai.OpenAIClient;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
-
 import org.springframework.ai.document.MetadataMode;
 import org.springframework.ai.embedding.EmbeddingRequest;
 
+import java.util.List;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**

diff --git a/...ure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiChatClientIT.java b/...ure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiChatClientIT.java
@@ -15,35 +15,34 @@
  */
 package org.springframework.ai.azure.openai;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
 import com.azure.ai.openai.OpenAIClient;
 import com.azure.ai.openai.OpenAIClientBuilder;
 import com.azure.core.credential.AzureKeyCredential;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
-
 import org.springframework.ai.chat.ChatResponse;
 import org.springframework.ai.chat.Generation;
 import org.springframework.ai.chat.messages.AssistantMessage;
-import org.springframework.ai.parser.BeanOutputParser;
-import org.springframework.ai.parser.ListOutputParser;
-import org.springframework.ai.parser.MapOutputParser;
+import org.springframework.ai.chat.messages.Message;
+import org.springframework.ai.chat.messages.UserMessage;
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.chat.prompt.PromptTemplate;
 import org.springframework.ai.chat.prompt.SystemPromptTemplate;
-import org.springframework.ai.chat.messages.Message;
-import org.springframework.ai.chat.messages.UserMessage;
+import org.springframework.ai.parser.BeanOutputParser;
+import org.springframework.ai.parser.ListOutputParser;
+import org.springframework.ai.parser.MapOutputParser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.convert.support.DefaultConversionService;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest(classes = AzureOpenAiChatClientIT.TestConfiguration.class)

diff --git a/...penai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiEmbeddingClientIT.java b/...penai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiEmbeddingClientIT.java
@@ -15,20 +15,19 @@
  */
 package org.springframework.ai.azure.openai;
 
-import java.util.List;
-
 import com.azure.ai.openai.OpenAIClient;
 import com.azure.ai.openai.OpenAIClientBuilder;
 import com.azure.core.credential.AzureKeyCredential;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
-
 import org.springframework.ai.embedding.EmbeddingResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Bean;
 
+import java.util.List;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest

diff --git a/...ure-openai/src/test/java/org/springframework/ai/azure/openai/MockAiTestConfiguration.java b/...ure-openai/src/test/java/org/springframework/ai/azure/openai/MockAiTestConfiguration.java
@@ -15,17 +15,11 @@
  */
 package org.springframework.ai.azure.openai;
 
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.Optional;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedDeque;
-
+import okhttp3.mockwebserver.Dispatcher;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import okhttp3.mockwebserver.RecordedRequest;
+import okio.Buffer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;
@@ -43,11 +37,16 @@
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
-import okhttp3.mockwebserver.Dispatcher;
-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.MockWebServer;
-import okhttp3.mockwebserver.RecordedRequest;
-import okio.Buffer;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.Optional;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedDeque;
+
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 /**
  * Spring {@link Configuration} for AI integration testing using mock objects.

diff --git a/...i/src/test/java/org/springframework/ai/azure/openai/MockAzureOpenAiTestConfiguration.java b/...i/src/test/java/org/springframework/ai/azure/openai/MockAzureOpenAiTestConfiguration.java
@@ -17,17 +17,15 @@
 
 import com.azure.ai.openai.OpenAIClient;
 import com.azure.ai.openai.OpenAIClientBuilder;
-
+import okhttp3.HttpUrl;
+import okhttp3.mockwebserver.Dispatcher;
+import okhttp3.mockwebserver.MockWebServer;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Profile;
 import org.springframework.test.web.servlet.MockMvc;
 
-import okhttp3.HttpUrl;
-import okhttp3.mockwebserver.Dispatcher;
-import okhttp3.mockwebserver.MockWebServer;
-
 /**
  * {@link SpringBootConfiguration} for testing {@literal Azure OpenAI's} API using mock
  * objects.

diff --git a/...i/src/test/java/org/springframework/ai/azure/openai/aot/AzureOpenAiRuntimeHintsTests.java b/...i/src/test/java/org/springframework/ai/azure/openai/aot/AzureOpenAiRuntimeHintsTests.java
@@ -15,17 +15,16 @@
  */
 package org.springframework.ai.azure.openai.aot;
 
-import java.util.Set;
-
 import com.azure.ai.openai.OpenAIAsyncClient;
 import com.azure.ai.openai.OpenAIClient;
 import com.azure.ai.openai.models.ChatChoice;
 import org.junit.jupiter.api.Test;
-
 import org.springframework.ai.aot.AiRuntimeHints;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.TypeReference;
 
+import java.util.Set;
+
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.springframework.aot.hint.predicate.RuntimeHintsPredicates.reflection;
 import static org.springframework.aot.hint.predicate.RuntimeHintsPredicates.resource;

diff --git a/...ava/org/springframework/ai/azure/openai/function/AzureOpenAiChatClientFunctionCallIT.java b/...ava/org/springframework/ai/azure/openai/function/AzureOpenAiChatClientFunctionCallIT.java
@@ -15,19 +15,13 @@
  */
 package org.springframework.ai.azure.openai.function;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Consumer;
-
 import com.azure.ai.openai.OpenAIClient;
 import com.azure.ai.openai.OpenAIClientBuilder;
 import com.azure.core.credential.AzureKeyCredential;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.springframework.ai.azure.openai.AzureOpenAiChatClient;
 import org.springframework.ai.azure.openai.AzureOpenAiChatOptions;
 import org.springframework.ai.chat.ChatResponse;
@@ -40,6 +34,10 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Bean;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest(classes = AzureOpenAiChatClientFunctionCallIT.TestConfiguration.class)

diff --git a/...openai/src/test/java/org/springframework/ai/azure/openai/function/MockWeatherService.java b/...openai/src/test/java/org/springframework/ai/azure/openai/function/MockWeatherService.java
@@ -15,14 +15,14 @@
  */
 package org.springframework.ai.azure.openai.function;
 
-import java.util.function.Function;
-
 import com.fasterxml.jackson.annotation.JsonClassDescription;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
 
+import java.util.function.Function;
+
 /**
  * @author Christian Tzolov
  */
@@ -87,4 +87,4 @@ else if (request.location().contains("San Francisco")) {
 		return new Response(temperature, 15, 20, 2, 53, 45, Unit.C);
 	}
 
-}
+}
diff --git a/...i-huggingface/src/main/java/org/springframework/ai/huggingface/HuggingfaceChatClient.java b/...i-huggingface/src/main/java/org/springframework/ai/huggingface/HuggingfaceChatClient.java
@@ -15,23 +15,22 @@
  */
 package org.springframework.ai.huggingface;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.springframework.ai.chat.ChatClient;
 import org.springframework.ai.chat.ChatResponse;
 import org.springframework.ai.chat.Generation;
+import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.huggingface.api.TextGenerationInferenceApi;
 import org.springframework.ai.huggingface.invoker.ApiClient;
 import org.springframework.ai.huggingface.model.AllOfGenerateResponseDetails;
 import org.springframework.ai.huggingface.model.GenerateParameters;
 import org.springframework.ai.huggingface.model.GenerateRequest;
 import org.springframework.ai.huggingface.model.GenerateResponse;
-import org.springframework.ai.chat.prompt.Prompt;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * An implementation of {@link ChatClient} that interfaces with HuggingFace Inference

diff --git a/...ring-ai-huggingface/src/test/java/org/springframework/ai/huggingface/client/ClientIT.java b/...ring-ai-huggingface/src/test/java/org/springframework/ai/huggingface/client/ClientIT.java
@@ -18,10 +18,9 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
-
 import org.springframework.ai.chat.ChatResponse;
-import org.springframework.ai.huggingface.HuggingfaceChatClient;
 import org.springframework.ai.chat.prompt.Prompt;
+import org.springframework.ai.huggingface.HuggingfaceChatClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;