Refactor OpenShift AI model to use model ID directly instead of UnifiedCompletionRequest

Author: Jan-Kazlouski-elastic

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/openshiftai/OpenShiftAiService.java

@@ -138,7 +138,7 @@ protected void doUnifiedCompletionInfer(
         }
 
         OpenShiftAiChatCompletionModel chatCompletionModel = (OpenShiftAiChatCompletionModel) model;
-        var overriddenModel = OpenShiftAiChatCompletionModel.of(chatCompletionModel, inputs.getRequest());
+        var overriddenModel = OpenShiftAiChatCompletionModel.of(chatCompletionModel, inputs.getRequest().model());
         var manager = new GenericRequestManager<>(
             getServiceComponents().threadPool(),
             overriddenModel,

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/openshiftai/completion/OpenShiftAiChatCompletionModel.java

@@ -12,14 +12,14 @@
 import org.elasticsearch.inference.ModelSecrets;
 import org.elasticsearch.inference.SecretSettings;
 import org.elasticsearch.inference.TaskType;
-import org.elasticsearch.inference.UnifiedCompletionRequest;
 import org.elasticsearch.xpack.inference.external.action.ExecutableAction;
 import org.elasticsearch.xpack.inference.services.ConfigurationParseContext;
 import org.elasticsearch.xpack.inference.services.openshiftai.OpenShiftAiModel;
 import org.elasticsearch.xpack.inference.services.openshiftai.action.OpenShiftAiActionVisitor;
 import org.elasticsearch.xpack.inference.services.settings.DefaultSecretSettings;
 
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * Represents an OpenShift AI chat completion model.
@@ -79,18 +79,18 @@ public OpenShiftAiChatCompletionModel(
      * If the request does not specify a model ID, the original model is returned.
      *
      * @param model the original OpenShiftAiChatCompletionModel
-     * @param request the UnifiedCompletionRequest containing potential overrides
+     * @param modelId the model ID specified in the request, which may override the original model's ID
      * @return a new OpenShiftAiChatCompletionModel with overridden settings or the original model ID if no overrides are specified
      */
-    public static OpenShiftAiChatCompletionModel of(OpenShiftAiChatCompletionModel model, UnifiedCompletionRequest request) {
-        if (request.model() == null) {
-            // If no model ID is specified in the request, return the original model
+    public static OpenShiftAiChatCompletionModel of(OpenShiftAiChatCompletionModel model, String modelId) {
+        if (modelId == null || Objects.equals(model.getServiceSettings().modelId(), modelId)) {
+            // If no model ID is specified in the request, or if it matches the original model's ID, return the original model.
             return model;
         }
 
         var originalModelServiceSettings = model.getServiceSettings();
         var overriddenServiceSettings = new OpenShiftAiChatCompletionServiceSettings(
-            request.model(),
+            modelId,
             originalModelServiceSettings.uri(),
             originalModelServiceSettings.rateLimitSettings()
         );

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/openshiftai/completion/OpenShiftAiChatCompletionModelTests.java

@@ -9,12 +9,9 @@
 
 import org.elasticsearch.common.settings.SecureString;
 import org.elasticsearch.inference.TaskType;
-import org.elasticsearch.inference.UnifiedCompletionRequest;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.xpack.inference.services.settings.DefaultSecretSettings;
 
-import java.util.List;
-
 import static org.hamcrest.Matchers.is;
 
 public class OpenShiftAiChatCompletionModelTests extends ESTestCase {
@@ -38,90 +35,21 @@ public static OpenShiftAiChatCompletionModel createModelWithTaskType(String url,
 
     public void testOverrideWith_UnifiedCompletionRequest_KeepsSameModelId() {
         var model = createCompletionModel("url", "api_key", "model_name");
-        var request = new UnifiedCompletionRequest(
-            List.of(new UnifiedCompletionRequest.Message(new UnifiedCompletionRequest.ContentString("hello"), "role", null, null)),
-            "model_name", // same model
-            null,
-            null,
-            null,
-            null,
-            null,
-            null
-        );
-
-        var overriddenModel = OpenShiftAiChatCompletionModel.of(model, request);
+        var overriddenModel = OpenShiftAiChatCompletionModel.of(model, "model_name");
 
-        assertThat(overriddenModel, is(model));
+        assertThat(overriddenModel.getServiceSettings().modelId(), is("model_name"));
     }
 
     public void testOverrideWith_UnifiedCompletionRequest_OverridesExistingModelId() {
         var model = createCompletionModel("url", "api_key", "model_name");
-        var request = new UnifiedCompletionRequest(
-            List.of(new UnifiedCompletionRequest.Message(new UnifiedCompletionRequest.ContentString("hello"), "role", null, null)),
-            "different_model", // overriding model
-            null,
-            null,
-            null,
-            null,
-            null,
-            null
-        );
-
-        var overriddenModel = OpenShiftAiChatCompletionModel.of(model, request);
+        var overriddenModel = OpenShiftAiChatCompletionModel.of(model, "different_model");
 
         assertThat(overriddenModel.getServiceSettings().modelId(), is("different_model"));
     }
 
-    public void testOverrideWith_UnifiedCompletionRequest_OverridesNullModelId() {
-        var model = createCompletionModel("url", "api_key", null);
-        var request = new UnifiedCompletionRequest(
-            List.of(new UnifiedCompletionRequest.Message(new UnifiedCompletionRequest.ContentString("hello"), "role", null, null)),
-            "different_model", // overriding model
-            null,
-            null,
-            null,
-            null,
-            null,
-            null
-        );
-
-        var overriddenModel = OpenShiftAiChatCompletionModel.of(model, request);
-
-        assertThat(overriddenModel.getServiceSettings().modelId(), is("different_model"));
-    }
-
-    public void testOverrideWith_UnifiedCompletionRequest_KeepsNullIfNoModelIdProvided() {
-        var model = createCompletionModel("url", "api_key", null);
-        var request = new UnifiedCompletionRequest(
-            List.of(new UnifiedCompletionRequest.Message(new UnifiedCompletionRequest.ContentString("hello"), "role", null, null)),
-            null, // not overriding model
-            null,
-            null,
-            null,
-            null,
-            null,
-            null
-        );
-
-        var overriddenModel = OpenShiftAiChatCompletionModel.of(model, request);
-
-        assertNull(overriddenModel.getServiceSettings().modelId());
-    }
-
     public void testOverrideWith_UnifiedCompletionRequest_UsesModelFields_WhenRequestDoesNotOverride() {
         var model = createCompletionModel("url", "api_key", "model_name");
-        var request = new UnifiedCompletionRequest(
-            List.of(new UnifiedCompletionRequest.Message(new UnifiedCompletionRequest.ContentString("hello"), "role", null, null)),
-            null, // not overriding model
-            null,
-            null,
-            null,
-            null,
-            null,
-            null
-        );
-
-        var overriddenModel = OpenShiftAiChatCompletionModel.of(model, request);
+        var overriddenModel = OpenShiftAiChatCompletionModel.of(model, null);
 
         assertThat(overriddenModel.getServiceSettings().modelId(), is("model_name"));
     }