Strip linux suffix from model_id for default stats

Author: dimitris-athanasiou

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/TransportInferenceUsageAction.java

@@ -232,10 +232,20 @@ private static Map<String, List<InferenceFieldMetadata>> filterFields(
 
     private record DefaultModelStatsKey(String service, TaskType taskType, String modelId) {
 
+        // Some of the default models have optimized variants for linux that will have the following suffix.
+        private static final String MODEL_ID_LINUX_SUFFIX = "-x86_64";
+
         @Override
         public String toString() {
             // Inference ids cannot start with '_'. Thus, default stats do to avoid conflicts with user-defined inference ids.
-            return "_" + service + "_" + modelId.replace('.', '_');
+            return "_" + service + "_" + stripLinuxSuffix(modelId).replace('.', '_');
+        }
+
+        private static String stripLinuxSuffix(String modelId) {
+            if (modelId.endsWith(MODEL_ID_LINUX_SUFFIX)) {
+                return modelId.substring(0, modelId.length() - MODEL_ID_LINUX_SUFFIX.length());
+            }
+            return modelId;
         }
     }
 

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/TransportInferenceUsageActionTests.java

@@ -220,6 +220,39 @@ public void testGivenServices_SemanticTextFieldsDefaultModels() throws Exception
         assertStats(response, 8, new ModelStats("openai", TaskType.TEXT_EMBEDDING, 1, new SemanticTextStats()));
     }
 
+    public void testGivenDefaultModelWithLinuxSuffix() throws Exception {
+        givenInferenceEndpoints(
+            new ModelConfigurations(".endpoint-001", TaskType.TEXT_EMBEDDING, "eis", mockServiceSettings(".model-id-001-x86_64")),
+            new ModelConfigurations("endpoint-002", TaskType.TEXT_EMBEDDING, "eis", mockServiceSettings(".model-id-001-x86_64"))
+        );
+
+        givenDefaultEndpoints(".endpoint-001");
+
+        givenInferenceFields(
+            Map.of(
+                "index_1",
+                List.of(
+                    new InferenceFieldMetadata("semantic-1", ".endpoint-001", new String[0], null),
+                    new InferenceFieldMetadata("semantic-2", ".endpoint-001", new String[0], null),
+                    new InferenceFieldMetadata("semantic-3", "endpoint-002", new String[0], null)
+                ),
+                "index_2",
+                List.of(
+                    new InferenceFieldMetadata("semantic-1", ".endpoint-001", new String[0], null),
+                    new InferenceFieldMetadata("semantic-2", ".endpoint-001", new String[0], null),
+                    new InferenceFieldMetadata("semantic-3", "endpoint-002", new String[0], null)
+                )
+            )
+        );
+
+        XContentSource response = executeAction();
+
+        assertThat(response.getValue("models"), hasSize(3));
+        assertStats(response, 0, new ModelStats("_all", TaskType.TEXT_EMBEDDING, 2, new SemanticTextStats(6, 2, 2)));
+        assertStats(response, 1, new ModelStats("_eis__model-id-001", TaskType.TEXT_EMBEDDING, 2, new SemanticTextStats(6, 2, 2)));
+        assertStats(response, 2, new ModelStats("eis", TaskType.TEXT_EMBEDDING, 2, new SemanticTextStats(6, 2, 2)));
+    }
+
     public void testGivenExternalServiceModelIsNull() throws Exception {
         givenInferenceEndpoints(new ModelConfigurations("endpoint-001", TaskType.TEXT_EMBEDDING, "openai", mockServiceSettings(null)));
         givenInferenceFields(Map.of("index_1", List.of(new InferenceFieldMetadata("semantic", "endpoint-001", new String[0], null))));