forked from spring-projects/spring-ai
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add retry support to VertexAI embedding and chat models
Resolves spring-projects#832 Introduces retry functionality to VertexAI embedding and chat models, enhancing their resilience against transient failures. It also corrects a typo in the VertexAiEmbeddingConnectionDetails class name. Key changes: * Add RetryTemplate to VertexAiTextEmbeddingModel and VertexAiGeminiChatModel * Introduce spring-ai-retry dependency * Refactor code to support retry logic * Update auto-configuration classes to incorporate retry functionality * Fix typo in VertexAiEmbeddingConnectionDetails class name remove extraneous commented out code Add missing copyright headers, author etc.
- Loading branch information
1 parent
6fc76b7
commit bb88e2f
Showing
14 changed files
with
624 additions
and
115 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
...t/java/org/springframework/ai/vertexai/embedding/text/TestVertexAiTextEmbeddingModel.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| * Copyright 2024-2024 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. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.springframework.ai.vertexai.embedding.text; | ||
|
|
||
| import com.google.cloud.aiplatform.v1.EndpointName; | ||
| import com.google.cloud.aiplatform.v1.PredictRequest; | ||
| import com.google.cloud.aiplatform.v1.PredictResponse; | ||
| import com.google.cloud.aiplatform.v1.PredictionServiceClient; | ||
| import org.springframework.ai.embedding.EmbeddingRequest; | ||
| import org.springframework.ai.vertexai.embedding.VertexAiEmbeddingConnectionDetails; | ||
| import org.springframework.retry.support.RetryTemplate; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| public class TestVertexAiTextEmbeddingModel extends VertexAiTextEmbeddingModel { | ||
|
|
||
| private PredictionServiceClient mockPredictionServiceClient; | ||
|
|
||
| private PredictRequest.Builder mockPredictRequestBuilder; | ||
|
|
||
| public TestVertexAiTextEmbeddingModel(VertexAiEmbeddingConnectionDetails connectionDetails, | ||
| VertexAiTextEmbeddingOptions defaultEmbeddingOptions, RetryTemplate retryTemplate) { | ||
| super(connectionDetails, defaultEmbeddingOptions, retryTemplate); | ||
| } | ||
|
|
||
| public void setMockPredictionServiceClient(PredictionServiceClient mockPredictionServiceClient) { | ||
| this.mockPredictionServiceClient = mockPredictionServiceClient; | ||
| } | ||
|
|
||
| @Override | ||
| PredictionServiceClient createPredictionServiceClient() { | ||
| if (mockPredictionServiceClient != null) { | ||
| return mockPredictionServiceClient; | ||
| } | ||
| return super.createPredictionServiceClient(); | ||
| } | ||
|
|
||
| @Override | ||
| PredictResponse getPredictResponse(PredictionServiceClient client, PredictRequest.Builder predictRequestBuilder) { | ||
| if (mockPredictionServiceClient != null) { | ||
| return mockPredictionServiceClient.predict(predictRequestBuilder.build()); | ||
| } | ||
| return super.getPredictResponse(client, predictRequestBuilder); | ||
| } | ||
|
|
||
| public void setMockPredictRequestBuilder(PredictRequest.Builder mockPredictRequestBuilder) { | ||
| this.mockPredictRequestBuilder = mockPredictRequestBuilder; | ||
| } | ||
|
|
||
| @Override | ||
| protected PredictRequest.Builder getPredictRequestBuilder(EmbeddingRequest request, EndpointName endpointName, | ||
| VertexAiTextEmbeddingOptions finalOptions) { | ||
| if (mockPredictRequestBuilder != null) { | ||
| return mockPredictRequestBuilder; | ||
| } | ||
| return super.getPredictRequestBuilder(request, endpointName, finalOptions); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.