Revert "feat(dotAI): Dot AI LangChain4J - Custom UI for provider config (#35445)"

This reverts commit 4c55a47.

Author: ihoffmann-dot

core-web/apps/dotcms-ui/src/app/portlets/dot-apps/components/dot-ai-config-detail/dot-ai-config-detail-resolver.service.ts

@@ -2,8 +2,6 @@ import { Routes } from '@angular/router';
 
 import { DotAppsService } from '@dotcms/data-access';
 
-import { dotAiConfigDetailResolver } from './components/dot-ai-config-detail/dot-ai-config-detail-resolver.service';
-import { DotAiConfigDetailComponent } from './components/dot-ai-config-detail/dot-ai-config-detail.component';
 import { DotAppsConfigurationComponent } from './components/dot-apps-configuration/dot-apps-configuration.component';
 import { DotAppsConfigurationDetailComponent } from './components/dot-apps-configuration-detail/dot-apps-configuration-detail.component';
 import { DotAppsListComponent } from './dot-apps-list/dot-apps-list.component';
@@ -12,14 +10,6 @@ import { DotAppsConfigurationResolver } from './services/dot-apps-configuration-
 import { DotAppsListResolver } from './services/dot-apps-list-resolver/dot-apps-list-resolver.service';
 
 export const dotAppsRoutes: Routes = [
-    {
-        component: DotAiConfigDetailComponent,
-        path: 'dotAI/edit/:id',
-        resolve: {
-            data: dotAiConfigDetailResolver
-        },
-        providers: [DotAppsService]
-    },
     {
         component: DotAppsConfigurationDetailComponent,
         path: ':appKey/create/:id',

core-web/apps/dotcms-ui/src/app/portlets/dot-apps/components/dot-ai-config-detail/dot-ai-config-detail.component.html

@@ -8,14 +8,12 @@ import { catchError, map, switchMap } from 'rxjs/operators';
 import {
     DotCMSContentlet,
     AiPluginResponse,
+    DotAICompletionsConfig,
     DotAIImageContent,
     DotAIImageOrientation,
-    DotAIImageResponse,
-    DotAiProviderConfig
+    DotAIImageResponse
 } from '@dotcms/dotcms-models';
 
-export { DotAiProviderConfig };
-
 export const AI_PLUGIN_KEY = {
     NOT_SET: 'NOT SET'
 };
@@ -107,27 +105,17 @@ export class DotAiService {
      */
     checkPluginInstallation(): Observable<boolean> {
         return this.#http
-            .get<DotAiProviderConfig>(`${API_ENDPOINT}/completions/config`, {
+            .get<DotAICompletionsConfig>(`${API_ENDPOINT}/completions/config`, {
                 observe: 'response'
             })
             .pipe(
-                map((res) => res.status === 200 && !!res?.body?.providerConfig),
+                map((res) => res.status === 200 && res?.body?.apiKey !== AI_PLUGIN_KEY.NOT_SET),
                 catchError(() => {
                     return of(false);
                 })
             );
     }
 
-    getConfig(): Observable<DotAiProviderConfig> {
-        return this.#http.get<DotAiProviderConfig>(`${API_ENDPOINT}/completions/config`);
-    }
-
-    saveConfig(json: string): Observable<DotAiProviderConfig> {
-        return this.#http.put<DotAiProviderConfig>(`${API_ENDPOINT}/completions/config`, json, {
-            headers
-        });
-    }
-
     createAndPublishContentlet(aiResponse: DotAIImageResponse): Observable<DotAIImageContent> {
         const { response, tempFileName } = aiResponse;
         const contentlets: Partial<DotCMSContentlet>[] = [

core-web/apps/dotcms-ui/src/app/portlets/dot-apps/components/dot-ai-config-detail/dot-ai-config-detail.component.ts

@@ -93,11 +93,6 @@ export interface DotAICompletionsConfig {
     textPrompt: string;
 }
 
-export interface DotAiProviderConfig {
-    providerConfig: string;
-    configHost: string;
-}
-
 export interface DotAiError {
     code: string;
     message: string;

core-web/apps/dotcms-ui/src/app/portlets/dot-apps/dot-apps.routes.ts

@@ -52,7 +52,6 @@ public class AppConfig implements Serializable {
     private final String listenerIndexer;
     private final String providerConfig;
     private final String providerConfigHash;
-    private final transient JsonNode providerConfigRoot;
     private final Map<String, Secret> configValues;
 
     public AppConfig(final String host, final Map<String, Secret> secrets) {
@@ -68,23 +67,22 @@ public AppConfig(final String host, final Map<String, Secret> secrets) {
 
         if (StringUtils.isNotBlank(providerConfig)) {
             providerConfigHash = DigestUtils.sha256Hex(providerConfig);
-            providerConfigRoot = parseProviderConfig(providerConfig);
+            final JsonNode providerConfigRoot = parseProviderConfig(providerConfig);
             model = buildModelFromProviderConfigNode(providerConfigRoot, "chat", AIModelType.TEXT);
             imageModel = buildModelFromProviderConfigNode(providerConfigRoot, "image", AIModelType.IMAGE);
             embeddingsModel = buildModelFromProviderConfigNode(providerConfigRoot, "embeddings", AIModelType.EMBEDDINGS);
         } else {
             providerConfigHash = "no-config";
-            providerConfigRoot = MAPPER.createObjectNode();
             model = AIModel.NOOP_MODEL;
             imageModel = AIModel.NOOP_MODEL;
             embeddingsModel = AIModel.NOOP_MODEL;
         }
 
-        rolePrompt = getFromSection(providerConfigRoot, "chat", "rolePrompt", AppKeys.ROLE_PROMPT.defaultValue);
-        textPrompt = getFromSection(providerConfigRoot, "chat", "textPrompt", AppKeys.TEXT_PROMPT.defaultValue);
-        imagePrompt = getFromSection(providerConfigRoot, "image", "imagePrompt", AppKeys.IMAGE_PROMPT.defaultValue);
-        imageSize = getFromSection(providerConfigRoot, "image", "size", AppKeys.IMAGE_SIZE.defaultValue);
-        listenerIndexer = getFromSection(providerConfigRoot, "embeddings", "listenerIndexer", AppKeys.LISTENER_INDEXER.defaultValue);
+        rolePrompt = aiAppUtil.discoverSecret(secrets, AppKeys.ROLE_PROMPT);
+        textPrompt = aiAppUtil.discoverSecret(secrets, AppKeys.TEXT_PROMPT);
+        imagePrompt = aiAppUtil.discoverSecret(secrets, AppKeys.IMAGE_PROMPT);
+        imageSize = aiAppUtil.discoverSecret(secrets, AppKeys.IMAGE_SIZE);
+        listenerIndexer = aiAppUtil.discoverSecret(secrets, AppKeys.LISTENER_INDEXER);
 
         configValues = secrets.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
 
@@ -329,7 +327,7 @@ public String getProviderConfig() {
     }
 
     /**
-     * Returns the SHA-256 hex digest of the {@code providerConfig} JSON, or {@code "no-config"} if not set.
+     * Returns the SHA-256 hex digest of the {@code providerConfig} JSON, or {@code null} if not set.
      * Computed once at construction time — safe to use as a cache key on every request.
      */
     public String getProviderConfigHash() {
@@ -355,25 +353,6 @@ public boolean isEnabled() {
         return true;
     }
 
-    private static String getFromSection(final JsonNode root, final String section,
-                                         final String field, final String defaultValue) {
-        try {
-            final JsonNode sectionNode = root.get(section);
-            if (sectionNode == null || sectionNode.isNull()) {
-                return defaultValue;
-            }
-            final JsonNode fieldNode = sectionNode.get(field);
-            if (fieldNode == null || fieldNode.isNull()) {
-                return defaultValue;
-            }
-            // Container nodes (object/array) are serialized back to a JSON string (e.g. listenerIndexer)
-            final String value = fieldNode.isContainerNode() ? fieldNode.toString() : fieldNode.asText();
-            return StringUtils.isNotBlank(value) ? value : defaultValue;
-        } catch (final Exception e) {
-            return defaultValue;
-        }
-    }
-
     @com.google.common.annotations.VisibleForTesting
     static JsonNode parseProviderConfig(final String json) {
         try {