Merge branch '8.18' into backport/8.18/pr-209973

package.json

@@ -1261,7 +1261,7 @@
     "rxjs": "^7.8.1",
     "safe-squel": "^5.12.5",
     "seedrandom": "^3.0.5",
-    "semver": "^7.7.0",
+    "semver": "^7.7.1",
     "set-value": "^4.1.0",
     "snakecase-keys": "^8.0.0",
     "source-map-support": "^0.5.19",

x-pack/platform/packages/shared/kbn-inference-endpoint-ui-common/src/components/configuration/configuration_form_items.test.tsx

@@ -0,0 +1,87 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { ConfigurationFormItems } from './configuration_form_items';
+import { render, screen } from '@testing-library/react';
+import { FieldType } from '../../types/dynamic_config/types';
+
+describe('ConfigurationFormItems', () => {
+  const mockItems = [
+    {
+      key: 'model_id',
+      isValid: true,
+      label: 'Model ID',
+      description: 'Enter model ID',
+      validationErrors: [],
+      required: true,
+      sensitive: false,
+      value: '',
+      default_value: '',
+      updatable: false,
+      type: FieldType.STRING,
+      supported_task_types: ['text_embedding'],
+    },
+  ];
+
+  const defaultProps = {
+    isLoading: false,
+    items: mockItems,
+    setConfigEntry: jest.fn(),
+  };
+
+  it('renders link when isInternalProvider is true and key is model_id', () => {
+    render(<ConfigurationFormItems {...defaultProps} isInternalProvider={true} />);
+
+    const link = screen.getByRole('link', { name: /looking for elasticsearch model ids/i });
+    expect(link).toBeInTheDocument();
+    expect(link).toHaveAttribute(
+      'href',
+      'https://www.elastic.co/guide/en/elasticsearch/reference/current/inference-apis.html#default-enpoints'
+    );
+
+    expect(screen.getByTestId('model_id-input')).toBeInTheDocument();
+  });
+
+  it('does not renders link when isInternalProvider is true and key is  model_id', () => {
+    const numAllocations = [
+      {
+        key: 'num_allocations',
+        isValid: true,
+        label: 'Number Allocations',
+        description:
+          'The total number of allocations this model is assigned across machine learning nodes.',
+        validationErrors: [],
+        required: true,
+        sensitive: false,
+        value: '',
+        default_value: 1,
+        updatable: true,
+        type: FieldType.INTEGER,
+        supported_task_types: ['text_embedding'],
+      },
+    ];
+
+    const props = {
+      isLoading: false,
+      items: numAllocations,
+      setConfigEntry: jest.fn(),
+    };
+
+    render(<ConfigurationFormItems {...props} isInternalProvider={true} />);
+
+    const link = screen.queryByRole('link', { name: /looking for elasticsearch model ids/i });
+    expect(link).not.toBeInTheDocument();
+  });
+
+  it('does not renders link when isInternalProvider is false and key is model_id', () => {
+    render(<ConfigurationFormItems {...defaultProps} isInternalProvider={false} />);
+
+    const link = screen.queryByRole('link', { name: /looking for elasticsearch model ids/i });
+    expect(link).not.toBeInTheDocument();
+  });
+});

x-pack/platform/packages/shared/kbn-inference-endpoint-ui-common/src/components/configuration/configuration_form_items.tsx

@@ -12,6 +12,7 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
   EuiFormRow,
+  EuiLink,
   EuiSpacer,
   EuiText,
 } from '@elastic/eui';
@@ -27,6 +28,7 @@ interface ConfigurationFormItemsProps {
   direction?: 'column' | 'row' | 'rowReverse' | 'columnReverse' | undefined;
   isEdit?: boolean;
   isPreconfigured?: boolean;
+  isInternalProvider?: boolean;
 }
 
 export const ConfigurationFormItems: React.FC<ConfigurationFormItemsProps> = ({
@@ -36,6 +38,7 @@ export const ConfigurationFormItems: React.FC<ConfigurationFormItemsProps> = ({
   direction,
   isEdit,
   isPreconfigured,
+  isInternalProvider,
 }) => {
   return (
     <EuiFlexGroup direction={direction} data-test-subj="configuration-fields">
@@ -54,6 +57,22 @@ export const ConfigurationFormItems: React.FC<ConfigurationFormItemsProps> = ({
           <p>{label}</p>
         );
 
+        const helpText =
+          isInternalProvider && key === 'model_id' && !isPreconfigured ? (
+            <>
+              {description}{' '}
+              <EuiLink
+                href="https://www.elastic.co/guide/en/elasticsearch/reference/current/inference-apis.html#default-enpoints"
+                external
+                target="_blank"
+              >
+                {LABELS.ES_MODELS_LINK_TEXT}
+              </EuiLink>
+            </>
+          ) : (
+            description
+          );
+
         const optionalLabel = !required ? (
           <EuiText color="subdued" size="xs">
             {LABELS.OPTIONALTEXT}
@@ -65,7 +84,7 @@ export const ConfigurationFormItems: React.FC<ConfigurationFormItemsProps> = ({
             <EuiFormRow
               label={rowLabel}
               fullWidth
-              helpText={description}
+              helpText={helpText}
               error={validationErrors}
               isInvalid={!isValid}
               labelAppend={optionalLabel}

x-pack/platform/packages/shared/kbn-inference-endpoint-ui-common/src/components/inference_service_form_fields.tsx

@@ -358,6 +358,8 @@ export const InferenceServiceFormFields: React.FC<InferenceServicesProps> = ({
     setRequiredProviderFormFields(existingConfiguration.filter((p) => p.required || p.sensitive));
   }, [config?.providerConfig, providerSchema, secrets, selectedTaskType]);
 
+  const isInternalProvider = config?.provider === 'elasticsearch'; // To display link for model_ids for Elasticsearch provider
+
   return !isLoading ? (
     <>
       <UseField
@@ -415,6 +417,7 @@ export const InferenceServiceFormFields: React.FC<InferenceServicesProps> = ({
             setConfigEntry={onSetProviderConfigEntry}
             isEdit={isEdit}
             isPreconfigured={isPreconfigured}
+            isInternalProvider={isInternalProvider}
           />
           <EuiSpacer size="m" />
           <AdditionalOptionsFields

x-pack/platform/packages/shared/kbn-inference-endpoint-ui-common/src/translations.ts

@@ -120,6 +120,13 @@ export const OPTIONALTEXT = i18n.translate(
   }
 );
 
+export const ES_MODELS_LINK_TEXT = i18n.translate(
+  'xpack.inferenceEndpointUICommon.components.esModelsLinkText',
+  {
+    defaultMessage: 'Looking for Elasticsearch model Ids',
+  }
+);
+
 export const RE_ENTER_SECRETS = (label: string) => {
   return i18n.translate('xpack.inferenceEndpointUICommon.components.requiredGenericTextField', {
     defaultMessage:

x-pack/platform/plugins/shared/inference/server/chat_complete/utils/function_calling_support.test.ts

@@ -60,5 +60,13 @@ describe('isNativeFunctionCallingSupported', () => {
       });
       expect(isNativeFunctionCallingSupported(connector)).toBe(false);
     });
+
+    it('returns true if the config is not exposed', () => {
+      const connector = createConnector({
+        type: InferenceConnectorType.OpenAI,
+        config: {},
+      });
+      expect(isNativeFunctionCallingSupported(connector)).toBe(true);
+    });
   });
 });

x-pack/platform/plugins/shared/inference/server/chat_complete/utils/function_calling_support.ts

@@ -11,9 +11,9 @@ import { OpenAiProviderType } from '../adapters/openai/types';
 export const isNativeFunctionCallingSupported = (connector: InferenceConnector): boolean => {
   switch (connector.type) {
     case InferenceConnectorType.OpenAI:
-      const apiProvider =
-        (connector.config.apiProvider as OpenAiProviderType) ?? OpenAiProviderType.Other;
-      return apiProvider !== OpenAiProviderType.Other;
+      const apiProvider = (connector.config.apiProvider as OpenAiProviderType) ?? undefined;
+      // defaulting to `true` when the config is not accessible
+      return apiProvider ? apiProvider !== OpenAiProviderType.Other : true;
     case InferenceConnectorType.Inference:
       // note: later we might need to check the provider type, for now let's assume support
       //       will be handled by ES and that all providers will support native FC.