Skip to content

Commit 8f9a147

Browse files
tzolovtzolov
committed
Re-align the grpc dependecies and exclusions so that Milvus and Pinecone autoconfigurations ITs work
1 parent 08fea31 commit 8f9a147

File tree

7 files changed

+40
-50
lines changed

7 files changed

+40
-50
lines changed

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,22 @@
2222

2323
import org.slf4j.Logger;
2424
import org.slf4j.LoggerFactory;
25-
import org.springframework.ai.chat.ChatClient;
26-
import org.springframework.ai.chat.ChatResponse;
2725
import reactor.core.publisher.Flux;
2826

29-
import org.springframework.ai.chat.StreamingChatClient;
27+
import org.springframework.ai.chat.ChatClient;
28+
import org.springframework.ai.chat.ChatResponse;
3029
import org.springframework.ai.chat.Generation;
30+
import org.springframework.ai.chat.StreamingChatClient;
31+
import org.springframework.ai.chat.messages.Message;
3132
import org.springframework.ai.chat.metadata.ChatGenerationMetadata;
3233
import org.springframework.ai.chat.metadata.RateLimit;
34+
import org.springframework.ai.chat.prompt.Prompt;
3335
import org.springframework.ai.openai.api.OpenAiApi;
3436
import org.springframework.ai.openai.api.OpenAiApi.ChatCompletion;
3537
import org.springframework.ai.openai.api.OpenAiApi.ChatCompletionMessage;
36-
import org.springframework.ai.openai.api.OpenAiApi.OpenAiApiClientErrorException;
3738
import org.springframework.ai.openai.api.OpenAiApi.OpenAiApiException;
3839
import org.springframework.ai.openai.metadata.OpenAiChatResponseMetadata;
3940
import org.springframework.ai.openai.metadata.support.OpenAiResponseHeaderExtractor;
40-
import org.springframework.ai.chat.prompt.Prompt;
41-
import org.springframework.ai.chat.messages.Message;
4241
import org.springframework.http.ResponseEntity;
4342
import org.springframework.retry.support.RetryTemplate;
4443
import org.springframework.util.Assert;

‎spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/vectorstore/milvus/MilvusVectorStoreAutoConfigurationIT.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
import org.junit.jupiter.api.AfterAll;
2626
import org.junit.jupiter.api.BeforeAll;
27-
import org.junit.jupiter.api.Disabled;
2827
import org.junit.jupiter.api.Test;
2928
import org.testcontainers.containers.DockerComposeContainer;
3029
import org.testcontainers.containers.wait.strategy.Wait;
@@ -47,7 +46,6 @@
4746
/**
4847
* @author Christian Tzolov
4948
*/
50-
@Disabled("Disabled until https://github.com/milvus-io/milvus-sdk-java/issues/704")
5149
@Testcontainers
5250
public class MilvusVectorStoreAutoConfigurationIT {
5351

‎spring-ai-spring-boot-autoconfigure/src/test/resources/milvus/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ services:
3737
retries: 3
3838

3939
standalone:
40-
image: milvusdb/milvus:v2.3.1
40+
image: milvusdb/milvus:v2.3.5
4141
command: ["milvus", "run", "standalone"]
4242
environment:
4343
ETCD_ENDPOINTS: etcd:2379

‎vector-stores/spring-ai-milvus-store/pom.xml

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,33 +31,19 @@
3131
<groupId>io.milvus</groupId>
3232
<artifactId>milvus-sdk-java</artifactId>
3333
<version>${milvus.version}</version>
34-
<exclusions>
35-
<exclusion>
36-
<groupId>io.netty</groupId>
37-
<artifactId>netty-codec</artifactId>
38-
</exclusion>
39-
<exclusion>
40-
<groupId>io.netty</groupId>
41-
<artifactId>netty-codec-http2</artifactId>
42-
</exclusion>
43-
</exclusions>
4434
</dependency>
4535

36+
<!-- TESTING -->
4637
<dependency>
47-
<groupId>io.netty</groupId>
48-
<artifactId>netty-codec</artifactId>
49-
<version>4.1.101.Final</version>
50-
</dependency>
51-
<dependency>
52-
<groupId>io.netty</groupId>
53-
<artifactId>netty-codec-http2</artifactId>
54-
<version>4.1.100.Final</version>
38+
<groupId>org.springframework.ai</groupId>
39+
<artifactId>spring-ai-vertex-ai</artifactId>
40+
<version>${parent.version}</version>
41+
<scope>test</scope>
5542
</dependency>
5643

57-
<!-- TESTING -->
5844
<dependency>
5945
<groupId>org.springframework.ai</groupId>
60-
<artifactId>spring-ai-vertex-ai</artifactId>
46+
<artifactId>spring-ai-openai</artifactId>
6147
<version>${parent.version}</version>
6248
<scope>test</scope>
6349
</dependency>

‎vector-stores/spring-ai-milvus-store/src/test/java/org/springframework/ai/vectorstore/MilvusVectorStoreIT.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040

4141
import org.springframework.ai.document.Document;
4242
import org.springframework.ai.embedding.EmbeddingClient;
43+
import org.springframework.ai.openai.OpenAiEmbeddingClient;
44+
import org.springframework.ai.openai.api.OpenAiApi;
4345
import org.springframework.ai.vectorstore.MilvusVectorStore.MilvusVectorStoreConfig;
44-
import org.springframework.ai.vertex.api.VertexAiApi;
45-
import org.springframework.ai.vertex.VertexAiEmbeddingClient;
4646
import org.springframework.beans.factory.annotation.Value;
4747
import org.springframework.boot.SpringBootConfiguration;
4848
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -58,8 +58,8 @@
5858
* @author Christian Tzolov
5959
*/
6060
@Testcontainers
61-
// @EnabledIfEnvironmentVariable(named = "OPENAI_API_KEY", matches = ".+")
62-
@EnabledIfEnvironmentVariable(named = "PALM_API_KEY", matches = ".+")
61+
@EnabledIfEnvironmentVariable(named = "OPENAI_API_KEY", matches = ".+")
62+
// @EnabledIfEnvironmentVariable(named = "PALM_API_KEY", matches = ".+")
6363
public class MilvusVectorStoreIT {
6464

6565
private static DockerComposeContainer milvusContainer;
@@ -307,9 +307,9 @@ public MilvusServiceClient milvusClient() {
307307

308308
@Bean
309309
public EmbeddingClient embeddingClient() {
310-
return new VertexAiEmbeddingClient(new VertexAiApi(System.getenv("PALM_API_KEY")));
311-
// return new OpenAiEmbeddingClient(new
312-
// OpenAiApi(System.getenv("OPENAI_API_KEY")));
310+
// return new VertexAiEmbeddingClient(new
311+
// VertexAiApi(System.getenv("PALM_API_KEY")));
312+
return new OpenAiEmbeddingClient(new OpenAiApi(System.getenv("OPENAI_API_KEY")));
313313
}
314314

315315
}

‎vector-stores/spring-ai-milvus-store/src/test/resources/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ services:
3737
retries: 3
3838

3939
standalone:
40-
image: milvusdb/milvus:v2.3.1
40+
image: milvusdb/milvus:v2.3.5
4141
command: ["milvus", "run", "standalone"]
4242
environment:
4343
ETCD_ENDPOINTS: etcd:2379

‎vector-stores/spring-ai-pinecone/pom.xml

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,31 +35,38 @@
3535
<dependency>
3636
<groupId>io.pinecone</groupId>
3737
<artifactId>pinecone-client</artifactId>
38-
<version>${pinecone.version}</version>
3938
<exclusions>
4039
<exclusion>
41-
<groupId>io.netty</groupId>
42-
<artifactId>netty-codec</artifactId>
40+
<groupId>io.grpc</groupId>
41+
<artifactId>grpc-netty</artifactId>
42+
</exclusion>
43+
<exclusion>
44+
<groupId>io.grpc</groupId>
45+
<artifactId>grpc-protobuf</artifactId>
4346
</exclusion>
4447
<exclusion>
45-
<groupId>io.netty</groupId>
46-
<artifactId>netty-codec-http2</artifactId>
48+
<groupId>io.grpc</groupId>
49+
<artifactId>grpc-stub</artifactId>
4750
</exclusion>
4851
</exclusions>
52+
<version>${pinecone.version}</version>
4953
</dependency>
5054

51-
<!-- Overrides the pinecone's dependencies. TODO review after pincone verions is updated to > 0.6.0 -->
5255
<dependency>
53-
<groupId>io.netty</groupId>
54-
<artifactId>netty-codec</artifactId>
55-
<version>4.1.101.Final</version>
56+
<groupId>io.grpc</groupId>
57+
<artifactId>grpc-netty</artifactId>
58+
<version>1.59.1</version>
5659
</dependency>
5760
<dependency>
58-
<groupId>io.netty</groupId>
59-
<artifactId>netty-codec-http2</artifactId>
60-
<version>4.1.100.Final</version>
61+
<groupId>io.grpc</groupId>
62+
<artifactId>grpc-protobuf</artifactId>
63+
<version>1.59.1</version>
64+
</dependency>
65+
<dependency>
66+
<groupId>io.grpc</groupId>
67+
<artifactId>grpc-stub</artifactId>
68+
<version>1.59.1</version>
6169
</dependency>
62-
6370

6471
<dependency>
6572
<groupId>com.google.protobuf</groupId>

0 commit comments

Comments
 (0)