Merge branch 'release/35.x'

* release/35.x: #5294 - Advanced LLM options not saved
inception-project · Feb 17, 2025 · eda4d37 · eda4d37
2 parents 560978b + 5100fdf
commit eda4d37
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/...inception/recommendation/imls/llm/support/traits/LlmRecommenderTraitsEditor_ImplBase.html b/...inception/recommendation/imls/llm/support/traits/LlmRecommenderTraitsEditor_ImplBase.html
@@ -104,8 +104,8 @@
           <textarea wicket:id="prompt" class="form-control" rows="10"/>
         </div>
       </div>
-      <div wicket:id="optionsPanel"/>
     </div>
+    <div wicket:id="optionsPanel"/>
   </form>
 </wicket:panel>
 </html>
diff --git a/...inception/recommendation/imls/llm/support/traits/LlmRecommenderTraitsEditor_ImplBase.java b/...inception/recommendation/imls/llm/support/traits/LlmRecommenderTraitsEditor_ImplBase.java
@@ -25,6 +25,7 @@
 import static java.util.Collections.emptyList;
 
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Optional;
 
@@ -142,11 +143,11 @@ protected void onSubmit()
                 optionSettingsList.add(new OptionSetting(option, e.getValue()));
             });
         }
-        optionSettings = new ListModel<>(optionSettingsList);
 
+        optionSettings = new ListModel<>(optionSettingsList);
         optionSettingsContainer = new OptionsPanel(MID_OPTIONS_PANEL, options, optionSettings);
         optionSettingsContainer.setOutputMarkupPlaceholderTag(true);
-        promptContainer.add(optionSettingsContainer);
+        form.add(optionSettingsContainer);
 
         var presetSelect = new DropDownChoice<Preset>(MID_PRESET);
         presetSelect.setModel(Model.of());
@@ -192,6 +193,12 @@ protected AuthenticationTraitsEditor createAuthenticationTraitsEditor(String aId
     protected void onSubmit()
     {
         authenticationTraitsEditor.commit();
+        var optionsMap = new LinkedHashMap<String, Object>();
+        for (var optionSetting : optionSettings.getObject()) {
+            var option = optionSetting.getOption();
+            optionsMap.put(option.getName(), option.parseValue(optionSetting.getValue()));
+        }
+        traits.getObject().setOptions(optionsMap);
         getToolFactory().writeTraits(getModelObject(), traits.getObject());
     }