Add new transport version

Author: prwhelan

server/src/main/java/org/elasticsearch/TransportVersions.java

@@ -172,6 +172,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19 = def(8_841_0_25);
     public static final TransportVersion INTRODUCE_FAILURES_DEFAULT_RETENTION_BACKPORT_8_19 = def(8_841_0_26);
     public static final TransportVersion RESCORE_VECTOR_ALLOW_ZERO_BACKPORT_8_19 = def(8_841_0_27);
+    public static final TransportVersion ML_INFERENCE_SAGEMAKER_CHAT_COMPLETION_8_19 = def(8_841_0_28);
     public static final TransportVersion V_9_0_0 = def(9_000_0_09);
     public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10);
     public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_2 = def(9_000_0_11);
@@ -248,6 +249,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion INTRODUCE_FAILURES_DEFAULT_RETENTION = def(9_071_0_00);
     public static final TransportVersion FILE_SETTINGS_HEALTH_INFO = def(9_072_0_00);
     public static final TransportVersion FIELD_CAPS_ADD_CLUSTER_ALIAS = def(9_073_0_00);
+    public static final TransportVersion ML_INFERENCE_SAGEMAKER_CHAT_COMPLETION = def(9_074_0_00);
 
     /*
      * STOP! READ THIS FIRST! No, really,

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/SageMakerOpenAiTaskSettings.java

@@ -23,7 +23,7 @@
 import static org.elasticsearch.xpack.inference.services.ServiceUtils.extractOptionalString;
 
 record SageMakerOpenAiTaskSettings(@Nullable String user) implements SageMakerStoredTaskSchema {
-    static final String NAME = "sagemaker_openai_text_embeddings_task_settings"; // also used for completion and chat completion
+    static final String NAME = "sagemaker_openai_task_settings";
     private static final String USER_FIELD = "user";
 
     SageMakerOpenAiTaskSettings(StreamInput in) throws IOException {
@@ -37,7 +37,7 @@ public String getWriteableName() {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.ML_INFERENCE_SAGEMAKER;
+        return TransportVersions.ML_INFERENCE_SAGEMAKER_CHAT_COMPLETION;
     }
 
     @Override

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/sagemaker/schema/openai/OpenAiCompletionPayloadTests.java

@@ -11,6 +11,7 @@
 import software.amazon.awssdk.services.sagemakerruntime.model.InvokeEndpointResponse;
 
 import org.elasticsearch.common.Strings;
+import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.inference.InputType;
 import org.elasticsearch.inference.TaskType;
 import org.elasticsearch.inference.UnifiedCompletionRequest;
@@ -172,8 +173,8 @@ public void testResponse() throws Exception {
     }
 
     public void testStreamResponse() throws Exception {
-        var responseJson = """
-            data: {
+        var responseJson = dataPayload("""
+            {
                 "id":"12345",
                 "object":"chat.completion.chunk",
                 "created":123456789,
@@ -190,14 +191,18 @@ public void testStreamResponse() throws Exception {
                     }
                 ]
             }
-            """.replaceAll("\\s+", "").replaceAll("\\n+", "") + "\n\n";
+            """);
 
-        var streamingResults = payload.streamResponseBody(mockModel(), SdkBytes.fromUtf8String(responseJson));
+        var streamingResults = payload.streamResponseBody(mockModel(), responseJson);
 
         assertThat(streamingResults.results().size(), is(1));
         assertThat(streamingResults.results().iterator().next().delta(), is("test"));
     }
 
+    private SdkBytes dataPayload(String json) throws IOException {
+        return SdkBytes.fromUtf8String("data: " + XContentHelper.stripWhitespace(json) + "\n\n");
+    }
+
     private SageMakerModel mockModel() {
         SageMakerModel model = mock();
         when(model.apiTaskSettings()).thenReturn(randomApiTaskSettings());
@@ -260,12 +265,9 @@ public void testChatCompletionResponse() throws Exception {
                             "total_tokens": 15
                           }
                         }
-            """.replaceAll("\\s+", "").replaceAll("\\n+", "");
+            """;
 
-        var chatCompletionResponse = payload.chatCompletionResponseBody(
-            mockModel(),
-            SdkBytes.fromUtf8String("data:" + responseJson + "\n\n")
-        );
+        var chatCompletionResponse = payload.chatCompletionResponseBody(mockModel(), dataPayload(responseJson));
 
         XContentBuilder builder = JsonXContent.contentBuilder();
         chatCompletionResponse.toXContentChunked(null).forEachRemaining(xContent -> {
@@ -276,6 +278,6 @@ public void testChatCompletionResponse() throws Exception {
             }
         });
 
-        assertEquals(responseJson, Strings.toString(builder).trim());
+        assertEquals(XContentHelper.stripWhitespace(responseJson), Strings.toString(builder).trim());
     }
 }