[9.3] [AI Connector][Inference endpoint] Creation: adaptive allocations not set correctly on serverless (#251357) (#254585)

saikatsarkar056 · web-flow · commit 342266a63c5c · 2026-02-23T15:57:27.000-07:00
# Backport This will backport the following commits from `main` to `9.3`: - [[AI Connector][Inference endpoint] Creation: adaptive allocations not set correctly on serverless (#251357)](#251357)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport)
diff --git a/x-pack/platform/packages/shared/kbn-inference-endpoint-ui-common/src/components/inference_flyout_wrapper.test.tsx b/x-pack/platform/packages/shared/kbn-inference-endpoint-ui-common/src/components/inference_flyout_wrapper.test.tsx
@@ -198,4 +198,38 @@ describe('InferenceFlyout', () => {
     renderComponent({ isEdit: true, inferenceEndpoint: mockEndpoint });
     expect(screen.getByTestId('num_allocations-number')).toBeEnabled();
   });
+
+  it('excludes num_allocations from update payload when adaptive allocations is enabled', async () => {
+    const mockEndpoint = {
+      config: {
+        inferenceId: 'test-id',
+        provider: 'elasticsearch',
+        taskType: 'text_embedding',
+        providerConfig: {
+          model_id: '.elser_model_2',
+          num_allocations: 1,
+          'adaptive_allocations.max_number_of_allocations': 5,
+        },
+      },
+      secrets: {
+        providerSecrets: {},
+      },
+    };
+
+    renderComponent({
+      isEdit: true,
+      enforceAdaptiveAllocations: true,
+      inferenceEndpoint: mockEndpoint,
+    });
+
+    await userEvent.click(screen.getByTestId('inference-endpoint-submit-button'));
+
+    const submittedData = mockMutationFn.mock.calls[0][0];
+    expect(submittedData.config.providerConfig.adaptive_allocations).toEqual({
+      enabled: true,
+      min_number_of_allocations: 0,
+      max_number_of_allocations: 5,
+    });
+    expect(submittedData.config.providerConfig).not.toHaveProperty('num_allocations');
+  });
 });
diff --git a/x-pack/platform/packages/shared/kbn-inference-endpoint-ui-common/src/components/inference_flyout_wrapper.tsx b/x-pack/platform/packages/shared/kbn-inference-endpoint-ui-common/src/components/inference_flyout_wrapper.tsx
@@ -18,6 +18,7 @@ import {
   EuiTitle,
   useGeneratedHtmlId,
 } from '@elastic/eui';
+import { omit } from 'lodash';
 import React, { useCallback } from 'react';
 import type { HttpSetup, IToasts } from '@kbn/core/public';
 import { Form, useForm } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
@@ -29,25 +30,37 @@ import { useInferenceEndpointMutation } from '../hooks/use_inference_endpoint_mu
 const MIN_ALLOCATIONS = 0;
 const DEFAULT_NUM_THREADS = 1;
 
+const ADAPTIVE_ALLOCATIONS_FLAT_KEYS = [
+  'adaptive_allocations.max_number_of_allocations',
+  'adaptive_allocations.enabled',
+  'adaptive_allocations.min_number_of_allocations',
+];
+
 const formDeserializer = (data: InferenceEndpoint) => {
-  if (
+  const maxAllocations =
     data.config?.providerConfig?.adaptive_allocations?.max_number_of_allocations ||
-    data.config?.headers
-  ) {
+    data.config?.providerConfig?.['adaptive_allocations.max_number_of_allocations'];
+
+  if (maxAllocations || data.config?.headers) {
     const { headers, ...restConfig } = data.config;
-    const maxAllocations =
-      data.config.providerConfig?.adaptive_allocations?.max_number_of_allocations;
+    const restProviderConfig = omit(
+      data.config.providerConfig || {},
+      ADAPTIVE_ALLOCATIONS_FLAT_KEYS
+    );
 
     return {
       ...data,
       config: {
         ...restConfig,
         providerConfig: {
-          ...(data.config.providerConfig as InferenceEndpoint['config']['providerConfig']),
+          ...restProviderConfig,
           ...(headers ? { headers } : {}),
           ...(maxAllocations
             ? // remove the adaptive_allocations from the data config as form does not expect it
-              { max_number_of_allocations: maxAllocations, adaptive_allocations: undefined }
+              {
+                max_number_of_allocations: maxAllocations as number,
+                adaptive_allocations: undefined,
+              }
             : {}),
         },
       },
@@ -66,6 +79,7 @@ export const formSerializer = (formData: InferenceEndpoint) => {
     const {
       max_number_of_allocations: maxAllocations,
       headers,
+      num_allocations: numAllocations,
       ...restProviderConfig
     } = providerConfig || {};
 
@@ -85,7 +99,7 @@ export const formSerializer = (formData: InferenceEndpoint) => {
                 // Temporary solution until the endpoint is updated to no longer require it and to set its own default for this value
                 num_threads: DEFAULT_NUM_THREADS,
               }
-            : {}),
+            : { ...(numAllocations != null && { num_allocations: numAllocations }) }),
         },
         ...(headers ? { headers } : {}),
       },
diff --git a/x-pack/platform/plugins/shared/inference_endpoint/server/routes/index.ts b/x-pack/platform/plugins/shared/inference_endpoint/server/routes/index.ts
@@ -228,15 +228,22 @@ export const getInferenceServicesRoute = (
 
           const taskSettings = config?.headers ? { headers: config.headers } : undefined;
 
-          // currently update api only allows api_key and num_allocations
+          const adaptiveAllocations = config?.providerConfig?.adaptive_allocations;
+          const numAllocations = config?.providerConfig?.num_allocations;
+
+          let allocationSettings = {};
+          if (adaptiveAllocations) {
+            allocationSettings = { adaptive_allocations: adaptiveAllocations };
+          } else if (numAllocations) {
+            allocationSettings = { num_allocations: numAllocations };
+          }
+
           const body = {
             service_settings: {
               ...(secrets?.providerSecrets?.api_key && {
                 api_key: secrets.providerSecrets.api_key,
               }),
-              ...(config?.providerConfig?.num_allocations !== undefined && {
-                num_allocations: config.providerConfig.num_allocations,
-              }),
+              ...allocationSettings,
             },
             ...(taskSettings ? { task_settings: taskSettings } : {}),
           };
