Rework Chat Assistant Settings

ConfigurationManager.cpp

@@ -37,18 +37,6 @@ void ConfigurationManager::init()
     setupConnections();
 }
 
-LLMCore::Provider *ConfigurationManager::getCurrentProvider()
-{
-    auto providerName = Settings::generalSettings().ccProvider();
-    return LLMCore::ProvidersManager::instance().getProviderByName(providerName);
-}
-
-LLMCore::PromptTemplate *ConfigurationManager::getCurrentTemplate()
-{
-    auto templateName = Settings::generalSettings().ccTemplate();
-    return LLMCore::PromptTemplateManager::instance().getFimTemplateByName(templateName);
-}
-
 ConfigurationManager::ConfigurationManager(QObject *parent)
     : QObject(parent)
     , m_generalSettings(Settings::generalSettings())

ConfigurationManager.hpp

@@ -36,9 +36,6 @@ public:
 
     void init();
 
-    LLMCore::Provider *getCurrentProvider();
-    LLMCore::PromptTemplate *getCurrentTemplate();
-
 public slots:
     void selectProvider();
     void selectModel();

LLMClientInterface.cpp

@@ -151,9 +151,12 @@ void LLMClientInterface::handleCompletion(const QJsonObject &request)
     auto updatedContext = prepareContext(request);
     auto &completeSettings = Settings::codeCompletionSettings();
 
-    auto &configManager = ConfigurationManager::instance();
+    auto providerName = Settings::generalSettings().ccProvider();
-    auto provider = configManager.getCurrentProvider();
+    auto provider = LLMCore::ProvidersManager::instance().getProviderByName(providerName);
-    auto promptTemplate = configManager.getCurrentTemplate();
+
+    auto templateName = Settings::generalSettings().ccTemplate();
+    auto promptTemplate = LLMCore::PromptTemplateManager::instance().getFimTemplateByName(
+        templateName);
 
     LLMCore::LLMConfig config;
     config.requestType = LLMCore::RequestType::Fim;

chatview/ChatModel.cpp

@@ -22,7 +22,7 @@
 #include <QtQml>
 #include <utils/aspects.h>
 
-#include "GeneralSettings.hpp"
+#include "ChatAssistantSettings.hpp"
 
 namespace QodeAssist::Chat {
 
@@ -30,12 +30,12 @@ ChatModel::ChatModel(QObject *parent)
     : QAbstractListModel(parent)
     , m_totalTokens(0)
 {
-    // auto &settings = Settings::generalSettings();
+    auto &settings = Settings::chatAssistantSettings();
 
-    // connect(&settings.chatTokensThreshold,
+    connect(&settings.chatTokensThreshold,
-    //         &Utils::BaseAspect::changed,
+            &Utils::BaseAspect::changed,
-    //         this,
+            this,
-    //         &ChatModel::tokensThresholdChanged);
+            &ChatModel::tokensThresholdChanged);
 }
 
 int ChatModel::rowCount(const QModelIndex &parent) const
@@ -183,9 +183,8 @@ int ChatModel::totalTokens() const
 
 int ChatModel::tokensThreshold() const
 {
-    // auto &settings = Settings::generalSettings();
+    auto &settings = Settings::chatAssistantSettings();
-    // return settings.chatTokensThreshold();
+    return settings.chatTokensThreshold();
-    return 0;
 }
 
 QString ChatModel::lastMessageId() const

chatview/ChatRootView.cpp

@@ -31,12 +31,12 @@ ChatRootView::ChatRootView(QQuickItem *parent)
     , m_chatModel(new ChatModel(this))
     , m_clientInterface(new ClientInterface(m_chatModel, this))
 {
-    // auto &settings = Settings::generalSettings();
+    auto &settings = Settings::generalSettings();
 
-    // connect(&settings.chatModelName,
+    connect(&settings.caModel,
-    //         &Utils::BaseAspect::changed,
+            &Utils::BaseAspect::changed,
-    //         this,
+            this,
-    //         &ChatRootView::currentTemplateChanged);
+            &ChatRootView::currentTemplateChanged);
     generateColors();
 }
 

chatview/ClientInterface.cpp

@@ -18,16 +18,17 @@
  */
 
 #include "ClientInterface.hpp"
-#include "ContextSettings.hpp"
-#include "GeneralSettings.hpp"
-#include "Logger.hpp"
-#include "PromptTemplateManager.hpp"
-#include "ProvidersManager.hpp"
 
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QUuid>
 
+#include "ChatAssistantSettings.hpp"
+#include "GeneralSettings.hpp"
+#include "Logger.hpp"
+#include "PromptTemplateManager.hpp"
+#include "ProvidersManager.hpp"
+
 namespace QodeAssist::Chat {
 
 ClientInterface::ClientInterface(ChatModel *chatModel, QObject *parent)
@@ -56,46 +57,51 @@ ClientInterface::~ClientInterface() = default;
 
 void ClientInterface::sendMessage(const QString &message)
 {
-    // cancelRequest();
+    cancelRequest();
 
-    // LOG_MESSAGE("Sending message: " + message);
+    auto &chatAssistantSettings = Settings::chatAssistantSettings();
-    // LOG_MESSAGE("chatProvider " + Settings::generalSettings().chatLlmProviders.stringValue());
-    // LOG_MESSAGE("chatTemplate " + Settings::generalSettings().chatPrompts.stringValue());
 
-    // auto chatTemplate = LLMCore::PromptTemplateManager::instance().getCurrentChatTemplate();
+    auto providerName = Settings::generalSettings().caProvider();
-    // auto chatProvider = LLMCore::ProvidersManager::instance().getCurrentChatProvider();
+    auto provider = LLMCore::ProvidersManager::instance().getProviderByName(providerName);
 
-    // LLMCore::ContextData context;
+    auto templateName = Settings::generalSettings().caTemplate();
-    // context.prefix = message;
+    auto promptTemplate = LLMCore::PromptTemplateManager::instance().getChatTemplateByName(
-    // context.suffix = "";
+        templateName);
-    // if (Settings::contextSettings().useChatSystemPrompt())
-    //     context.systemPrompt = Settings::contextSettings().chatSystemPrompt();
 
-    // QJsonObject providerRequest;
+    LLMCore::ContextData context;
-    // providerRequest["model"] = Settings::generalSettings().chatModelName();
+    context.prefix = message;
-    // providerRequest["stream"] = true;
+    context.suffix = "";
-    // providerRequest["messages"] = m_chatModel->prepareMessagesForRequest(context);
+    if (chatAssistantSettings.useSystemPrompt())
+        context.systemPrompt = chatAssistantSettings.systemPrompt();
 
-    // if (!chatTemplate || !chatProvider) {
+    QJsonObject providerRequest;
-    //     LOG_MESSAGE("Check settings, provider or template are not set");
+    providerRequest["model"] = Settings::generalSettings().caModel();
-    // }
+    providerRequest["stream"] = true;
-    // chatTemplate->prepareRequest(providerRequest, context);
+    providerRequest["messages"] = m_chatModel->prepareMessagesForRequest(context);
-    // chatProvider->prepareRequest(providerRequest, LLMCore::RequestType::Chat);
 
-    // LLMCore::LLMConfig config;
+    if (promptTemplate)
-    // config.requestType = LLMCore::RequestType::Chat;
+        promptTemplate->prepareRequest(providerRequest, context);
-    // config.provider = chatProvider;
+    else
-    // config.promptTemplate = chatTemplate;
+        qWarning("No prompt template found");
-    // config.url = QString("%1%2").arg(Settings::generalSettings().chatUrl(),
-    //                                  Settings::generalSettings().chatEndPoint());
-    // config.providerRequest = providerRequest;
-    // config.multiLineCompletion = Settings::generalSettings().multiLineCompletion();
 
-    // QJsonObject request;
+    if (provider)
-    // request["id"] = QUuid::createUuid().toString();
+        provider->prepareRequest(providerRequest, LLMCore::RequestType::Chat);
+    else
+        qWarning("No provider found");
 
-    // m_chatModel->addMessage(message, ChatModel::ChatRole::User, "");
+    LLMCore::LLMConfig config;
-    // m_requestHandler->sendLLMRequest(config, request);
+    config.requestType = LLMCore::RequestType::Chat;
+    config.provider = provider;
+    config.promptTemplate = promptTemplate;
+    config.url = QString("%1%2").arg(Settings::generalSettings().caUrl(), provider->chatEndpoint());
+    config.providerRequest = providerRequest;
+    config.multiLineCompletion = false;
+
+    QJsonObject request;
+    request["id"] = QUuid::createUuid().toString();
+
+    m_chatModel->addMessage(message, ChatModel::ChatRole::User, "");
+    m_requestHandler->sendLLMRequest(config, request);
 }
 
 void ClientInterface::clearMessages()

settings/CMakeLists.txt

@@ -8,6 +8,7 @@ add_library(QodeAssistSettings STATIC
     ButtonAspect.hpp
     SettingsTr.hpp
     CodeCompletionSettings.hpp CodeCompletionSettings.cpp
+    ChatAssistantSettings.hpp ChatAssistantSettings.cpp
 )
 
 target_link_libraries(QodeAssistSettings

settings/ChatAssistantSettings.cpp

@@ -0,0 +1,231 @@
+/* 
+ * Copyright (C) 2024 Petr Mironychev
+ *
+ * This file is part of QodeAssist.
+ *
+ * QodeAssist is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QodeAssist is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "ChatAssistantSettings.hpp"
+
+#include <QMessageBox>
+#include <coreplugin/dialogs/ioptionspage.h>
+#include <coreplugin/icore.h>
+#include <utils/layoutbuilder.h>
+
+#include "SettingsConstants.hpp"
+#include "SettingsTr.hpp"
+#include "SettingsUtils.hpp"
+
+namespace QodeAssist::Settings {
+
+ChatAssistantSettings &chatAssistantSettings()
+{
+    static ChatAssistantSettings settings;
+    return settings;
+}
+
+ChatAssistantSettings::ChatAssistantSettings()
+{
+    setAutoApply(false);
+
+    setDisplayName(Tr::tr("Chat Assistant"));
+
+    // Chat Settings
+    chatTokensThreshold.setSettingsKey(Constants::CA_TOKENS_THRESHOLD);
+    chatTokensThreshold.setLabelText(Tr::tr("Chat History Token Limit:"));
+    chatTokensThreshold.setToolTip(Tr::tr("Maximum number of tokens in chat history. When "
+                                          "exceeded, oldest messages will be removed."));
+    chatTokensThreshold.setRange(1000, 16000);
+    chatTokensThreshold.setDefaultValue(8000);
+
+    // General Parameters Settings
+    temperature.setSettingsKey(Constants::CA_TEMPERATURE);
+    temperature.setLabelText(Tr::tr("Temperature:"));
+    temperature.setDefaultValue(0.5);
+    temperature.setRange(0.0, 2.0);
+    temperature.setSingleStep(0.1);
+
+    maxTokens.setSettingsKey(Constants::CA_MAX_TOKENS);
+    maxTokens.setLabelText(Tr::tr("Max Tokens:"));
+    maxTokens.setRange(-1, 10000);
+    maxTokens.setDefaultValue(2000);
+
+    // Advanced Parameters
+    useTopP.setSettingsKey(Constants::CA_USE_TOP_P);
+    useTopP.setDefaultValue(false);
+    useTopP.setLabelText(Tr::tr("Top P:"));
+
+    topP.setSettingsKey(Constants::CA_TOP_P);
+    topP.setDefaultValue(0.9);
+    topP.setRange(0.0, 1.0);
+    topP.setSingleStep(0.1);
+
+    useTopK.setSettingsKey(Constants::CA_USE_TOP_K);
+    useTopK.setDefaultValue(false);
+    useTopK.setLabelText(Tr::tr("Top K:"));
+
+    topK.setSettingsKey(Constants::CA_TOP_K);
+    topK.setDefaultValue(50);
+    topK.setRange(1, 1000);
+
+    usePresencePenalty.setSettingsKey(Constants::CA_USE_PRESENCE_PENALTY);
+    usePresencePenalty.setDefaultValue(false);
+    usePresencePenalty.setLabelText(Tr::tr("Presence Penalty:"));
+
+    presencePenalty.setSettingsKey(Constants::CA_PRESENCE_PENALTY);
+    presencePenalty.setDefaultValue(0.0);
+    presencePenalty.setRange(-2.0, 2.0);
+    presencePenalty.setSingleStep(0.1);
+
+    useFrequencyPenalty.setSettingsKey(Constants::CA_USE_FREQUENCY_PENALTY);
+    useFrequencyPenalty.setDefaultValue(false);
+    useFrequencyPenalty.setLabelText(Tr::tr("Frequency Penalty:"));
+
+    frequencyPenalty.setSettingsKey(Constants::CA_FREQUENCY_PENALTY);
+    frequencyPenalty.setDefaultValue(0.0);
+    frequencyPenalty.setRange(-2.0, 2.0);
+    frequencyPenalty.setSingleStep(0.1);
+
+    // Context Settings
+    useSystemPrompt.setSettingsKey(Constants::CA_USE_SYSTEM_PROMPT);
+    useSystemPrompt.setDefaultValue(true);
+    useSystemPrompt.setLabelText(Tr::tr("Use System Prompt"));
+
+    systemPrompt.setSettingsKey(Constants::CA_SYSTEM_PROMPT);
+    systemPrompt.setDisplayStyle(Utils::StringAspect::TextEditDisplay);
+    systemPrompt.setDefaultValue(
+        "You are an advanced AI assistant specializing in C++, Qt, and QML development. Your role "
+        "is to provide helpful, accurate, and detailed responses to questions about coding, "
+        "debugging, "
+        "and best practices in these technologies.");
+
+    // Ollama Settings
+    ollamaLivetime.setSettingsKey(Constants::CA_OLLAMA_LIVETIME);
+    ollamaLivetime.setToolTip(
+        Tr::tr("Time to suspend Ollama after completion request (in minutes), "
+               "Only Ollama,  -1 to disable"));
+    ollamaLivetime.setLabelText("Livetime:");
+    ollamaLivetime.setDefaultValue("5m");
+    ollamaLivetime.setDisplayStyle(Utils::StringAspect::LineEditDisplay);
+
+    contextWindow.setSettingsKey(Constants::CA_OLLAMA_CONTEXT_WINDOW);
+    contextWindow.setLabelText(Tr::tr("Context Window:"));
+    contextWindow.setRange(-1, 10000);
+    contextWindow.setDefaultValue(2048);
+
+    // API Configuration Settings
+    apiKey.setSettingsKey(Constants::CA_API_KEY);
+    apiKey.setLabelText(Tr::tr("API Key:"));
+    apiKey.setDisplayStyle(Utils::StringAspect::LineEditDisplay);
+    apiKey.setPlaceHolderText(Tr::tr("Enter your API key here"));
+
+    resetToDefaults.m_buttonText = TrConstants::RESET_TO_DEFAULTS;
+
+    readSettings();
+
+    setupConnections();
+
+    setLayouter([this]() {
+        using namespace Layouting;
+
+        auto genGrid = Grid{};
+        genGrid.addRow({Row{temperature}});
+        genGrid.addRow({Row{maxTokens}});
+
+        auto advancedGrid = Grid{};
+        advancedGrid.addRow({useTopP, topP});
+        advancedGrid.addRow({useTopK, topK});
+        advancedGrid.addRow({usePresencePenalty, presencePenalty});
+        advancedGrid.addRow({useFrequencyPenalty, frequencyPenalty});
+
+        auto ollamaGrid = Grid{};
+        ollamaGrid.addRow({ollamaLivetime});
+        ollamaGrid.addRow({contextWindow});
+
+        return Column{Row{Stretch{1}, resetToDefaults},
+                      Space{8},
+                      Group{title(Tr::tr("Chat Settings")), Row{chatTokensThreshold, Stretch{1}}},
+                      Space{8},
+                      Group{
+                          title(Tr::tr("General Parameters")),
+                          Row{genGrid, Stretch{1}},
+                      },
+                      Space{8},
+                      Group{title(Tr::tr("Advanced Parameters")),
+                            Column{Row{advancedGrid, Stretch{1}}}},
+                      Space{8},
+                      Group{title(Tr::tr("Context Settings")),
+                            Column{
+                                Row{useSystemPrompt, Stretch{1}},
+                                systemPrompt,
+                            }},
+                      Group{title(Tr::tr("Ollama Settings")), Column{Row{ollamaGrid, Stretch{1}}}},
+                      Space{8},
+                      Group{title(Tr::tr("API Configuration")), Column{apiKey}},
+                      Stretch{1}};
+    });
+}
+
+void ChatAssistantSettings::setupConnections()
+{
+    connect(&resetToDefaults,
+            &ButtonAspect::clicked,
+            this,
+            &ChatAssistantSettings::resetSettingsToDefaults);
+}
+
+void ChatAssistantSettings::resetSettingsToDefaults()
+{
+    QMessageBox::StandardButton reply;
+    reply = QMessageBox::question(
+        Core::ICore::dialogParent(),
+        Tr::tr("Reset Settings"),
+        Tr::tr("Are you sure you want to reset all settings to default values?"),
+        QMessageBox::Yes | QMessageBox::No);
+
+    if (reply == QMessageBox::Yes) {
+        resetAspect(chatTokensThreshold);
+        resetAspect(temperature);
+        resetAspect(maxTokens);
+        resetAspect(useTopP);
+        resetAspect(topP);
+        resetAspect(useTopK);
+        resetAspect(topK);
+        resetAspect(usePresencePenalty);
+        resetAspect(presencePenalty);
+        resetAspect(useFrequencyPenalty);
+        resetAspect(frequencyPenalty);
+        resetAspect(useSystemPrompt);
+        resetAspect(systemPrompt);
+        resetAspect(ollamaLivetime);
+        resetAspect(contextWindow);
+    }
+}
+
+class ChatAssistantSettingsPage : public Core::IOptionsPage
+{
+public:
+    ChatAssistantSettingsPage()
+    {
+        setId(Constants::QODE_ASSIST_CHAT_ASSISTANT_SETTINGS_PAGE_ID);
+        setDisplayName(Tr::tr("Chat Assistant"));
+        setCategory(Constants::QODE_ASSIST_GENERAL_OPTIONS_CATEGORY);
+        setSettingsProvider([] { return &chatAssistantSettings(); });
+    }
+};
+
+const ChatAssistantSettingsPage chatAssistantSettingsPage;
+
+} // namespace QodeAssist::Settings

settings/ChatAssistantSettings.hpp

@@ -0,0 +1,73 @@
+/* 
+ * Copyright (C) 2024 Petr Mironychev
+ *
+ * This file is part of QodeAssist.
+ *
+ * QodeAssist is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * QodeAssist is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <utils/aspects.h>
+
+#include "ButtonAspect.hpp"
+
+namespace QodeAssist::Settings {
+
+class ChatAssistantSettings : public Utils::AspectContainer
+{
+public:
+    ChatAssistantSettings();
+
+    ButtonAspect resetToDefaults{this};
+
+    // Chat settings
+    Utils::IntegerAspect chatTokensThreshold{this};
+
+    // General Parameters Settings
+    Utils::DoubleAspect temperature{this};
+    Utils::IntegerAspect maxTokens{this};
+
+    // Advanced Parameters
+    Utils::BoolAspect useTopP{this};
+    Utils::DoubleAspect topP{this};
+
+    Utils::BoolAspect useTopK{this};
+    Utils::IntegerAspect topK{this};
+
+    Utils::BoolAspect usePresencePenalty{this};
+    Utils::DoubleAspect presencePenalty{this};
+
+    Utils::BoolAspect useFrequencyPenalty{this};
+    Utils::DoubleAspect frequencyPenalty{this};
+
+    // Context Settings
+    Utils::BoolAspect useSystemPrompt{this};
+    Utils::StringAspect systemPrompt{this};
+
+    // Ollama Settings
+    Utils::StringAspect ollamaLivetime{this};
+    Utils::IntegerAspect contextWindow{this};
+
+    // API Configuration Settings
+    Utils::StringAspect apiKey{this};
+
+private:
+    void setupConnections();
+    void resetSettingsToDefaults();
+};
+
+ChatAssistantSettings &chatAssistantSettings();
+
+} // namespace QodeAssist::Settings

settings/CodeCompletionSettings.cpp

@@ -55,7 +55,7 @@ CodeCompletionSettings::CodeCompletionSettings()
     temperature.setSettingsKey(Constants::CC_TEMPERATURE);
     temperature.setLabelText(Tr::tr("Temperature:"));
     temperature.setDefaultValue(0.2);
-    temperature.setRange(0.0, 10.0);
+    temperature.setRange(0.0, 2.0);
     temperature.setSingleStep(0.1);
 
     maxTokens.setSettingsKey(Constants::CC_MAX_TOKENS);
@@ -63,6 +63,7 @@ CodeCompletionSettings::CodeCompletionSettings()
     maxTokens.setRange(-1, 10000);
     maxTokens.setDefaultValue(50);
 
+    // Advanced Parameters
     useTopP.setSettingsKey(Constants::CC_USE_TOP_P);
     useTopP.setDefaultValue(false);
     useTopP.setLabelText(Tr::tr("Top P:"));
@@ -80,7 +81,6 @@ CodeCompletionSettings::CodeCompletionSettings()
     topK.setDefaultValue(50);
     topK.setRange(1, 1000);
 
-    // Advanced Parameters
     usePresencePenalty.setSettingsKey(Constants::CC_USE_PRESENCE_PENALTY);
     usePresencePenalty.setDefaultValue(false);
     usePresencePenalty.setLabelText(Tr::tr("Presence Penalty:"));
@@ -124,11 +124,7 @@ CodeCompletionSettings::CodeCompletionSettings()
     systemPrompt.setDisplayStyle(Utils::StringAspect::TextEditDisplay);
     systemPrompt.setDefaultValue(
         "You are an expert C++, Qt, and QML code completion AI. Your task is to provide accurate "
-        "and "
+        "and contextually appropriate code suggestions.");
-        "contextually appropriate code suggestions. Focus on completing the code in a way that "
-        "follows best practices, is efficient, and matches the surrounding code style. Prioritize "
-        "Qt and QML-specific completions when appropriate. Avoid adding comments or explanations "
-        "in your completions.");
 
     useFilePathInContext.setSettingsKey(Constants::CC_USE_FILE_PATH_IN_CONTEXT);
     useFilePathInContext.setDefaultValue(false);
@@ -190,6 +186,7 @@ CodeCompletionSettings::CodeCompletionSettings()
         auto contextGrid = Grid{};
         contextGrid.addRow({Row{readFullFile}});
         contextGrid.addRow({Row{readFileParts, readStringsBeforeCursor, readStringsAfterCursor}});
+
         auto contextItem = Column{Row{contextGrid, Stretch{1}},
                                   Row{useSystemPrompt, Stretch{1}},
                                   systemPrompt,
@@ -204,19 +201,19 @@ CodeCompletionSettings::CodeCompletionSettings()
                                 Space{8},
                                 multiLineCompletion,
                             }},
-                      Space{16},
+                      Space{8},
                       Group{title(Tr::tr("General Parameters")),
                             Column{
                                 Row{genGrid, Stretch{1}},
                             }},
-                      Space{16},
+                      Space{8},
                       Group{title(Tr::tr("Advanced Parameters")),
                             Column{Row{advancedGrid, Stretch{1}}}},
-                      Space{16},
+                      Space{8},
                       Group{title(Tr::tr("Context Settings")), contextItem},
-                      Space{16},
+                      Space{8},
                       Group{title(Tr::tr("Ollama Settings")), Column{Row{ollamaGrid, Stretch{1}}}},
-                      Space{16},
+                      Space{8},
                       Group{title(Tr::tr("API Configuration")), Column{apiKey}},
                       Stretch{1}};
     });

settings/CodeCompletionSettings.hpp

@@ -40,13 +40,13 @@ public:
     Utils::DoubleAspect temperature{this};
     Utils::IntegerAspect maxTokens{this};
 
+    // Advanced Parameters
     Utils::BoolAspect useTopP{this};
     Utils::DoubleAspect topP{this};
 
     Utils::BoolAspect useTopK{this};
     Utils::IntegerAspect topK{this};
 
-    // Advanced Parameters
     Utils::BoolAspect usePresencePenalty{this};
     Utils::DoubleAspect presencePenalty{this};
 

settings/ContextSettings.cpp

@@ -73,11 +73,11 @@ ContextSettings::ContextSettings()
         "Qt and QML-specific completions when appropriate. Avoid adding comments or explanations "
         "in your completions.");
 
-    useChatSystemPrompt.setSettingsKey(Constants::USE_CHAT_SYSTEM_PROMPT);
+    useChatSystemPrompt.setSettingsKey(Constants::CA_SYSTEM_PROMPT);
     useChatSystemPrompt.setDefaultValue(true);
     useChatSystemPrompt.setLabelText(Tr::tr("Use System Prompt for chat"));
 
-    chatSystemPrompt.setSettingsKey(Constants::CHAT_SYSTEM_PROMPT);
+    chatSystemPrompt.setSettingsKey(Constants::CA_SYSTEM_PROMPT);
     chatSystemPrompt.setDisplayStyle(Utils::StringAspect::TextEditDisplay);
     chatSystemPrompt.setDefaultValue(
         "You are an advanced AI assistant specializing in C++, Qt, and QML development. Your role "

settings/PresetPromptsSettings.cpp

@@ -48,7 +48,7 @@ PresetPromptsSettings::PresetPromptsSettings()
     fimTemperature.setRange(0.0, 10.0);
     fimTemperature.setSingleStep(0.1);
 
-    chatTemperature.setSettingsKey(Constants::CHAT_TEMPERATURE);
+    chatTemperature.setSettingsKey(Constants::CA_TEMPERATURE);
     chatTemperature.setLabelText(Tr::tr("Temperature:"));
     chatTemperature.setDefaultValue(0.5);
     chatTemperature.setRange(0.0, 10.0);
@@ -61,7 +61,7 @@ PresetPromptsSettings::PresetPromptsSettings()
     fimOllamaLivetime.setDefaultValue("5m");
     fimOllamaLivetime.setDisplayStyle(Utils::StringAspect::LineEditDisplay);
 
-    chatOllamaLivetime.setSettingsKey(Constants::CHAT_OLLAMA_LIVETIME);
+    chatOllamaLivetime.setSettingsKey(Constants::CA_OLLAMA_LIVETIME);
     chatOllamaLivetime.setLabelText(
         Tr::tr("Time to suspend Ollama after completion request (in minutes), "
                "Only Ollama,  -1 to disable"));
@@ -73,7 +73,7 @@ PresetPromptsSettings::PresetPromptsSettings()
     fimMaxTokens.setRange(-1, 10000);
     fimMaxTokens.setDefaultValue(50);
 
-    chatMaxTokens.setSettingsKey(Constants::CHAT_MAX_TOKENS);
+    chatMaxTokens.setSettingsKey(Constants::CA_MAX_TOKENS);
     chatMaxTokens.setLabelText(Tr::tr("Max Tokens"));
     chatMaxTokens.setRange(-1, 10000);
     chatMaxTokens.setDefaultValue(2000);
@@ -87,10 +87,10 @@ PresetPromptsSettings::PresetPromptsSettings()
     fimTopP.setRange(0.0, 1.0);
     fimTopP.setSingleStep(0.1);
 
-    chatUseTopP.setSettingsKey(Constants::CHAT_USE_TOP_P);
+    chatUseTopP.setSettingsKey(Constants::CA_USE_TOP_P);
     chatUseTopP.setDefaultValue(false);
 
-    chatTopP.setSettingsKey(Constants::CHAT_TOP_P);
+    chatTopP.setSettingsKey(Constants::CA_TOP_P);
     chatTopP.setLabelText(Tr::tr("use top_p"));
     chatTopP.setDefaultValue(0.9);
     chatTopP.setRange(0.0, 1.0);
@@ -104,10 +104,10 @@ PresetPromptsSettings::PresetPromptsSettings()
     fimTopK.setDefaultValue(50);
     fimTopK.setRange(1, 1000);
 
-    chatUseTopK.setSettingsKey(Constants::CHAT_USE_TOP_K);
+    chatUseTopK.setSettingsKey(Constants::CA_USE_TOP_K);
     chatUseTopK.setDefaultValue(false);
 
-    chatTopK.setSettingsKey(Constants::CHAT_TOP_K);
+    chatTopK.setSettingsKey(Constants::CA_TOP_K);
     chatTopK.setLabelText(Tr::tr("use top_k"));
     chatTopK.setDefaultValue(50);
     chatTopK.setRange(1, 1000);
@@ -121,10 +121,10 @@ PresetPromptsSettings::PresetPromptsSettings()
     fimPresencePenalty.setRange(-2.0, 2.0);
     fimPresencePenalty.setSingleStep(0.1);
 
-    chatUsePresencePenalty.setSettingsKey(Constants::CHAT_USE_PRESENCE_PENALTY);
+    chatUsePresencePenalty.setSettingsKey(Constants::CA_USE_PRESENCE_PENALTY);
     chatUsePresencePenalty.setDefaultValue(false);
 
-    chatPresencePenalty.setSettingsKey(Constants::CHAT_PRESENCE_PENALTY);
+    chatPresencePenalty.setSettingsKey(Constants::CA_PRESENCE_PENALTY);
     chatPresencePenalty.setLabelText(Tr::tr("use presence_penalty"));
     chatPresencePenalty.setDefaultValue(0.0);
     chatPresencePenalty.setRange(-2.0, 2.0);
@@ -139,10 +139,10 @@ PresetPromptsSettings::PresetPromptsSettings()
     fimFrequencyPenalty.setRange(-2.0, 2.0);
     fimFrequencyPenalty.setSingleStep(0.1);
 
-    chatUseFrequencyPenalty.setSettingsKey(Constants::CHAT_USE_FREQUENCY_PENALTY);
+    chatUseFrequencyPenalty.setSettingsKey(Constants::CA_USE_FREQUENCY_PENALTY);
     chatUseFrequencyPenalty.setDefaultValue(false);
 
-    chatFrequencyPenalty.setSettingsKey(Constants::CHAT_FREQUENCY_PENALTY);
+    chatFrequencyPenalty.setSettingsKey(Constants::CA_FREQUENCY_PENALTY);
     chatFrequencyPenalty.setLabelText(Tr::tr("use frequency_penalty"));
     chatFrequencyPenalty.setDefaultValue(0.0);
     chatFrequencyPenalty.setRange(-2.0, 2.0);
@@ -153,7 +153,7 @@ PresetPromptsSettings::PresetPromptsSettings()
     fimApiKey.setDisplayStyle(Utils::StringAspect::LineEditDisplay);
     fimApiKey.setPlaceHolderText(Tr::tr("Enter your API key here"));
 
-    chatApiKey.setSettingsKey(Constants::CHAT_API_KEY);
+    chatApiKey.setSettingsKey(Constants::CA_API_KEY);
     chatApiKey.setLabelText(Tr::tr("API Key:"));
     chatApiKey.setDisplayStyle(Utils::StringAspect::LineEditDisplay);
     chatApiKey.setPlaceHolderText(Tr::tr("Enter your API key here"));

settings/SettingsConstants.hpp

@@ -46,16 +46,18 @@ const char AUTO_COMPLETION_TYPING_INTERVAL[] = "QodeAssist.autoCompletionTypingI
 const char MAX_FILE_THRESHOLD[] = "QodeAssist.maxFileThreshold";
 const char CC_MULTILINE_COMPLETION[] = "QodeAssist.ccMultilineCompletion";
 const char CUSTOM_JSON_TEMPLATE[] = "QodeAssist.customJsonTemplate";
-const char CHAT_TOKENS_THRESHOLD[] = "QodeAssist.chatTokensThreshold";
+const char CA_TOKENS_THRESHOLD[] = "QodeAssist.caTokensThreshold";
 
 const char QODE_ASSIST_GENERAL_OPTIONS_ID[] = "QodeAssist.GeneralOptions";
 const char QODE_ASSIST_GENERAL_SETTINGS_PAGE_ID[] = "QodeAssist.1GeneralSettingsPageId";
 const char QODE_ASSIST_CODE_COMPLETION_SETTINGS_PAGE_ID[]
     = "QodeAssist.2CodeCompletionSettingsPageId";
-const char QODE_ASSIST_CONTEXT_SETTINGS_PAGE_ID[] = "QodeAssist.3ContextSettingsPageId";
+const char QODE_ASSIST_CHAT_ASSISTANT_SETTINGS_PAGE_ID[]
+    = "QodeAssist.3ChatAssistantSettingsPageId";
+const char QODE_ASSIST_CONTEXT_SETTINGS_PAGE_ID[] = "QodeAssist.4ContextSettingsPageId";
 const char QODE_ASSIST_PRESET_PROMPTS_SETTINGS_PAGE_ID[]
-    = "QodeAssist.4PresetPromptsSettingsPageId";
+    = "QodeAssist.5PresetPromptsSettingsPageId";
-const char QODE_ASSIST_CUSTOM_PROMPT_SETTINGS_PAGE_ID[] = "QodeAssist.5CustomPromptSettingsPageId";
+const char QODE_ASSIST_CUSTOM_PROMPT_SETTINGS_PAGE_ID[] = "QodeAssist.6CustomPromptSettingsPageId";
 
 const char QODE_ASSIST_GENERAL_OPTIONS_CATEGORY[] = "QodeAssist.Category";
 const char QODE_ASSIST_GENERAL_OPTIONS_DISPLAY_CATEGORY[] = "Qode Assist";
@@ -71,8 +73,8 @@ const char CC_USE_FILE_PATH_IN_CONTEXT[] = "QodeAssist.ccUseFilePathInContext";
 const char CC_SYSTEM_PROMPT[] = "QodeAssist.ccSystemPrompt";
 const char CC_USE_PROJECT_CHANGES_CACHE[] = "QodeAssist.ccUseProjectChangesCache";
 const char CC_MAX_CHANGES_CACHE_SIZE[] = "QodeAssist.ccMaxChangesCacheSize";
-const char USE_CHAT_SYSTEM_PROMPT[] = "QodeAssist.useChatSystemPrompt";
+const char CA_USE_SYSTEM_PROMPT[] = "QodeAssist.useChatSystemPrompt";
-const char CHAT_SYSTEM_PROMPT[] = "QodeAssist.chatSystemPrompt";
+const char CA_SYSTEM_PROMPT[] = "QodeAssist.chatSystemPrompt";
 
 // preset prompt settings
 const char CC_TEMPERATURE[] = "QodeAssist.ccTemperature";
@@ -88,17 +90,18 @@ const char CC_FREQUENCY_PENALTY[] = "QodeAssist.fimFrequencyPenalty";
 const char CC_OLLAMA_LIVETIME[] = "QodeAssist.fimOllamaLivetime";
 const char CC_OLLAMA_CONTEXT_WINDOW[] = "QodeAssist.ccOllamaContextWindow";
 const char CC_API_KEY[] = "QodeAssist.apiKey";
-const char CHAT_TEMPERATURE[] = "QodeAssist.chatTemperature";
+const char CA_TEMPERATURE[] = "QodeAssist.chatTemperature";
-const char CHAT_MAX_TOKENS[] = "QodeAssist.chatMaxTokens";
+const char CA_MAX_TOKENS[] = "QodeAssist.chatMaxTokens";
-const char CHAT_USE_TOP_P[] = "QodeAssist.chatUseTopP";
+const char CA_USE_TOP_P[] = "QodeAssist.chatUseTopP";
-const char CHAT_TOP_P[] = "QodeAssist.chatTopP";
+const char CA_TOP_P[] = "QodeAssist.chatTopP";
-const char CHAT_USE_TOP_K[] = "QodeAssist.chatUseTopK";
+const char CA_USE_TOP_K[] = "QodeAssist.chatUseTopK";
-const char CHAT_TOP_K[] = "QodeAssist.chatTopK";
+const char CA_TOP_K[] = "QodeAssist.chatTopK";
-const char CHAT_USE_PRESENCE_PENALTY[] = "QodeAssist.chatUsePresencePenalty";
+const char CA_USE_PRESENCE_PENALTY[] = "QodeAssist.chatUsePresencePenalty";
-const char CHAT_PRESENCE_PENALTY[] = "QodeAssist.chatPresencePenalty";
+const char CA_PRESENCE_PENALTY[] = "QodeAssist.chatPresencePenalty";
-const char CHAT_USE_FREQUENCY_PENALTY[] = "QodeAssist.chatUseFrequencyPenalty";
+const char CA_USE_FREQUENCY_PENALTY[] = "QodeAssist.chatUseFrequencyPenalty";
-const char CHAT_FREQUENCY_PENALTY[] = "QodeAssist.chatFrequencyPenalty";
+const char CA_FREQUENCY_PENALTY[] = "QodeAssist.chatFrequencyPenalty";
-const char CHAT_OLLAMA_LIVETIME[] = "QodeAssist.chatOllamaLivetime";
+const char CA_OLLAMA_LIVETIME[] = "QodeAssist.chatOllamaLivetime";
-const char CHAT_API_KEY[] = "QodeAssist.chatApiKey";
+const char CA_OLLAMA_CONTEXT_WINDOW[] = "QodeAssist.caOllamaContextWindow";
+const char CA_API_KEY[] = "QodeAssist.chatApiKey";
 
 } // namespace QodeAssist::Constants