modelTuple) {
- for(final Model model : modelTuple._1.getModels()) {
- if (isSameAsFirst(modelTuple._2, model) || !isOperational(model, request.getConfig())) {
- continue;
- }
-
- request.getPayload().put(AiKeys.MODEL, model.getName());
- final AIResponseData responseData = sendRequest(
- client,
- evaluator,
- request,
- output,
- Tuple.of(modelTuple._1, model));
- if (responseData.isSuccess()) {
- return responseData;
- }
- }
-
- return null;
- }
-
-}
diff --git a/dotCMS/src/main/java/com/dotcms/ai/client/AIProxyClient.java b/dotCMS/src/main/java/com/dotcms/ai/client/AIProxyClient.java
index b8776fe6db6c..3f5cfc57b04c 100644
--- a/dotCMS/src/main/java/com/dotcms/ai/client/AIProxyClient.java
+++ b/dotCMS/src/main/java/com/dotcms/ai/client/AIProxyClient.java
@@ -1,7 +1,6 @@
package com.dotcms.ai.client;
-import com.dotcms.ai.client.openai.OpenAIClient;
-import com.dotcms.ai.client.openai.OpenAIResponseEvaluator;
+import com.dotcms.ai.client.langchain4j.LangChain4jAIClient;
import com.dotcms.ai.domain.AIProvider;
import com.dotcms.ai.domain.AIResponse;
import io.vavr.Lazy;
@@ -39,9 +38,9 @@ public class AIProxyClient {
private AIProxyClient() {
proxiedClients = new ConcurrentHashMap<>();
addClient(
- AIProvider.OPEN_AI.name(),
- AIProxiedClient.of(OpenAIClient.get(), AIProxyStrategy.MODEL_FALLBACK, OpenAIResponseEvaluator.get()));
- currentProvider = new AtomicReference<>(AIProvider.OPEN_AI);
+ AIProvider.LANGCHAIN4J.name(),
+ AIProxiedClient.of(LangChain4jAIClient.get(), AIProxyStrategy.DEFAULT));
+ currentProvider = new AtomicReference<>(AIProvider.LANGCHAIN4J);
}
public static AIProxyClient get() {
diff --git a/dotCMS/src/main/java/com/dotcms/ai/client/AIProxyStrategy.java b/dotCMS/src/main/java/com/dotcms/ai/client/AIProxyStrategy.java
index 08b2c34f0a6b..80f2e5b34e40 100644
--- a/dotCMS/src/main/java/com/dotcms/ai/client/AIProxyStrategy.java
+++ b/dotCMS/src/main/java/com/dotcms/ai/client/AIProxyStrategy.java
@@ -4,9 +4,8 @@
* Enumeration representing different strategies for proxying AI client requests.
*
*
- * This enum provides different strategies for handling AI client requests, including
- * a default strategy and a model fallback strategy. Each strategy is associated with
- * an implementation of the {@link AIClientStrategy} interface.
+ * This enum provides strategies for handling AI client requests. Each strategy is
+ * associated with an implementation of the {@link AIClientStrategy} interface.
*
*
*
@@ -18,8 +17,7 @@
*/
public enum AIProxyStrategy {
- DEFAULT(new AIDefaultStrategy()),
- MODEL_FALLBACK(new AIModelFallbackStrategy());
+ DEFAULT(new AIDefaultStrategy());
private final AIClientStrategy strategy;
diff --git a/dotCMS/src/main/java/com/dotcms/ai/client/langchain4j/LangChain4jAIClient.java b/dotCMS/src/main/java/com/dotcms/ai/client/langchain4j/LangChain4jAIClient.java
new file mode 100644
index 000000000000..32fae81c14a9
--- /dev/null
+++ b/dotCMS/src/main/java/com/dotcms/ai/client/langchain4j/LangChain4jAIClient.java
@@ -0,0 +1,414 @@
+package com.dotcms.ai.client.langchain4j;
+
+import com.dotcms.ai.AiKeys;
+import com.dotcms.ai.app.AIModelType;
+import com.dotcms.ai.app.AppConfig;
+import com.dotcms.ai.client.AIClient;
+import com.dotcms.ai.client.AIRequest;
+import com.dotcms.ai.client.JSONObjectAIRequest;
+import com.dotcms.ai.domain.AIProvider;
+import com.dotcms.ai.exception.DotAIAppConfigDisabledException;
+import com.dotcms.ai.exception.DotAIClientConnectException;
+import com.dotcms.rest.api.v1.DotObjectMapperProvider;
+import com.dotmarketing.util.Logger;
+import com.dotmarketing.util.json.JSONArray;
+import com.dotmarketing.util.json.JSONObject;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import dev.langchain4j.data.embedding.Embedding;
+import dev.langchain4j.data.image.Image;
+import dev.langchain4j.data.message.AiMessage;
+import dev.langchain4j.data.message.ChatMessage;
+import dev.langchain4j.data.message.SystemMessage;
+import dev.langchain4j.data.message.UserMessage;
+import dev.langchain4j.data.segment.TextSegment;
+import dev.langchain4j.model.chat.ChatModel;
+import dev.langchain4j.model.chat.StreamingChatModel;
+import dev.langchain4j.model.chat.request.ChatRequest;
+import dev.langchain4j.model.chat.response.ChatResponse;
+import dev.langchain4j.model.chat.response.StreamingChatResponseHandler;
+import dev.langchain4j.model.embedding.EmbeddingModel;
+import dev.langchain4j.model.image.ImageModel;
+import dev.langchain4j.model.output.FinishReason;
+import dev.langchain4j.model.output.Response;
+import dev.langchain4j.model.output.TokenUsage;
+import io.vavr.Lazy;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
+import com.google.common.util.concurrent.UncheckedExecutionException;
+
+/**
+ * {@link AIClient} implementation backed by LangChain4J.
+ *
+ *
Replaces the custom OpenAI HTTP client ({@code OpenAIClient}) with a unified LangChain4J
+ * abstraction layer that supports multiple AI providers without custom HTTP handling.
+ *
+ *
Model instances are cached per host and provider configuration to avoid rebuilding
+ * them on every request. The cache key is {@code hostname:configHash:type} where
+ * {@code configHash} is the SHA-256 hex digest of the {@code providerConfig} JSON (credentials
+ * are never stored in heap keys) and {@code type} is {@code chat}, {@code embeddings},
+ * or {@code image}.
+ *
+ *
The response JSON is formatted in OpenAI-compatible structure so that all
+ * existing upper-layer code ({@code CompletionsAPIImpl}, {@code EmbeddingsAPIImpl}, etc.)
+ * can parse it without modification.
+ */
+public class LangChain4jAIClient implements AIClient {
+
+ private static final Lazy INSTANCE = Lazy.of(LangChain4jAIClient::new);
+ private static final ObjectMapper MAPPER = DotObjectMapperProvider.createDefaultMapper();
+ private static final long MODEL_CACHE_TTL_HOURS = 1;
+ private static final long STREAMING_TIMEOUT_SECONDS = 300;
+
+ private final Cache chatModelCache = CacheBuilder.newBuilder()
+ .expireAfterWrite(MODEL_CACHE_TTL_HOURS, TimeUnit.HOURS)
+ .build();
+ private final Cache streamingChatModelCache = CacheBuilder.newBuilder()
+ .expireAfterWrite(MODEL_CACHE_TTL_HOURS, TimeUnit.HOURS)
+ .build();
+ private final Cache embeddingModelCache = CacheBuilder.newBuilder()
+ .expireAfterWrite(MODEL_CACHE_TTL_HOURS, TimeUnit.HOURS)
+ .build();
+ private final Cache imageModelCache = CacheBuilder.newBuilder()
+ .expireAfterWrite(MODEL_CACHE_TTL_HOURS, TimeUnit.HOURS)
+ .build();
+
+ private LangChain4jAIClient() {}
+
+ public static LangChain4jAIClient get() {
+ return INSTANCE.get();
+ }
+
+ /**
+ * Evicts cached model instances for the specified host. Should be called when the provider
+ * config for a host changes (e.g., API key rotation) to ensure stale credentials are not reused.
+ *
+ * Cache keys are prefixed with the hostname, so only entries for the affected host
+ * are invalidated — other hosts' cached models are unaffected.
+ *
+ * @param hostname the hostname whose cached models should be evicted
+ */
+ public void flushCachesForHost(final String hostname) {
+ final String prefix = hostname + ":";
+ chatModelCache.asMap().keySet().removeIf(key -> key.startsWith(prefix));
+ streamingChatModelCache.asMap().keySet().removeIf(key -> key.startsWith(prefix));
+ embeddingModelCache.asMap().keySet().removeIf(key -> key.startsWith(prefix));
+ imageModelCache.asMap().keySet().removeIf(key -> key.startsWith(prefix));
+ }
+
+ @Override
+ public AIProvider getProvider() {
+ return AIProvider.LANGCHAIN4J;
+ }
+
+ /**
+ * Executes the AI request and writes an OpenAI-compatible JSON response to {@code output}.
+ *
+ *
Routing is determined by {@link AIModelType} in the request:
+ *
+ * - {@code TEXT} → chat completion
+ * - {@code EMBEDDINGS} → embedding generation
+ * - {@code IMAGE} → image generation
+ *
+ */
+ @Override
+ public void sendRequest(final AIRequest request, final OutputStream output) {
+ final JSONObjectAIRequest jsonRequest = AIClient.useRequestOrThrow(request);
+ final AppConfig appConfig = jsonRequest.getConfig();
+
+ if (!appConfig.isEnabled()) {
+ throw new DotAIAppConfigDisabledException("App dotAI config is not enabled — set providerConfig");
+ }
+
+ final String providerConfigJson = appConfig.getProviderConfig();
+ final AIModelType type = jsonRequest.getType();
+ final JSONObject payload = jsonRequest.getPayload();
+
+ AppConfig.debugLogger(appConfig, LangChain4jAIClient.class,
+ () -> "LangChain4jAIClient: type=" + type + " payload=" + payload.toString(2));
+
+ final String cacheKeyPrefix = appConfig.getHost() + ":" + appConfig.getProviderConfigHash();
+
+ if (type == AIModelType.IMAGE) {
+ writeToOutput(executeImageRequest(cacheKeyPrefix, providerConfigJson, payload), output);
+ } else if (type == AIModelType.EMBEDDINGS) {
+ writeToOutput(executeEmbeddingRequest(cacheKeyPrefix, providerConfigJson, payload), output);
+ } else if (Boolean.TRUE.equals(payload.opt(AiKeys.STREAM))) {
+ executeStreamingChatRequest(cacheKeyPrefix, providerConfigJson, payload, output);
+ } else {
+ writeToOutput(executeChatRequest(cacheKeyPrefix, providerConfigJson, payload), output);
+ }
+ }
+
+ private String executeChatRequest(final String cacheKeyPrefix, final String providerConfigJson, final JSONObject payload) {
+ final ChatModel model;
+ try {
+ model = chatModelCache.get(
+ cacheKeyPrefix + ":chat",
+ () -> LangChain4jModelFactory.buildChatModel(parseSection(providerConfigJson, "chat")));
+ } catch (ExecutionException | UncheckedExecutionException e) {
+ final Throwable cause = e.getCause() != null ? e.getCause() : e;
+ throw new IllegalArgumentException("Failed to initialize chat model: " + cause.getMessage(), cause);
+ }
+
+ final List messages = toMessages(payload.optJSONArray(AiKeys.MESSAGES));
+ if (messages.isEmpty()) {
+ throw new IllegalArgumentException("Chat request must contain at least one message");
+ }
+
+ final ChatResponse response = model.chat(
+ ChatRequest.builder().messages(messages).build());
+ return toChatResponseJson(response);
+ }
+
+ private void executeStreamingChatRequest(final String cacheKeyPrefix,
+ final String providerConfigJson,
+ final JSONObject payload,
+ final OutputStream output) {
+ final StreamingChatModel model;
+ try {
+ model = streamingChatModelCache.get(
+ cacheKeyPrefix + ":chat:streaming",
+ () -> LangChain4jModelFactory.buildStreamingChatModel(parseSection(providerConfigJson, "chat")));
+ } catch (ExecutionException | UncheckedExecutionException e) {
+ final Throwable cause = e.getCause() != null ? e.getCause() : e;
+ throw new IllegalArgumentException("Failed to initialize streaming chat model: " + cause.getMessage(), cause);
+ }
+
+ final List messages = toMessages(payload.optJSONArray(AiKeys.MESSAGES));
+ if (messages.isEmpty()) {
+ throw new IllegalArgumentException("Chat request must contain at least one message");
+ }
+
+ final ChatRequest chatRequest = ChatRequest.builder().messages(messages).build();
+
+ final CountDownLatch latch = new CountDownLatch(1);
+ final AtomicReference error = new AtomicReference<>();
+ final AtomicReference cancelled = new AtomicReference<>(false);
+
+ model.chat(chatRequest, new StreamingChatResponseHandler() {
+ @Override
+ public void onPartialResponse(final String token) {
+ if (cancelled.get()) {
+ return;
+ }
+ try {
+ output.write(toSseChunk(token).getBytes(StandardCharsets.UTF_8));
+ } catch (IOException e) {
+ error.set(e);
+ latch.countDown();
+ }
+ }
+
+ @Override
+ public void onCompleteResponse(final ChatResponse response) {
+ try {
+ output.write("data: [DONE]\n\n".getBytes(StandardCharsets.UTF_8));
+ } catch (IOException e) {
+ Logger.warn(LangChain4jAIClient.class, "Failed to write [DONE] marker: " + e.getMessage());
+ } finally {
+ latch.countDown();
+ }
+ }
+
+ @Override
+ public void onError(final Throwable e) {
+ error.set(e);
+ latch.countDown();
+ }
+ });
+
+ try {
+ final boolean completed = latch.await(STREAMING_TIMEOUT_SECONDS, TimeUnit.SECONDS);
+ if (!completed) {
+ cancelled.set(true);
+ throw new DotAIClientConnectException(
+ "Streaming timed out after " + STREAMING_TIMEOUT_SECONDS + " seconds",
+ new java.util.concurrent.TimeoutException());
+ }
+ } catch (InterruptedException e) {
+ cancelled.set(true);
+ Thread.currentThread().interrupt();
+ throw new DotAIClientConnectException("Streaming interrupted: " + e.getMessage(), e);
+ }
+
+ if (error.get() != null) {
+ final Throwable t = error.get();
+ throw new DotAIClientConnectException("Streaming failed: " + t.getMessage(), t);
+ }
+ }
+
+ private static String toSseChunk(final String token) {
+ final JSONObject delta = new JSONObject();
+ delta.put(AiKeys.CONTENT, token);
+ final JSONObject choice = new JSONObject();
+ choice.put("delta", delta);
+ choice.put(AiKeys.INDEX, 0);
+ final JSONArray choices = new JSONArray();
+ choices.put(choice);
+ final JSONObject chunk = new JSONObject();
+ chunk.put("choices", choices);
+ return "data: " + chunk + "\n\n";
+ }
+
+ private void writeToOutput(final String responseJson, final OutputStream output) {
+ try {
+ output.write(responseJson.getBytes(StandardCharsets.UTF_8));
+ } catch (IOException e) {
+ Logger.error(this, "Failed to write AI response to output stream: " + e.getMessage(), e);
+ throw new DotAIClientConnectException("Failed to write AI response to output stream: " + e.getMessage(), e);
+ }
+ }
+
+ private String executeEmbeddingRequest(final String cacheKeyPrefix, final String providerConfigJson, final JSONObject payload) {
+ final EmbeddingModel model;
+ try {
+ model = embeddingModelCache.get(
+ cacheKeyPrefix + ":embeddings",
+ () -> LangChain4jModelFactory.buildEmbeddingModel(parseSection(providerConfigJson, "embeddings")));
+ } catch (ExecutionException | UncheckedExecutionException e) {
+ final Throwable cause = e.getCause() != null ? e.getCause() : e;
+ throw new IllegalArgumentException("Failed to initialize embedding model: " + cause.getMessage(), cause);
+ }
+
+ final String input = payload.getString(AiKeys.INPUT);
+ final Response response = model.embed(TextSegment.from(input));
+ return toEmbeddingResponseJson(response.content());
+ }
+
+ private String executeImageRequest(final String cacheKeyPrefix, final String providerConfigJson, final JSONObject payload) {
+ final ImageModel model;
+ try {
+ model = imageModelCache.get(
+ cacheKeyPrefix + ":image",
+ () -> LangChain4jModelFactory.buildImageModel(parseSection(providerConfigJson, "image")));
+ } catch (ExecutionException | UncheckedExecutionException e) {
+ final Throwable cause = e.getCause() != null ? e.getCause() : e;
+ throw new IllegalArgumentException("Failed to initialize image model: " + cause.getMessage(), cause);
+ }
+
+ final String prompt = payload.getString(AiKeys.PROMPT);
+ final Response response = model.generate(prompt);
+ return toImageResponseJson(response.content());
+ }
+
+ static List toMessages(final JSONArray messagesArray) {
+ final List messages = new ArrayList<>();
+ if (messagesArray == null) {
+ return messages;
+ }
+ for (int i = 0; i < messagesArray.length(); i++) {
+ final JSONObject msg = messagesArray.getJSONObject(i);
+ final String role = msg.optString(AiKeys.ROLE, AiKeys.USER).toLowerCase();
+ final String content = msg.optString(AiKeys.CONTENT, "");
+ if ("system".equals(role)) {
+ messages.add(new SystemMessage(content));
+ } else if ("assistant".equals(role)) {
+ messages.add(new AiMessage(content));
+ } else {
+ messages.add(new UserMessage(content));
+ }
+ }
+ return messages;
+ }
+
+ static String toChatResponseJson(final ChatResponse response) {
+ final JSONObject message = new JSONObject();
+ message.put(AiKeys.ROLE, "assistant");
+ message.put(AiKeys.CONTENT, response.aiMessage().text());
+
+ final FinishReason finishReason = response.finishReason();
+ final JSONObject choice = new JSONObject();
+ choice.put(AiKeys.MESSAGE, message);
+ choice.put(AiKeys.INDEX, 0);
+ choice.put("finish_reason", finishReason != null ? finishReason.name().toLowerCase() : "stop");
+ choice.put("logprobs", JSONObject.NULL);
+
+ final JSONArray choices = new JSONArray();
+ choices.put(choice);
+
+ final TokenUsage tokenUsage = response.tokenUsage();
+ final JSONObject usage = new JSONObject();
+ usage.put("prompt_tokens", tokenUsage != null && tokenUsage.inputTokenCount() != null ? tokenUsage.inputTokenCount() : 0);
+ usage.put("completion_tokens", tokenUsage != null && tokenUsage.outputTokenCount() != null ? tokenUsage.outputTokenCount() : 0);
+ usage.put("total_tokens", tokenUsage != null && tokenUsage.totalTokenCount() != null ? tokenUsage.totalTokenCount() : 0);
+
+ final JSONObject result = new JSONObject();
+ result.put("id", response.id() != null ? response.id() : "chatcmpl-langchain4j");
+ result.put("object", "chat.completion");
+ result.put("created", System.currentTimeMillis() / 1000);
+ result.put(AiKeys.MODEL, response.modelName() != null ? response.modelName() : "unknown");
+ result.put("choices", choices);
+ result.put("usage", usage);
+ result.put("system_fingerprint", JSONObject.NULL);
+ return result.toString();
+ }
+
+ static String toEmbeddingResponseJson(final Embedding embedding) {
+ final JSONArray embeddingArray = new JSONArray();
+ for (final float value : embedding.vector()) {
+ embeddingArray.put((double) value);
+ }
+
+ final JSONObject data = new JSONObject();
+ data.put(AiKeys.EMBEDDING, embeddingArray);
+ data.put(AiKeys.INDEX, 0);
+ data.put("object", "embedding");
+
+ final JSONArray dataArray = new JSONArray();
+ dataArray.put(data);
+
+ final JSONObject result = new JSONObject();
+ result.put(AiKeys.DATA, dataArray);
+ return result.toString();
+ }
+
+ static String toImageResponseJson(final Image image) {
+ final JSONObject data = new JSONObject();
+ if (image != null && image.url() != null) {
+ data.put(AiKeys.URL, image.url().toString());
+ } else if (image != null && image.base64Data() != null) {
+ data.put(AiKeys.URL, "");
+ data.put(AiKeys.B64_JSON, image.base64Data());
+ } else {
+ data.put(AiKeys.URL, "");
+ }
+
+ final JSONArray dataArray = new JSONArray();
+ dataArray.put(data);
+
+ final JSONObject result = new JSONObject();
+ result.put(AiKeys.DATA, dataArray);
+ return result.toString();
+ }
+
+ private static ProviderConfig parseSection(final String providerConfigJson, final String section) {
+ try {
+ final JsonNode root = MAPPER.readTree(providerConfigJson);
+ final JsonNode sectionNode = root.get(section);
+ if (sectionNode == null) {
+ throw new IllegalArgumentException(
+ "Missing '" + section + "' section in providerConfig");
+ }
+ return MAPPER.treeToValue(sectionNode, ProviderConfig.class);
+ } catch (IllegalArgumentException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new IllegalArgumentException(
+ "Failed to parse '" + section + "' from providerConfig: " + e.getMessage(), e);
+ }
+ }
+
+}
diff --git a/dotCMS/src/main/java/com/dotcms/ai/client/langchain4j/LangChain4jModelFactory.java b/dotCMS/src/main/java/com/dotcms/ai/client/langchain4j/LangChain4jModelFactory.java
new file mode 100644
index 000000000000..c7eeb2a585ef
--- /dev/null
+++ b/dotCMS/src/main/java/com/dotcms/ai/client/langchain4j/LangChain4jModelFactory.java
@@ -0,0 +1,237 @@
+package com.dotcms.ai.client.langchain4j;
+
+import dev.langchain4j.model.azure.AzureOpenAiChatModel;
+import dev.langchain4j.model.azure.AzureOpenAiEmbeddingModel;
+import dev.langchain4j.model.azure.AzureOpenAiImageModel;
+import dev.langchain4j.model.azure.AzureOpenAiStreamingChatModel;
+import dev.langchain4j.model.chat.ChatModel;
+import dev.langchain4j.model.chat.StreamingChatModel;
+import dev.langchain4j.model.embedding.EmbeddingModel;
+import dev.langchain4j.model.image.ImageModel;
+import dev.langchain4j.model.openai.OpenAiChatModel;
+import dev.langchain4j.model.openai.OpenAiEmbeddingModel;
+import dev.langchain4j.model.openai.OpenAiImageModel;
+import dev.langchain4j.model.openai.OpenAiStreamingChatModel;
+
+import java.time.Duration;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+/**
+ * Factory for creating LangChain4J model instances from a {@link ProviderConfig}.
+ *
+ * This is the only class that contains provider-specific builder logic.
+ * To add support for a new provider, add a case to each switch block below.
+ * No other class needs to change.
+ *
+ *
Supported providers: {@code openai}, {@code azure_openai}
+ *
Planned (Phase 2): {@code bedrock}, {@code vertex_ai}
+ */
+public class LangChain4jModelFactory {
+
+ private LangChain4jModelFactory() {}
+
+ /**
+ * Builds a {@link ChatModel} for the given provider configuration.
+ *
+ * @param config provider-specific configuration for the chat section
+ * @return a configured {@link ChatModel}
+ * @throws IllegalArgumentException if config or provider is null, or the provider is unsupported
+ */
+ public static ChatModel buildChatModel(final ProviderConfig config) {
+ return build(config, "chat",
+ LangChain4jModelFactory::buildOpenAiChatModel,
+ LangChain4jModelFactory::buildAzureOpenAiChatModel);
+ }
+
+ /**
+ * Builds a {@link StreamingChatModel} for the given provider configuration.
+ *
+ * @param config provider-specific configuration for the chat section
+ * @return a configured {@link StreamingChatModel}
+ * @throws IllegalArgumentException if config or provider is null, or the provider is unsupported
+ */
+ public static StreamingChatModel buildStreamingChatModel(final ProviderConfig config) {
+ return build(config, "chat",
+ LangChain4jModelFactory::buildOpenAiStreamingChatModel,
+ LangChain4jModelFactory::buildAzureOpenAiStreamingChatModel);
+ }
+
+ /**
+ * Builds an {@link EmbeddingModel} for the given provider configuration.
+ *
+ * @param config provider-specific configuration for the embeddings section
+ * @return a configured {@link EmbeddingModel}
+ * @throws IllegalArgumentException if config or provider is null, or the provider is unsupported
+ */
+ public static EmbeddingModel buildEmbeddingModel(final ProviderConfig config) {
+ return build(config, "embeddings",
+ LangChain4jModelFactory::buildOpenAiEmbeddingModel,
+ LangChain4jModelFactory::buildAzureOpenAiEmbeddingModel);
+ }
+
+ /**
+ * Builds an {@link ImageModel} for the given provider configuration.
+ *
+ * @param config provider-specific configuration for the image section
+ * @return a configured {@link ImageModel}
+ * @throws IllegalArgumentException if config or provider is null, or the provider is unsupported
+ */
+ public static ImageModel buildImageModel(final ProviderConfig config) {
+ return build(config, "image",
+ LangChain4jModelFactory::buildOpenAiImageModel,
+ LangChain4jModelFactory::buildAzureOpenAiImageModel);
+ }
+
+ private static T build(final ProviderConfig config,
+ final String modelType,
+ final Function openAiFn,
+ final Function azureOpenAiFn) {
+ if (config == null || config.provider() == null) {
+ throw new IllegalArgumentException("ProviderConfig or provider name is null for model type: " + modelType);
+ }
+ requireNonBlank(config.model(), "model", modelType);
+ switch (config.provider().toLowerCase()) {
+ case "openai":
+ validateOpenAi(config, modelType);
+ return openAiFn.apply(config);
+ case "azure_openai":
+ validateAzureOpenAi(config, modelType);
+ return azureOpenAiFn.apply(config);
+ default:
+ throw new IllegalArgumentException("Unsupported " + modelType + " provider: "
+ + config.provider() + ". Supported: openai, azure_openai");
+ }
+ }
+
+ private static void validateOpenAi(final ProviderConfig config, final String modelType) {
+ requireNonBlank(config.apiKey(), "apiKey", modelType);
+ }
+
+ private static void validateAzureOpenAi(final ProviderConfig config, final String modelType) {
+ requireNonBlank(config.apiKey(), "apiKey", modelType);
+ requireNonBlank(config.endpoint(), "endpoint", modelType);
+ }
+
+ private static void requireNonBlank(final String value, final String field, final String modelType) {
+ if (value == null || value.isBlank()) {
+ throw new IllegalArgumentException(
+ "providerConfig." + modelType + "." + field + " is required but was not set");
+ }
+ }
+
+ // ── OpenAI builders ───────────────────────────────────────────────────────
+
+ private static void applyCommonConfig(final ProviderConfig config,
+ final Consumer baseUrlFn,
+ final Consumer retriesFn,
+ final Consumer timeoutFn) {
+ if (config.endpoint() != null) baseUrlFn.accept(config.endpoint());
+ if (config.maxRetries() != null) retriesFn.accept(config.maxRetries());
+ if (config.timeout() != null) timeoutFn.accept(Duration.ofSeconds(config.timeout()));
+ }
+
+ private static ChatModel buildOpenAiChatModel(final ProviderConfig config) {
+ final OpenAiChatModel.OpenAiChatModelBuilder builder = OpenAiChatModel.builder()
+ .apiKey(config.apiKey())
+ .modelName(config.model());
+ applyCommonConfig(config, builder::baseUrl, builder::maxRetries, builder::timeout);
+ if (config.temperature() != null) {
+ builder.temperature(config.temperature());
+ }
+ if (config.maxCompletionTokens() != null) {
+ builder.maxCompletionTokens(config.maxCompletionTokens());
+ } else if (config.maxTokens() != null) {
+ builder.maxTokens(config.maxTokens());
+ }
+ return builder.build();
+ }
+
+ private static StreamingChatModel buildOpenAiStreamingChatModel(final ProviderConfig config) {
+ final OpenAiStreamingChatModel.OpenAiStreamingChatModelBuilder builder = OpenAiStreamingChatModel.builder()
+ .apiKey(config.apiKey())
+ .modelName(config.model());
+ applyCommonConfig(config, builder::baseUrl, ignored -> {}, builder::timeout);
+ if (config.temperature() != null) builder.temperature(config.temperature());
+ if (config.maxCompletionTokens() != null) {
+ builder.maxCompletionTokens(config.maxCompletionTokens());
+ } else if (config.maxTokens() != null) {
+ builder.maxTokens(config.maxTokens());
+ }
+ return builder.build();
+ }
+
+ private static EmbeddingModel buildOpenAiEmbeddingModel(final ProviderConfig config) {
+ final OpenAiEmbeddingModel.OpenAiEmbeddingModelBuilder builder = OpenAiEmbeddingModel.builder()
+ .apiKey(config.apiKey())
+ .modelName(config.model());
+ applyCommonConfig(config, builder::baseUrl, builder::maxRetries, builder::timeout);
+ if (config.dimensions() != null) {
+ builder.dimensions(config.dimensions());
+ }
+ return builder.build();
+ }
+
+ private static ImageModel buildOpenAiImageModel(final ProviderConfig config) {
+ final OpenAiImageModel.OpenAiImageModelBuilder builder = OpenAiImageModel.builder()
+ .apiKey(config.apiKey())
+ .modelName(config.model());
+ applyCommonConfig(config, builder::baseUrl, builder::maxRetries, builder::timeout);
+ if (config.size() != null) {
+ builder.size(config.size());
+ }
+ return builder.build();
+ }
+
+ // ── Azure OpenAI builders ─────────────────────────────────────────────────
+
+ private static StreamingChatModel buildAzureOpenAiStreamingChatModel(final ProviderConfig config) {
+ final AzureOpenAiStreamingChatModel.Builder builder = AzureOpenAiStreamingChatModel.builder()
+ .apiKey(config.apiKey())
+ .endpoint(config.endpoint())
+ .deploymentName(config.deploymentName() != null ? config.deploymentName() : config.model());
+ if (config.apiVersion() != null) builder.serviceVersion(config.apiVersion());
+ if (config.maxRetries() != null) builder.maxRetries(config.maxRetries());
+ if (config.timeout() != null) builder.timeout(Duration.ofSeconds(config.timeout()));
+ if (config.temperature() != null) builder.temperature(config.temperature());
+ if (config.maxTokens() != null) builder.maxTokens(config.maxTokens());
+ return builder.build();
+ }
+
+ private static ChatModel buildAzureOpenAiChatModel(final ProviderConfig config) {
+ final AzureOpenAiChatModel.Builder builder = AzureOpenAiChatModel.builder()
+ .apiKey(config.apiKey())
+ .endpoint(config.endpoint())
+ .deploymentName(config.deploymentName() != null ? config.deploymentName() : config.model());
+ if (config.apiVersion() != null) builder.serviceVersion(config.apiVersion());
+ if (config.maxRetries() != null) builder.maxRetries(config.maxRetries());
+ if (config.timeout() != null) builder.timeout(Duration.ofSeconds(config.timeout()));
+ if (config.temperature() != null) builder.temperature(config.temperature());
+ if (config.maxTokens() != null) builder.maxTokens(config.maxTokens());
+ return builder.build();
+ }
+
+ private static EmbeddingModel buildAzureOpenAiEmbeddingModel(final ProviderConfig config) {
+ final AzureOpenAiEmbeddingModel.Builder builder = AzureOpenAiEmbeddingModel.builder()
+ .apiKey(config.apiKey())
+ .endpoint(config.endpoint())
+ .deploymentName(config.deploymentName() != null ? config.deploymentName() : config.model());
+ if (config.apiVersion() != null) builder.serviceVersion(config.apiVersion());
+ if (config.maxRetries() != null) builder.maxRetries(config.maxRetries());
+ if (config.timeout() != null) builder.timeout(Duration.ofSeconds(config.timeout()));
+ return builder.build();
+ }
+
+ private static ImageModel buildAzureOpenAiImageModel(final ProviderConfig config) {
+ final AzureOpenAiImageModel.Builder builder = AzureOpenAiImageModel.builder()
+ .apiKey(config.apiKey())
+ .endpoint(config.endpoint())
+ .deploymentName(config.deploymentName() != null ? config.deploymentName() : config.model());
+ if (config.apiVersion() != null) builder.serviceVersion(config.apiVersion());
+ if (config.maxRetries() != null) builder.maxRetries(config.maxRetries());
+ if (config.timeout() != null) builder.timeout(Duration.ofSeconds(config.timeout()));
+ if (config.size() != null) builder.size(config.size());
+ return builder.build();
+ }
+
+}
diff --git a/dotCMS/src/main/java/com/dotcms/ai/client/langchain4j/ProviderConfig.java b/dotCMS/src/main/java/com/dotcms/ai/client/langchain4j/ProviderConfig.java
new file mode 100644
index 000000000000..26445210c6a4
--- /dev/null
+++ b/dotCMS/src/main/java/com/dotcms/ai/client/langchain4j/ProviderConfig.java
@@ -0,0 +1,80 @@
+package com.dotcms.ai.client.langchain4j;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
+
+import javax.annotation.Nullable;
+
+/**
+ * Immutable representation of a single provider section in the {@code providerConfig} JSON.
+ *
+ * Each section (chat, embeddings, image) in the JSON maps to one instance of this class.
+ * Unknown fields are ignored to allow forward-compatible configuration.
+ *
+ *
Common fields (all providers):
+ *
+ * - {@code provider} – identifier: {@code openai}, {@code azure_openai}, {@code bedrock}, {@code vertex_ai}
+ * - {@code model} – model name or ID
+ * - {@code maxTokens} – max output tokens
+ * - {@code temperature} – sampling temperature (0.0–2.0)
+ * - {@code maxRetries} – retry attempts on transient failures
+ * - {@code timeout} – request timeout in seconds
+ *
+ *
+ * OpenAI / Azure OpenAI:
+ *
+ * - {@code apiKey}
+ * - {@code size} – image size, e.g. {@code 1024x1024} (image only)
+ * - {@code dimensions} – embedding vector size (embeddings only); required for models like {@code text-embedding-3-small/large}
+ * - {@code endpoint} – Azure base URL
+ * - {@code deploymentName} – Azure deployment name
+ * - {@code apiVersion} – Azure API version, e.g. {@code 2024-02-01}
+ *
+ *
+ * AWS Bedrock:
+ *
+ * - {@code region}
+ * - {@code accessKeyId}
+ * - {@code secretAccessKey}
+ *
+ *
+ * Google Vertex AI:
+ *
+ * - {@code projectId}
+ * - {@code location}
+ *
+ */
+@Value.Immutable
+@JsonSerialize(as = ImmutableProviderConfig.class)
+@JsonDeserialize(as = ImmutableProviderConfig.class)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public interface ProviderConfig {
+
+ @Nullable String provider();
+ @Nullable String model();
+ @Nullable Integer maxTokens();
+ @Nullable Integer maxCompletionTokens();
+ @Nullable Double temperature();
+ @Nullable Integer maxRetries();
+ @Nullable Integer timeout();
+
+ // OpenAI / Azure OpenAI
+ @Value.Redacted @Nullable String apiKey();
+ @Nullable String size();
+ @Nullable Integer dimensions();
+ @Nullable String endpoint();
+ @Nullable String deploymentName();
+ @Nullable String apiVersion();
+
+ // AWS Bedrock
+ @Nullable String region();
+ @Value.Redacted @Nullable String accessKeyId();
+ @Value.Redacted @Nullable String secretAccessKey();
+
+ // Google Vertex AI
+ @Nullable String projectId();
+ @Nullable String location();
+
+}
diff --git a/dotCMS/src/main/java/com/dotcms/ai/client/openai/OpenAIClient.java b/dotCMS/src/main/java/com/dotcms/ai/client/openai/OpenAIClient.java
deleted file mode 100644
index 36d138266642..000000000000
--- a/dotCMS/src/main/java/com/dotcms/ai/client/openai/OpenAIClient.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package com.dotcms.ai.client.openai;
-
-import com.dotcms.ai.AiKeys;
-import com.dotcms.ai.app.AIModel;
-import com.dotcms.ai.app.AIModels;
-import com.dotcms.ai.app.AppConfig;
-import com.dotcms.ai.app.AppKeys;
-import com.dotcms.ai.client.AIClient;
-import com.dotcms.ai.client.AIRequest;
-import com.dotcms.ai.client.JSONObjectAIRequest;
-import com.dotcms.ai.domain.AIProvider;
-import com.dotcms.ai.domain.Model;
-import com.dotcms.ai.exception.DotAIAppConfigDisabledException;
-import com.dotcms.ai.exception.DotAIClientConnectException;
-import com.dotcms.ai.exception.DotAIModelNotFoundException;
-import com.dotcms.ai.exception.DotAIModelNotOperationalException;
-import com.dotcms.business.SystemTableUpdatedKeyEvent;
-import com.dotcms.http.CircuitBreakerUrl;
-import com.dotcms.rest.exception.GenericHttpStatusCodeException;
-import com.dotcms.system.event.local.model.EventSubscriber;
-import com.dotmarketing.util.Config;
-import com.dotmarketing.util.Logger;
-import com.dotmarketing.util.json.JSONObject;
-import io.vavr.Lazy;
-import io.vavr.Tuple2;
-
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.core.Response;
-import java.io.OutputStream;
-import java.io.Serializable;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-
-/**
- * Implementation of the {@link AIClient} interface for interacting with the OpenAI service.
- *
- *
- * This class provides methods to send requests to the OpenAI service and handle responses.
- * It includes functionality to manage rate limiting and ensure that models are operational
- * before sending requests.
- *
- *
- *
- * The class uses a singleton pattern to ensure a single instance of the client is used
- * throughout the application. It also maintains a record of the last REST call for each
- * model to enforce rate limiting.
- *
- *
- * @auhor vico
- */
-public class OpenAIClient implements AIClient {
-
- private static final String AI_OPEN_AI_TIMEOUT_KEY = "AI_OPEN_AI_TIMEOUT_KEY";
- private static final String AI_OPEN_AI_ATTEMPTS_KEY = "AI_OPEN_AI_ATTEMPTS_KEY";
- private static final Lazy INSTANCE = Lazy.of(OpenAIClient::new);
-
- public static OpenAIClient get() {
- return INSTANCE.get();
- }
-
- private static long resolveTimeout() {
- return Config.getLongProperty(AI_OPEN_AI_TIMEOUT_KEY, 120 * 1000L);
- }
-
- private static int resolveAttempts() {
- return Config.getIntProperty(AI_OPEN_AI_ATTEMPTS_KEY, 3);
- }
-
- private static CircuitBreakerUrl.Method resolveMethod(final JSONObjectAIRequest request) {
- switch(request.getMethod().toUpperCase()) {
- case HttpMethod.POST:
- return CircuitBreakerUrl.Method.POST;
- case HttpMethod.PUT:
- return CircuitBreakerUrl.Method.PUT;
- case HttpMethod.DELETE:
- return CircuitBreakerUrl.Method.DELETE;
- case HttpMethod.PATCH:
- return CircuitBreakerUrl.Method.PATCH;
- case HttpMethod.GET:
- default:
- return CircuitBreakerUrl.Method.GET;
- }
- }
-
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override
- public AIProvider getProvider() {
- return AIProvider.OPEN_AI;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void sendRequest(final AIRequest request, final OutputStream output) {
- final JSONObjectAIRequest jsonRequest = AIClient.useRequestOrThrow(request);
- final AppConfig appConfig = jsonRequest.getConfig();
-
- appConfig.debugLogger(
- OpenAIClient.class,
- () -> String.format(
- "Posting to [%s] with method [%s]%s with app config:%s%s the payload: %s",
- jsonRequest.getUrl(),
- jsonRequest.getMethod(),
- System.lineSeparator(),
- appConfig,
- System.lineSeparator(),
- jsonRequest.payloadToString()));
-
- if (!appConfig.isEnabled()) {
- appConfig.debugLogger(OpenAIClient.class, () -> "App dotAI is not enabled and will not send request.");
- throw new DotAIAppConfigDisabledException("App dotAI config without API urls or API key");
- }
-
- final JSONObject payload = jsonRequest.getPayload();
- final String modelName = Optional
- .ofNullable(payload.optString(AiKeys.MODEL))
- .orElseThrow(() -> new DotAIModelNotFoundException("Model is not present in the request"));
- final Tuple2 modelTuple = appConfig.resolveModelOrThrow(modelName, jsonRequest.getType());
- //final AIModel aiModel = modelTuple._1;
-
- if (!modelTuple._2.isOperational()) {
- appConfig.debugLogger(
- getClass(),
- () -> String.format("Resolved model [%s] is not operational, avoiding its usage", modelName));
- throw new DotAIModelNotOperationalException(String.format("Model [%s] is not operational", modelName));
- }
-
- try {
- CircuitBreakerUrl.builder()
- .setMethod(resolveMethod(jsonRequest))
- .setAuthHeaders(AIModels.BEARER + appConfig.getApiKey())
- .setUrl(jsonRequest.getUrl())
- .setRawData(payload.toString())
- .setTimeout(resolveTimeout())
- .setTryAgainAttempts(resolveAttempts())
- .setOverrideException(statusCode -> resolveException(jsonRequest, modelName, statusCode))
- .setRaiseFailsafe(true)
- .build()
- .doOut(output);
- } catch (DotAIModelNotFoundException e) {
- throw e;
- } catch (Exception e) {
- if (appConfig.getConfigBoolean(AppKeys.DEBUG_LOGGING)) {
- Logger.warn(this, "INVALID REQUEST: " + e.getMessage(), e);
- } else {
- Logger.warn(this, "INVALID REQUEST: " + e.getMessage());
- }
-
- Logger.warn(this, " - " + jsonRequest.getMethod() + " : " + payload);
-
- throw new DotAIClientConnectException("Error while sending request to OpenAI", e);
- }
- }
-
- private Exception resolveException(final JSONObjectAIRequest jsonRequest,
- final String modelName,
- final int statusCode) {
- return statusCode == 404
- ? new DotAIModelNotFoundException(String.format("Model [%s] not found", modelName))
- : new GenericHttpStatusCodeException(
- String.format(
- "Got invalid response for url: [%s] response: [%d]",
- jsonRequest.getUrl(),
- statusCode),
- Response.Status.fromStatusCode(statusCode));
- }
-}
diff --git a/dotCMS/src/main/java/com/dotcms/ai/client/openai/OpenAIResponseEvaluator.java b/dotCMS/src/main/java/com/dotcms/ai/client/openai/OpenAIResponseEvaluator.java
deleted file mode 100644
index 268fc834cdfd..000000000000
--- a/dotCMS/src/main/java/com/dotcms/ai/client/openai/OpenAIResponseEvaluator.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.dotcms.ai.client.openai;
-
-import com.dotcms.ai.AiKeys;
-import com.dotcms.ai.client.AIResponseEvaluator;
-import com.dotcms.ai.domain.AIResponseData;
-import com.dotcms.ai.domain.ModelStatus;
-import com.dotcms.ai.exception.DotAIModelNotFoundException;
-import com.dotcms.ai.exception.DotAIModelNotOperationalException;
-import com.dotcms.rest.exception.GenericHttpStatusCodeException;
-import com.dotmarketing.exception.DotRuntimeException;
-import com.dotmarketing.util.json.JSONObject;
-import io.vavr.Lazy;
-
-import javax.ws.rs.core.Response;
-import java.util.Optional;
-import java.util.stream.Stream;
-
-/**
- * Evaluates AI responses from OpenAI and updates the provided metadata.
- * This class implements the singleton pattern and provides methods to process responses and exceptions.
- *
- * Methods:
- *
- * - \fromResponse\ - Processes a response string and updates the metadata.
- * - \fromThrowable\ - Processes an exception and updates the metadata.
- *
- *
- * @author vico
- */
-public class OpenAIResponseEvaluator implements AIResponseEvaluator {
-
- private static final String JSON_ERROR_FIELD = "\"error\":";
- private static final Lazy INSTANCE = Lazy.of(OpenAIResponseEvaluator::new);
-
- public static OpenAIResponseEvaluator get() {
- return INSTANCE.get();
- }
-
- private OpenAIResponseEvaluator() {}
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void fromResponse(final String response, final AIResponseData metadata, final boolean jsonExpected) {
- Optional.ofNullable(response)
- .ifPresent(resp -> {
- if (jsonExpected || resp.contains(JSON_ERROR_FIELD)) {
- final JSONObject jsonResponse = new JSONObject(resp);
- if (jsonResponse.has(AiKeys.ERROR)) {
- final JSONObject error = jsonResponse.getJSONObject(AiKeys.ERROR);
- final String message = error.getString(AiKeys.MESSAGE);
- metadata.setError(message);
- metadata.setStatus(resolveStatus(message));
- }
- }
- });
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void fromException(final Throwable exception, final AIResponseData metadata) {
- metadata.setError(exception.getMessage());
- metadata.setStatus(resolveStatus(exception));
- metadata.setException(exception instanceof DotRuntimeException
- ? (DotRuntimeException) exception
- : new DotRuntimeException(exception));
- }
-
- private ModelStatus resolveStatus(final String error) {
- if (error.contains("has been deprecated")) {
- return ModelStatus.DECOMMISSIONED;
- } else if (error.contains("does not exist or you do not have access to it")) {
- return ModelStatus.INVALID;
- } else {
- return ModelStatus.UNKNOWN;
- }
- }
-
- private ModelStatus resolveStatus(final Throwable throwable) {
- if (Stream
- .of(DotAIModelNotFoundException.class, DotAIModelNotOperationalException.class)
- .anyMatch(exception -> exception.isInstance(throwable))) {
- return ModelStatus.INVALID;
- }
-
-
- if (throwable instanceof GenericHttpStatusCodeException) {
- final GenericHttpStatusCodeException statusCodeException = (GenericHttpStatusCodeException) throwable;
- final Response.Status status = Response.Status.fromStatusCode(statusCodeException.getResponse().getStatus());
- if (status == Response.Status.NOT_FOUND) {
- return ModelStatus.INVALID;
- }
- }
-
- return ModelStatus.UNKNOWN;
- }
-}
diff --git a/dotCMS/src/main/java/com/dotcms/ai/domain/AIProvider.java b/dotCMS/src/main/java/com/dotcms/ai/domain/AIProvider.java
index 9e844d47619f..fcc4ca22576e 100644
--- a/dotCMS/src/main/java/com/dotcms/ai/domain/AIProvider.java
+++ b/dotCMS/src/main/java/com/dotcms/ai/domain/AIProvider.java
@@ -18,9 +18,12 @@
public enum AIProvider {
NONE("None"),
+ LANGCHAIN4J("LangChain4J"),
OPEN_AI("OpenAI"),
+ AZURE_OPENAI("Azure OpenAI"),
BEDROCK("Amazon Bedrock"),
- GEMINI("Google Gemini");
+ GEMINI("Google Gemini"),
+ VERTEX_AI("Google Vertex AI");
private final String provider;
diff --git a/dotCMS/src/main/java/com/dotcms/ai/listener/AIAppListener.java b/dotCMS/src/main/java/com/dotcms/ai/listener/AIAppListener.java
index a95b8f8df520..491ca828353f 100644
--- a/dotCMS/src/main/java/com/dotcms/ai/listener/AIAppListener.java
+++ b/dotCMS/src/main/java/com/dotcms/ai/listener/AIAppListener.java
@@ -1,10 +1,7 @@
package com.dotcms.ai.listener;
-import com.dotcms.ai.app.AIModels;
-import com.dotcms.ai.app.AppConfig;
import com.dotcms.ai.app.AppKeys;
-import com.dotcms.ai.app.ConfigService;
-import com.dotcms.ai.validator.AIAppValidator;
+import com.dotcms.ai.client.langchain4j.LangChain4jAIClient;
import com.dotcms.security.apps.AppSecretSavedEvent;
import com.dotcms.system.event.local.model.EventSubscriber;
import com.dotcms.system.event.local.model.KeyFilterable;
@@ -45,8 +42,7 @@ public AIAppListener() {
*
* - Logs a debug message if the event is null or the event's host identifier is blank.
* - Finds the host associated with the event's host identifier.
- * - Resets the AI models for the found host's hostname.
- * - Validates the AI configuration using the {@link AIAppValidator}.
+ * - Evicts cached LangChain4J model instances for the host so new credentials take effect immediately.
*
*
*
@@ -67,10 +63,7 @@ public void notify(final AppSecretSavedEvent event) {
final String hostId = event.getHostIdentifier();
final Host host = Try.of(() -> hostAPI.find(hostId, APILocator.systemUser(), false)).getOrNull();
- Optional.ofNullable(host).ifPresent(found -> AIModels.get().resetModels(found.getHostname()));
- final AppConfig appConfig = ConfigService.INSTANCE.config(host);
-
- AIAppValidator.get().validateAIConfig(appConfig, event.getUserId());
+ Optional.ofNullable(host).ifPresent(found -> LangChain4jAIClient.get().flushCachesForHost(found.getHostname()));
}
@Override
diff --git a/dotCMS/src/main/java/com/dotcms/ai/model/OpenAIModel.java b/dotCMS/src/main/java/com/dotcms/ai/model/OpenAIModel.java
deleted file mode 100644
index eeebccd7c12f..000000000000
--- a/dotCMS/src/main/java/com/dotcms/ai/model/OpenAIModel.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.dotcms.ai.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-
-/**
- * Represents an OpenAI model with details such as ID, object type, creation timestamp, and owner.
- * This class is immutable and uses Jackson annotations for JSON serialization and deserialization.
- *
- * @author vico
- */
- public class OpenAIModel implements Serializable {
-
- private final String id;
- private final String object;
- private final long created;
- private final String ownedBy;
-
- @JsonCreator
- public OpenAIModel(@JsonProperty("id") final String id,
- @JsonProperty("object") final String object,
- @JsonProperty("created") final long created,
- @JsonProperty("owned_by") final String ownedBy) {
- this.id = id;
- this.object = object;
- this.created = created;
- this.ownedBy = ownedBy;
- }
-
- public String getId() {
- return id;
- }
-
- public String getObject() {
- return object;
- }
-
- public long getCreated() {
- return created;
- }
-
- @JsonProperty("owned_by")
- public String getOwnedBy() {
- return ownedBy;
- }
-
-}
diff --git a/dotCMS/src/main/java/com/dotcms/ai/model/OpenAIModels.java b/dotCMS/src/main/java/com/dotcms/ai/model/OpenAIModels.java
deleted file mode 100644
index b98317557246..000000000000
--- a/dotCMS/src/main/java/com/dotcms/ai/model/OpenAIModels.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.dotcms.ai.model;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * Represents a collection of OpenAI models with details such as the type of object and the list of models.
- * This class is immutable and uses Jackson annotations for JSON serialization and deserialization.
- *
- * @author vico
- */
-public class OpenAIModels implements Serializable {
-
- private final String object;
- private final List data;
- private final OpenAIError error;
-
- @JsonCreator
- public OpenAIModels(@JsonProperty("object") final String object,
- @JsonProperty("data") final List data,
- @JsonProperty("error") final OpenAIError error) {
- this.object = object;
- this.data = data;
- this.error = error;
- }
-
- public String getObject() {
- return object;
- }
-
- public List getData() {
- return data;
- }
-
- public OpenAIError getError() {
- return error;
- }
-
- public static class OpenAIError {
-
- private final String message;
- private final String type;
- private final String param;
- private final String code;
-
- @JsonCreator
- public OpenAIError(@JsonProperty("object") final String message,
- @JsonProperty("type") final String type,
- @JsonProperty("param") final String param,
- @JsonProperty("code") final String code) {
- this.message = message;
- this.type = type;
- this.param = param;
- this.code = code;
- }
-
- public String getMessage() {
- return message;
- }
-
- public String getType() {
- return type;
- }
-
- public String getParam() {
- return param;
- }
-
- public String getCode() {
- return code;
- }
- }
-
-}
diff --git a/dotCMS/src/main/java/com/dotcms/ai/rest/CompletionsResource.java b/dotCMS/src/main/java/com/dotcms/ai/rest/CompletionsResource.java
index 4016b76fa4f3..b86a81b61b3c 100644
--- a/dotCMS/src/main/java/com/dotcms/ai/rest/CompletionsResource.java
+++ b/dotCMS/src/main/java/com/dotcms/ai/rest/CompletionsResource.java
@@ -1,19 +1,21 @@
package com.dotcms.ai.rest;
import com.dotcms.ai.AiKeys;
-import com.dotcms.ai.app.AIModels;
import com.dotcms.ai.app.AppConfig;
import com.dotcms.ai.app.AppKeys;
import com.dotcms.ai.app.ConfigService;
-import com.dotcms.ai.model.SimpleModel;
import com.dotcms.ai.rest.forms.CompletionsForm;
import com.dotcms.ai.util.LineReadingOutputStream;
import com.dotcms.rest.WebResource;
+import com.dotcms.rest.api.v1.DotObjectMapperProvider;
import com.dotmarketing.beans.Host;
import com.dotmarketing.business.APILocator;
import com.dotmarketing.business.web.WebAPILocator;
-import com.dotmarketing.util.UtilMethods;
+import com.dotmarketing.util.Logger;
import com.dotmarketing.util.json.JSONObject;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import com.liferay.portal.model.User;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -37,8 +39,10 @@
import javax.ws.rs.core.StreamingOutput;
import java.io.OutputStream;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.function.Consumer;
import java.util.function.Supplier;
@@ -50,6 +54,9 @@
@Tag(name = "AI", description = "AI-powered content generation and analysis endpoints")
public class CompletionsResource {
+ private static final ObjectMapper REDACTION_MAPPER = DotObjectMapperProvider.createDefaultMapper();
+ private static final Set CREDENTIAL_FIELDS = Set.of("apiKey", "secretAccessKey", "accessKeyId");
+
/**
* Handles POST requests to generate completions based on a given prompt.
*
@@ -170,19 +177,50 @@ public final Response getConfig(@Context final HttpServletRequest request,
final Map map = new HashMap<>();
map.put(AiKeys.CONFIG_HOST, host.getHostname() + " (falls back to system host)");
- for (final AppKeys config : AppKeys.values()) {
- map.put(config.key, appConfig.getConfig(config));
- }
- final String apiKey = UtilMethods.isSet(appConfig.getApiKey()) ? "*****" : "NOT SET";
- map.put(AppKeys.API_KEY.key, apiKey);
+ final String providerConfig = appConfig.getProviderConfig();
+ if (StringUtils.isNotBlank(providerConfig)) {
+ map.put(AppKeys.PROVIDER_CONFIG.key, redactCredentials(providerConfig));
+ }
- final List models = AIModels.get().getAvailableModels();
- map.put(AiKeys.AVAILABLE_MODELS, models);
+ map.put(AppKeys.ROLE_PROMPT.key, appConfig.getRolePrompt());
+ map.put(AppKeys.TEXT_PROMPT.key, appConfig.getTextPrompt());
+ map.put(AppKeys.IMAGE_PROMPT.key, appConfig.getImagePrompt());
+ map.put(AppKeys.IMAGE_SIZE.key, appConfig.getImageSize());
+ map.put(AppKeys.LISTENER_INDEXER.key, appConfig.getListenerIndexer());
+ map.put(AppKeys.DEBUG_LOGGING.key, appConfig.getConfig(AppKeys.DEBUG_LOGGING));
return Response.ok(map).build();
}
+ private static String redactCredentials(final String json) {
+ try {
+ final JsonNode root = REDACTION_MAPPER.readTree(json);
+ redactNode(root);
+ return REDACTION_MAPPER.writeValueAsString(root);
+ } catch (Exception e) {
+ Logger.warn(CompletionsResource.class, "Failed to parse providerConfig for redaction: " + e.getMessage(), e);
+ return "[CONFIG PRESENT — REDACTION FAILED]";
+ }
+ }
+
+ private static void redactNode(final JsonNode node) {
+ if (node.isObject()) {
+ final ObjectNode obj = (ObjectNode) node;
+ final Iterator> fields = obj.fields();
+ while (fields.hasNext()) {
+ final Map.Entry field = fields.next();
+ if (CREDENTIAL_FIELDS.contains(field.getKey())) {
+ obj.put(field.getKey(), "*****");
+ } else {
+ redactNode(field.getValue());
+ }
+ }
+ } else if (node.isArray()) {
+ node.forEach(CompletionsResource::redactNode);
+ }
+ }
+
private static Response badRequestResponse() {
return Response.status(Response.Status.BAD_REQUEST).entity(Map.of(AiKeys.ERROR, "query required")).build();
}
@@ -222,9 +260,8 @@ private static Response getResponse(final HttpServletRequest request,
}
final long startTime = System.currentTimeMillis();
- final CompletionsForm resolvedForm = resolveForm(request, response, formIn);
- if (resolvedForm.stream) {
+ if (formIn.stream) {
final StreamingOutput streaming = output -> {
outputStream.accept(output);
output.flush();
diff --git a/dotCMS/src/main/java/com/dotcms/ai/rest/ImageResource.java b/dotCMS/src/main/java/com/dotcms/ai/rest/ImageResource.java
index abd877a20113..7607248cbd6a 100644
--- a/dotCMS/src/main/java/com/dotcms/ai/rest/ImageResource.java
+++ b/dotCMS/src/main/java/com/dotcms/ai/rest/ImageResource.java
@@ -100,7 +100,7 @@ public Response handleImageRequest(@Context final HttpServletRequest request,
readParameters(request.getParameterMap()), Marshaller.marshal(aiImageRequestDTO)));
final AppConfig config = ConfigService.INSTANCE.config(WebAPILocator.getHostWebAPI().getHost(request));
- if (UtilMethods.isEmpty(config.getApiKey())) {
+ if (!config.isEnabled()) {
return Response
.status(Status.INTERNAL_SERVER_ERROR)
.entity(Map.of(AiKeys.ERROR, "App Config missing"))
diff --git a/dotCMS/src/main/java/com/dotcms/ai/validator/AIAppValidator.java b/dotCMS/src/main/java/com/dotcms/ai/validator/AIAppValidator.java
deleted file mode 100644
index 196f207750be..000000000000
--- a/dotCMS/src/main/java/com/dotcms/ai/validator/AIAppValidator.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.dotcms.ai.validator;
-
-import com.dotcms.ai.app.AIModel;
-import com.dotcms.ai.app.AIModels;
-import com.dotcms.ai.app.AppConfig;
-import com.dotcms.ai.app.InvalidAIKeyException;
-import com.dotcms.ai.client.AIProxyClient;
-import com.dotcms.ai.client.AIRequest;
-import com.dotcms.ai.client.JSONObjectAIRequest;
-import com.dotcms.ai.domain.Model;
-import com.dotcms.api.system.event.message.MessageSeverity;
-import com.dotcms.api.system.event.message.SystemMessageEventUtil;
-import com.dotcms.api.system.event.message.builder.SystemMessage;
-import com.dotcms.api.system.event.message.builder.SystemMessageBuilder;
-import com.dotmarketing.util.DateUtil;
-import com.google.common.annotations.VisibleForTesting;
-import com.liferay.portal.language.LanguageUtil;
-import io.vavr.Lazy;
-import io.vavr.control.Try;
-
-import java.util.Collections;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * The AIAppValidator class is responsible for validating AI configurations and model usage.
- * It ensures that the AI models specified in the application configuration are supported
- * and not exhausted.
- *
- * @author vico
- */
-public class AIAppValidator {
-
- private static final Lazy INSTANCE = Lazy.of(AIAppValidator::new);
-
- private SystemMessageEventUtil systemMessageEventUtil;
-
- private AIAppValidator() {
- setSystemMessageEventUtil(SystemMessageEventUtil.getInstance());
- }
-
- public static AIAppValidator get() {
- return INSTANCE.get();
- }
-
- /**
- * Validates the AI configuration for the specified user.
- * If the user ID is null, the validation is skipped.
- * Checks if the models specified in the application configuration are supported.
- * If any unsupported models are found, a warning message is pushed to the user.
- *
- * @param appConfig the application configuration
- * @param userId the user ID
- */
- public void validateAIConfig(final AppConfig appConfig, final String userId) {
- if (Objects.isNull(userId)) {
- appConfig.debugLogger(getClass(), () -> "User Id is null, skipping AI configuration validation");
- return;
- }
-
- try {
- final Set supportedModels = AIModels.get().getOrPullSupportedModels(appConfig);
- final Set unsupportedModels = Stream.of(
- appConfig.getModel(),
- appConfig.getImageModel(),
- appConfig.getEmbeddingsModel())
- .flatMap(aiModel -> aiModel.getModels().stream())
- .map(Model::getName)
- .filter(model -> !supportedModels.contains(model))
- .collect(Collectors.toSet());
- if (unsupportedModels.isEmpty()) {
- return;
- }
-
- sendUnsupportedModelsNotification(userId, unsupportedModels);
- } catch (InvalidAIKeyException e) {
- sendInvalidAIKeyNotification(userId);
- }
- }
-
- private void sendInvalidAIKeyNotification(final String userId) {
- final String message = Try
- .of(() -> LanguageUtil.get("ai.key.invalid"))
- .getOrElse("AI key authentication failed. Please ensure the key is valid, active, and correctly configured.");
-
- final SystemMessage systemMessage = new SystemMessageBuilder()
- .setMessage(message)
- .setSeverity(MessageSeverity.ERROR)
- .setLife(DateUtil.SEVEN_SECOND_MILLIS)
- .create();
-
- systemMessageEventUtil.pushMessage(systemMessage, Collections.singletonList(userId));
- }
-
- /**
- * Sends a notification to the specified user about unsupported AI models.
- * Creates a warning message containing the names of the unsupported models
- * and pushes it to the user's notification system.
- *
- * @param userId the ID of the user to receive the notification
- * @param unsupportedModels a set of model names that are not supported
- */
- private void sendUnsupportedModelsNotification(String userId, Set unsupportedModels) {
- final String unsupported = String.join(", ", unsupportedModels);
- final String message = Try
- .of(() -> LanguageUtil.get("ai.unsupported.models", unsupported))
- .getOrElse(String.format("The following models are not supported: [%s]", unsupported));
- final SystemMessage systemMessage = new SystemMessageBuilder()
- .setMessage(message)
- .setSeverity(MessageSeverity.WARNING)
- .setLife(DateUtil.SEVEN_SECOND_MILLIS)
- .create();
-
- systemMessageEventUtil.pushMessage(systemMessage, Collections.singletonList(userId));
- }
-
- /**
- * Validates the usage of AI models for the specified user.
- * If the user ID is null, the validation is skipped.
- * Checks if the models specified in the AI model are exhausted or invalid.
- * If any exhausted or invalid models are found, a warning message is pushed to the user.
- *
- * @param aiModel the AI model
- * @param request the ai request
- */
- public void validateModelsUsage(final AIModel aiModel, final JSONObjectAIRequest request) {
- if (Objects.isNull(request.getUserId())) {
- request.getConfig().debugLogger(getClass(), () -> "User Id is null, skipping AI models usage validation");
- return;
- }
-
- final String unavailableModels = aiModel.getModels()
- .stream()
- .map(Model::getName)
- .collect(Collectors.joining(", "));
- final String message = Try
- .of(() -> LanguageUtil.get("ai.models.exhausted", aiModel.getType(), unavailableModels)).
- getOrElse(
- String.format(
- "All the %s models: [%s] have been exhausted since they are invalid or has been decommissioned",
- aiModel.getType(),
- unavailableModels));
- final SystemMessage systemMessage = new SystemMessageBuilder()
- .setMessage(message)
- .setSeverity(MessageSeverity.WARNING)
- .setLife(DateUtil.SEVEN_SECOND_MILLIS)
- .create();
-
- systemMessageEventUtil.pushMessage(systemMessage, Collections.singletonList(request.getUserId()));
- }
-
- @VisibleForTesting
- void setSystemMessageEventUtil(SystemMessageEventUtil systemMessageEventUtil) {
- this.systemMessageEventUtil = systemMessageEventUtil;
- }
-
-}
diff --git a/dotCMS/src/main/java/com/dotcms/ai/viewtool/CompletionsTool.java b/dotCMS/src/main/java/com/dotcms/ai/viewtool/CompletionsTool.java
index adc3a77cc60c..d43594238293 100644
--- a/dotCMS/src/main/java/com/dotcms/ai/viewtool/CompletionsTool.java
+++ b/dotCMS/src/main/java/com/dotcms/ai/viewtool/CompletionsTool.java
@@ -55,9 +55,7 @@ public Map getConfig() {
AppKeys.COMPLETION_ROLE_PROMPT.key,
this.config.getConfig(AppKeys.COMPLETION_ROLE_PROMPT),
AppKeys.COMPLETION_TEXT_PROMPT.key,
- this.config.getConfig(AppKeys.COMPLETION_TEXT_PROMPT),
- AppKeys.TEXT_MODEL_NAMES.key,
- this.config.getConfig(AppKeys.TEXT_MODEL_NAMES));
+ this.config.getConfig(AppKeys.COMPLETION_TEXT_PROMPT));
}
/**
diff --git a/dotCMS/src/main/java/com/dotcms/ai/workflow/OpenAIAutoTagActionlet.java b/dotCMS/src/main/java/com/dotcms/ai/workflow/OpenAIAutoTagActionlet.java
index 989edd2b4860..4b9e42a2ccad 100644
--- a/dotCMS/src/main/java/com/dotcms/ai/workflow/OpenAIAutoTagActionlet.java
+++ b/dotCMS/src/main/java/com/dotcms/ai/workflow/OpenAIAutoTagActionlet.java
@@ -1,7 +1,5 @@
package com.dotcms.ai.workflow;
-import com.dotcms.ai.app.AppConfig;
-import com.dotcms.ai.app.ConfigService;
import com.dotmarketing.portlets.workflows.actionlet.Actionlet;
import com.dotmarketing.portlets.workflows.actionlet.WorkFlowActionlet;
import com.dotmarketing.portlets.workflows.model.MultiKeyValue;
@@ -38,21 +36,7 @@ public List getParameters() {
)
);
- final AppConfig appConfig = ConfigService.INSTANCE.config();
- return List.of(
- overwriteParameter,
- limitTagsToHost,
- new WorkflowActionletParameter(
- OpenAIParams.MODEL.key,
- "The AI model to use, defaults to " + appConfig.getModel().getCurrentModel(),
- appConfig.getModel().getCurrentModel(),
- false),
- new WorkflowActionletParameter(
- OpenAIParams.TEMPERATURE.key,
- "The AI temperature for the response. Between .1 and 2.0.",
- ".1",
- false)
- );
+ return List.of(overwriteParameter, limitTagsToHost);
}
@Override
diff --git a/dotCMS/src/main/java/com/dotcms/ai/workflow/OpenAIAutoTagRunner.java b/dotCMS/src/main/java/com/dotcms/ai/workflow/OpenAIAutoTagRunner.java
index a63c03743686..202497022932 100644
--- a/dotCMS/src/main/java/com/dotcms/ai/workflow/OpenAIAutoTagRunner.java
+++ b/dotCMS/src/main/java/com/dotcms/ai/workflow/OpenAIAutoTagRunner.java
@@ -1,7 +1,5 @@
package com.dotcms.ai.workflow;
-import com.dotcms.ai.app.AppKeys;
-import com.dotcms.ai.app.ConfigService;
import com.dotcms.ai.util.ContentToStringUtil;
import com.dotcms.ai.util.VelocityContextFactory;
import com.dotcms.api.system.event.message.MessageSeverity;
@@ -45,8 +43,6 @@ public class OpenAIAutoTagRunner implements Runnable {
final User user;
final boolean overwriteField;
final boolean limitTags;
- final String model;
- final float temperature;
final Contentlet contentlet;
OpenAIAutoTagRunner(final WorkflowProcessor processor, final Map params) {
@@ -54,18 +50,14 @@ public class OpenAIAutoTagRunner implements Runnable {
processor.getContentlet(),
processor.getUser(),
Boolean.parseBoolean(params.get(OpenAIParams.OVERWRITE_FIELDS.key).getValue()),
- Boolean.parseBoolean(params.get(OpenAIParams.LIMIT_TAGS_TO_HOST.key).getValue()),
- params.get(OpenAIParams.MODEL.key).getValue(),
- Try.of(() -> Float.parseFloat(params.get(OpenAIParams.TEMPERATURE.key).getValue())).getOrElse(ConfigService.INSTANCE.config().getConfigFloat(AppKeys.COMPLETION_TEMPERATURE))
+ Boolean.parseBoolean(params.get(OpenAIParams.LIMIT_TAGS_TO_HOST.key).getValue())
);
}
OpenAIAutoTagRunner(final Contentlet contentlet,
final User user,
final boolean overwriteField,
- final boolean limitTags,
- final String model,
- final float temperature) {
+ final boolean limitTags) {
if (UtilMethods.isEmpty(contentlet::getIdentifier)) {
throw new IllegalArgumentException("Content must be saved and have an identifier before running AI Content Prompt");
@@ -74,8 +66,6 @@ public class OpenAIAutoTagRunner implements Runnable {
this.overwriteField = overwriteField;
this.limitTags = limitTags;
this.user = user;
- this.model = model;
- this.temperature = temperature;
}
@@ -146,7 +136,7 @@ private String openAIRequest(final Contentlet workingContentlet, final String co
final String parsedContentPrompt = VelocityUtil.eval(contentToTag, ctx);
final JSONObject openAIResponse = APILocator.getDotAIAPI().getCompletionsAPI()
- .prompt(parsedSystemPrompt, parsedContentPrompt, model, temperature, 2000, user.getUserId());
+ .prompt(parsedSystemPrompt, parsedContentPrompt, null, 0f, 2000, user.getUserId());
return openAIResponse.getJSONArray("choices").getJSONObject(0).getJSONObject("message").getString("content");
}
diff --git a/dotCMS/src/main/java/com/dotcms/ai/workflow/OpenAIContentPromptActionlet.java b/dotCMS/src/main/java/com/dotcms/ai/workflow/OpenAIContentPromptActionlet.java
index f64b05cb6358..121dd00f6660 100644
--- a/dotCMS/src/main/java/com/dotcms/ai/workflow/OpenAIContentPromptActionlet.java
+++ b/dotCMS/src/main/java/com/dotcms/ai/workflow/OpenAIContentPromptActionlet.java
@@ -1,8 +1,5 @@
package com.dotcms.ai.workflow;
-import com.dotcms.ai.app.AppConfig;
-import com.dotcms.ai.app.AppKeys;
-import com.dotcms.ai.app.ConfigService;
import com.dotmarketing.portlets.workflows.actionlet.Actionlet;
import com.dotmarketing.portlets.workflows.actionlet.WorkFlowActionlet;
import com.dotmarketing.portlets.workflows.model.MultiKeyValue;
@@ -29,7 +26,6 @@ public List getParameters() {
new MultiKeyValue(Boolean.toString(false), Boolean.toString(false)),
new MultiKeyValue(Boolean.toString(true), Boolean.toString(true)))
);
- final AppConfig appConfig = ConfigService.INSTANCE.config();
return List.of(
new WorkflowActionletParameter(
@@ -44,18 +40,7 @@ public List getParameters() {
OpenAIParams.OPEN_AI_PROMPT.key,
"The prompt that will be sent to the AI",
"We need an attractive search result in Google. Return a json object that includes the fields \"pageTitle\" for a meta title of less than 55 characters and \"metaDescription\" for the meta description of less than 300 characters using this content:\\n\\n${fieldContent}\\n\\n",
- true),
- new WorkflowActionletParameter(
- OpenAIParams.MODEL.key,
- "The AI model to use, defaults to " + appConfig.getModel().getCurrentModel(),
- appConfig.getModel().getCurrentModel(),
- false),
- new WorkflowActionletParameter(
- OpenAIParams.TEMPERATURE.key,
- "The AI temperature for the response. Between .1 and 2.0. Defaults to "
- + appConfig.getConfig(AppKeys.COMPLETION_TEMPERATURE),
- appConfig.getConfig(AppKeys.COMPLETION_TEMPERATURE),
- false)
+ true)
);
}
diff --git a/dotCMS/src/main/java/com/dotcms/ai/workflow/OpenAIContentPromptRunner.java b/dotCMS/src/main/java/com/dotcms/ai/workflow/OpenAIContentPromptRunner.java
index 5ebca943a044..a5f6f3d8f138 100644
--- a/dotCMS/src/main/java/com/dotcms/ai/workflow/OpenAIContentPromptRunner.java
+++ b/dotCMS/src/main/java/com/dotcms/ai/workflow/OpenAIContentPromptRunner.java
@@ -1,7 +1,5 @@
package com.dotcms.ai.workflow;
-import com.dotcms.ai.app.AppKeys;
-import com.dotcms.ai.app.ConfigService;
import com.dotcms.ai.util.ContentToStringUtil;
import com.dotcms.ai.util.VelocityContextFactory;
import com.dotcms.api.system.event.Payload;
@@ -52,8 +50,6 @@ public class OpenAIContentPromptRunner implements Runnable {
final String prompt;
final boolean overwriteField;
final String fieldToWrite;
- final String model;
- final float temperature;
final Contentlet contentlet;
OpenAIContentPromptRunner(final WorkflowProcessor processor,
@@ -64,14 +60,7 @@ public class OpenAIContentPromptRunner implements Runnable {
processor.getUser(),
params.get(OpenAIParams.OPEN_AI_PROMPT.key).getValue(),
Boolean.parseBoolean(params.get(OpenAIParams.OVERWRITE_FIELDS.key).getValue()),
- params.get(OpenAIParams.FIELD_TO_WRITE.key).getValue(),
- params.get(OpenAIParams.MODEL.key).getValue(),
- Try.of(() ->
- Float.parseFloat(
- params
- .get(OpenAIParams.TEMPERATURE.key)
- .getValue()))
- .getOrElse(ConfigService.INSTANCE.config().getConfigFloat(AppKeys.COMPLETION_TEMPERATURE))
+ params.get(OpenAIParams.FIELD_TO_WRITE.key).getValue()
);
}
@@ -79,9 +68,7 @@ public class OpenAIContentPromptRunner implements Runnable {
final User user,
final String prompt,
final boolean overwriteField,
- final String fieldToWrite,
- final String model,
- final float temperature) {
+ final String fieldToWrite) {
if (UtilMethods.isEmpty(contentlet::getIdentifier)) {
throw new IllegalArgumentException(
@@ -92,8 +79,6 @@ public class OpenAIContentPromptRunner implements Runnable {
this.overwriteField = overwriteField;
this.fieldToWrite = fieldToWrite;
this.user = user;
- this.model = model;
- this.temperature = temperature;
}
@Override
@@ -147,7 +132,7 @@ private String openAIRequest(final Contentlet workingContentlet) throws Exceptio
final String parsedPrompt = VelocityUtil.eval(prompt, ctx);
final JSONObject openAIResponse = APILocator.getDotAIAPI()
.getCompletionsAPI()
- .raw(buildRequest(parsedPrompt, model, temperature), user.getUserId());
+ .raw(buildRequest(parsedPrompt), user.getUserId());
try {
return openAIResponse
@@ -199,14 +184,12 @@ private void setJsonProperties(final Contentlet contentlet, final JSONObject jso
}
}
- private JSONObject buildRequest(final String prompt, final String model, final float temperature) {
+ private JSONObject buildRequest(final String prompt) {
final JSONArray messages = new JSONArray();
messages.add(Map.of("role", "user", "content", prompt));
final JSONObject json = new JSONObject();
json.put("messages", messages);
- json.put("model", model);
- json.put("temperature", temperature);
json.put("stream", false);
Logger.debug(this.getClass(), "Open AI Request:\n" + json.toString(2));
diff --git a/dotCMS/src/main/resources/apps/dotAI.yml b/dotCMS/src/main/resources/apps/dotAI.yml
index d694a4c6bf96..3192c882d892 100644
--- a/dotCMS/src/main/resources/apps/dotAI.yml
+++ b/dotCMS/src/main/resources/apps/dotAI.yml
@@ -2,25 +2,26 @@ name: "dotAI"
iconUrl: "https://static.dotcms.com/assets/icons/apps/chatgpt_logo.svg"
allowExtraParameters: true
description: |
- Credentials and options for using OpenAI/ChatGPT with dotCMS. There are a number of config
- properties that can be set in the extra parameter fields. Please see the "config" tab of the [dotAI tool](#/c/dotai) to see what can be configured. We recommend you have a single config for all your sites,
- by placing all config on the SYSTEM_HOST or provide a configuration PER site.
+ Configuration for dotAI, powered by LangChain4J. Supports multiple AI providers
+ configured via a single JSON field (Provider Config). Each provider section (chat, embeddings, image)
+ is declared independently, allowing you to mix providers or models per capability.
+ We recommend a single configuration on SYSTEM_HOST, or override per site as needed.
params:
- apiKey:
+ providerConfig:
value: ""
hidden: true
type: "STRING"
- label: "API Key"
- hint: "Your ChatGPT API key"
+ label: "Provider Config (JSON)"
+ hint: |
+ JSON configuration for the AI provider. Each section (chat, embeddings, image) declares its own provider independently.
+ Example for OpenAI:
+ {
+ "chat": { "provider": "openai", "apiKey": "sk-...", "model": "gpt-4o", "maxTokens": 16384, "temperature": 1.0, "maxRetries": 3 },
+ "embeddings": { "provider": "openai", "apiKey": "sk-...", "model": "text-embedding-ada-002" },
+ "image": { "provider": "openai", "apiKey": "sk-...", "model": "dall-e-3", "size": "1024x1024" }
+ }
required: true
- textModelNames:
- value: "gpt-4o"
- hidden: false
- type: "STRING"
- label: "Allowed Model Names"
- hint: "Comma delimited list of models allowed to generate OpenAI API response (e.g. gpt-4o,gpt-4o-mini). If the list is empty, then all models are allowed."
- required: false
rolePrompt:
value: "You are dotCMSbot, and AI assistant to help content creators generate and rewrite content in their content management system."
hidden: false
@@ -35,41 +36,6 @@ params:
label: "Text Prompt"
hint: "A prompt describing writing style."
required: false
- textModelTokensPerMinute:
- value: "180000"
- hidden: false
- type: "STRING"
- label: "Tokens per Minute"
- hint: "Tokens per minute used to generate OpenAI API response."
- required: false
- textModelApiPerMinute:
- value: "3500"
- hidden: false
- type: "STRING"
- label: "API per Minute"
- hint: "API per minute used to generate OpenAI API response."
- required: false
- textModelMaxTokens:
- value: "16384"
- hidden: false
- type: "STRING"
- label: "Max Tokens"
- hint: "Maximum number of tokens used to generate OpenAI API response."
- required: false
- textModelCompletion:
- value: "true"
- hidden: false
- type: "BOOL"
- label: "Completion model enabled"
- hint: "Enable completion model used to generate OpenAI API response."
- required: false
- imageModelNames:
- value: "dall-e-3"
- hidden: false
- type: "STRING"
- label: "Image Model Names"
- hint: "Comma delimited list of image models used to generate OpenAI API response(e.g. dall-e-3)."
- required: true
imagePrompt:
value: "Use 16:9 aspect ratio."
hidden: false
@@ -82,7 +48,7 @@ params:
type: "SELECT"
label: "Image size"
hint: "Image size to generate"
- required: true
+ required: false
value:
- label: "1792x1024 (Blog Image 3:2)"
value: "1792x1024"
@@ -103,69 +69,6 @@ params:
value: "1920x1080"
- label: "256x256 (Small Square 1:1)"
value: "256x256"
- imageModelTokensPerMinute:
- value: "0"
- hidden: false
- type: "STRING"
- label: "Image Tokens per Minute"
- hint: "Tokens per minute used to generate OpenAI API response."
- required: false
- imageModelApiPerMinute:
- value: "50"
- hidden: false
- type: "STRING"
- label: "Image API per Minute"
- hint: "API per minute used to generate OpenAI API response."
- required: false
- imageModelMaxTokens:
- value: "0"
- hidden: false
- type: "STRING"
- label: "Image Max Tokens"
- hint: "Maximum number of tokens used to generate OpenAI API response."
- required: false
- imageModelCompletion:
- value: "false"
- hidden: false
- type: "BOOL"
- label: "Image Completion model enabled"
- hint: "Enable completion model used to generate OpenAI API response."
- required: false
- embeddingsModelNames:
- value: "text-embedding-ada-002"
- hidden: false
- type: "STRING"
- label: "Embeddings Model Names"
- hint: "Comma delimited list of embeddings models used to generate OpenAI API response (e.g. text-embedding-ada-002)."
- required: true
- embeddingsModelTokensPerMinute:
- value: "1000000"
- hidden: false
- type: "STRING"
- label: "Embeddings Tokens per Minute"
- hint: "Tokens per minute used to generate OpenAI API response."
- required: false
- embeddingsModelApiPerMinute:
- value: "3000"
- hidden: false
- type: "STRING"
- label: "Embeddings API per Minute"
- hint: "API per minute used to generate OpenAI API response."
- required: false
- embeddingsModelMaxTokens:
- value: "8191"
- hidden: false
- type: "STRING"
- label: "Embeddings Max Tokens"
- hint: "Maximum number of tokens used to generate OpenAI API response."
- required: false
- embeddingsModelCompletion:
- value: "false"
- hidden: false
- type: "BOOL"
- label: "Embeddings Completion model enabled"
- hint: "Enable completion model used to generate OpenAI API response."
- required: false
listenerIndexer:
value: ""
hidden: false
@@ -179,7 +82,7 @@ params:
"blogsOnly": "blog.blogcontent"
}
```
- means that blog, news and webPageContent will be indexed in the `default` index and the blog field `blog.blogcontent` will be
- indexed into the `blogsOnly` index. The list of content types is a comma separated list content types and can optionally
+ means that blog, news and webPageContent will be indexed in the `default` index and the blog field `blog.blogcontent` will be
+ indexed into the `blogsOnly` index. The list of content types is a comma separated list content types and can optionally
include the field that should be indexed when a contentlet is published. All unpublished content will be removed from the index.
required: false
diff --git a/dotCMS/src/main/webapp/WEB-INF/jsp/dotai/render.jsp b/dotCMS/src/main/webapp/WEB-INF/jsp/dotai/render.jsp
index d2846e2045e3..079ee9399aee 100644
--- a/dotCMS/src/main/webapp/WEB-INF/jsp/dotai/render.jsp
+++ b/dotCMS/src/main/webapp/WEB-INF/jsp/dotai/render.jsp
@@ -11,8 +11,7 @@
refreshConfigs().then(() => {
writeConfigTable();
writeModelToDropdown();
- alert
- if (dotAiState.config["apiKey"] != "*****") {
+ if (!dotAiState.config["providerConfig"]) {
document.getElementById("openAIKeyWarn").style.display = "block";
}
});
@@ -23,7 +22,7 @@
- Your OpenAI API key is not set. Please add a valid API key in your
App screen.