Skip to content

Commit 7ce90d0

Browse files
GrogdunnGrogdunn
committed
🔀 Merge branch 'main'
2 parents 00ef4ef + 1c93ae5 commit 7ce90d0

File tree

207 files changed

+1562
-1171
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

207 files changed

+1562
-1171
lines changed

‎models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/ChatCompletionRequestTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package org.springframework.ai.anthropic;
1717

1818
import org.junit.jupiter.api.Test;
19-
2019
import org.springframework.ai.anthropic.api.AnthropicApi;
2120
import org.springframework.ai.chat.prompt.Prompt;
2221

‎models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiChatOptions.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,22 @@
1515
*/
1616
package org.springframework.ai.azure.openai;
1717

18-
import java.util.ArrayList;
19-
import java.util.HashSet;
20-
import java.util.List;
21-
import java.util.Map;
22-
import java.util.Set;
23-
2418
import com.fasterxml.jackson.annotation.JsonIgnore;
2519
import com.fasterxml.jackson.annotation.JsonInclude;
2620
import com.fasterxml.jackson.annotation.JsonInclude.Include;
2721
import com.fasterxml.jackson.annotation.JsonProperty;
28-
2922
import org.springframework.ai.chat.prompt.ChatOptions;
3023
import org.springframework.ai.model.function.FunctionCallback;
3124
import org.springframework.ai.model.function.FunctionCallingOptions;
3225
import org.springframework.boot.context.properties.NestedConfigurationProperty;
3326
import org.springframework.util.Assert;
3427

28+
import java.util.ArrayList;
29+
import java.util.HashSet;
30+
import java.util.List;
31+
import java.util.Map;
32+
import java.util.Set;
33+
3534
/**
3635
* The configuration information for a chat completions request. Completions support a
3736
* wide variety of tasks and generate text that continues from or "completes" provided

‎models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiEmbeddingClient.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,13 @@
1515
*/
1616
package org.springframework.ai.azure.openai;
1717

18-
import java.util.ArrayList;
19-
import java.util.List;
20-
2118
import com.azure.ai.openai.OpenAIClient;
2219
import com.azure.ai.openai.models.EmbeddingItem;
2320
import com.azure.ai.openai.models.Embeddings;
2421
import com.azure.ai.openai.models.EmbeddingsOptions;
2522
import com.azure.ai.openai.models.EmbeddingsUsage;
2623
import org.slf4j.Logger;
2724
import org.slf4j.LoggerFactory;
28-
2925
import org.springframework.ai.document.Document;
3026
import org.springframework.ai.document.MetadataMode;
3127
import org.springframework.ai.embedding.AbstractEmbeddingClient;
@@ -37,6 +33,9 @@
3733
import org.springframework.ai.model.ModelOptionsUtils;
3834
import org.springframework.util.Assert;
3935

36+
import java.util.ArrayList;
37+
import java.util.List;
38+
4039
public class AzureOpenAiEmbeddingClient extends AbstractEmbeddingClient {
4140

4241
private static final Logger logger = LoggerFactory.getLogger(AzureOpenAiEmbeddingClient.class);
@@ -112,9 +111,10 @@ private EmbeddingResponse generateEmbeddingResponse(Embeddings embeddings) {
112111
private List<Embedding> generateEmbeddingList(List<EmbeddingItem> nativeData) {
113112
List<Embedding> data = new ArrayList<>();
114113
for (EmbeddingItem nativeDatum : nativeData) {
115-
List<Double> nativeDatumEmbedding = nativeDatum.getEmbedding();
114+
List<Float> nativeDatumEmbedding = nativeDatum.getEmbedding();
116115
int nativeIndex = nativeDatum.getPromptIndex();
117-
Embedding embedding = new Embedding(nativeDatumEmbedding, nativeIndex);
116+
Embedding embedding = new Embedding(nativeDatumEmbedding.stream().map(f -> f.doubleValue()).toList(),
117+
nativeIndex);
118118
data.add(embedding);
119119
}
120120
return data;

‎models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiEmbeddingOptions.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package org.springframework.ai.azure.openai;
1717

1818
import com.fasterxml.jackson.annotation.JsonProperty;
19-
2019
import org.springframework.ai.embedding.EmbeddingOptions;
2120

2221
/**

‎models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/aot/AzureOpenAiRuntimeHints.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.azure.ai.openai.OpenAIAsyncClient;
1919
import com.azure.ai.openai.OpenAIClient;
2020
import com.azure.ai.openai.models.ChatChoice;
21-
2221
import org.springframework.ai.aot.AiRuntimeHints;
2322
import org.springframework.aot.hint.MemberCategory;
2423
import org.springframework.aot.hint.RuntimeHints;

‎models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/metadata/AzureOpenAiChatResponseMetadata.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package org.springframework.ai.azure.openai.metadata;
1717

1818
import com.azure.ai.openai.models.ChatCompletions;
19-
2019
import org.springframework.ai.chat.metadata.ChatResponseMetadata;
2120
import org.springframework.ai.chat.metadata.PromptMetadata;
2221
import org.springframework.ai.chat.metadata.Usage;

‎models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/metadata/AzureOpenAiUsage.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import com.azure.ai.openai.models.ChatCompletions;
1919
import com.azure.ai.openai.models.CompletionsUsage;
20-
2120
import org.springframework.ai.chat.metadata.Usage;
2221
import org.springframework.util.Assert;
2322

‎models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureChatCompletionsOptionsTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.junit.jupiter.params.provider.Arguments;
2222
import org.junit.jupiter.params.provider.MethodSource;
2323
import org.mockito.Mockito;
24-
2524
import org.springframework.ai.chat.prompt.Prompt;
2625

2726
import java.util.stream.Stream;

‎models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureEmbeddingsOptionsTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@
1515
*/
1616
package org.springframework.ai.azure.openai;
1717

18-
import java.util.List;
19-
2018
import com.azure.ai.openai.OpenAIClient;
2119
import org.junit.jupiter.api.Test;
2220
import org.mockito.Mockito;
23-
2421
import org.springframework.ai.document.MetadataMode;
2522
import org.springframework.ai.embedding.EmbeddingRequest;
2623

24+
import java.util.List;
25+
2726
import static org.assertj.core.api.Assertions.assertThat;
2827

2928
/**

‎models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiChatClientIT.java

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,35 +15,34 @@
1515
*/
1616
package org.springframework.ai.azure.openai;
1717

18-
import java.util.Arrays;
19-
import java.util.List;
20-
import java.util.Map;
21-
import java.util.Objects;
22-
import java.util.stream.Collectors;
23-
2418
import com.azure.ai.openai.OpenAIClient;
2519
import com.azure.ai.openai.OpenAIClientBuilder;
2620
import com.azure.core.credential.AzureKeyCredential;
2721
import org.junit.jupiter.api.Test;
2822
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
29-
3023
import org.springframework.ai.chat.ChatResponse;
3124
import org.springframework.ai.chat.Generation;
3225
import org.springframework.ai.chat.messages.AssistantMessage;
33-
import org.springframework.ai.parser.BeanOutputParser;
34-
import org.springframework.ai.parser.ListOutputParser;
35-
import org.springframework.ai.parser.MapOutputParser;
26+
import org.springframework.ai.chat.messages.Message;
27+
import org.springframework.ai.chat.messages.UserMessage;
3628
import org.springframework.ai.chat.prompt.Prompt;
3729
import org.springframework.ai.chat.prompt.PromptTemplate;
3830
import org.springframework.ai.chat.prompt.SystemPromptTemplate;
39-
import org.springframework.ai.chat.messages.Message;
40-
import org.springframework.ai.chat.messages.UserMessage;
31+
import org.springframework.ai.parser.BeanOutputParser;
32+
import org.springframework.ai.parser.ListOutputParser;
33+
import org.springframework.ai.parser.MapOutputParser;
4134
import org.springframework.beans.factory.annotation.Autowired;
4235
import org.springframework.boot.SpringBootConfiguration;
4336
import org.springframework.boot.test.context.SpringBootTest;
4437
import org.springframework.context.annotation.Bean;
4538
import org.springframework.core.convert.support.DefaultConversionService;
4639

40+
import java.util.Arrays;
41+
import java.util.List;
42+
import java.util.Map;
43+
import java.util.Objects;
44+
import java.util.stream.Collectors;
45+
4746
import static org.assertj.core.api.Assertions.assertThat;
4847

4948
@SpringBootTest(classes = AzureOpenAiChatClientIT.TestConfiguration.class)

‎models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/AzureOpenAiEmbeddingClientIT.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,19 @@
1515
*/
1616
package org.springframework.ai.azure.openai;
1717

18-
import java.util.List;
19-
2018
import com.azure.ai.openai.OpenAIClient;
2119
import com.azure.ai.openai.OpenAIClientBuilder;
2220
import com.azure.core.credential.AzureKeyCredential;
2321
import org.junit.jupiter.api.Test;
2422
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
25-
2623
import org.springframework.ai.embedding.EmbeddingResponse;
2724
import org.springframework.beans.factory.annotation.Autowired;
2825
import org.springframework.boot.SpringBootConfiguration;
2926
import org.springframework.boot.test.context.SpringBootTest;
3027
import org.springframework.context.annotation.Bean;
3128

29+
import java.util.List;
30+
3231
import static org.assertj.core.api.Assertions.assertThat;
3332

3433
@SpringBootTest

‎models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/MockAiTestConfiguration.java

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,11 @@
1515
*/
1616
package org.springframework.ai.azure.openai;
1717

18-
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
19-
20-
import java.io.IOException;
21-
import java.io.UnsupportedEncodingException;
22-
import java.net.URI;
23-
import java.nio.charset.Charset;
24-
import java.nio.charset.StandardCharsets;
25-
import java.util.Optional;
26-
import java.util.Queue;
27-
import java.util.concurrent.ConcurrentLinkedDeque;
28-
18+
import okhttp3.mockwebserver.Dispatcher;
19+
import okhttp3.mockwebserver.MockResponse;
20+
import okhttp3.mockwebserver.MockWebServer;
21+
import okhttp3.mockwebserver.RecordedRequest;
22+
import okio.Buffer;
2923
import org.slf4j.Logger;
3024
import org.slf4j.LoggerFactory;
3125
import org.springframework.beans.factory.DisposableBean;
@@ -43,11 +37,16 @@
4337
import org.springframework.util.Assert;
4438
import org.springframework.util.StringUtils;
4539

46-
import okhttp3.mockwebserver.Dispatcher;
47-
import okhttp3.mockwebserver.MockResponse;
48-
import okhttp3.mockwebserver.MockWebServer;
49-
import okhttp3.mockwebserver.RecordedRequest;
50-
import okio.Buffer;
40+
import java.io.IOException;
41+
import java.io.UnsupportedEncodingException;
42+
import java.net.URI;
43+
import java.nio.charset.Charset;
44+
import java.nio.charset.StandardCharsets;
45+
import java.util.Optional;
46+
import java.util.Queue;
47+
import java.util.concurrent.ConcurrentLinkedDeque;
48+
49+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
5150

5251
/**
5352
* Spring {@link Configuration} for AI integration testing using mock objects.

‎models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/MockAzureOpenAiTestConfiguration.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,15 @@
1717

1818
import com.azure.ai.openai.OpenAIClient;
1919
import com.azure.ai.openai.OpenAIClientBuilder;
20-
20+
import okhttp3.HttpUrl;
21+
import okhttp3.mockwebserver.Dispatcher;
22+
import okhttp3.mockwebserver.MockWebServer;
2123
import org.springframework.boot.SpringBootConfiguration;
2224
import org.springframework.context.annotation.Bean;
2325
import org.springframework.context.annotation.Import;
2426
import org.springframework.context.annotation.Profile;
2527
import org.springframework.test.web.servlet.MockMvc;
2628

27-
import okhttp3.HttpUrl;
28-
import okhttp3.mockwebserver.Dispatcher;
29-
import okhttp3.mockwebserver.MockWebServer;
30-
3129
/**
3230
* {@link SpringBootConfiguration} for testing {@literal Azure OpenAI's} API using mock
3331
* objects.

‎models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/aot/AzureOpenAiRuntimeHintsTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,16 @@
1515
*/
1616
package org.springframework.ai.azure.openai.aot;
1717

18-
import java.util.Set;
19-
2018
import com.azure.ai.openai.OpenAIAsyncClient;
2119
import com.azure.ai.openai.OpenAIClient;
2220
import com.azure.ai.openai.models.ChatChoice;
2321
import org.junit.jupiter.api.Test;
24-
2522
import org.springframework.ai.aot.AiRuntimeHints;
2623
import org.springframework.aot.hint.RuntimeHints;
2724
import org.springframework.aot.hint.TypeReference;
2825

26+
import java.util.Set;
27+
2928
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
3029
import static org.springframework.aot.hint.predicate.RuntimeHintsPredicates.reflection;
3130
import static org.springframework.aot.hint.predicate.RuntimeHintsPredicates.resource;

‎models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/function/AzureOpenAiChatClientFunctionCallIT.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,13 @@
1515
*/
1616
package org.springframework.ai.azure.openai.function;
1717

18-
import java.util.ArrayList;
19-
import java.util.List;
20-
import java.util.Optional;
21-
import java.util.function.Consumer;
22-
2318
import com.azure.ai.openai.OpenAIClient;
2419
import com.azure.ai.openai.OpenAIClientBuilder;
2520
import com.azure.core.credential.AzureKeyCredential;
2621
import org.junit.jupiter.api.Test;
2722
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
2823
import org.slf4j.Logger;
2924
import org.slf4j.LoggerFactory;
30-
3125
import org.springframework.ai.azure.openai.AzureOpenAiChatClient;
3226
import org.springframework.ai.azure.openai.AzureOpenAiChatOptions;
3327
import org.springframework.ai.chat.ChatResponse;
@@ -40,6 +34,10 @@
4034
import org.springframework.boot.test.context.SpringBootTest;
4135
import org.springframework.context.annotation.Bean;
4236

37+
import java.util.ArrayList;
38+
import java.util.List;
39+
import java.util.Optional;
40+
4341
import static org.assertj.core.api.Assertions.assertThat;
4442

4543
@SpringBootTest(classes = AzureOpenAiChatClientFunctionCallIT.TestConfiguration.class)

‎models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/function/MockWeatherService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
*/
1616
package org.springframework.ai.azure.openai.function;
1717

18-
import java.util.function.Function;
19-
2018
import com.fasterxml.jackson.annotation.JsonClassDescription;
2119
import com.fasterxml.jackson.annotation.JsonInclude;
2220
import com.fasterxml.jackson.annotation.JsonInclude.Include;
2321
import com.fasterxml.jackson.annotation.JsonProperty;
2422
import com.fasterxml.jackson.annotation.JsonPropertyDescription;
2523

24+
import java.util.function.Function;
25+
2626
/**
2727
* @author Christian Tzolov
2828
*/
@@ -87,4 +87,4 @@ else if (request.location().contains("San Francisco")) {
8787
return new Response(temperature, 15, 20, 2, 53, 45, Unit.C);
8888
}
8989

90-
}
90+
}

‎models/spring-ai-huggingface/src/main/java/org/springframework/ai/huggingface/HuggingfaceChatClient.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,22 @@
1515
*/
1616
package org.springframework.ai.huggingface;
1717

18-
import java.util.ArrayList;
19-
import java.util.List;
20-
import java.util.Map;
21-
2218
import com.fasterxml.jackson.core.type.TypeReference;
2319
import com.fasterxml.jackson.databind.ObjectMapper;
24-
2520
import org.springframework.ai.chat.ChatClient;
2621
import org.springframework.ai.chat.ChatResponse;
2722
import org.springframework.ai.chat.Generation;
23+
import org.springframework.ai.chat.prompt.Prompt;
2824
import org.springframework.ai.huggingface.api.TextGenerationInferenceApi;
2925
import org.springframework.ai.huggingface.invoker.ApiClient;
3026
import org.springframework.ai.huggingface.model.AllOfGenerateResponseDetails;
3127
import org.springframework.ai.huggingface.model.GenerateParameters;
3228
import org.springframework.ai.huggingface.model.GenerateRequest;
3329
import org.springframework.ai.huggingface.model.GenerateResponse;
34-
import org.springframework.ai.chat.prompt.Prompt;
30+
31+
import java.util.ArrayList;
32+
import java.util.List;
33+
import java.util.Map;
3534

3635
/**
3736
* An implementation of {@link ChatClient} that interfaces with HuggingFace Inference

‎models/spring-ai-huggingface/src/test/java/org/springframework/ai/huggingface/client/ClientIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@
1818
import org.junit.jupiter.api.Disabled;
1919
import org.junit.jupiter.api.Test;
2020
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
21-
2221
import org.springframework.ai.chat.ChatResponse;
23-
import org.springframework.ai.huggingface.HuggingfaceChatClient;
2422
import org.springframework.ai.chat.prompt.Prompt;
23+
import org.springframework.ai.huggingface.HuggingfaceChatClient;
2524
import org.springframework.beans.factory.annotation.Autowired;
2625
import org.springframework.boot.test.context.SpringBootTest;
2726

0 commit comments

Comments
 (0)