Skip to content

Commit 0166d98

Browse files
Adding model tests
1 parent df1b006 commit 0166d98

File tree

1 file changed

+40
-0
lines changed

1 file changed

+40
-0
lines changed

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/openai/completion/OpenAiChatCompletionModelTests.java

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@
1010
import org.elasticsearch.common.settings.SecureString;
1111
import org.elasticsearch.core.Nullable;
1212
import org.elasticsearch.inference.TaskType;
13+
import org.elasticsearch.inference.UnifiedCompletionRequest;
1314
import org.elasticsearch.test.ESTestCase;
1415
import org.elasticsearch.xpack.inference.services.settings.DefaultSecretSettings;
1516

17+
import java.util.List;
1618
import java.util.Map;
1719

1820
import static org.elasticsearch.xpack.inference.services.openai.completion.OpenAiChatCompletionRequestTaskSettingsTests.getChatCompletionRequestTaskSettingsMap;
@@ -46,6 +48,44 @@ public void testOverrideWith_NullMap() {
4648
assertThat(overriddenModel, sameInstance(model));
4749
}
4850

51+
public void testOverrideWith_UnifiedCompletionRequest_OverridesModelId() {
52+
var model = createChatCompletionModel("url", "org", "api_key", "model_name", "user");
53+
var request = new UnifiedCompletionRequest(
54+
List.of(new UnifiedCompletionRequest.Message(new UnifiedCompletionRequest.ContentString("hello"), "role", null, null, null)),
55+
"different_model",
56+
null,
57+
null,
58+
null,
59+
null,
60+
null,
61+
null
62+
);
63+
64+
assertThat(
65+
OpenAiChatCompletionModel.of(model, request),
66+
is(createChatCompletionModel("url", "org", "api_key", "different_model", "user"))
67+
);
68+
}
69+
70+
public void testOverrideWith_UnifiedCompletionRequest_UsesModelFields_WhenRequestDoesNotOverride() {
71+
var model = createChatCompletionModel("url", "org", "api_key", "model_name", "user");
72+
var request = new UnifiedCompletionRequest(
73+
List.of(new UnifiedCompletionRequest.Message(new UnifiedCompletionRequest.ContentString("hello"), "role", null, null, null)),
74+
null, // not overriding model
75+
null,
76+
null,
77+
null,
78+
null,
79+
null,
80+
null
81+
);
82+
83+
assertThat(
84+
OpenAiChatCompletionModel.of(model, request),
85+
is(createChatCompletionModel("url", "org", "api_key", "model_name", "user"))
86+
);
87+
}
88+
4989
public static OpenAiChatCompletionModel createChatCompletionModel(
5090
String url,
5191
@Nullable String org,

0 commit comments

Comments
 (0)