Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: support read apikey from system env #26

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat: support read apikey from system env #26

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1964119
feat: support read apikey from system env
yuluo-yx Sep 24, 2024
4147474
fix
yuluo-yx Sep 24, 2024
e25b59c
fix
yuluo-yx Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions ...rc/main/java/com/alibaba/cloud/ai/autoconfigure/dashscope/DashScopeAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,13 @@

import com.alibaba.cloud.ai.dashscope.api.DashScopeAgentApi;
import com.alibaba.cloud.ai.dashscope.api.DashScopeImageApi;
import com.alibaba.cloud.ai.dashscope.common.DashScopeApiConstants;
import com.alibaba.cloud.ai.dashscope.embedding.DashScopeEmbeddingModel;
import com.alibaba.cloud.ai.dashscope.api.DashScopeApi;
import com.alibaba.cloud.ai.dashscope.chat.DashScopeChatModel;
import com.alibaba.cloud.ai.dashscope.image.DashScopeImageModel;
import com.alibaba.dashscope.audio.asr.transcription.Transcription;
import com.alibaba.dashscope.audio.tts.SpeechSynthesizer;
import com.alibaba.dashscope.exception.NoApiKeyException;
import com.alibaba.dashscope.utils.ApiKey;
import com.alibaba.dashscope.utils.Constants;
import org.jetbrains.annotations.NotNull;

import org.springframework.ai.autoconfigure.retry.SpringAiRetryAutoConfiguration;
Expand Down Expand Up @@ -61,16 +59,14 @@
import org.springframework.web.client.RestClient;
import org.springframework.web.reactive.function.client.WebClient;

import static com.alibaba.cloud.ai.dashscope.common.DashScopeApiConstants.DASHSCOPE_API_KEY;

/**
* @author nuocheng.lxm
* @author yuluo
* @since 2024/8/16 11:45
*/
@ConditionalOnClass(DashScopeApi.class)
@AutoConfiguration(after = { RestClientAutoConfiguration.class, WebClientAutoConfiguration.class,
SpringAiRetryAutoConfiguration.class })
@ConditionalOnClass(DashScopeApi.class)
@EnableConfigurationProperties({ DashScopeConnectionProperties.class, DashScopeChatProperties.class,
DashScopeImageProperties.class, DashScopeAudioTranscriptionProperties.class,
DashScopeAudioSpeechProperties.class, DashScopeEmbeddingProperties.class })
Expand Down Expand Up @@ -146,7 +142,6 @@ public DashScopeEmbeddingModel dashscopeEmbeddingModel(DashScopeConnectionProper
public DashScopeApi dashscopeEmbeddingApi(DashScopeConnectionProperties commonProperties,
DashScopeEmbeddingProperties embeddingProperties, RestClient.Builder restClientBuilder,
WebClient.Builder webClientBuilder, ResponseErrorHandler responseErrorHandler) {

DashScopeAutoConfiguration.ResolvedConnectionProperties resolved = resolveConnectionProperties(commonProperties,
embeddingProperties, "embedding");

Expand Down Expand Up @@ -197,6 +192,7 @@ public DashScopeImageModel dashScopeImageModel(DashScopeConnectionProperties com
@Bean
@ConditionalOnMissingBean
public FunctionCallbackContext springAiFunctionManager(ApplicationContext context) {

FunctionCallbackContext manager = new FunctionCallbackContext();
manager.setApplicationContext(context);
return manager;
Expand All @@ -221,6 +217,13 @@ private record ResolvedConnectionProperties(String baseUrl, String apiKey, Strin
connectionHeaders.put("DashScope-Workspace", List.of(workspaceId));
}

// get apikey from system env.
if (Objects.isNull(apiKey)) {
if (Objects.nonNull(System.getenv(DashScopeApiConstants.DASHSCOPE_API_KEY))) {
apiKey = System.getenv(DashScopeApiConstants.DASHSCOPE_API_KEY);
}
}

Assert.hasText(baseUrl,
"DashScope base URL must be set. Use the connection property: spring.ai.dashscope.base-url or spring.ai.dashscope."
+ modelType + ".base-url property.");
Expand Down