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

Update Azure OpenAI to check ModelAuthProvider during Embedding and Image model creation #1162

Merged
merged 1 commit into from
Dec 16, 2024
Merged

Update Azure OpenAI to check ModelAuthProvider during Embedding and Image model creation #1162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions ...rc/main/java/io/quarkiverse/langchain4j/azure/openai/deployment/AzureOpenAiProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,17 @@ void generateBeans(AzureOpenAiRecorder recorder,
for (var selected : selectedEmbedding) {
if (PROVIDER.equals(selected.getProvider())) {
String configName = selected.getConfigName();

var embeddingModel = recorder.embeddingModel(config, configName);
var builder = SyntheticBeanBuildItem
.configure(EMBEDDING_MODEL)
.setRuntimeInit()
.unremovable()
.defaultBean()
.scope(ApplicationScoped.class)
.supplier(recorder.embeddingModel(config, configName));
.addInjectionPoint(ParameterizedType.create(DotNames.CDI_INSTANCE,
new Type[] { ClassType.create(DotNames.MODEL_AUTH_PROVIDER) }, null))
.createWith(embeddingModel);
addQualifierIfNecessary(builder, configName);
beanProducer.produce(builder.done());
}
Expand All @@ -136,12 +140,16 @@ void generateBeans(AzureOpenAiRecorder recorder,
for (var selected : selectedImage) {
if (PROVIDER.equals(selected.getProvider())) {
String configName = selected.getConfigName();

var imageModel = recorder.imageModel(config, configName);
var builder = SyntheticBeanBuildItem
.configure(IMAGE_MODEL)
.setRuntimeInit()
.defaultBean()
.scope(ApplicationScoped.class)
.supplier(recorder.imageModel(config, configName));
.addInjectionPoint(ParameterizedType.create(DotNames.CDI_INSTANCE,
new Type[] { ClassType.create(DotNames.MODEL_AUTH_PROVIDER) }, null))
.createWith(imageModel);
addQualifierIfNecessary(builder, configName);
beanProducer.produce(builder.done());
}
Expand Down
30 changes: 16 additions & 14 deletions ...me/src/main/java/io/quarkiverse/langchain4j/azure/openai/runtime/AzureOpenAiRecorder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,16 +153,14 @@ public StreamingChatLanguageModel apply(SyntheticCreationalContext<StreamingChat
}
}

public Supplier<EmbeddingModel> embeddingModel(LangChain4jAzureOpenAiConfig runtimeConfig, String configName) {
public Function<SyntheticCreationalContext<EmbeddingModel>, EmbeddingModel> embeddingModel(
LangChain4jAzureOpenAiConfig runtimeConfig, String configName) {
LangChain4jAzureOpenAiConfig.AzureAiConfig azureAiConfig = correspondingAzureOpenAiConfig(runtimeConfig, configName);

if (azureAiConfig.enableIntegration()) {
EmbeddingModelConfig embeddingModelConfig = azureAiConfig.embeddingModel();
String apiKey = azureAiConfig.apiKey().orElse(null);
String adToken = azureAiConfig.adToken().orElse(null);
if (apiKey == null && adToken == null) {
throw new ConfigValidationException(createKeyMisconfigurationProblem(configName));
}
var builder = AzureOpenAiEmbeddingModel.builder()
.endpoint(getEndpoint(azureAiConfig, configName, EndpointType.EMBEDDING))
.apiKey(apiKey)
Expand All @@ -174,29 +172,31 @@ public Supplier<EmbeddingModel> embeddingModel(LangChain4jAzureOpenAiConfig runt
.logRequests(firstOrDefault(false, embeddingModelConfig.logRequests(), azureAiConfig.logRequests()))
.logResponses(firstOrDefault(false, embeddingModelConfig.logResponses(), azureAiConfig.logResponses()));

return new Supplier<>() {
return new Function<>() {
@Override
public EmbeddingModel get() {
public EmbeddingModel apply(SyntheticCreationalContext<EmbeddingModel> context) {
throwIfApiKeysNotConfigured(apiKey, adToken, isAuthProviderAvailable(context, configName),
configName);
return builder.build();
}
};
} else {
return new Supplier<>() {
return new Function<>() {
@Override
public EmbeddingModel get() {
public EmbeddingModel apply(SyntheticCreationalContext<EmbeddingModel> context) {
return new DisabledEmbeddingModel();
}
};
}
}

public Supplier<ImageModel> imageModel(LangChain4jAzureOpenAiConfig runtimeConfig, String configName) {
public Function<SyntheticCreationalContext<ImageModel>, ImageModel> imageModel(LangChain4jAzureOpenAiConfig runtimeConfig,
String configName) {
LangChain4jAzureOpenAiConfig.AzureAiConfig azureAiConfig = correspondingAzureOpenAiConfig(runtimeConfig, configName);

if (azureAiConfig.enableIntegration()) {
var apiKey = azureAiConfig.apiKey().orElse(null);
String adToken = azureAiConfig.adToken().orElse(null);
throwIfApiKeysNotConfigured(apiKey, adToken, false, configName);

var imageModelConfig = azureAiConfig.imageModel();
var builder = AzureOpenAiImageModel.builder()
Expand Down Expand Up @@ -236,16 +236,18 @@ public Optional<? extends Path> get() {

builder.persistDirectory(persistDirectory);

return new Supplier<>() {
return new Function<>() {
@Override
public ImageModel get() {
public ImageModel apply(SyntheticCreationalContext<ImageModel> context) {
throwIfApiKeysNotConfigured(apiKey, adToken, isAuthProviderAvailable(context, configName),
configName);
return builder.build();
}
};
} else {
return new Supplier<>() {
return new Function<>() {
@Override
public ImageModel get() {
public ImageModel apply(SyntheticCreationalContext<ImageModel> context) {
return new DisabledImageModel();
}
};
Expand Down
4 changes: 2 additions & 2 deletions ...o/quarkiverse/langchain4j/azure/openai/runtime/DisabledModelsAzureOpenAiRecorderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ void disabledStreamingChatModel() {

@Test
void disabledEmbeddingModel() {
assertThat(recorder.embeddingModel(config, NamedConfigUtil.DEFAULT_NAME).get())
assertThat(recorder.embeddingModel(config, NamedConfigUtil.DEFAULT_NAME).apply(null))
.isNotNull()
.isExactlyInstanceOf(DisabledEmbeddingModel.class);
}

@Test
void disabledImageModel() {
assertThat(recorder.imageModel(config, NamedConfigUtil.DEFAULT_NAME).get())
assertThat(recorder.imageModel(config, NamedConfigUtil.DEFAULT_NAME).apply(null))
.isNotNull()
.isExactlyInstanceOf(DisabledImageModel.class);
}
Expand Down
Loading