Skip to content

[Inference API] Fix model field in OpenAI Upgrade IT #119362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 30, 2024
Merged

[Inference API] Fix model field in OpenAI Upgrade IT #119362

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e5372a
Fix NPE by getting request once and defaulting to empty list
Dec 30, 2024
3d2d6a7
Merge branch 'main' of https://github.com/elastic/elasticsearch
Dec 30, 2024
cc0de43
Fix error in OpenAIUpgrade test which used the wrong field name for c…
Dec 30, 2024
12116c1
[CI] Auto commit changes from spotless
Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions ...ade/src/javaRestTest/java/org/elasticsearch/xpack/application/OpenAiServiceUpgradeIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
import org.junit.BeforeClass;

import java.io.IOException;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;

Expand Down Expand Up @@ -83,8 +85,9 @@ public void testOpenAiEmbeddings() throws IOException {
assertEquals("openai", configs.get(0).get("service"));
var serviceSettings = (Map<String, Object>) configs.get(0).get("service_settings");
var taskSettings = (Map<String, Object>) configs.get(0).get("task_settings");
var modelIdFound = serviceSettings.containsKey("model_id") || taskSettings.containsKey("model_id");
assertTrue("model_id not found in config: " + configs.toString(), modelIdFound);
var modelIdFound = serviceSettings.containsKey("model_id")
|| (taskSettings.containsKey("model") && getOldClusterTestVersion().onOrBefore(OPEN_AI_EMBEDDINGS_MODEL_SETTING_MOVED));
assertTrue("model_id not found in config: " + configs, modelIdFound);

assertEmbeddingInference(oldClusterId);
} else if (isUpgradedCluster()) {
Expand Down Expand Up @@ -139,9 +142,11 @@ public void testOpenAiCompletions() throws IOException {

assertCompletionInference(oldClusterId);
} else if (isMixedCluster()) {
var configs = (List<Map<String, Object>>) get(testTaskType, oldClusterId).get("endpoints");
List<Map<String, Object>> configs = new LinkedList<>();
var request = get(testTaskType, oldClusterId);
configs.addAll((Collection<? extends Map<String, Object>>) request.getOrDefault("endpoints", List.of()));
if (oldClusterHasFeature("gte_v" + MODELS_RENAMED_TO_ENDPOINTS) == false) {
configs.addAll((List<Map<String, Object>>) get(testTaskType, oldClusterId).get(old_cluster_endpoint_identifier));
configs.addAll((List<Map<String, Object>>) request.getOrDefault(old_cluster_endpoint_identifier, List.of()));
// in version 8.15, there was a breaking change where "models" was renamed to "endpoints"
}
assertEquals("openai", configs.get(0).get("service"));
Expand Down
Loading