tests

elastic · Oct 30, 2024 · b11e196 · b11e196
1 parent 7c8025a
commit b11e196
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/x-pack/plugins/elastic_assistant/server/ai_assistant_data_clients/knowledge_base/index.ts b/x-pack/plugins/elastic_assistant/server/ai_assistant_data_clients/knowledge_base/index.ts
@@ -191,11 +191,11 @@ export class AIAssistantKnowledgeBaseDataClient extends AIAssistantDataClient {
           stats.deployment_stats?.allocation_status.state === 'fully_allocated';
 
         const isReadyServerless = (stats: MlTrainedModelStats) =>
-          (stats.deployment_stats?.nodes as unknown as MlTrainedModelDeploymentNodesStats[]).some(
+          (stats.deployment_stats?.nodes as unknown as MlTrainedModelDeploymentNodesStats[])?.some(
             (node) => node.routing_state.routing_state === 'started'
           );
 
-        return getResponse.trained_model_stats.some(
+        return getResponse.trained_model_stats?.some(
           (stats) => isReadyESS(stats) || isReadyServerless(stats)
         );
       }

diff --git a/x-pack/plugins/elastic_assistant/server/routes/knowledge_base/get_knowledge_base_status.ts b/x-pack/plugins/elastic_assistant/server/routes/knowledge_base/get_knowledge_base_status.ts
@@ -73,13 +73,19 @@ export const getKnowledgeBaseStatusRoute = (router: ElasticAssistantPluginRouter
             pipeline_exists: pipelineExists,
           };
 
-          if (v2KnowledgeBaseEnabled && indexExists && isModelDeployed) {
-            const securityLabsExists = await kbDataClient.isSecurityLabsDocsLoaded();
+          if (indexExists && isModelDeployed) {
+            const securityLabsExists = v2KnowledgeBaseEnabled
+              ? await kbDataClient.isSecurityLabsDocsLoaded()
+              : true;
+            const userDataExists = v2KnowledgeBaseEnabled
+              ? await kbDataClient.isUserDataExists()
+              : true;
+
             return response.ok({
               body: {
                 ...body,
                 security_labs_exists: securityLabsExists,
-                user_data_exists: await kbDataClient.isUserDataExists(),
+                user_data_exists: userDataExists,
               },
             });
           }