Explicitly set default chunking settings

davidkyle · Nov 22, 2024 · 4027642 · 4027642
1 parent a1247b3
commit 4027642
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/...ice-tests/src/javaRestTest/java/org/elasticsearch/xpack/inference/DefaultEndPointsIT.java b/...ice-tests/src/javaRestTest/java/org/elasticsearch/xpack/inference/DefaultEndPointsIT.java
@@ -51,6 +51,14 @@ public void tearDown() throws Exception {
         super.tearDown();
     }
 
+    public void testGet() throws IOException {
+        var elserModel = getModel(ElasticsearchInternalService.DEFAULT_ELSER_ID);
+        assertDefaultElserConfig(elserModel);
+
+        var e5Model = getModel(ElasticsearchInternalService.DEFAULT_E5_ID);
+        assertDefaultE5Config(e5Model);
+    }
+
     @SuppressWarnings("unchecked")
     public void testInferDeploysDefaultElser() throws IOException {
         var model = getModel(ElasticsearchInternalService.DEFAULT_ELSER_ID);
@@ -79,6 +87,7 @@ private static void assertDefaultElserConfig(Map<String, Object> modelConfig) {
             adaptiveAllocations,
             Matchers.is(Map.of("enabled", true, "min_number_of_allocations", 0, "max_number_of_allocations", 32))
         );
+        assertDefaultChunkingSettings(modelConfig);
     }
 
     @SuppressWarnings("unchecked")
@@ -113,6 +122,17 @@ private static void assertDefaultE5Config(Map<String, Object> modelConfig) {
             adaptiveAllocations,
             Matchers.is(Map.of("enabled", true, "min_number_of_allocations", 0, "max_number_of_allocations", 32))
         );
+        assertDefaultChunkingSettings(modelConfig);
+    }
+
+    @SuppressWarnings("unchecked")
+    private static void assertDefaultChunkingSettings(Map<String, Object> modelConfig) {
+        var chunkingSettings = (Map<String, Object>) modelConfig.get("chunking_settings");
+        assertThat(
+            modelConfig.toString(),
+            chunkingSettings,
+            Matchers.is(Map.of("strategy", "sentence", "max_chunk_size", 250, "sentence_overlap", 1))
+        );
     }
 
     public void testMultipleInferencesTriggeringDownloadAndDeploy() throws InterruptedException {

diff --git a/...rg/elasticsearch/xpack/inference/services/elasticsearch/ElasticsearchInternalService.java b/...rg/elasticsearch/xpack/inference/services/elasticsearch/ElasticsearchInternalService.java
@@ -862,6 +862,7 @@ public void updateModelsWithDynamicFields(List<Model> models, ActionListener<Lis
         );
     }
 
+    @Override
     public void defaultConfigs(ActionListener<List<Model>> defaultsListener) {
         preferredModelVariantFn.accept(defaultsListener.delegateFailureAndWrap((delegate, preferredModelVariant) -> {
             if (PreferredModelVariant.LINUX_X86_OPTIMIZED.equals(preferredModelVariant)) {
@@ -892,7 +893,7 @@ private List<Model> defaultConfigs(boolean useLinuxOptimizedModel) {
                 new AdaptiveAllocationsSettings(Boolean.TRUE, 0, 32)
             ),
             ElserMlNodeTaskSettings.DEFAULT,
-            null // default chunking settings
+            ChunkingSettingsBuilder.DEFAULT_SETTINGS
         );
         var defaultE5 = new MultilingualE5SmallModel(
             DEFAULT_E5_ID,
@@ -904,7 +905,7 @@ private List<Model> defaultConfigs(boolean useLinuxOptimizedModel) {
                 useLinuxOptimizedModel ? MULTILINGUAL_E5_SMALL_MODEL_ID_LINUX_X86 : MULTILINGUAL_E5_SMALL_MODEL_ID,
                 new AdaptiveAllocationsSettings(Boolean.TRUE, 0, 32)
             ),
-            null // default chunking settings
+            ChunkingSettingsBuilder.DEFAULT_SETTINGS
         );
         return List.of(defaultElser, defaultE5);
     }