Skip to content

fix: restore last selected model state (#1021) #1022

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

Open
mihaibuba wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: restore last selected model state (#1021) #1022

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 18 additions & 6 deletions src/main/java/com/devoxx/genie/ui/settings/DevoxxGenieStateService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,12 @@ public static DevoxxGenieStateService getInstance() {
private String tavilySearchKey = "";
private Integer maxSearchResults = MAX_SEARCH_RESULTS;

// Global fallback fields
private static final String DEFAULT_PROVIDER = ModelProvider.Ollama.getName();
private static final String DEFAULT_LANGUAGE_MODEL = "";

private String lastGlobalProvider = DEFAULT_PROVIDER;
private String lastGlobalLanguageModel = DEFAULT_LANGUAGE_MODEL;
// Last selected language model
private Map<String, String> lastSelectedProvider;
private Map<String, String> lastSelectedLanguageModel;
Expand Down Expand Up @@ -418,13 +424,16 @@ public void setSelectedLanguageModel(@NotNull String projectLocation, String sel
lastSelectedLanguageModel = new HashMap<>();
}
lastSelectedLanguageModel.put(projectLocation, selectedLanguageModel);
lastGlobalLanguageModel = selectedLanguageModel;
}

public String getSelectedLanguageModel(@NotNull String projectLocation) {
if (lastSelectedLanguageModel != null) {
return lastSelectedLanguageModel.getOrDefault(projectLocation, "");
if (lastSelectedLanguageModel != null && lastSelectedLanguageModel.containsKey(projectLocation)) {
return lastSelectedLanguageModel.get(projectLocation);
} else if (lastGlobalLanguageModel != null && !lastGlobalLanguageModel.isEmpty()) {
return lastGlobalLanguageModel;
} else {
return "";
return DEFAULT_LANGUAGE_MODEL;
}
}

Expand All @@ -433,13 +442,16 @@ public void setSelectedProvider(@NotNull String projectLocation, String selected
lastSelectedProvider = new HashMap<>();
}
lastSelectedProvider.put(projectLocation, selectedProvider);
lastGlobalProvider = selectedProvider;
}

public String getSelectedProvider(@NotNull String projectLocation) {
if (lastSelectedProvider != null) {
return lastSelectedProvider.getOrDefault(projectLocation, ModelProvider.Ollama.getName());
if (lastSelectedProvider != null && lastSelectedProvider.containsKey(projectLocation)) {
return lastSelectedProvider.get(projectLocation);
} else if (lastGlobalProvider != null && !lastGlobalProvider.isEmpty()) {
return lastGlobalProvider;
} else {
return ModelProvider.Ollama.getName();
return DEFAULT_PROVIDER;
}
}

Expand Down