Upgrade to version 0.3.9

- Replace codellama to qwen models
- Add prefer auto template for ollama provider

.clang-format

@@ -0,0 +1,108 @@
+# .clang-format from Qt Creator
+# https://github.com/qt-creator/qt-creator/blob/master/.clang-format
+#
+# yaml-language-server: $schema=https://json.schemastore.org/clang-format.json
+#
+---
+Language:        Cpp
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+AlignConsecutiveAssignments: None
+AlignConsecutiveDeclarations: None
+AlignEscapedNewlines: DontAlign
+AlignOperands:   Align
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:
+  AfterClass:      true
+  AfterControlStatement: Never
+  AfterEnum:       false
+  AfterFunction:   true
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     true
+  AfterUnion:      false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+BreakBeforeBinaryOperators: All
+BreakBeforeBraces: Custom
+BreakBeforeInheritanceComma: false
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeComma
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:    100
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:
+  - forever # avoids { wrapped to next line
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeCategories:
+  - Regex:           '^<Q.*'
+    Priority:        200
+IncludeIsMainRegex: '(Test)?$'
+IndentCaseLabels: false
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+InsertBraces: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+# Do not add QT_BEGIN_NAMESPACE/QT_END_NAMESPACE as this will indent lines in between.
+MacroBlockBegin: ""
+MacroBlockEnd:   ""
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 4
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 88
+PenaltyBreakBeforeFirstCallParameter: 300
+PenaltyBreakComment: 500
+PenaltyBreakFirstLessLess: 400
+PenaltyBreakString: 600
+PenaltyExcessCharacter: 50
+PenaltyReturnTypeOnItsOwnLine: 300
+PointerAlignment: Right
+ReflowComments:  false
+SortIncludes: CaseSensitive
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: true
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  Never
+SpacesInContainerLiterals: false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: c++17
+TabWidth:        4
+UseTab:          Never

.github/FUNDING.yml

@@ -3,7 +3,7 @@
 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
-ko_fi: petrmdev
+ko_fi: qodeassist
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
 liberapay: # Replace with a single Liberapay username

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/workflows/build_cmake.yml

@@ -1,11 +1,18 @@
 name: Build plugin
 
-on: [push]
-
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - 'v*'
+  pull_request:
+    branches:
+      - main
 env:
   PLUGIN_NAME: QodeAssist
-  QT_VERSION: 6.7.2
-  QT_CREATOR_VERSION: 14.0.0
+  QT_VERSION: 6.7.3
+  QT_CREATOR_VERSION: 14.0.2
   QT_CREATOR_SNAPSHOT: NO
   MACOS_DEPLOYMENT_TARGET: "11.0"
   CMAKE_VERSION: "3.29.6"
@@ -100,7 +107,7 @@ jobs:
             COMMAND sudo apt update
           )
           execute_process(
-            COMMAND sudo apt install libgl1-mesa-dev
+            COMMAND sudo apt install libgl1-mesa-dev libcups2-dev
             RESULT_VARIABLE result
           )
           if (NOT result EQUAL 0)

.gitignore

@@ -34,6 +34,7 @@ Thumbs.db
 *.rc
 /.qmake.cache
 /.qmake.stash
+.qmlls.ini
 
 # qtcreator generated files
 *.pro.user*

.qmlformat.ini

@@ -0,0 +1,3 @@
+[General]
+IndentWidth=4
+NewlineType=native

CMakeLists.txt

@@ -10,18 +10,28 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 find_package(QtCreator REQUIRED COMPONENTS Core)
-find_package(Qt6 COMPONENTS Widgets REQUIRED)
+find_package(Qt6 COMPONENTS Core Gui Quick Widgets Network REQUIRED)
+
+add_subdirectory(llmcore)
+add_subdirectory(settings)
+add_subdirectory(logger)
+add_subdirectory(ChatView)
 
 add_qtc_plugin(QodeAssist
   PLUGIN_DEPENDS
     QtCreator::Core
     QtCreator::LanguageClient
     QtCreator::TextEditor
+    QtCreator::ProjectExplorer
   DEPENDS
+    Qt::Core
+    Qt::Gui
+    Qt::Quick
     Qt::Widgets
+    Qt::Network
     QtCreator::ExtensionSystem
     QtCreator::Utils
-    QtCreator::ProjectExplorer
+    QodeAssistChatViewplugin
   SOURCES
     .github/workflows/build_cmake.yml
     .github/workflows/README.md
@@ -30,36 +40,27 @@ add_qtc_plugin(QodeAssist
     QodeAssistConstants.hpp
     QodeAssisttr.h
     LLMClientInterface.hpp LLMClientInterface.cpp
-    PromptTemplateManager.hpp PromptTemplateManager.cpp
-    templates/PromptTemplate.hpp
-    templates/CodeLlamaFimTemplate.hpp
-    templates/StarCoder2Template.hpp
-    templates/DeepSeekCoderV2.hpp
-    templates/CustomTemplate.hpp
-    templates/DeepSeekCoderChatTemplate.hpp
-    templates/CodeLlamaInstruct.hpp
-    providers/LLMProvider.hpp
+    templates/CodeLlamaFim.hpp
+    templates/StarCoder2Fim.hpp
+    templates/DeepSeekCoderFim.hpp
+    templates/CustomFimTemplate.hpp
+    templates/DeepSeekCoderChat.hpp
+    templates/CodeLlamaChat.hpp
+    templates/Qwen.hpp
+    templates/StarCoderChat.hpp
+    templates/Ollama.hpp
+    templates/BasicChat.hpp
     providers/OllamaProvider.hpp providers/OllamaProvider.cpp
     providers/LMStudioProvider.hpp providers/LMStudioProvider.cpp
     providers/OpenAICompatProvider.hpp providers/OpenAICompatProvider.cpp
-    LLMProvidersManager.hpp LLMProvidersManager.cpp
     QodeAssist.qrc
     LSPCompletion.hpp
     LLMSuggestion.hpp LLMSuggestion.cpp
     QodeAssistClient.hpp QodeAssistClient.cpp
-    QodeAssistUtils.hpp
     DocumentContextReader.hpp DocumentContextReader.cpp
-    QodeAssistData.hpp
     utils/CounterTooltip.hpp utils/CounterTooltip.cpp
-    settings/GeneralSettings.hpp settings/GeneralSettings.cpp
-    settings/ContextSettings.hpp settings/ContextSettings.cpp
-    settings/CustomPromptSettings.hpp settings/CustomPromptSettings.cpp
-    settings/PresetPromptsSettings.hpp settings/PresetPromptsSettings.cpp
-    settings/SettingsUtils.hpp
     core/ChangesManager.h core/ChangesManager.cpp
-    core/LLMRequestHandler.hpp core/LLMRequestHandler.cpp
-    core/LLMRequestConfig.hpp
-    chat/ChatWidget.h chat/ChatWidget.cpp
     chat/ChatOutputPane.h chat/ChatOutputPane.cpp
-    chat/ChatClientInterface.hpp chat/ChatClientInterface.cpp
+    chat/NavigationPanel.hpp chat/NavigationPanel.cpp
+    ConfigurationManager.hpp ConfigurationManager.cpp
 )

ChatView/CMakeLists.txt

@@ -0,0 +1,39 @@
+qt_add_library(QodeAssistChatView STATIC)
+
+qt_policy(SET QTP0001 NEW)
+
+# URI name should match the subdirectory name to suppress the warning
+qt_add_qml_module(QodeAssistChatView
+    URI ChatView
+    VERSION 1.0
+    DEPENDENCIES QtQuick
+    QML_FILES
+    qml/RootItem.qml
+    qml/ChatItem.qml
+    qml/Badge.qml
+    qml/dialog/CodeBlock.qml
+    qml/dialog/TextBlock.qml
+    SOURCES
+    ChatWidget.hpp ChatWidget.cpp
+    ChatModel.hpp ChatModel.cpp
+    ChatRootView.hpp ChatRootView.cpp
+    ClientInterface.hpp ClientInterface.cpp
+    MessagePart.hpp
+    ChatUtils.h ChatUtils.cpp
+)
+
+target_link_libraries(QodeAssistChatView
+    PUBLIC
+    Qt::Widgets
+    Qt::Quick
+    Qt::QuickWidgets
+    Qt::Network
+    QtCreator::Core
+    QtCreator::Utils
+    LLMCore
+    QodeAssistSettings
+)
+
+target_include_directories(QodeAssistChatView
+    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
+)

ChatView/ChatModel.cpp

@@ -0,0 +1,195 @@
+/*
+ * 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 "ChatModel.hpp"
+#include <QtCore/qjsonobject.h>
+#include <QtQml>
+#include <utils/aspects.h>
+
+#include "ChatAssistantSettings.hpp"
+
+namespace QodeAssist::Chat {
+
+ChatModel::ChatModel(QObject *parent)
+    : QAbstractListModel(parent)
+    , m_totalTokens(0)
+{
+    auto &settings = Settings::chatAssistantSettings();
+
+    connect(&settings.chatTokensThreshold,
+            &Utils::BaseAspect::changed,
+            this,
+            &ChatModel::tokensThresholdChanged);
+}
+
+int ChatModel::rowCount(const QModelIndex &parent) const
+{
+    return m_messages.size();
+}
+
+QVariant ChatModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid() || index.row() >= m_messages.size())
+        return QVariant();
+
+    const Message &message = m_messages[index.row()];
+    switch (static_cast<Roles>(role)) {
+    case Roles::RoleType:
+        return QVariant::fromValue(message.role);
+    case Roles::Content: {
+        return message.content;
+    }
+    default:
+        return QVariant();
+    }
+}
+
+QHash<int, QByteArray> ChatModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+    roles[Roles::RoleType] = "roleType";
+    roles[Roles::Content] = "content";
+    return roles;
+}
+
+void ChatModel::addMessage(const QString &content, ChatRole role, const QString &id)
+{
+    int tokenCount = estimateTokenCount(content);
+
+    if (!m_messages.isEmpty() && !id.isEmpty() && m_messages.last().id == id) {
+        Message &lastMessage = m_messages.last();
+        int oldTokenCount = lastMessage.tokenCount;
+        lastMessage.content = content;
+        lastMessage.tokenCount = tokenCount;
+        m_totalTokens += (tokenCount - oldTokenCount);
+        emit dataChanged(index(m_messages.size() - 1), index(m_messages.size() - 1));
+    } else {
+        beginInsertRows(QModelIndex(), m_messages.size(), m_messages.size());
+        m_messages.append({role, content, tokenCount, id});
+        m_totalTokens += tokenCount;
+        endInsertRows();
+    }
+
+    trim();
+    emit totalTokensChanged();
+}
+
+QVector<ChatModel::Message> ChatModel::getChatHistory() const
+{
+    return m_messages;
+}
+
+void ChatModel::trim()
+{
+    while (m_totalTokens > tokensThreshold()) {
+        if (!m_messages.isEmpty()) {
+            m_totalTokens -= m_messages.first().tokenCount;
+            beginRemoveRows(QModelIndex(), 0, 0);
+            m_messages.removeFirst();
+            endRemoveRows();
+        } else {
+            break;
+        }
+    }
+}
+
+int ChatModel::estimateTokenCount(const QString &text) const
+{
+    return text.length() / 4;
+}
+
+void ChatModel::clear()
+{
+    beginResetModel();
+    m_messages.clear();
+    m_totalTokens = 0;
+    endResetModel();
+    emit totalTokensChanged();
+}
+
+QList<MessagePart> ChatModel::processMessageContent(const QString &content) const
+{
+    QList<MessagePart> parts;
+    QRegularExpression codeBlockRegex("```(\\w*)\\n?([\\s\\S]*?)```");
+    int lastIndex = 0;
+    auto blockMatches = codeBlockRegex.globalMatch(content);
+
+    while (blockMatches.hasNext()) {
+        auto match = blockMatches.next();
+        if (match.capturedStart() > lastIndex) {
+            QString textBetween = content.mid(lastIndex, match.capturedStart() - lastIndex).trimmed();
+            if (!textBetween.isEmpty()) {
+                parts.append({MessagePart::Text, textBetween, ""});
+            }
+        }
+        parts.append({MessagePart::Code, match.captured(2).trimmed(), match.captured(1)});
+        lastIndex = match.capturedEnd();
+    }
+
+    if (lastIndex < content.length()) {
+        QString remainingText = content.mid(lastIndex).trimmed();
+        if (!remainingText.isEmpty()) {
+            parts.append({MessagePart::Text, remainingText, ""});
+        }
+    }
+
+    return parts;
+}
+
+QJsonArray ChatModel::prepareMessagesForRequest(const QString &systemPrompt) const
+{
+    QJsonArray messages;
+
+    messages.append(QJsonObject{{"role", "system"}, {"content", systemPrompt}});
+
+    for (const auto &message : m_messages) {
+        QString role;
+        switch (message.role) {
+        case ChatRole::User:
+            role = "user";
+            break;
+        case ChatRole::Assistant:
+            role = "assistant";
+            break;
+        default:
+            continue;
+        }
+        messages.append(QJsonObject{{"role", role}, {"content", message.content}});
+    }
+
+    return messages;
+}
+
+int ChatModel::totalTokens() const
+{
+    return m_totalTokens;
+}
+
+int ChatModel::tokensThreshold() const
+{
+    auto &settings = Settings::chatAssistantSettings();
+    return settings.chatTokensThreshold();
+}
+
+QString ChatModel::lastMessageId() const
+{
+    return !m_messages.isEmpty() ? m_messages.last().id : "";
+}
+
+} // namespace QodeAssist::Chat

ChatView/ChatModel.hpp

@@ -0,0 +1,85 @@
+/*
+ * 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 "ContextData.hpp"
+#include "MessagePart.hpp"
+
+#include <QAbstractListModel>
+#include <QJsonArray>
+#include <QtQmlIntegration>
+
+namespace QodeAssist::Chat {
+
+class ChatModel : public QAbstractListModel
+{
+    Q_OBJECT
+    Q_PROPERTY(int totalTokens READ totalTokens NOTIFY totalTokensChanged FINAL)
+    Q_PROPERTY(int tokensThreshold READ tokensThreshold NOTIFY tokensThresholdChanged FINAL)
+    QML_ELEMENT
+
+public:
+    enum Roles { RoleType = Qt::UserRole, Content };
+
+    enum ChatRole { System, User, Assistant };
+    Q_ENUM(ChatRole)
+
+    struct Message
+    {
+        ChatRole role;
+        QString content;
+        int tokenCount;
+        QString id;
+    };
+
+    explicit ChatModel(QObject *parent = nullptr);
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    QHash<int, QByteArray> roleNames() const override;
+
+    Q_INVOKABLE void addMessage(const QString &content, ChatRole role, const QString &id);
+    Q_INVOKABLE void clear();
+    Q_INVOKABLE QList<MessagePart> processMessageContent(const QString &content) const;
+
+    QVector<Message> getChatHistory() const;
+    QJsonArray prepareMessagesForRequest(const QString &systemPrompt) const;
+
+    int totalTokens() const;
+    int tokensThreshold() const;
+
+    QString currentModel() const;
+    QString lastMessageId() const;
+
+signals:
+    void totalTokensChanged();
+    void tokensThresholdChanged();
+
+private:
+    void trim();
+    int estimateTokenCount(const QString &text) const;
+
+    QVector<Message> m_messages;
+    int m_totalTokens = 0;
+};
+
+} // namespace QodeAssist::Chat
+Q_DECLARE_METATYPE(QodeAssist::Chat::ChatModel::Message)
+Q_DECLARE_METATYPE(QodeAssist::Chat::MessagePart)

ChatView/ChatRootView.cpp

@@ -0,0 +1,144 @@
+/*
+ * 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 "ChatRootView.hpp"
+#include <QtGui/qclipboard.h>
+#include <utils/theme/theme.h>
+#include <utils/utilsicons.h>
+
+#include "ChatAssistantSettings.hpp"
+#include "GeneralSettings.hpp"
+
+namespace QodeAssist::Chat {
+
+ChatRootView::ChatRootView(QQuickItem *parent)
+    : QQuickItem(parent)
+    , m_chatModel(new ChatModel(this))
+    , m_clientInterface(new ClientInterface(m_chatModel, this))
+{
+    auto &settings = Settings::generalSettings();
+
+    connect(&settings.caModel,
+            &Utils::BaseAspect::changed,
+            this,
+            &ChatRootView::currentTemplateChanged);
+
+    connect(&Settings::chatAssistantSettings().sharingCurrentFile,
+            &Utils::BaseAspect::changed,
+            this,
+            &ChatRootView::isSharingCurrentFileChanged);
+
+    generateColors();
+}
+
+ChatModel *ChatRootView::chatModel() const
+{
+    return m_chatModel;
+}
+
+QColor ChatRootView::backgroundColor() const
+{
+    return Utils::creatorColor(Utils::Theme::BackgroundColorNormal);
+}
+
+void ChatRootView::sendMessage(const QString &message, bool sharingCurrentFile) const
+{
+    m_clientInterface->sendMessage(message, sharingCurrentFile);
+}
+
+void ChatRootView::copyToClipboard(const QString &text)
+{
+    QGuiApplication::clipboard()->setText(text);
+}
+
+void ChatRootView::cancelRequest()
+{
+    m_clientInterface->cancelRequest();
+}
+
+void ChatRootView::generateColors()
+{
+    QColor baseColor = backgroundColor();
+    bool isDarkTheme = baseColor.lightness() < 128;
+
+    if (isDarkTheme) {
+        m_primaryColor = generateColor(baseColor, 0.1, 1.2, 1.4);
+        m_secondaryColor = generateColor(baseColor, -0.1, 1.1, 1.2);
+        m_codeColor = generateColor(baseColor, 0.05, 0.8, 1.1);
+    } else {
+        m_primaryColor = generateColor(baseColor, 0.05, 1.05, 1.1);
+        m_secondaryColor = generateColor(baseColor, -0.05, 1.1, 1.2);
+        m_codeColor = generateColor(baseColor, 0.02, 0.95, 1.05);
+    }
+}
+
+QColor ChatRootView::generateColor(const QColor &baseColor,
+                                   float hueShift,
+                                   float saturationMod,
+                                   float lightnessMod)
+{
+    float h, s, l, a;
+    baseColor.getHslF(&h, &s, &l, &a);
+    bool isDarkTheme = l < 0.5;
+
+    h = fmod(h + hueShift + 1.0, 1.0);
+
+    s = qBound(0.0f, s * saturationMod, 1.0f);
+
+    if (isDarkTheme) {
+        l = qBound(0.0f, l * lightnessMod, 1.0f);
+    } else {
+        l = qBound(0.0f, l / lightnessMod, 1.0f);
+    }
+
+    h = qBound(0.0f, h, 1.0f);
+    s = qBound(0.0f, s, 1.0f);
+    l = qBound(0.0f, l, 1.0f);
+    a = qBound(0.0f, a, 1.0f);
+
+    return QColor::fromHslF(h, s, l, a);
+}
+
+QString ChatRootView::currentTemplate() const
+{
+    auto &settings = Settings::generalSettings();
+    return settings.caModel();
+}
+
+QColor ChatRootView::primaryColor() const
+{
+    return m_primaryColor;
+}
+
+QColor ChatRootView::secondaryColor() const
+{
+    return m_secondaryColor;
+}
+
+QColor ChatRootView::codeColor() const
+{
+    return m_codeColor;
+}
+
+bool ChatRootView::isSharingCurrentFile() const
+{
+    return Settings::chatAssistantSettings().sharingCurrentFile();
+}
+
+} // namespace QodeAssist::Chat

ChatView/ChatRootView.hpp

@@ -0,0 +1,86 @@
+/*
+ * 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 <QQuickItem>
+
+#include "ChatModel.hpp"
+#include "ClientInterface.hpp"
+
+namespace QodeAssist::Chat {
+
+class ChatRootView : public QQuickItem
+{
+    Q_OBJECT
+    // Possibly Qt bug: QTBUG-131004
+    // The class type name must be fully qualified
+    // including the namespace.
+    // Otherwise qmlls can't find it.
+    Q_PROPERTY(QodeAssist::Chat::ChatModel *chatModel READ chatModel NOTIFY chatModelChanged FINAL)
+    Q_PROPERTY(QString currentTemplate READ currentTemplate NOTIFY currentTemplateChanged FINAL)
+    Q_PROPERTY(QColor backgroundColor READ backgroundColor CONSTANT FINAL)
+    Q_PROPERTY(QColor primaryColor READ primaryColor CONSTANT FINAL)
+    Q_PROPERTY(QColor secondaryColor READ secondaryColor CONSTANT FINAL)
+    Q_PROPERTY(QColor codeColor READ codeColor CONSTANT FINAL)
+    Q_PROPERTY(bool isSharingCurrentFile READ isSharingCurrentFile NOTIFY
+                   isSharingCurrentFileChanged FINAL)
+    QML_ELEMENT
+
+public:
+    ChatRootView(QQuickItem *parent = nullptr);
+
+    ChatModel *chatModel() const;
+    QString currentTemplate() const;
+
+    QColor backgroundColor() const;
+    QColor primaryColor() const;
+    QColor secondaryColor() const;
+
+    QColor codeColor() const;
+
+    bool isSharingCurrentFile() const;
+
+public slots:
+    void sendMessage(const QString &message, bool sharingCurrentFile = false) const;
+    void copyToClipboard(const QString &text);
+    void cancelRequest();
+
+signals:
+    void chatModelChanged();
+    void currentTemplateChanged();
+
+    void isSharingCurrentFileChanged();
+
+private:
+    void generateColors();
+    QColor generateColor(const QColor &baseColor,
+                         float hueShift,
+                         float saturationMod,
+                         float lightnessMod);
+
+    ChatModel *m_chatModel;
+    ClientInterface *m_clientInterface;
+    QString m_currentTemplate;
+    QColor m_primaryColor;
+    QColor m_secondaryColor;
+    QColor m_codeColor;
+};
+
+} // namespace QodeAssist::Chat

ChatView/ChatUtils.cpp

@@ -0,0 +1,32 @@
+/* 
+ * 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 "ChatUtils.h"
+
+#include <QClipboard>
+#include <QGuiApplication>
+
+namespace QodeAssist::Chat {
+
+void ChatUtils::copyToClipboard(const QString &text)
+{
+    QGuiApplication::clipboard()->setText(text);
+}
+
+} // namespace QodeAssist::Chat

ChatView/ChatUtils.h

@@ -0,0 +1,40 @@
+/* 
+ * 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 <qobject.h>
+#include <qqmlintegration.h>
+
+namespace QodeAssist::Chat {
+// Q_NAMESPACE
+
+class ChatUtils : public QObject
+{
+    Q_OBJECT
+    QML_NAMED_ELEMENT(ChatUtils)
+
+public:
+    explicit ChatUtils(QObject *parent = nullptr)
+        : QObject(parent) {};
+
+    Q_INVOKABLE void copyToClipboard(const QString &text);
+};
+
+} // namespace QodeAssist::Chat

ChatView/ChatWidget.cpp

@@ -0,0 +1,43 @@
+/*
+ * 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 "ChatWidget.hpp"
+
+#include <QQmlContext>
+#include <QQmlEngine>
+
+namespace QodeAssist::Chat {
+
+ChatWidget::ChatWidget(QWidget *parent)
+    : QQuickWidget(parent)
+{
+    setSource(QUrl("qrc:/qt/qml/ChatView/qml/RootItem.qml"));
+    setResizeMode(QQuickWidget::SizeRootObjectToView);
+}
+
+void ChatWidget::clear()
+{
+    QMetaObject::invokeMethod(rootObject(), "clearChat");
+}
+
+void ChatWidget::scrollToBottom()
+{
+    QMetaObject::invokeMethod(rootObject(), "scrollToBottom");
+}
+}

ChatView/ChatWidget.hpp

@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2024 Petr Mironychev
  *
  * This file is part of QodeAssist.
@@ -19,45 +19,23 @@
 
 #pragma once
 
-#include <QLineEdit>
-#include <QPushButton>
-#include <QTextEdit>
-#include <QWidget>
-
-#include "ChatClientInterface.hpp"
+#include <QtQuickWidgets/QtQuickWidgets>
 
 namespace QodeAssist::Chat {
 
-class ChatWidget : public QWidget
+class ChatWidget : public QQuickWidget
 {
     Q_OBJECT
 
 public:
     explicit ChatWidget(QWidget *parent = nullptr);
+    ~ChatWidget() = default;
 
-    void clear();
-    void scrollToBottom();
-    void setShowTimestamp(bool show);
+    Q_INVOKABLE void clear();
+    Q_INVOKABLE void scrollToBottom();
 
-    void receiveMessage(const QString &message);
-
-private slots:
-    void sendMessage();
-    void receivePartialMessage(const QString &partialMessage);
-    void onMessageCompleted();
-    void handleError(const QString &error);
-
-private:
-    QTextEdit *m_chatDisplay;
-    QLineEdit *m_messageInput;
-    QPushButton *m_sendButton;
-    bool m_showTimestamp;
-    ChatClientInterface *m_chatClient;
-    QString m_currentAIResponse;
-
-    void setupUi();
-    void addMessage(const QString &message, bool fromUser = true);
-    void updateLastAIMessage(const QString &message);
+signals:
+    void clearPressed();
 };
 
-} // namespace QodeAssist::Chat
+}

ChatView/ClientInterface.cpp

@@ -0,0 +1,183 @@
+/* 
+ * 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 "ClientInterface.hpp"
+
+#include <QFileInfo>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QUuid>
+#include <texteditor/textdocument.h>
+
+#include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/editormanager/ieditor.h>
+#include <coreplugin/idocument.h>
+
+#include <texteditor/textdocument.h>
+#include <texteditor/texteditor.h>
+
+#include "ChatAssistantSettings.hpp"
+#include "GeneralSettings.hpp"
+#include "Logger.hpp"
+#include "PromptTemplateManager.hpp"
+#include "ProvidersManager.hpp"
+
+namespace QodeAssist::Chat {
+
+ClientInterface::ClientInterface(ChatModel *chatModel, QObject *parent)
+    : QObject(parent)
+    , m_requestHandler(new LLMCore::RequestHandler(this))
+    , m_chatModel(chatModel)
+{
+    connect(m_requestHandler,
+            &LLMCore::RequestHandler::completionReceived,
+            this,
+            [this](const QString &completion, const QJsonObject &request, bool isComplete) {
+                handleLLMResponse(completion, request, isComplete);
+            });
+
+    connect(m_requestHandler,
+            &LLMCore::RequestHandler::requestFinished,
+            this,
+            [this](const QString &, bool success, const QString &errorString) {
+                if (!success) {
+                    emit errorOccurred(errorString);
+                }
+            });
+}
+
+ClientInterface::~ClientInterface() = default;
+
+void ClientInterface::sendMessage(const QString &message, bool includeCurrentFile)
+{
+    cancelRequest();
+
+    auto &chatAssistantSettings = Settings::chatAssistantSettings();
+
+    auto providerName = Settings::generalSettings().caProvider();
+    auto provider = LLMCore::ProvidersManager::instance().getProviderByName(providerName);
+
+    if (!provider) {
+        LOG_MESSAGE(QString("No provider found with name: %1").arg(providerName));
+        return;
+    }
+
+    auto templateName = Settings::generalSettings().caTemplate();
+    auto promptTemplate = LLMCore::PromptTemplateManager::instance().getChatTemplateByName(
+        templateName);
+
+    if (!promptTemplate) {
+        LOG_MESSAGE(QString("No template found with name: %1").arg(templateName));
+        return;
+    }
+
+    LLMCore::ContextData context;
+    context.prefix = message;
+    context.suffix = "";
+
+    QString systemPrompt;
+    if (chatAssistantSettings.useSystemPrompt())
+        systemPrompt = chatAssistantSettings.systemPrompt();
+
+    if (includeCurrentFile) {
+        QString fileContext = getCurrentFileContext();
+        if (!fileContext.isEmpty()) {
+            systemPrompt = systemPrompt.append(fileContext);
+        }
+    }
+
+    QJsonObject providerRequest;
+    providerRequest["model"] = Settings::generalSettings().caModel();
+    providerRequest["stream"] = true;
+    providerRequest["messages"] = m_chatModel->prepareMessagesForRequest(systemPrompt);
+
+    if (promptTemplate)
+        promptTemplate->prepareRequest(providerRequest, context);
+    else
+        qWarning("No prompt template found");
+
+    if (provider)
+        provider->prepareRequest(providerRequest, LLMCore::RequestType::Chat);
+    else
+        qWarning("No provider found");
+
+    LLMCore::LLMConfig config;
+    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()
+{
+    m_chatModel->clear();
+    LOG_MESSAGE("Chat history cleared");
+}
+
+void ClientInterface::cancelRequest()
+{
+    auto id = m_chatModel->lastMessageId();
+    m_requestHandler->cancelRequest(id);
+}
+
+void ClientInterface::handleLLMResponse(const QString &response,
+                                        const QJsonObject &request,
+                                        bool isComplete)
+{
+    QString messageId = request["id"].toString();
+    m_chatModel->addMessage(response.trimmed(), ChatModel::ChatRole::Assistant, messageId);
+
+    if (isComplete) {
+        LOG_MESSAGE("Message completed. Final response for message " + messageId + ": " + response);
+    }
+}
+
+QString ClientInterface::getCurrentFileContext() const
+{
+    auto currentEditor = Core::EditorManager::currentEditor();
+    if (!currentEditor) {
+        LOG_MESSAGE("No active editor found");
+        return QString();
+    }
+
+    auto textDocument = qobject_cast<TextEditor::TextDocument *>(currentEditor->document());
+    if (!textDocument) {
+        LOG_MESSAGE("Current document is not a text document");
+        return QString();
+    }
+
+    QString fileInfo = QString("Language: %1\nFile: %2\n\n")
+                           .arg(textDocument->mimeType(), textDocument->filePath().toString());
+
+    QString content = textDocument->document()->toPlainText();
+
+    LOG_MESSAGE(QString("Got context from file: %1").arg(textDocument->filePath().toString()));
+
+    return QString("Current file context:\n%1\nFile content:\n%2").arg(fileInfo, content);
+}
+
+} // namespace QodeAssist::Chat

ChatView/ClientInterface.hpp

@@ -0,0 +1,54 @@
+/* 
+ * 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 <QObject>
+#include <QString>
+#include <QVector>
+
+#include "ChatModel.hpp"
+#include "RequestHandler.hpp"
+
+namespace QodeAssist::Chat {
+
+class ClientInterface : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit ClientInterface(ChatModel *chatModel, QObject *parent = nullptr);
+    ~ClientInterface();
+
+    void sendMessage(const QString &message, bool includeCurrentFile = false);
+    void clearMessages();
+    void cancelRequest();
+
+signals:
+    void errorOccurred(const QString &error);
+
+private:
+    void handleLLMResponse(const QString &response, const QJsonObject &request, bool isComplete);
+    QString getCurrentFileContext() const;
+
+    LLMCore::RequestHandler *m_requestHandler;
+    ChatModel *m_chatModel;
+};
+
+} // namespace QodeAssist::Chat

ChatView/MessagePart.hpp

@@ -0,0 +1,51 @@
+/*
+ * 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 <qobject.h>
+#include <qqmlintegration.h>
+
+namespace QodeAssist::Chat {
+Q_NAMESPACE
+
+class MessagePart
+{
+    Q_GADGET
+    Q_PROPERTY(PartType type MEMBER type CONSTANT FINAL)
+    Q_PROPERTY(QString text MEMBER text CONSTANT FINAL)
+    Q_PROPERTY(QString language MEMBER language CONSTANT FINAL)
+    QML_VALUE_TYPE(messagePart)
+public:
+    enum PartType { Code, Text };
+    Q_ENUM(PartType)
+
+    PartType type;
+    QString text;
+    QString language;
+};
+
+class MessagePartType : public MessagePart
+{
+    Q_GADGET
+};
+
+QML_NAMED_ELEMENT(MessagePart)
+QML_FOREIGN_NAMESPACE(QodeAssist::Chat::MessagePartType)
+} // namespace QodeAssist::Chat

ChatView/qml/Badge.qml

@@ -0,0 +1,40 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick
+
+Rectangle {
+    id: root
+
+    property alias text: badgeText.text
+    property alias fontColor: badgeText.color
+
+    width: badgeText.implicitWidth + radius
+    height: badgeText.implicitHeight + 6
+    color: "lightgreen"
+    radius: height / 2
+    border.width: 1
+    border.color: "gray"
+
+    Text {
+        id: badgeText
+
+        anchors.centerIn: parent
+    }
+}

ChatView/qml/ChatItem.qml

@@ -0,0 +1,111 @@
+/*
+ * 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 ComponentBehavior: Bound
+
+import QtQuick
+import ChatView
+import "./dialog"
+
+Rectangle {
+    id: root
+
+    property alias msgModel: msgCreator.model
+    property color fontColor
+    property color codeBgColor
+    property color selectionColor
+
+    height: msgColumn.height
+    radius: 8
+
+    Column {
+        id: msgColumn
+
+        anchors.verticalCenter: parent.verticalCenter
+        width: parent.width
+        spacing: 5
+
+        Repeater {
+            id: msgCreator
+            delegate: Loader {
+                id: msgCreatorDelegate
+                // Fix me:
+                // why does `required property MessagePart modelData` not work?
+                required property var modelData
+
+                width: parent.width
+                sourceComponent: {
+                    // If `required property MessagePart modelData` is used
+                    // and conversion to MessagePart fails, you're left
+                    // with a nullptr. This tests that to prevent crashing.
+                    if(!modelData) {
+                        return undefined;
+                    }
+
+                    switch(modelData.type) {
+                        case MessagePart.Text: return textComponent;
+                        case MessagePart.Code: return codeBlockComponent;
+                        default: return textComponent;
+                    }
+                }
+
+                Component {
+                    id: textComponent
+                    TextComponent {
+                        itemData: msgCreatorDelegate.modelData
+                    }
+                }
+
+                Component {
+                    id: codeBlockComponent
+                    CodeBlockComponent {
+                        itemData: msgCreatorDelegate.modelData
+                    }
+                }
+            }
+        }
+    }
+
+    component TextComponent : TextBlock {
+        required property var itemData
+        height: implicitHeight + 10
+        verticalAlignment: Text.AlignVCenter
+        leftPadding: 10
+        text: itemData.text
+        color: root.fontColor
+        selectionColor: root.selectionColor
+    }
+
+
+    component CodeBlockComponent : CodeBlock {
+        required property var itemData
+        anchors {
+            left: parent.left
+            leftMargin: 10
+            right: parent.right
+            rightMargin: 10
+        }
+
+        code: itemData.text
+        language: itemData.language
+        color: root.codeBgColor
+        selectionColor: root.selectionColor
+    }
+
+}

ChatView/qml/RootItem.qml

@@ -0,0 +1,186 @@
+/*
+ * 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 ComponentBehavior: Bound
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Basic as QQC
+import QtQuick.Layouts
+import ChatView
+
+ChatRootView {
+    id: root
+
+    Rectangle {
+        id: bg
+        anchors.fill: parent
+        color: root.backgroundColor
+    }
+
+    ColumnLayout {
+        anchors {
+            fill: parent
+        }
+        spacing: 10
+
+        ListView {
+            id: chatListView
+
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+            leftMargin: 5
+            model: root.chatModel
+            clip: true
+            spacing: 10
+            boundsBehavior: Flickable.StopAtBounds
+            cacheBuffer: 2000
+
+            delegate: ChatItem {
+                required property var model
+                width: ListView.view.width - scroll.width
+                msgModel: root.chatModel.processMessageContent(model.content)
+                color: model.roleType === ChatModel.User ? root.primaryColor : root.secondaryColor
+                fontColor: root.primaryColor.hslLightness > 0.5 ? "black" : "white"
+                codeBgColor: root.codeColor
+                selectionColor: root.primaryColor.hslLightness > 0.5 ? Qt.darker(root.primaryColor, 1.5)
+                                                                     : Qt.lighter(root.primaryColor, 1.5)
+
+            }
+
+            header: Item {
+                width: ListView.view.width - scroll.width
+                height: 30
+            }
+
+            ScrollBar.vertical: ScrollBar {
+                id: scroll
+            }
+
+            onCountChanged: {
+                root.scrollToBottom()
+            }
+
+            onContentHeightChanged: {
+                if (atYEnd) {
+                    root.scrollToBottom()
+                }
+            }
+        }
+
+        ScrollView {
+            id: view
+
+            Layout.fillWidth: true
+            Layout.minimumHeight: 30
+            Layout.maximumHeight: root.height / 2
+
+            QQC.TextArea {
+                id: messageInput
+
+                placeholderText: qsTr("Type your message here...")
+                placeholderTextColor: "#888"
+                color: root.primaryColor.hslLightness > 0.5 ? "black" : "white"
+                background: Rectangle {
+                    radius: 2
+                    color: root.primaryColor
+                    border.color: root.primaryColor.hslLightness > 0.5 ? Qt.lighter(root.primaryColor, 1.5)
+                                                                       : Qt.darker(root.primaryColor, 1.5)
+                    border.width: 1
+                }
+                Keys.onPressed: function(event) {
+                    if ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && !(event.modifiers & Qt.ShiftModifier)) {
+                        root.sendChatMessage()
+                        event.accepted = true;
+                    }
+                }
+            }
+        }
+
+        RowLayout {
+            Layout.fillWidth: true
+            spacing: 5
+
+            Button {
+                id: sendButton
+
+                Layout.alignment: Qt.AlignBottom
+                text: qsTr("Send")
+                onClicked: root.sendChatMessage()
+            }
+
+            Button {
+                id: stopButton
+
+                Layout.alignment: Qt.AlignBottom
+                text: qsTr("Stop")
+                onClicked: root.cancelRequest()
+            }
+
+            Button {
+                id: clearButton
+
+                Layout.alignment: Qt.AlignBottom
+                text: qsTr("Clear Chat")
+                onClicked: root.clearChat()
+            }
+
+            CheckBox {
+                id: sharingCurrentFile
+
+                text: "Share current file with models"
+                checked: root.isSharingCurrentFile
+            }
+        }
+    }
+
+    Row {
+        id: bar
+
+        layoutDirection: Qt.RightToLeft
+
+        anchors {
+            left: parent.left
+            leftMargin: 5
+            right: parent.right
+            rightMargin: scroll.width
+        }
+        spacing: 10
+
+        Badge {
+            text: qsTr("tokens:%1/%2").arg(root.chatModel.totalTokens).arg(root.chatModel.tokensThreshold)
+            color: root.codeColor
+            fontColor: root.primaryColor.hslLightness > 0.5 ? "black" : "white"
+        }
+    }
+
+    function clearChat() {
+        root.chatModel.clear()
+    }
+
+    function scrollToBottom() {
+        Qt.callLater(chatListView.positionViewAtEnd)
+    }
+
+    function sendChatMessage() {
+        root.sendMessage(messageInput.text, sharingCurrentFile.checked)
+        messageInput.text = ""
+        scrollToBottom()
+    }
+}

ChatView/qml/dialog/CodeBlock.qml

@@ -0,0 +1,100 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick
+import QtQuick.Controls
+import ChatView
+
+Rectangle {
+    id: root
+
+    property string code: ""
+    property string language: ""
+    property color selectionColor
+
+    readonly property string monospaceFont: {
+        switch (Qt.platform.os) {
+            case "windows":
+                return "Consolas";
+            case "osx":
+                return "Menlo";
+            case "linux":
+                return "DejaVu Sans Mono";
+            default:
+                return "monospace";
+        }
+    }
+
+    border.color: root.color.hslLightness > 0.5 ? Qt.darker(root.color, 1.3)
+                                                : Qt.lighter(root.color, 1.3)
+    border.width: 2
+    radius: 4
+
+    implicitWidth: parent.width
+    implicitHeight: codeText.implicitHeight + 20
+
+    ChatUtils {
+        id: utils
+    }
+
+    TextEdit {
+        id: codeText
+
+        anchors.fill: parent
+        anchors.margins: 10
+        text: root.code
+        readOnly: true
+        selectByMouse: true
+        font.family: root.monospaceFont
+        font.pointSize: 12
+        color: parent.color.hslLightness > 0.5 ? "black" : "white"
+        wrapMode: Text.WordWrap
+        selectionColor: root.selectionColor
+    }
+
+    TextEdit {
+        anchors.top: parent.top
+        anchors.right: parent.right
+        anchors.margins: 5
+        readOnly: true
+        selectByMouse: true
+        text: root.language
+        color: root.color.hslLightness > 0.5 ? Qt.darker(root.color, 1.1)
+                                             : Qt.lighter(root.color, 1.1)
+        font.pointSize: 8
+    }
+
+    Button {
+        anchors.top: parent.top
+        anchors.right: parent.right
+        anchors.margins: 5
+        text: "Copy"
+        onClicked: {
+            utils.copyToClipboard(root.code)
+            text = qsTr("Copied")
+            copyTimer.start()
+        }
+
+        Timer {
+            id: copyTimer
+            interval: 2000
+            onTriggered: parent.text = qsTr("Copy")
+        }
+    }
+}

ChatView/qml/dialog/TextBlock.qml

@@ -0,0 +1,29 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick
+
+TextEdit {
+    id: root
+
+    readOnly: true
+    selectByMouse: true
+    wrapMode: Text.WordWrap
+    textFormat: Text.StyledText
+}

ConfigurationManager.cpp

@@ -0,0 +1,162 @@
+/* 
+ * 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 "ConfigurationManager.hpp"
+
+#include <QTimer>
+#include <settings/ButtonAspect.hpp>
+
+#include "QodeAssisttr.h"
+
+namespace QodeAssist {
+
+ConfigurationManager &ConfigurationManager::instance()
+{
+    static ConfigurationManager instance;
+    return instance;
+}
+
+void ConfigurationManager::init()
+{
+    setupConnections();
+}
+
+ConfigurationManager::ConfigurationManager(QObject *parent)
+    : QObject(parent)
+    , m_generalSettings(Settings::generalSettings())
+    , m_providersManager(LLMCore::ProvidersManager::instance())
+    , m_templateManger(LLMCore::PromptTemplateManager::instance())
+{}
+
+void ConfigurationManager::setupConnections()
+{
+    using Config = ConfigurationManager;
+    using Button = ButtonAspect;
+
+    connect(&m_generalSettings.ccSelectProvider, &Button::clicked, this, &Config::selectProvider);
+    connect(&m_generalSettings.caSelectProvider, &Button::clicked, this, &Config::selectProvider);
+    connect(&m_generalSettings.ccSelectModel, &Button::clicked, this, &Config::selectModel);
+    connect(&m_generalSettings.caSelectModel, &Button::clicked, this, &Config::selectModel);
+    connect(&m_generalSettings.ccSelectTemplate, &Button::clicked, this, &Config::selectTemplate);
+    connect(&m_generalSettings.caSelectTemplate, &Button::clicked, this, &Config::selectTemplate);
+    connect(&m_generalSettings.ccSetUrl, &Button::clicked, this, &Config::selectUrl);
+    connect(&m_generalSettings.caSetUrl, &Button::clicked, this, &Config::selectUrl);
+}
+
+void ConfigurationManager::selectProvider()
+{
+    const auto providersList = m_providersManager.providersNames();
+
+    auto *settingsButton = qobject_cast<ButtonAspect *>(sender());
+    if (!settingsButton)
+        return;
+
+    auto &targetSettings = (settingsButton == &m_generalSettings.ccSelectProvider)
+                               ? m_generalSettings.ccProvider
+                               : m_generalSettings.caProvider;
+
+    QTimer::singleShot(0, this, [this, providersList, &targetSettings] {
+        m_generalSettings.showSelectionDialog(providersList,
+                                              targetSettings,
+                                              Tr::tr("Select LLM Provider"),
+                                              Tr::tr("Providers:"));
+    });
+}
+
+void ConfigurationManager::selectModel()
+{
+    auto *settingsButton = qobject_cast<ButtonAspect *>(sender());
+    if (!settingsButton)
+        return;
+
+    const bool isCodeCompletion = (settingsButton == &m_generalSettings.ccSelectModel);
+
+    const QString providerName = isCodeCompletion ? m_generalSettings.ccProvider.volatileValue()
+                                                  : m_generalSettings.caProvider.volatileValue();
+
+    const auto providerUrl = isCodeCompletion ? m_generalSettings.ccUrl.volatileValue()
+                                              : m_generalSettings.caUrl.volatileValue();
+
+    auto &targetSettings = isCodeCompletion ? m_generalSettings.ccModel : m_generalSettings.caModel;
+
+    if (auto provider = m_providersManager.getProviderByName(providerName)) {
+        if (!provider->supportsModelListing()) {
+            m_generalSettings.showModelsNotSupportedDialog(targetSettings);
+            return;
+        }
+
+        const auto modelList = provider->getInstalledModels(providerUrl);
+
+        if (modelList.isEmpty()) {
+            m_generalSettings.showModelsNotFoundDialog(targetSettings);
+            return;
+        }
+
+        QTimer::singleShot(0, &m_generalSettings, [this, modelList, &targetSettings]() {
+            m_generalSettings.showSelectionDialog(
+                modelList, targetSettings, Tr::tr("Select LLM Model"), Tr::tr("Models:"));
+        });
+    }
+}
+
+void ConfigurationManager::selectTemplate()
+{
+    auto *settingsButton = qobject_cast<ButtonAspect *>(sender());
+    if (!settingsButton)
+        return;
+
+    const bool isCodeCompletion = (settingsButton == &m_generalSettings.ccSelectTemplate);
+
+    const auto templateList = isCodeCompletion ? m_templateManger.fimTemplatesNames()
+                                               : m_templateManger.chatTemplatesNames();
+
+    auto &targetSettings = isCodeCompletion ? m_generalSettings.ccTemplate
+                                            : m_generalSettings.caTemplate;
+
+    QTimer::singleShot(0, &m_generalSettings, [this, templateList, &targetSettings]() {
+        m_generalSettings.showSelectionDialog(templateList,
+                                              targetSettings,
+                                              Tr::tr("Select Template"),
+                                              Tr::tr("Templates:"));
+    });
+}
+
+void ConfigurationManager::selectUrl()
+{
+    auto *settingsButton = qobject_cast<ButtonAspect *>(sender());
+    if (!settingsButton)
+        return;
+
+    QStringList urls;
+    for (const auto &name : m_providersManager.providersNames()) {
+        const auto url = m_providersManager.getProviderByName(name)->url();
+        if (!urls.contains(url))
+            urls.append(url);
+    }
+
+    auto &targetSettings = (settingsButton == &m_generalSettings.ccSetUrl)
+                               ? m_generalSettings.ccUrl
+                               : m_generalSettings.caUrl;
+
+    QTimer::singleShot(0, &m_generalSettings, [this, urls, &targetSettings]() {
+        m_generalSettings.showUrlSelectionDialog(targetSettings, urls);
+    });
+}
+
+} // namespace QodeAssist

ConfigurationManager.hpp

@@ -0,0 +1,58 @@
+/* 
+ * 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 <QObject>
+
+#include "llmcore/PromptTemplateManager.hpp"
+#include "llmcore/ProvidersManager.hpp"
+#include "settings/GeneralSettings.hpp"
+
+namespace QodeAssist {
+
+class ConfigurationManager : public QObject
+{
+    Q_OBJECT
+
+public:
+    static ConfigurationManager &instance();
+
+    void init();
+
+public slots:
+    void selectProvider();
+    void selectModel();
+    void selectTemplate();
+    void selectUrl();
+
+private:
+    explicit ConfigurationManager(QObject *parent = nullptr);
+    ~ConfigurationManager() = default;
+    ConfigurationManager(const ConfigurationManager &) = delete;
+    ConfigurationManager &operator=(const ConfigurationManager &) = delete;
+
+    Settings::GeneralSettings &m_generalSettings;
+    LLMCore::ProvidersManager &m_providersManager;
+    LLMCore::PromptTemplateManager &m_templateManger;
+
+    void setupConnections();
+};
+
+} // namespace QodeAssist

DocumentContextReader.cpp

@@ -24,7 +24,7 @@
 #include <languageserverprotocol/lsptypes.h>
 
 #include "core/ChangesManager.h"
-#include "settings/ContextSettings.hpp"
+#include "settings/CodeCompletionSettings.hpp"
 
 const QRegularExpression &getYearRegex()
 {
@@ -135,13 +135,6 @@ QString DocumentContextReader::getLanguageAndFileInfo() const
         .arg(language, mimeType, filePath, fileExtension);
 }
 
-QString DocumentContextReader::getSpecificInstructions() const
-{
-    QString specificInstruction = Settings::contextSettings().specificInstractions().arg(
-        LanguageServerProtocol::TextDocumentItem::mimeTypeToLanguageId(m_textDocument->mimeType()));
-    return QString("%1").arg(specificInstruction);
-}
-
 CopyrightInfo DocumentContextReader::findCopyright()
 {
     CopyrightInfo result = {-1, -1, false};
@@ -210,22 +203,28 @@ CopyrightInfo DocumentContextReader::copyrightInfo() const
     return m_copyrightInfo;
 }
 
-ContextData DocumentContextReader::prepareContext(int lineNumber, int cursorPosition) const
+LLMCore::ContextData DocumentContextReader::prepareContext(int lineNumber, int cursorPosition) const
 {
     QString contextBefore = getContextBefore(lineNumber, cursorPosition);
     QString contextAfter = getContextAfter(lineNumber, cursorPosition);
-    QString instructions = getInstructions();
 
-    return {contextBefore, contextAfter, instructions};
+    QString fileContext;
+    if (Settings::codeCompletionSettings().useFilePathInContext())
+        fileContext += getLanguageAndFileInfo();
+
+    if (Settings::codeCompletionSettings().useProjectChangesCache())
+        fileContext += ChangesManager::instance().getRecentChangesContext(m_textDocument);
+
+    return {contextBefore, contextAfter, fileContext};
 }
 
 QString DocumentContextReader::getContextBefore(int lineNumber, int cursorPosition) const
 {
-    if (Settings::contextSettings().readFullFile()) {
+    if (Settings::codeCompletionSettings().readFullFile()) {
         return readWholeFileBefore(lineNumber, cursorPosition);
     } else {
         int effectiveStartLine;
-        int beforeCursor = Settings::contextSettings().readStringsBeforeCursor();
+        int beforeCursor = Settings::codeCompletionSettings().readStringsBeforeCursor();
         if (m_copyrightInfo.found) {
             effectiveStartLine = qMax(m_copyrightInfo.endLine + 1, lineNumber - beforeCursor);
         } else {
@@ -237,26 +236,13 @@ QString DocumentContextReader::getContextBefore(int lineNumber, int cursorPositi
 
 QString DocumentContextReader::getContextAfter(int lineNumber, int cursorPosition) const
 {
-    if (Settings::contextSettings().readFullFile()) {
+    if (Settings::codeCompletionSettings().readFullFile()) {
         return readWholeFileAfter(lineNumber, cursorPosition);
     } else {
         int endLine = qMin(m_document->blockCount() - 1,
-                           lineNumber + Settings::contextSettings().readStringsAfterCursor());
+                           lineNumber + Settings::codeCompletionSettings().readStringsAfterCursor());
         return getContextBetween(lineNumber + 1, endLine, -1);
     }
 }
 
-QString DocumentContextReader::getInstructions() const
-{
-    QString instructions;
-
-    if (Settings::contextSettings().useFilePathInContext())
-        instructions += getLanguageAndFileInfo();
-
-    if (Settings::contextSettings().useProjectChangesCache())
-        instructions += ChangesManager::instance().getRecentChangesContext(m_textDocument);
-
-    return instructions;
-}
-
 } // namespace QodeAssist

DocumentContextReader.hpp

@@ -22,7 +22,7 @@
 #include <QTextDocument>
 #include <texteditor/textdocument.h>
 
-#include "QodeAssistData.hpp"
+#include <llmcore/ContextData.hpp>
 
 namespace QodeAssist {
 
@@ -44,18 +44,16 @@ public:
     QString readWholeFileBefore(int lineNumber, int cursorPosition) const;
     QString readWholeFileAfter(int lineNumber, int cursorPosition) const;
     QString getLanguageAndFileInfo() const;
-    QString getSpecificInstructions() const;
     CopyrightInfo findCopyright();
     QString getContextBetween(int startLine, int endLine, int cursorPosition) const;
 
     CopyrightInfo copyrightInfo() const;
 
-    ContextData prepareContext(int lineNumber, int cursorPosition) const;
+    LLMCore::ContextData prepareContext(int lineNumber, int cursorPosition) const;
 
 private:
     QString getContextBefore(int lineNumber, int cursorPosition) const;
     QString getContextAfter(int lineNumber, int cursorPosition) const;
-    QString getInstructions() const;
 
 private:
     TextEditor::TextDocument *m_textDocument;

LLMClientInterface.cpp

@@ -23,14 +23,14 @@
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 
+#include <llmcore/RequestConfig.hpp>
 #include <texteditor/textdocument.h>
 
 #include "DocumentContextReader.hpp"
-#include "LLMProvidersManager.hpp"
-#include "PromptTemplateManager.hpp"
-#include "QodeAssistUtils.hpp"
-#include "core/LLMRequestConfig.hpp"
-#include "settings/ContextSettings.hpp"
+#include "llmcore/PromptTemplateManager.hpp"
+#include "llmcore/ProvidersManager.hpp"
+#include "logger/Logger.hpp"
+#include "settings/CodeCompletionSettings.hpp"
 #include "settings/GeneralSettings.hpp"
 
 namespace QodeAssist {
@@ -39,7 +39,7 @@ LLMClientInterface::LLMClientInterface()
     : m_requestHandler(this)
 {
     connect(&m_requestHandler,
-            &LLMRequestHandler::completionReceived,
+            &LLMCore::RequestHandler::completionReceived,
             this,
             &LLMClientInterface::sendCompletionToClient);
 }
@@ -80,7 +80,7 @@ void LLMClientInterface::sendData(const QByteArray &data)
     } else if (method == "exit") {
         // TODO make exit handler
     } else {
-        logMessage(QString("Unknown method: %1").arg(method));
+        LOG_MESSAGE(QString("Unknown method: %1").arg(method));
     }
 }
 
@@ -88,9 +88,9 @@ void LLMClientInterface::handleCancelRequest(const QJsonObject &request)
 {
     QString id = request["params"].toObject()["id"].toString();
     if (m_requestHandler.cancelRequest(id)) {
-        logMessage(QString("Request %1 cancelled successfully").arg(id));
+        LOG_MESSAGE(QString("Request %1 cancelled successfully").arg(id));
     } else {
-        logMessage(QString("Request %1 not found").arg(id));
+        LOG_MESSAGE(QString("Request %1 not found").arg(id));
     }
 }
 
@@ -147,30 +147,56 @@ void LLMClientInterface::handleExit(const QJsonObject &request)
 void LLMClientInterface::handleCompletion(const QJsonObject &request)
 {
     auto updatedContext = prepareContext(request);
+    auto &completeSettings = Settings::codeCompletionSettings();
 
-    LLMConfig config;
-    config.requestType = RequestType::Fim;
-    config.provider = LLMProvidersManager::instance().getCurrentFimProvider();
-    config.promptTemplate = PromptTemplateManager::instance().getCurrentFimTemplate();
-    config.url = QUrl(QString("%1%2").arg(Settings::generalSettings().url(),
-                                          Settings::generalSettings().endPoint()));
+    auto providerName = Settings::generalSettings().ccProvider();
+    auto provider = LLMCore::ProvidersManager::instance().getProviderByName(providerName);
 
-    config.providerRequest = {{"model", Settings::generalSettings().modelName.value()},
-                              {"stream", true},
-                              {"stop",
-                               QJsonArray::fromStringList(config.promptTemplate->stopWords())}};
+    if (!provider) {
+        LOG_MESSAGE(QString("No provider found with name: %1").arg(providerName));
+        return;
+    }
 
-    if (Settings::contextSettings().useSpecificInstructions())
-        config.providerRequest["system"] = Settings::contextSettings().specificInstractions();
+    auto templateName = Settings::generalSettings().ccTemplate();
+    auto promptTemplate = LLMCore::PromptTemplateManager::instance().getFimTemplateByName(
+        templateName);
+
+    if (!promptTemplate) {
+        LOG_MESSAGE(QString("No template found with name: %1").arg(templateName));
+        return;
+    }
+
+    LLMCore::LLMConfig config;
+    config.requestType = LLMCore::RequestType::Fim;
+    config.provider = provider;
+    config.promptTemplate = promptTemplate;
+    config.url = QUrl(
+        QString("%1%2").arg(Settings::generalSettings().ccUrl(), provider->completionEndpoint()));
+
+    config.providerRequest = {{"model", Settings::generalSettings().ccModel()}, {"stream", true}};
+
+    config.multiLineCompletion = completeSettings.multiLineCompletion();
+
+    QString systemPrompt;
+    if (completeSettings.useSystemPrompt())
+        systemPrompt.append(completeSettings.systemPrompt());
+    if (!updatedContext.fileContext.isEmpty())
+        systemPrompt.append(updatedContext.fileContext);
+    if (!systemPrompt.isEmpty())
+        config.providerRequest["system"] = systemPrompt;
+
+    const auto stopWords = QJsonArray::fromStringList(config.promptTemplate->stopWords());
+    if (!stopWords.isEmpty())
+        config.providerRequest["stop"] = stopWords;
 
     config.promptTemplate->prepareRequest(config.providerRequest, updatedContext);
-    config.provider->prepareRequest(config.providerRequest);
+    config.provider->prepareRequest(config.providerRequest, LLMCore::RequestType::Fim);
 
     m_requestHandler.sendLLMRequest(config, request);
 }
 
-ContextData LLMClientInterface::prepareContext(const QJsonObject &request,
-                                               const QStringView &accumulatedCompletion)
+LLMCore::ContextData LLMClientInterface::prepareContext(const QJsonObject &request,
+                                                        const QStringView &accumulatedCompletion)
 {
     QJsonObject params = request["params"].toObject();
     QJsonObject doc = params["doc"].toObject();
@@ -182,8 +208,8 @@ ContextData LLMClientInterface::prepareContext(const QJsonObject &request,
         filePath);
 
     if (!textDocument) {
-        logMessage("Error: Document is not available for" + filePath.toString());
-        return ContextData{};
+        LOG_MESSAGE("Error: Document is not available for" + filePath.toString());
+        return LLMCore::ContextData{};
     }
 
     int cursorPosition = position["character"].toInt();
@@ -218,11 +244,11 @@ void LLMClientInterface::sendCompletionToClient(const QString &completion,
     result[LanguageServerProtocol::isIncompleteKey] = !isComplete;
     response[LanguageServerProtocol::resultKey] = result;
 
-    logMessage(
+    LOG_MESSAGE(
         QString("Completions: \n%1")
             .arg(QString::fromUtf8(QJsonDocument(completions).toJson(QJsonDocument::Indented))));
 
-    logMessage(QString("Full response: \n%1")
+    LOG_MESSAGE(QString("Full response: \n%1")
                    .arg(QString::fromUtf8(QJsonDocument(response).toJson(QJsonDocument::Indented))));
 
     QString requestId = request["id"].toString();
@@ -250,7 +276,7 @@ void LLMClientInterface::logPerformance(const QString &requestId,
                                         const QString &operation,
                                         qint64 elapsedMs)
 {
-    logMessage(QString("Performance: %1 %2 took %3 ms").arg(requestId, operation).arg(elapsedMs));
+    LOG_MESSAGE(QString("Performance: %1 %2 took %3 ms").arg(requestId, operation).arg(elapsedMs));
 }
 
 void LLMClientInterface::parseCurrentMessage() {}

LLMClientInterface.hpp

@@ -22,8 +22,8 @@
 #include <languageclient/languageclientinterface.h>
 #include <texteditor/texteditor.h>
 
-#include "QodeAssistData.hpp"
-#include "core/LLMRequestHandler.hpp"
+#include <llmcore/ContextData.hpp>
+#include <llmcore/RequestHandler.hpp>
 
 class QNetworkReply;
 class QNetworkAccessManager;
@@ -58,10 +58,10 @@ private:
     void handleExit(const QJsonObject &request);
     void handleCancelRequest(const QJsonObject &request);
 
-    ContextData prepareContext(const QJsonObject &request,
-                               const QStringView &accumulatedCompletion = QString{});
+    LLMCore::ContextData prepareContext(const QJsonObject &request,
+                                        const QStringView &accumulatedCompletion = QString{});
 
-    LLMRequestHandler m_requestHandler;
+    LLMCore::RequestHandler m_requestHandler;
     QElapsedTimer m_completionTimer;
     QMap<QString, qint64> m_requestStartTimes;
 

LLMProvidersManager.cpp

@@ -1,86 +0,0 @@
-/* 
- * 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 "LLMProvidersManager.hpp"
-
-#include "QodeAssistUtils.hpp"
-
-namespace QodeAssist {
-
-LLMProvidersManager &LLMProvidersManager::instance()
-{
-    static LLMProvidersManager instance;
-    return instance;
-}
-
-Providers::LLMProvider *LLMProvidersManager::setCurrentFimProvider(const QString &name)
-{
-    logMessage("Setting current FIM provider to: " + name);
-    if (!m_providers.contains(name)) {
-        logMessage("Can't find provider with name: " + name);
-        return nullptr;
-    }
-
-    m_currentFimProvider = m_providers[name];
-    return m_currentFimProvider;
-}
-
-Providers::LLMProvider *LLMProvidersManager::setCurrentChatProvider(const QString &name)
-{
-    logMessage("Setting current chat provider to: " + name);
-    if (!m_providers.contains(name)) {
-        logMessage("Can't find chat provider with name: " + name);
-        return nullptr;
-    }
-
-    m_currentChatProvider = m_providers[name];
-    return m_currentChatProvider;
-}
-
-Providers::LLMProvider *LLMProvidersManager::getCurrentFimProvider()
-{
-    if (m_currentFimProvider == nullptr) {
-        logMessage("Current fim provider is null");
-        return nullptr;
-    }
-
-    return m_currentFimProvider;
-}
-
-Providers::LLMProvider *LLMProvidersManager::getCurrentChatProvider()
-{
-    if (m_currentChatProvider == nullptr) {
-        logMessage("Current chat provider is null");
-        return nullptr;
-    }
-
-    return m_currentChatProvider;
-}
-
-QStringList LLMProvidersManager::providersNames() const
-{
-    return m_providers.keys();
-}
-
-LLMProvidersManager::~LLMProvidersManager()
-{
-    qDeleteAll(m_providers);
-}
-
-} // namespace QodeAssist

PromptTemplateManager.cpp

@@ -1,88 +0,0 @@
-/* 
- * 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 "PromptTemplateManager.hpp"
-
-#include "QodeAssistUtils.hpp"
-
-namespace QodeAssist {
-
-PromptTemplateManager &PromptTemplateManager::instance()
-{
-    static PromptTemplateManager instance;
-    return instance;
-}
-
-void PromptTemplateManager::setCurrentFimTemplate(const QString &name)
-{
-    logMessage("Setting current FIM provider to: " + name);
-    if (!m_fimTemplates.contains(name) || m_fimTemplates[name] == nullptr) {
-        logMessage("Error to set current FIM template" + name);
-        return;
-    }
-
-    m_currentFimTemplate = m_fimTemplates[name];
-}
-
-Templates::PromptTemplate *PromptTemplateManager::getCurrentFimTemplate()
-{
-    if (m_currentFimTemplate == nullptr) {
-        logMessage("Current fim provider is null");
-        return nullptr;
-    }
-
-    return m_currentFimTemplate;
-}
-
-void PromptTemplateManager::setCurrentChatTemplate(const QString &name)
-{
-    logMessage("Setting current chat provider to:  " + name);
-    if (!m_chatTemplates.contains(name) || m_chatTemplates[name] == nullptr) {
-        logMessage("Error to set current chat template" + name);
-        return;
-    }
-
-    m_currentChatTemplate = m_chatTemplates[name];
-}
-
-Templates::PromptTemplate *PromptTemplateManager::getCurrentChatTemplate()
-{
-    if (m_currentChatTemplate == nullptr)
-        logMessage("Current chat provider is null");
-
-    return m_currentChatTemplate;
-}
-
-QStringList PromptTemplateManager::fimTemplatesNames() const
-{
-    return m_fimTemplates.keys();
-}
-
-QStringList PromptTemplateManager::chatTemplatesNames() const
-{
-    return m_chatTemplates.keys();
-}
-
-PromptTemplateManager::~PromptTemplateManager()
-{
-    qDeleteAll(m_fimTemplates);
-    qDeleteAll(m_chatTemplates);
-}
-
-} // namespace QodeAssist

QodeAssist.json.in

@@ -1,6 +1,6 @@
 {
     "Name" : "QodeAssist",
-    "Version" : "0.2.2",
+    "Version" : "0.3.9",
     "CompatVersion" : "${IDE_VERSION_COMPAT}",
     "Vendor" : "Petr Mironychev",
     "Copyright" : "(C) ${IDE_COPYRIGHT_YEAR} Petr Mironychev, (C) ${IDE_COPYRIGHT_YEAR} The Qt Company Ltd",

QodeAssistClient.cpp

@@ -32,7 +32,7 @@
 #include "LLMClientInterface.hpp"
 #include "LLMSuggestion.hpp"
 #include "core/ChangesManager.h"
-#include "settings/ContextSettings.hpp"
+#include "settings/CodeCompletionSettings.hpp"
 #include "settings/GeneralSettings.hpp"
 
 using namespace LanguageServerProtocol;
@@ -75,7 +75,7 @@ void QodeAssistClient::openDocument(TextEditor::TextDocument *document)
             this,
             [this, document](int position, int charsRemoved, int charsAdded) {
                 Q_UNUSED(charsRemoved)
-                if (!Settings::generalSettings().enableAutoComplete())
+                if (!Settings::codeCompletionSettings().autoCompletion())
                     return;
 
                 auto project = ProjectManager::projectForFile(document->filePath());
@@ -86,7 +86,7 @@ void QodeAssistClient::openDocument(TextEditor::TextDocument *document)
                 if (!textEditor || textEditor->document() != document)
                     return;
 
-                if (Settings::contextSettings().useProjectChangesCache())
+                if (Settings::codeCompletionSettings().useProjectChangesCache())
                     ChangesManager::instance().addChange(document,
                                                          position,
                                                          charsRemoved,
@@ -102,12 +102,13 @@ void QodeAssistClient::openDocument(TextEditor::TextDocument *document)
                 m_recentCharCount += charsAdded;
 
                 if (m_typingTimer.elapsed()
-                    > Settings::generalSettings().autoCompletionTypingInterval()) {
+                    > Settings::codeCompletionSettings().autoCompletionTypingInterval()) {
                     m_recentCharCount = charsAdded;
                     m_typingTimer.restart();
                 }
 
-                if (m_recentCharCount > Settings::generalSettings().autoCompletionCharThreshold()) {
+                if (m_recentCharCount
+                    > Settings::codeCompletionSettings().autoCompletionCharThreshold()) {
                     scheduleRequest(widget);
                 }
             });
@@ -154,7 +155,8 @@ void QodeAssistClient::scheduleRequest(TextEditor::TextEditorWidget *editor)
             if (editor
                 && editor->textCursor().position()
                        == m_scheduledRequests[editor]->property("cursorPosition").toInt()
-                && m_recentCharCount > Settings::generalSettings().autoCompletionCharThreshold())
+                && m_recentCharCount
+                       > Settings::codeCompletionSettings().autoCompletionCharThreshold())
                 requestCompletions(editor);
         });
         connect(editor, &TextEditorWidget::destroyed, this, [this, editor]() {
@@ -168,7 +170,7 @@ void QodeAssistClient::scheduleRequest(TextEditor::TextEditorWidget *editor)
     }
 
     it.value()->setProperty("cursorPosition", editor->textCursor().position());
-    it.value()->start(Settings::generalSettings().startSuggestionTimer());
+    it.value()->start(Settings::codeCompletionSettings().startSuggestionTimer());
 }
 void QodeAssistClient::handleCompletions(const GetCompletionRequest::Response &response,
                                          TextEditor::TextEditorWidget *editor)

QodeAssistConstants.hpp

@@ -24,60 +24,6 @@ namespace QodeAssist::Constants {
 const char ACTION_ID[] = "QodeAssist.Action";
 const char MENU_ID[] = "QodeAssist.Menu";
 
-// settings
-const char ENABLE_QODE_ASSIST[] = "QodeAssist.enableQodeAssist";
-const char ENABLE_AUTO_COMPLETE[] = "QodeAssist.enableAutoComplete";
-const char ENABLE_LOGGING[] = "QodeAssist.enableLogging";
-const char LLM_PROVIDERS[] = "QodeAssist.llmProviders";
-const char URL[] = "QodeAssist.url";
-const char END_POINT[] = "QodeAssist.endPoint";
-const char MODEL_NAME[] = "QodeAssist.modelName";
-const char SELECT_MODELS[] = "QodeAssist.selectModels";
-const char FIM_PROMPTS[] = "QodeAssist.fimPrompts";
-const char TEMPERATURE[] = "QodeAssist.temperature";
-const char MAX_TOKENS[] = "QodeAssist.maxTokens";
-const char READ_FULL_FILE[] = "QodeAssist.readFullFile";
-const char READ_STRINGS_BEFORE_CURSOR[] = "QodeAssist.readStringsBeforeCursor";
-const char READ_STRINGS_AFTER_CURSOR[] = "QodeAssist.readStringsAfterCursor";
-const char USE_TOP_P[] = "QodeAssist.useTopP";
-const char TOP_P[] = "QodeAssist.topP";
-const char USE_TOP_K[] = "QodeAssist.useTopK";
-const char TOP_K[] = "QodeAssist.topK";
-const char USE_PRESENCE_PENALTY[] = "QodeAssist.usePresencePenalty";
-const char PRESENCE_PENALTY[] = "QodeAssist.presencePenalty";
-const char USE_FREQUENCY_PENALTY[] = "QodeAssist.useFrequencyPenalty";
-const char FREQUENCY_PENALTY[] = "QodeAssist.frequencyPenalty";
-const char PROVIDER_PATHS[] = "QodeAssist.providerPaths";
-const char START_SUGGESTION_TIMER[] = "QodeAssist.startSuggestionTimer";
-const char AUTO_COMPLETION_CHAR_THRESHOLD[] = "QodeAssist.autoCompletionCharThreshold";
-const char AUTO_COMPLETION_TYPING_INTERVAL[] = "QodeAssist.autoCompletionTypingInterval";
-const char MAX_FILE_THRESHOLD[] = "QodeAssist.maxFileThreshold";
-const char OLLAMA_LIVETIME[] = "QodeAssist.ollamaLivetime";
-const char SYSTEM_PROMPT[] = "QodeAssist.systemPrompt";
-const char MULTILINE_COMPLETION[] = "QodeAssist.multilineCompletion";
-const char API_KEY[] = "QodeAssist.apiKey";
-const char USE_SYSTEM_PROMPT[] = "QodeAssist.useSystemPrompt";
-const char USE_FILE_PATH_IN_CONTEXT[] = "QodeAssist.useFilePathInContext";
-const char CUSTOM_JSON_TEMPLATE[] = "QodeAssist.customJsonTemplate";
-const char USE_PROJECT_CHANGES_CACHE[] = "QodeAssist.useProjectChangesCache";
-const char MAX_CHANGES_CACHE_SIZE[] = "QodeAssist.maxChangesCacheSize";
-const char CHAT_LLM_PROVIDERS[] = "QodeAssist.chatLlmProviders";
-const char CHAT_URL[] = "QodeAssist.chatUrl";
-const char CHAT_END_POINT[] = "QodeAssist.chatEndPoint";
-const char CHAT_MODEL_NAME[] = "QodeAssist.chatModelName";
-const char CHAT_SELECT_MODELS[] = "QodeAssist.chatSelectModels";
-const char CHAT_PROMPTS[] = "QodeAssist.chatPrompts";
-
-const char QODE_ASSIST_GENERAL_OPTIONS_ID[] = "QodeAssist.GeneralOptions";
-const char QODE_ASSIST_GENERAL_SETTINGS_PAGE_ID[] = "QodeAssist.1GeneralSettingsPageId";
-const char QODE_ASSIST_CONTEXT_SETTINGS_PAGE_ID[] = "QodeAssist.2ContextSettingsPageId";
-const char QODE_ASSIST_PRESET_PROMPTS_SETTINGS_PAGE_ID[]
-    = "QodeAssist.3PresetPromptsSettingsPageId";
-const char QODE_ASSIST_CUSTOM_PROMPT_SETTINGS_PAGE_ID[] = "QodeAssist.4CustomPromptSettingsPageId";
-
-const char QODE_ASSIST_GENERAL_OPTIONS_CATEGORY[] = "QodeAssist.Category";
-const char QODE_ASSIST_GENERAL_OPTIONS_DISPLAY_CATEGORY[] = "Qode Assist";
-
 const char QODE_ASSIST_REQUEST_SUGGESTION[] = "QodeAssist.RequestSuggestion";
 
 } // namespace QodeAssist::Constants

QodeAssistUtils.hpp

@@ -1,107 +0,0 @@
-/* 
- * 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 <QEventLoop>
-#include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QString>
-#include <QTimer>
-#include <QUrl>
-#include <coreplugin/messagemanager.h>
-#include <utils/qtcassert.h>
-
-namespace QodeAssist {
-
-inline bool &loggingEnabled()
-{
-    static bool enabled = false;
-    return enabled;
-}
-
-inline void setLoggingEnabled(bool enable)
-{
-    loggingEnabled() = enable;
-}
-
-inline void logMessage(const QString &message, bool silent = true)
-{
-    if (!loggingEnabled())
-        return;
-
-    const QString prefixedMessage = QLatin1String("[Qode Assist] ") + message;
-    if (silent) {
-        Core::MessageManager::writeSilently(prefixedMessage);
-    } else {
-        Core::MessageManager::writeFlashing(prefixedMessage);
-    }
-}
-
-inline void logMessages(const QStringList &messages, bool silent = true)
-{
-    if (!loggingEnabled())
-        return;
-
-    QStringList prefixedMessages;
-    qDebug() << prefixedMessages;
-
-    for (const QString &message : messages) {
-        prefixedMessages << (QLatin1String("[Qode Assist] ") + message);
-    }
-    if (silent) {
-        Core::MessageManager::writeSilently(prefixedMessages);
-    } else {
-        Core::MessageManager::writeFlashing(prefixedMessages);
-    }
-}
-
-inline bool pingUrl(const QUrl &url, int timeout = 5000)
-{
-    if (!url.isValid()) {
-        return false;
-    }
-
-    QNetworkAccessManager manager;
-    QNetworkRequest request(url);
-    request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, true);
-
-    QScopedPointer<QNetworkReply> reply(manager.get(request));
-
-    QTimer timer;
-    timer.setSingleShot(true);
-
-    QEventLoop loop;
-    QObject::connect(reply.data(), &QNetworkReply::finished, &loop, &QEventLoop::quit);
-    QObject::connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
-
-    timer.start(timeout);
-    loop.exec();
-
-    if (timer.isActive()) {
-        timer.stop();
-        return (reply->error() == QNetworkReply::NoError);
-    } else {
-        QObject::disconnect(reply.data(), &QNetworkReply::finished, &loop, &QEventLoop::quit);
-        reply->abort();
-        return false;
-    }
-}
-
-} // namespace QodeAssist

README.md

@@ -1,81 +1,74 @@
-# QodeAssist
+# QodeAssist - AI-powered coding assistant plugin for Qt Creator
+[![Discord](https://dcbadge.limes.pink/api/server/https://discord.gg/DGgMtTteAD?style=flat?theme=discord)](https://discord.gg/DGgMtTteAD)
 [![Build plugin](https://github.com/Palm1r/QodeAssist/actions/workflows/build_cmake.yml/badge.svg?branch=main)](https://github.com/Palm1r/QodeAssist/actions/workflows/build_cmake.yml)
+![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/Palm1r/QodeAssist/total?color=41%2C173%2C71)
+![GitHub Tag](https://img.shields.io/github/v/tag/Palm1r/QodeAssist)
+![Static Badge](https://img.shields.io/badge/QtCreator-14.0.2-brightgreen)
 
 QodeAssist is an AI-powered coding assistant plugin for Qt Creator. It provides intelligent code completion and suggestions for C++ and QML, leveraging large language models through local providers like Ollama. Enhance your coding productivity with context-aware AI assistance directly in your Qt development environment.
 
-<img src="https://github.com/user-attachments/assets/255a52f1-5cc0-4ca3-b05c-c4cf9cdbe25a" width="600" alt="QodeAssistPreview">
+## Table of Contents
+1. [Overview](#overview)
+2. [Installation](#installation)
+3. [Configure Plugin](#configure-plugin)
+4. [Supported LLM Providers](#supported-llm-providers)
+5. [Recommended Models](#recommended-models)
+   - [Ollama](#ollama)
+   - [LM Studio](#lm-studio)
+6. [QtCreator Version Compatibility](#qtcreator-version-compatibility)
+7. [Development Progress](#development-progress)
+8. [Hotkeys](#hotkeys)
+9. [Troubleshooting](#troubleshooting)
+10. [Support the Development](#support-the-development-of-qodeassist)
+11. [How to Build](#how-to-build)
 
-## Supported LLM Providers
-QodeAssist currently supports the following LLM (Large Language Model) providers:
-- [Ollama](https://ollama.com)
-- [LM Studio](https://lmstudio.ai)
-- OpenAI compatible providers
+## Overview
 
-## Supported Models
+- AI-powered code completion
+- Chat functionality:
+  - Side and Bottom panels
+- Support for multiple LLM providers:
+  - Ollama
+  - LM Studio (experimental)
+  - OpenAI-compatible providers (experimental)
+- Extensive library of model-specific templates
+- Custom template support
+- Easy configuration and model selection
 
-QodeAssist has been thoroughly tested and optimized for use with the following language models, all of which are specifically trained for Fill-in-the-Middle (FIM) tasks:
+<details>
+  <summary>Code completion: (click to expand)</summary>
+  <img src="https://github.com/user-attachments/assets/255a52f1-5cc0-4ca3-b05c-c4cf9cdbe25a" width="600" alt="QodeAssistPreview">
+</details>
 
-- CodeLlama
-- StarCoder2
-- DeepSeek-Coder-V2-Lite-Base
+<details>
+  <summary>Chat with LLM models in side panels: (click to expand)</summary>
+  <img src="https://github.com/user-attachments/assets/ead5a5d9-b40a-4f17-af05-77fa2bcb3a61" width="600" alt="QodeAssistChat">
+</details>
 
-These models have demonstrated excellent performance in code completion and assistance tasks within the QodeAssist environment.
+<details>
+  <summary>Chat with LLM models in bottom panel: (click to expand)</summary>
+  <img width="326" alt="QodeAssistBottomPanel" src="https://github.com/user-attachments/assets/4cc64c23-a294-4df8-9153-39ad6fdab34b">
+</details>
 
-### Custom Prompts
+## Installation
 
-For advanced users or those with specific requirements, QodeAssist offers the flexibility to create, save, and load custom prompts using JSON templates. This feature allows you to tailor the AI's behavior to your exact needs.
-
-To get started with custom prompts:
-
-1. Navigate to the "Custom Template" option in the FIM Prompt Settings.
-2. Create your custom JSON prompt template.
-3. Use the "Save Custom Template to JSON" button to store your template for future use.
-4. To use a previously saved template, click "Load Custom Template from JSON".
-5. Make sure to select "Custom Template" from the dropdown menu in the FIM Prompt Settings on the General page to activate your custom template.
-
-For inspiration and examples of effective custom prompts, please refer to the `rawPromptExamples` folder in our repository.
-
-<img width="600" alt="Custom template" src="https://github.com/user-attachments/assets/4a14c552-baba-4531-ab4f-cb1f9ac6620b">
-<img width="600" alt="Select custom template" src="https://github.com/user-attachments/assets/3651dafd-83f9-4df9-943f-69c28cd3d8a3">
-
-### Tested Models
-
-#### Ollama:
-- [starcoder2](https://ollama.com/library/starcoder2)
-- [codellama](https://ollama.com/library/codellama)
-
-#### LM Studio:
-- [second-state/StarCoder2-7B-GGUF](https://huggingface.co/second-state/StarCoder2-7B-GGUF)
-- [TheBloke/CodeLlama-7B-GGUF](https://huggingface.co/TheBloke/CodeLlama-7B-GGUF)
-
-Please note that while these models have been specifically tested and confirmed to work well with QodeAssist, other models compatible with the supported providers may also work. We encourage users to experiment with different models and report their experiences.
-
-If you've successfully used a model that's not listed here, please let us know by opening an issue or submitting a pull request to update this list.
-
-## Development Progress
-
-- [x] Basic plugin with code autocomplete functionality
-- [x] Improve and automate settings
-- [ ] Add chat functionality
-- [x] Sharing diff with model
-- [ ] Sharing project source with model
-- [ ] Support for more providers and models
-
-## Plugin installation using Ollama as an example
-
-1. Install QtCreator 14.0
+1. Install Latest QtCreator
 2. Install [Ollama](https://ollama.com). Make sure to review the system requirements before installation.
-3. Install a language models in Ollama. For example, you can run:
+3. Install a language models in Ollama via terminal. For example, you can run:
 
-For suggestions:
+For standard computers (minimum 8GB RAM):
 ```
-ollama run codellama:7b-code
+ollama run qwen2.5-coder:7b
 ```
-For chat:
+For better performance (16GB+ RAM):
 ```
-ollama run codellama:7b-instruct
+ollama run qwen2.5-coder:14b
 ```
-4. Download the QodeAssist plugin.
+For high-end systems (32GB+ RAM):
+```
+ollama run qwen2.5-coder:32b
+```
+4. Download the QodeAssist plugin for your QtCreator.
 5. Launch Qt Creator and install the plugin:
    - Go to MacOS: Qt Creator -> About Plugins...
            Windows\Linux: Help -> About Plugins...
@@ -84,19 +77,63 @@ ollama run codellama:7b-instruct
 
 ## Configure Plugin
 
-<img src="https://github.com/user-attachments/assets/0743d09e-1f02-44ed-9a1a-85e2a0a0c01a" width="800" alt="QodeAssist в действии">
+QodeAssist comes with default settings that should work immediately after installing a language model. The plugin is pre-configured to use Ollama with standard templates, so you may only need to verify the settings.
 
-1. Open Qt Creator settings
+1. Open Qt Creator settings (Edit > Preferences on Linux/Windows, Qt Creator > Preferences on macOS)
 2. Navigate to the "Qode Assist" tab
-3. Select "General" page
-4. Choose your LLM provider (e.g., Ollama)
-5. Select the installed model by the "Select Model" button
-   - For LM Studio you will see current load model
-6. Choose the prompt template that corresponds to your model
-7. Apply the settings
+3. On the "General" page, verify:
+    - Ollama is selected as your LLM provider
+    - The URL is set to http://localhost:11434
+    - Your installed model appears in the model selection
+    - The prompt template is Ollama Auto FIM
+4. Click Apply if you made any changes
 
 You're all set! QodeAssist is now ready to use in Qt Creator.
 
+## Supported LLM Providers
+QodeAssist currently supports the following LLM (Large Language Model) providers:
+- [Ollama](https://ollama.com)
+- [LM Studio](https://lmstudio.ai) (experimental)
+- OpenAI compatible providers (experimental)
+
+## Recommended Models:
+QodeAssist has been thoroughly tested and optimized for use with the following language models:
+
+- Qwen2.5-coder
+- CodeLlama
+- StarCoder2
+- DeepSeek-Coder-V2
+
+### Ollama:
+### For autocomplete(FIM)
+```
+ollama run codellama:7b-code
+ollama run starcoder2:7b
+ollama run qwen2.5-coder:7b-base
+ollama run deepseek-coder-v2:16b-lite-base-q3_K_M
+```
+### For chat
+```
+ollama run codellama:7b-instruct
+ollama run starcoder2:instruct
+ollama run qwen2.5-coder:7b-instruct
+ollama run deepseek-coder-v2
+```
+
+## QtCreator Version Compatibility
+
+- QtCreator 14.0.2 - 0.2.3 - 0.3.x 
+- QtCreator 14.0.1 - 0.2.2 plugin version and below
+
+## Development Progress
+
+- [x] Basic plugin with code autocomplete functionality
+- [x] Improve and automate settings
+- [x] Add chat functionality
+- [x] Sharing diff with model
+- [ ] Sharing project source with model
+- [ ] Support for more providers and models
+
 ## Hotkeys
 
 - To call manual request to suggestion, you can use or change it in settings
@@ -145,7 +182,6 @@ If you find QodeAssist helpful, there are several ways you can support the proje
 3. **Spread the Word**: Star our GitHub repository and share QodeAssist with your fellow developers.
 
 4. **Financial Support**: If you'd like to support the development financially, you can make a donation using one of the following:
-   - [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/P5P412V96G)
    - Bitcoin (BTC): `bc1qndq7f0mpnlya48vk7kugvyqj5w89xrg4wzg68t`
    - Ethereum (ETH): `0xA5e8c37c94b24e25F9f1f292a01AF55F03099D8D`
    - Litecoin (LTC): `ltc1qlrxnk30s2pcjchzx4qrxvdjt5gzuervy5mv0vy`
@@ -164,3 +200,8 @@ where `<path_to_qtcreator>` is the relative or absolute path to a Qt Creator bui
 combined binary and development package (Windows / Linux), or to the `Qt Creator.app/Contents/Resources/`
 directory of a combined binary and development package (macOS), and `<path_to_plugin_source>` is the
 relative or absolute path to this plugin directory.
+
+## For Contributors
+
+QML code style: Preferably follow the following guidelines https://github.com/Furkanzmc/QML-Coding-Guide, thank you @Furkanzmc for collect them
+C++ code style: check use .clang-fortmat in project

chat/ChatClientInterface.cpp

@@ -1,192 +0,0 @@
-/* 
- * 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 "ChatClientInterface.hpp"
-#include "LLMProvidersManager.hpp"
-#include "PromptTemplateManager.hpp"
-#include "QodeAssistUtils.hpp"
-#include "settings/ContextSettings.hpp"
-#include "settings/GeneralSettings.hpp"
-#include "settings/PresetPromptsSettings.hpp"
-
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QUuid>
-
-namespace QodeAssist::Chat {
-
-int ChatHistory::estimateTokenCount(const QString &text) const
-{
-    return text.length() / 4;
-}
-
-void ChatHistory::addMessage(ChatMessage::Role role, const QString &content)
-{
-    int tokenCount = estimateTokenCount(content);
-    m_messages.append({role, content, tokenCount});
-    m_totalTokens += tokenCount;
-    trim();
-}
-void ChatHistory::clear()
-{
-    m_messages.clear();
-    m_totalTokens = 0;
-}
-
-QVector<ChatMessage> ChatHistory::getMessages() const
-{
-    return m_messages;
-}
-
-QString ChatHistory::getSystemPrompt() const
-{
-    return m_systemPrompt;
-}
-
-void ChatHistory::setSystemPrompt(const QString &prompt)
-{
-    m_systemPrompt = prompt;
-}
-
-void ChatHistory::trim()
-{
-    while (m_messages.size() > MAX_HISTORY_SIZE || m_totalTokens > MAX_TOKENS) {
-        if (!m_messages.isEmpty()) {
-            m_totalTokens -= m_messages.first().tokenCount;
-            m_messages.removeFirst();
-        } else {
-            break;
-        }
-    }
-}
-
-ChatClientInterface::ChatClientInterface(QObject *parent)
-    : QObject(parent)
-    , m_requestHandler(new LLMRequestHandler(this))
-{
-    connect(m_requestHandler,
-            &LLMRequestHandler::completionReceived,
-            this,
-            [this](const QString &completion, const QJsonObject &, bool isComplete) {
-                handleLLMResponse(completion, isComplete);
-            });
-
-    connect(m_requestHandler,
-            &LLMRequestHandler::requestFinished,
-            this,
-            [this](const QString &, bool success, const QString &errorString) {
-                if (!success) {
-                    emit errorOccurred(errorString);
-                }
-            });
-
-    m_chatHistory.setSystemPrompt("You are a helpful C++ and QML programming assistant.");
-}
-
-ChatClientInterface::~ChatClientInterface() = default;
-
-void ChatClientInterface::sendMessage(const QString &message)
-{
-    logMessage("Sending message: " + message);
-    logMessage("chatProvider " + Settings::generalSettings().chatLlmProviders.stringValue());
-    logMessage("chatTemplate " + Settings::generalSettings().chatPrompts.stringValue());
-
-    auto chatTemplate = PromptTemplateManager::instance().getCurrentChatTemplate();
-    auto chatProvider = LLMProvidersManager::instance().getCurrentChatProvider();
-
-    ContextData context;
-    context.prefix = message;
-    context.suffix = "";
-    if (Settings::contextSettings().useSpecificInstructions())
-        context.instriuctions = Settings::contextSettings().specificInstractions();
-
-    QJsonObject providerRequest;
-    providerRequest["model"] = Settings::generalSettings().chatModelName();
-    providerRequest["stream"] = true;
-    providerRequest["messages"] = prepareMessagesForRequest();
-
-    chatTemplate->prepareRequest(providerRequest, context);
-    chatProvider->prepareRequest(providerRequest);
-
-    LLMConfig config;
-    config.requestType = RequestType::Chat;
-    config.provider = chatProvider;
-    config.promptTemplate = chatTemplate;
-    config.url = QString("%1%2").arg(Settings::generalSettings().chatUrl(),
-                                     Settings::generalSettings().chatEndPoint());
-    config.providerRequest = providerRequest;
-
-    QJsonObject request;
-    request["id"] = QUuid::createUuid().toString();
-
-    m_accumulatedResponse.clear();
-    m_chatHistory.addMessage(ChatMessage::Role::User, message);
-    m_requestHandler->sendLLMRequest(config, request);
-}
-
-void ChatClientInterface::clearMessages()
-{
-    m_chatHistory.clear();
-    m_accumulatedResponse.clear();
-    logMessage("Chat history cleared");
-}
-
-QVector<ChatMessage> ChatClientInterface::getChatHistory() const
-{
-    return m_chatHistory.getMessages();
-}
-
-void ChatClientInterface::handleLLMResponse(const QString &response, bool isComplete)
-{
-    m_accumulatedResponse += response;
-
-    if (isComplete) {
-        logMessage("Message completed. Final response: " + m_accumulatedResponse);
-        emit messageReceived(m_accumulatedResponse.trimmed());
-
-        m_chatHistory.addMessage(ChatMessage::Role::Assistant, m_accumulatedResponse.trimmed());
-        m_accumulatedResponse.clear();
-    }
-}
-
-QJsonArray ChatClientInterface::prepareMessagesForRequest() const
-{
-    QJsonArray messages;
-
-    messages.append(QJsonObject{{"role", "system"}, {"content", m_chatHistory.getSystemPrompt()}});
-
-    for (const auto &message : m_chatHistory.getMessages()) {
-        QString role;
-        switch (message.role) {
-        case ChatMessage::Role::User:
-            role = "user";
-            break;
-        case ChatMessage::Role::Assistant:
-            role = "assistant";
-            break;
-        default:
-            continue;
-        }
-        messages.append(QJsonObject{{"role", role}, {"content", message.content}});
-    }
-
-    return messages;
-}
-
-} // namespace QodeAssist::Chat

chat/ChatClientInterface.hpp

@@ -1,83 +0,0 @@
-/* 
- * 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 <QObject>
-#include <QString>
-#include <QVector>
-#include "QodeAssistData.hpp"
-#include "core/LLMRequestHandler.hpp"
-
-namespace QodeAssist::Chat {
-
-struct ChatMessage
-{
-    enum class Role { System, User, Assistant };
-    Role role;
-    QString content;
-    int tokenCount;
-};
-
-class ChatHistory
-{
-public:
-    void addMessage(ChatMessage::Role role, const QString &content);
-    void clear();
-    QVector<ChatMessage> getMessages() const;
-    QString getSystemPrompt() const;
-    void setSystemPrompt(const QString &prompt);
-    void trim();
-
-private:
-    QVector<ChatMessage> m_messages;
-    QString m_systemPrompt;
-    int m_totalTokens = 0;
-    static const int MAX_HISTORY_SIZE = 50;
-    static const int MAX_TOKENS = 4000;
-
-    int estimateTokenCount(const QString &text) const;
-};
-
-class ChatClientInterface : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit ChatClientInterface(QObject *parent = nullptr);
-    ~ChatClientInterface();
-
-    void sendMessage(const QString &message);
-    void clearMessages();
-    QVector<ChatMessage> getChatHistory() const;
-
-signals:
-    void messageReceived(const QString &message);
-    void errorOccurred(const QString &error);
-
-private:
-    void handleLLMResponse(const QString &response, bool isComplete);
-    QJsonArray prepareMessagesForRequest() const;
-
-    LLMRequestHandler *m_requestHandler;
-    QString m_accumulatedResponse;
-    ChatHistory m_chatHistory;
-};
-
-} // namespace QodeAssist::Chat

chat/ChatOutputPane.h

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "ChatWidget.h"
+#include "ChatView/ChatWidget.hpp"
 #include <coreplugin/ioutputpane.h>
 
 namespace QodeAssist::Chat {

chat/ChatWidget.cpp

@@ -1,147 +0,0 @@
-/* 
- * 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 "ChatWidget.h"
-#include "QodeAssistUtils.hpp"
-
-#include <QCoreApplication>
-#include <QDateTime>
-#include <QScrollBar>
-#include <QVBoxLayout>
-#include <QtCore/qtimer.h>
-
-namespace QodeAssist::Chat {
-
-ChatWidget::ChatWidget(QWidget *parent)
-    : QWidget(parent)
-    , m_showTimestamp(false)
-    , m_chatClient(new ChatClientInterface(this))
-{
-    setupUi();
-
-    connect(m_sendButton, &QPushButton::clicked, this, &ChatWidget::sendMessage);
-    connect(m_messageInput, &QLineEdit::returnPressed, this, &ChatWidget::sendMessage);
-
-    connect(m_chatClient, &ChatClientInterface::messageReceived, this, &ChatWidget::receiveMessage);
-    connect(m_chatClient, &ChatClientInterface::errorOccurred, this, &ChatWidget::handleError);
-
-    logMessage("ChatWidget initialized");
-}
-
-void ChatWidget::setupUi()
-{
-    m_chatDisplay = new QTextEdit(this);
-    m_chatDisplay->setReadOnly(true);
-
-    m_messageInput = new QLineEdit(this);
-    m_sendButton = new QPushButton("Send", this);
-
-    QHBoxLayout *inputLayout = new QHBoxLayout;
-    inputLayout->addWidget(m_messageInput);
-    inputLayout->addWidget(m_sendButton);
-
-    QVBoxLayout *mainLayout = new QVBoxLayout(this);
-    mainLayout->addWidget(m_chatDisplay);
-    mainLayout->addLayout(inputLayout);
-
-    setLayout(mainLayout);
-}
-
-void ChatWidget::sendMessage()
-{
-    QString message = m_messageInput->text().trimmed();
-    if (!message.isEmpty()) {
-        logMessage("Sending message: " + message);
-        addMessage(message, true);
-        m_chatClient->sendMessage(message);
-        m_messageInput->clear();
-        addMessage("AI is typing...", false);
-    }
-}
-
-void ChatWidget::receiveMessage(const QString &message)
-{
-    updateLastAIMessage(message);
-}
-
-void ChatWidget::receivePartialMessage(const QString &partialMessage)
-{
-    logMessage("Received partial message: " + partialMessage);
-    m_currentAIResponse += partialMessage;
-    updateLastAIMessage(m_currentAIResponse);
-}
-
-void ChatWidget::onMessageCompleted()
-{
-    updateLastAIMessage(m_currentAIResponse);
-    m_currentAIResponse.clear();
-    scrollToBottom();
-}
-
-void ChatWidget::handleError(const QString &error)
-{
-    logMessage("Error occurred: " + error);
-    addMessage("Error: " + error, false);
-}
-
-void ChatWidget::addMessage(const QString &message, bool fromUser)
-{
-    auto prefix = fromUser ? "You: " : "AI: ";
-    QString timestamp = m_showTimestamp ? QDateTime::currentDateTime().toString("[hh:mm:ss] ") : "";
-    QString fullMessage = timestamp + prefix + message;
-    m_chatDisplay->append(fullMessage);
-    scrollToBottom();
-}
-
-void ChatWidget::updateLastAIMessage(const QString &message)
-{
-    QTextCursor cursor = m_chatDisplay->textCursor();
-    cursor.movePosition(QTextCursor::End);
-    cursor.movePosition(QTextCursor::StartOfBlock, QTextCursor::KeepAnchor);
-    cursor.removeSelectedText();
-
-    QString timestamp = m_showTimestamp ? QDateTime::currentDateTime().toString("[hh:mm:ss] ") : "";
-    cursor.insertText(timestamp + "AI: " + message);
-
-    cursor.movePosition(QTextCursor::End);
-    m_chatDisplay->setTextCursor(cursor);
-
-    scrollToBottom();
-    m_chatDisplay->repaint();
-}
-
-void ChatWidget::clear()
-{
-    m_chatDisplay->clear();
-    m_currentAIResponse.clear();
-    m_chatClient->clearMessages();
-}
-
-void ChatWidget::scrollToBottom()
-{
-    QScrollBar *scrollBar = m_chatDisplay->verticalScrollBar();
-    scrollBar->setValue(scrollBar->maximum());
-}
-
-void ChatWidget::setShowTimestamp(bool show)
-{
-    m_showTimestamp = show;
-}
-
-} // namespace QodeAssist::Chat

chat/NavigationPanel.cpp

@@ -0,0 +1,45 @@
+/*
+ * 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 "NavigationPanel.hpp"
+
+#include "ChatView/ChatWidget.hpp"
+
+namespace QodeAssist::Chat {
+
+NavigationPanel::NavigationPanel() {
+    setDisplayName(tr("QodeAssist Chat"));
+    setPriority(500);
+    setId("QodeAssistChat");
+    setActivationSequence(QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_C));
+}
+
+NavigationPanel::~NavigationPanel()
+{
+}
+
+Core::NavigationView NavigationPanel::createWidget()
+{
+    Core::NavigationView view;
+    view.widget = new ChatWidget;
+
+    return view;
+}
+
+}

chat/NavigationPanel.hpp

@@ -0,0 +1,37 @@
+/*
+ * 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 <QObject>
+#include <coreplugin/inavigationwidgetfactory.h>
+
+namespace QodeAssist::Chat {
+
+class NavigationPanel : public Core::INavigationWidgetFactory
+{
+    Q_OBJECT
+public:
+    explicit NavigationPanel();
+    ~NavigationPanel();
+
+    Core::NavigationView createWidget() override;
+};
+
+}

core/ChangesManager.cpp

@@ -18,8 +18,7 @@
  */
 
 #include "ChangesManager.h"
-#include "QodeAssistUtils.hpp"
-#include "settings/ContextSettings.hpp"
+#include "settings/CodeCompletionSettings.hpp"
 
 namespace QodeAssist {
 
@@ -61,7 +60,7 @@ void ChangesManager::addChange(TextEditor::TextDocument *document,
     } else {
         documentQueue.enqueue(change);
 
-        if (documentQueue.size() > Settings::contextSettings().maxChangesCacheSize()) {
+        if (documentQueue.size() > Settings::codeCompletionSettings().maxChangesCacheSize()) {
             documentQueue.dequeue();
         }
     }

llmcore/CMakeLists.txt

@@ -0,0 +1,23 @@
+add_library(LLMCore STATIC
+    RequestType.hpp
+    Provider.hpp
+    ProvidersManager.hpp ProvidersManager.cpp
+    ContextData.hpp
+    PromptTemplate.hpp
+    PromptTemplateManager.hpp PromptTemplateManager.cpp
+    RequestConfig.hpp
+    RequestHandler.hpp RequestHandler.cpp
+)
+
+target_link_libraries(LLMCore
+    PUBLIC
+    Qt::Core
+    Qt::Network
+    QtCreator::Core
+    QtCreator::Utils
+    QtCreator::ExtensionSystem
+    PRIVATE
+    QodeAssistLogger
+)
+
+target_include_directories(LLMCore PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

llmcore/ContextData.hpp

@@ -21,13 +21,13 @@
 
 #include <QString>
 
-namespace QodeAssist {
+namespace QodeAssist::LLMCore {
 
 struct ContextData
 {
     QString prefix;
     QString suffix;
-    QString instriuctions;
+    QString fileContext;
 };
 
-} // namespace QodeAssist
+} // namespace QodeAssist::LLMCore

llmcore/PromptTemplate.hpp

@@ -23,9 +23,9 @@
 #include <QList>
 #include <QString>
 
-#include "QodeAssistData.hpp"
+#include "ContextData.hpp"
 
-namespace QodeAssist::Templates {
+namespace QodeAssist::LLMCore {
 
 enum class TemplateType { Chat, Fim };
 
@@ -39,4 +39,4 @@ public:
     virtual QStringList stopWords() const = 0;
     virtual void prepareRequest(QJsonObject &request, const ContextData &context) const = 0;
 };
-} // namespace QodeAssist::Templates
+} // namespace QodeAssist::LLMCore

llmcore/PromptTemplateManager.cpp

@@ -0,0 +1,56 @@
+/* 
+ * 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 "PromptTemplateManager.hpp"
+
+namespace QodeAssist::LLMCore {
+
+PromptTemplateManager &PromptTemplateManager::instance()
+{
+    static PromptTemplateManager instance;
+    return instance;
+}
+
+QStringList PromptTemplateManager::fimTemplatesNames() const
+{
+    return m_fimTemplates.keys();
+}
+
+QStringList PromptTemplateManager::chatTemplatesNames() const
+{
+    return m_chatTemplates.keys();
+}
+
+PromptTemplateManager::~PromptTemplateManager()
+{
+    qDeleteAll(m_fimTemplates);
+    qDeleteAll(m_chatTemplates);
+}
+
+PromptTemplate *PromptTemplateManager::getFimTemplateByName(const QString &templateName)
+{
+    return m_fimTemplates[templateName];
+}
+
+PromptTemplate *PromptTemplateManager::getChatTemplateByName(const QString &templateName)
+{
+    return m_chatTemplates[templateName];
+}
+
+} // namespace QodeAssist::LLMCore

llmcore/PromptTemplateManager.hpp

@@ -22,9 +22,9 @@
 #include <QMap>
 #include <QString>
 
-#include "templates/PromptTemplate.hpp"
+#include "PromptTemplate.hpp"
 
-namespace QodeAssist {
+namespace QodeAssist::LLMCore {
 
 class PromptTemplateManager
 {
@@ -35,22 +35,19 @@ public:
     template<typename T>
     void registerTemplate()
     {
-        static_assert(std::is_base_of<Templates::PromptTemplate, T>::value,
+        static_assert(std::is_base_of<PromptTemplate, T>::value,
                       "T must inherit from PromptTemplate");
         T *template_ptr = new T();
         QString name = template_ptr->name();
-        if (template_ptr->type() == Templates::TemplateType::Fim) {
+        if (template_ptr->type() == TemplateType::Fim) {
             m_fimTemplates[name] = template_ptr;
-        } else if (template_ptr->type() == Templates::TemplateType::Chat) {
+        } else if (template_ptr->type() == TemplateType::Chat) {
             m_chatTemplates[name] = template_ptr;
         }
     }
 
-    void setCurrentFimTemplate(const QString &name);
-    Templates::PromptTemplate *getCurrentFimTemplate();
-
-    void setCurrentChatTemplate(const QString &name);
-    Templates::PromptTemplate *getCurrentChatTemplate();
+    PromptTemplate *getFimTemplateByName(const QString &templateName);
+    PromptTemplate *getChatTemplateByName(const QString &templateName);
 
     QStringList fimTemplatesNames() const;
     QStringList chatTemplatesNames() const;
@@ -60,10 +57,8 @@ private:
     PromptTemplateManager(const PromptTemplateManager &) = delete;
     PromptTemplateManager &operator=(const PromptTemplateManager &) = delete;
 
-    QMap<QString, Templates::PromptTemplate *> m_fimTemplates;
-    QMap<QString, Templates::PromptTemplate *> m_chatTemplates;
-    Templates::PromptTemplate *m_currentFimTemplate;
-    Templates::PromptTemplate *m_currentChatTemplate;
+    QMap<QString, PromptTemplate *> m_fimTemplates;
+    QMap<QString, PromptTemplate *> m_chatTemplates;
 };
 
-} // namespace QodeAssist
+} // namespace QodeAssist::LLMCore

llmcore/Provider.hpp

@@ -20,26 +20,28 @@
 #pragma once
 
 #include <QString>
+#include "RequestType.hpp"
 #include <utils/environment.h>
 
 class QNetworkReply;
 class QJsonObject;
 
-namespace QodeAssist::Providers {
+namespace QodeAssist::LLMCore {
 
-class LLMProvider
+class Provider
 {
 public:
-    virtual ~LLMProvider() = default;
+    virtual ~Provider() = default;
 
     virtual QString name() const = 0;
     virtual QString url() const = 0;
     virtual QString completionEndpoint() const = 0;
     virtual QString chatEndpoint() const = 0;
+    virtual bool supportsModelListing() const = 0;
 
-    virtual void prepareRequest(QJsonObject &request) = 0;
+    virtual void prepareRequest(QJsonObject &request, RequestType type) = 0;
     virtual bool handleResponse(QNetworkReply *reply, QString &accumulatedResponse) = 0;
-    virtual QList<QString> getInstalledModels(const Utils::Environment &env, const QString &url) = 0;
+    virtual QList<QString> getInstalledModels(const QString &url) = 0;
 };
 
-} // namespace QodeAssist::Providers
+} // namespace QodeAssist::LLMCore

llmcore/ProvidersManager.cpp

@@ -0,0 +1,45 @@
+/* 
+ * 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 "ProvidersManager.hpp"
+
+namespace QodeAssist::LLMCore {
+
+ProvidersManager &ProvidersManager::instance()
+{
+    static ProvidersManager instance;
+    return instance;
+}
+
+QStringList ProvidersManager::providersNames() const
+{
+    return m_providers.keys();
+}
+
+ProvidersManager::~ProvidersManager()
+{
+    qDeleteAll(m_providers);
+}
+
+Provider *ProvidersManager::getProviderByName(const QString &providerName)
+{
+    return m_providers[providerName];
+}
+
+} // namespace QodeAssist::LLMCore

llmcore/ProvidersManager.hpp

@@ -21,42 +21,36 @@
 
 #include <QString>
 
-#include "providers/LLMProvider.hpp"
+#include <QMap>
+#include "Provider.hpp"
 
-namespace QodeAssist {
+namespace QodeAssist::LLMCore {
 
-class LLMProvidersManager
+class ProvidersManager
 {
 public:
-    static LLMProvidersManager &instance();
-    ~LLMProvidersManager();
+    static ProvidersManager &instance();
+    ~ProvidersManager();
 
     template<typename T>
     void registerProvider()
     {
-        static_assert(std::is_base_of<Providers::LLMProvider, T>::value,
-                      "T must inherit from LLMProvider");
+        static_assert(std::is_base_of<Provider, T>::value, "T must inherit from Provider");
         T *provider = new T();
         QString name = provider->name();
         m_providers[name] = provider;
     }
 
-    Providers::LLMProvider *setCurrentFimProvider(const QString &name);
-    Providers::LLMProvider *setCurrentChatProvider(const QString &name);
-
-    Providers::LLMProvider *getCurrentFimProvider();
-    Providers::LLMProvider *getCurrentChatProvider();
+    Provider *getProviderByName(const QString &providerName);
 
     QStringList providersNames() const;
 
 private:
-    LLMProvidersManager() = default;
-    LLMProvidersManager(const LLMProvidersManager &) = delete;
-    LLMProvidersManager &operator=(const LLMProvidersManager &) = delete;
+    ProvidersManager() = default;
+    ProvidersManager(const ProvidersManager &) = delete;
+    ProvidersManager &operator=(const ProvidersManager &) = delete;
 
-    QMap<QString, Providers::LLMProvider *> m_providers;
-    Providers::LLMProvider *m_currentFimProvider = nullptr;
-    Providers::LLMProvider *m_currentChatProvider = nullptr;
+    QMap<QString, Provider *> m_providers;
 };
 
-} // namespace QodeAssist
+} // namespace QodeAssist::LLMCore

llmcore/RequestConfig.hpp

@@ -21,20 +21,20 @@
 
 #include <QJsonObject>
 #include <QUrl>
-#include "providers/LLMProvider.hpp"
-#include "templates/PromptTemplate.hpp"
+#include "PromptTemplate.hpp"
+#include "Provider.hpp"
+#include "RequestType.hpp"
 
-namespace QodeAssist {
-
-enum class RequestType { Fim, Chat };
+namespace QodeAssist::LLMCore {
 
 struct LLMConfig
 {
     QUrl url;
-    Providers::LLMProvider *provider;
-    Templates::PromptTemplate *promptTemplate;
+    Provider *provider;
+    PromptTemplate *promptTemplate;
     QJsonObject providerRequest;
     RequestType requestType;
+    bool multiLineCompletion;
 };
 
-} // namespace QodeAssist
+} // namespace QodeAssist::LLMCore

llmcore/RequestHandler.cpp

@@ -17,24 +17,22 @@
  * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "LLMRequestHandler.hpp"
-#include "LLMProvidersManager.hpp"
-#include "QodeAssistUtils.hpp"
-#include "settings/GeneralSettings.hpp"
+#include "RequestHandler.hpp"
+#include "Logger.hpp"
 
 #include <QJsonDocument>
 #include <QNetworkReply>
 
-namespace QodeAssist {
+namespace QodeAssist::LLMCore {
 
-LLMRequestHandler::LLMRequestHandler(QObject *parent)
+RequestHandler::RequestHandler(QObject *parent)
     : QObject(parent)
     , m_manager(new QNetworkAccessManager(this))
 {}
 
-void LLMRequestHandler::sendLLMRequest(const LLMConfig &config, const QJsonObject &request)
+void RequestHandler::sendLLMRequest(const LLMConfig &config, const QJsonObject &request)
 {
-    logMessage(QString("Sending request to llm: \nurl: %1\nRequest body:\n%2")
+    LOG_MESSAGE(QString("Sending request to llm: \nurl: %1\nRequest body:\n%2")
                    .arg(config.url.toString(),
                         QString::fromUtf8(
                             QJsonDocument(config.providerRequest).toJson(QJsonDocument::Indented))));
@@ -45,7 +43,7 @@ void LLMRequestHandler::sendLLMRequest(const LLMConfig &config, const QJsonObjec
     QNetworkReply *reply = m_manager->post(networkRequest,
                                            QJsonDocument(config.providerRequest).toJson());
     if (!reply) {
-        logMessage("Error: Failed to create network reply");
+        LOG_MESSAGE("Error: Failed to create network reply");
         return;
     }
 
@@ -60,47 +58,43 @@ void LLMRequestHandler::sendLLMRequest(const LLMConfig &config, const QJsonObjec
         reply->deleteLater();
         m_activeRequests.remove(requestId);
         if (reply->error() != QNetworkReply::NoError) {
-            logMessage(QString("Error in QodeAssist request: %1").arg(reply->errorString()));
+            LOG_MESSAGE(QString("Error in QodeAssist request: %1").arg(reply->errorString()));
             emit requestFinished(requestId, false, reply->errorString());
         } else {
-            logMessage("Request finished successfully");
+            LOG_MESSAGE("Request finished successfully");
             emit requestFinished(requestId, true, QString());
         }
     });
 }
 
-void LLMRequestHandler::handleLLMResponse(QNetworkReply *reply,
-                                          const QJsonObject &request,
-                                          const LLMConfig &config)
+void RequestHandler::handleLLMResponse(QNetworkReply *reply,
+                                       const QJsonObject &request,
+                                       const LLMConfig &config)
 {
     QString &accumulatedResponse = m_accumulatedResponses[reply];
 
     bool isComplete = config.provider->handleResponse(reply, accumulatedResponse);
 
     if (config.requestType == RequestType::Fim) {
-        if (!Settings::generalSettings().multiLineCompletion()
+        if (!config.multiLineCompletion
             && processSingleLineCompletion(reply, request, accumulatedResponse, config)) {
             return;
         }
+
+        if (isComplete) {
+            auto cleanedCompletion = removeStopWords(accumulatedResponse,
+                                                     config.promptTemplate->stopWords());
+            emit completionReceived(cleanedCompletion, request, true);
+        }
+    } else if (config.requestType == RequestType::Chat) {
+        emit completionReceived(accumulatedResponse, request, isComplete);
     }
 
-    if (isComplete || reply->isFinished()) {
-        if (isComplete) {
-            if (config.requestType == RequestType::Fim) {
-                auto cleanedCompletion = removeStopWords(accumulatedResponse,
-                                                         config.promptTemplate->stopWords());
-                emit completionReceived(cleanedCompletion, request, true);
-            } else {
-                emit completionReceived(accumulatedResponse, request, true);
-            }
-        } else {
-            emit completionReceived(accumulatedResponse, request, false);
-        }
+    if (isComplete)
         m_accumulatedResponses.remove(reply);
-    }
 }
 
-bool LLMRequestHandler::cancelRequest(const QString &id)
+bool RequestHandler::cancelRequest(const QString &id)
 {
     if (m_activeRequests.contains(id)) {
         QNetworkReply *reply = m_activeRequests[id];
@@ -113,8 +107,8 @@ bool LLMRequestHandler::cancelRequest(const QString &id)
     return false;
 }
 
-void LLMRequestHandler::prepareNetworkRequest(QNetworkRequest &networkRequest,
-                                              const QJsonObject &providerRequest)
+void RequestHandler::prepareNetworkRequest(QNetworkRequest &networkRequest,
+                                           const QJsonObject &providerRequest)
 {
     networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
 
@@ -124,10 +118,10 @@ void LLMRequestHandler::prepareNetworkRequest(QNetworkRequest &networkRequest,
     }
 }
 
-bool LLMRequestHandler::processSingleLineCompletion(QNetworkReply *reply,
-                                                    const QJsonObject &request,
-                                                    const QString &accumulatedResponse,
-                                                    const LLMConfig &config)
+bool RequestHandler::processSingleLineCompletion(QNetworkReply *reply,
+                                                 const QJsonObject &request,
+                                                 const QString &accumulatedResponse,
+                                                 const LLMConfig &config)
 {
     int newlinePos = accumulatedResponse.indexOf('\n');
 
@@ -145,8 +139,7 @@ bool LLMRequestHandler::processSingleLineCompletion(QNetworkReply *reply,
     return false;
 }
 
-QString LLMRequestHandler::removeStopWords(const QStringView &completion,
-                                           const QStringList &stopWords)
+QString RequestHandler::removeStopWords(const QStringView &completion, const QStringList &stopWords)
 {
     QString filteredCompletion = completion.toString();
 
@@ -157,4 +150,4 @@ QString LLMRequestHandler::removeStopWords(const QStringView &completion,
     return filteredCompletion;
 }
 
-} // namespace QodeAssist
+} // namespace QodeAssist::LLMCore

llmcore/RequestHandler.hpp

@@ -23,19 +23,18 @@
 #include <QNetworkAccessManager>
 #include <QObject>
 
-#include "QodeAssistData.hpp"
-#include "core/LLMRequestConfig.hpp"
+#include "RequestConfig.hpp"
 
 class QNetworkReply;
 
-namespace QodeAssist {
+namespace QodeAssist::LLMCore {
 
-class LLMRequestHandler : public QObject
+class RequestHandler : public QObject
 {
     Q_OBJECT
 
 public:
-    explicit LLMRequestHandler(QObject *parent = nullptr);
+    explicit RequestHandler(QObject *parent = nullptr);
 
     void sendLLMRequest(const LLMConfig &config, const QJsonObject &request);
     void handleLLMResponse(QNetworkReply *reply,
@@ -61,4 +60,4 @@ private:
     QString removeStopWords(const QStringView &completion, const QStringList &stopWords);
 };
 
-} // namespace QodeAssist
+} // namespace QodeAssist::LLMCore

llmcore/RequestType.hpp

@@ -0,0 +1,25 @@
+/* 
+ * 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
+
+namespace QodeAssist::LLMCore {
+
+enum RequestType { Fim, Chat };
+}

logger/CMakeLists.txt

@@ -0,0 +1,14 @@
+add_library(QodeAssistLogger STATIC
+    Logger.cpp
+    Logger.hpp
+)
+
+target_link_libraries(QodeAssistLogger
+    PUBLIC
+    Qt::Core
+    QtCreator::Core
+)
+
+target_include_directories(QodeAssistLogger
+    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
+)

logger/Logger.cpp

@@ -0,0 +1,55 @@
+#include "Logger.hpp"
+#include <coreplugin/messagemanager.h>
+
+namespace QodeAssist {
+
+Logger &Logger::instance()
+{
+    static Logger instance;
+    return instance;
+}
+
+Logger::Logger()
+    : m_loggingEnabled(false)
+{}
+
+void Logger::setLoggingEnabled(bool enable)
+{
+    m_loggingEnabled = enable;
+}
+
+bool Logger::isLoggingEnabled() const
+{
+    return m_loggingEnabled;
+}
+
+void Logger::log(const QString &message, bool silent)
+{
+    if (!m_loggingEnabled)
+        return;
+
+    const QString prefixedMessage = QLatin1String("[Qode Assist] ") + message;
+    if (silent) {
+        Core::MessageManager::writeSilently(prefixedMessage);
+    } else {
+        Core::MessageManager::writeFlashing(prefixedMessage);
+    }
+}
+
+void Logger::logMessages(const QStringList &messages, bool silent)
+{
+    if (!m_loggingEnabled)
+        return;
+
+    QStringList prefixedMessages;
+    for (const QString &message : messages) {
+        prefixedMessages << (QLatin1String("[Qode Assist] ") + message);
+    }
+
+    if (silent) {
+        Core::MessageManager::writeSilently(prefixedMessages);
+    } else {
+        Core::MessageManager::writeFlashing(prefixedMessages);
+    }
+}
+} // namespace QodeAssist

logger/Logger.hpp

@@ -0,0 +1,33 @@
+#pragma once
+
+#include <QObject>
+#include <QString>
+
+namespace QodeAssist {
+
+class Logger : public QObject
+{
+    Q_OBJECT
+
+public:
+    static Logger &instance();
+
+    void setLoggingEnabled(bool enable);
+    bool isLoggingEnabled() const;
+
+    void log(const QString &message, bool silent = true);
+    void logMessages(const QStringList &messages, bool silent = true);
+
+private:
+    Logger();
+    ~Logger() = default;
+    Logger(const Logger &) = delete;
+    Logger &operator=(const Logger &) = delete;
+
+    bool m_loggingEnabled;
+};
+
+#define LOG_MESSAGE(msg) QodeAssist::Logger::instance().log(msg)
+#define LOG_MESSAGES(msgs) QodeAssist::Logger::instance().logMessages(msgs)
+
+} // namespace QodeAssist

providers/LMStudioProvider.cpp

@@ -25,8 +25,9 @@
 #include <QJsonObject>
 #include <QNetworkReply>
 
-#include "QodeAssistUtils.hpp"
-#include "settings/PresetPromptsSettings.hpp"
+#include "logger/Logger.hpp"
+#include "settings/ChatAssistantSettings.hpp"
+#include "settings/CodeCompletionSettings.hpp"
 
 namespace QodeAssist::Providers {
 
@@ -52,36 +53,50 @@ QString LMStudioProvider::chatEndpoint() const
     return "/v1/chat/completions";
 }
 
-void LMStudioProvider::prepareRequest(QJsonObject &request)
+bool LMStudioProvider::supportsModelListing() const
 {
-    auto &settings = Settings::presetPromptsSettings();
-    QJsonArray messages;
+    return true;
+}
 
-    if (request.contains("system")) {
-        QJsonObject systemMessage{{"role", "system"},
-                                  {"content", request.take("system").toString()}};
-        messages.append(systemMessage);
-    }
+void LMStudioProvider::prepareRequest(QJsonObject &request, LLMCore::RequestType type)
+{
+    auto prepareMessages = [](QJsonObject &req) -> QJsonArray {
+        QJsonArray messages;
+        if (req.contains("system")) {
+            messages.append(
+                QJsonObject{{"role", "system"}, {"content", req.take("system").toString()}});
+        }
+        if (req.contains("prompt")) {
+            messages.append(
+                QJsonObject{{"role", "user"}, {"content", req.take("prompt").toString()}});
+        }
+        return messages;
+    };
 
-    if (request.contains("prompt")) {
-        QJsonObject userMessage{{"role", "user"}, {"content", request.take("prompt").toString()}};
-        messages.append(userMessage);
-    }
+    auto applyModelParams = [&request](const auto &settings) {
+        request["max_tokens"] = settings.maxTokens();
+        request["temperature"] = settings.temperature();
 
+        if (settings.useTopP())
+            request["top_p"] = settings.topP();
+        if (settings.useTopK())
+            request["top_k"] = settings.topK();
+        if (settings.useFrequencyPenalty())
+            request["frequency_penalty"] = settings.frequencyPenalty();
+        if (settings.usePresencePenalty())
+            request["presence_penalty"] = settings.presencePenalty();
+    };
+
+    QJsonArray messages = prepareMessages(request);
     if (!messages.isEmpty()) {
         request["messages"] = std::move(messages);
     }
 
-    request["max_tokens"] = settings.maxTokens();
-    request["temperature"] = settings.temperature();
-    if (settings.useTopP())
-        request["top_p"] = settings.topP();
-    if (settings.useTopK())
-        request["top_k"] = settings.topK();
-    if (settings.useFrequencyPenalty())
-        request["frequency_penalty"] = settings.frequencyPenalty();
-    if (settings.usePresencePenalty())
-        request["presence_penalty"] = settings.presencePenalty();
+    if (type == LLMCore::RequestType::Fim) {
+        applyModelParams(Settings::codeCompletionSettings());
+    } else {
+        applyModelParams(Settings::chatAssistantSettings());
+    }
 }
 
 bool LMStudioProvider::handleResponse(QNetworkReply *reply, QString &accumulatedResponse)
@@ -125,8 +140,7 @@ bool LMStudioProvider::handleResponse(QNetworkReply *reply, QString &accumulated
     return isComplete;
 }
 
-QList<QString> LMStudioProvider::getInstalledModels(const Utils::Environment &env,
-                                                    const QString &url)
+QList<QString> LMStudioProvider::getInstalledModels(const QString &url)
 {
     QList<QString> models;
     QNetworkAccessManager manager;
@@ -150,7 +164,7 @@ QList<QString> LMStudioProvider::getInstalledModels(const Utils::Environment &en
             models.append(modelId);
         }
     } else {
-        logMessage(QString("Error fetching models: %1").arg(reply->errorString()));
+        LOG_MESSAGE(QString("Error fetching models: %1").arg(reply->errorString()));
     }
 
     reply->deleteLater();

providers/LMStudioProvider.hpp

@@ -19,11 +19,11 @@
 
 #pragma once
 
-#include "LLMProvider.hpp"
+#include "llmcore/Provider.hpp"
 
 namespace QodeAssist::Providers {
 
-class LMStudioProvider : public LLMProvider
+class LMStudioProvider : public LLMCore::Provider
 {
 public:
     LMStudioProvider();
@@ -32,9 +32,10 @@ public:
     QString url() const override;
     QString completionEndpoint() const override;
     QString chatEndpoint() const override;
-    void prepareRequest(QJsonObject &request) override;
+    bool supportsModelListing() const override;
+    void prepareRequest(QJsonObject &request, LLMCore::RequestType type) override;
     bool handleResponse(QNetworkReply *reply, QString &accumulatedResponse) override;
-    QList<QString> getInstalledModels(const Utils::Environment &env, const QString &url) override;
+    QList<QString> getInstalledModels(const QString &url) override;
 };
 
 } // namespace QodeAssist::Providers

providers/OllamaProvider.cpp

@@ -25,9 +25,9 @@
 #include <QNetworkReply>
 #include <QtCore/qeventloop.h>
 
-#include "PromptTemplateManager.hpp"
-#include "QodeAssistUtils.hpp"
-#include "settings/PresetPromptsSettings.hpp"
+#include "logger/Logger.hpp"
+#include "settings/ChatAssistantSettings.hpp"
+#include "settings/CodeCompletionSettings.hpp"
 
 namespace QodeAssist::Providers {
 
@@ -53,23 +53,36 @@ QString OllamaProvider::chatEndpoint() const
     return "/api/chat";
 }
 
-void OllamaProvider::prepareRequest(QJsonObject &request)
+bool OllamaProvider::supportsModelListing() const
 {
-    auto &settings = Settings::presetPromptsSettings();
+    return true;
+}
 
-    QJsonObject options;
-    options["num_predict"] = settings.maxTokens();
-    options["temperature"] = settings.temperature();
-    if (settings.useTopP())
-        options["top_p"] = settings.topP();
-    if (settings.useTopK())
-        options["top_k"] = settings.topK();
-    if (settings.useFrequencyPenalty())
-        options["frequency_penalty"] = settings.frequencyPenalty();
-    if (settings.usePresencePenalty())
-        options["presence_penalty"] = settings.presencePenalty();
-    request["options"] = options;
-    request["keep_alive"] = settings.ollamaLivetime();
+void OllamaProvider::prepareRequest(QJsonObject &request, LLMCore::RequestType type)
+{
+    auto applySettings = [&request](const auto &settings) {
+        QJsonObject options;
+        options["num_predict"] = settings.maxTokens();
+        options["temperature"] = settings.temperature();
+
+        if (settings.useTopP())
+            options["top_p"] = settings.topP();
+        if (settings.useTopK())
+            options["top_k"] = settings.topK();
+        if (settings.useFrequencyPenalty())
+            options["frequency_penalty"] = settings.frequencyPenalty();
+        if (settings.usePresencePenalty())
+            options["presence_penalty"] = settings.presencePenalty();
+
+        request["options"] = options;
+        request["keep_alive"] = settings.ollamaLivetime();
+    };
+
+    if (type == LLMCore::RequestType::Fim) {
+        applySettings(Settings::codeCompletionSettings());
+    } else {
+        applySettings(Settings::chatAssistantSettings());
+    }
 }
 
 bool OllamaProvider::handleResponse(QNetworkReply *reply, QString &accumulatedResponse)
@@ -85,7 +98,7 @@ bool OllamaProvider::handleResponse(QNetworkReply *reply, QString &accumulatedRe
 
         QJsonDocument doc = QJsonDocument::fromJson(line);
         if (doc.isNull()) {
-            logMessage("Invalid JSON response from Ollama: " + QString::fromUtf8(line));
+            LOG_MESSAGE("Invalid JSON response from Ollama: " + QString::fromUtf8(line));
             continue;
         }
 
@@ -93,7 +106,7 @@ bool OllamaProvider::handleResponse(QNetworkReply *reply, QString &accumulatedRe
 
         if (responseObj.contains("error")) {
             QString errorMessage = responseObj["error"].toString();
-            logMessage("Error in Ollama response: " + errorMessage);
+            LOG_MESSAGE("Error in Ollama response: " + errorMessage);
             return false;
         }
 
@@ -111,7 +124,7 @@ bool OllamaProvider::handleResponse(QNetworkReply *reply, QString &accumulatedRe
                 }
             }
         } else {
-            logMessage("Unknown endpoint: " + endpoint);
+            LOG_MESSAGE("Unknown endpoint: " + endpoint);
         }
 
         if (responseObj.contains("done") && responseObj["done"].toBool()) {
@@ -123,7 +136,7 @@ bool OllamaProvider::handleResponse(QNetworkReply *reply, QString &accumulatedRe
     return isComplete;
 }
 
-QList<QString> OllamaProvider::getInstalledModels(const Utils::Environment &env, const QString &url)
+QList<QString> OllamaProvider::getInstalledModels(const QString &url)
 {
     QList<QString> models;
     QNetworkAccessManager manager;
@@ -146,7 +159,7 @@ QList<QString> OllamaProvider::getInstalledModels(const Utils::Environment &env,
             models.append(modelName);
         }
     } else {
-        logMessage(QString("Error fetching models: %1").arg(reply->errorString()));
+        LOG_MESSAGE(QString("Error fetching models: %1").arg(reply->errorString()));
     }
 
     reply->deleteLater();

providers/OllamaProvider.hpp

@@ -19,11 +19,11 @@
 
 #pragma once
 
-#include "LLMProvider.hpp"
+#include "llmcore/Provider.hpp"
 
 namespace QodeAssist::Providers {
 
-class OllamaProvider : public LLMProvider
+class OllamaProvider : public LLMCore::Provider
 {
 public:
     OllamaProvider();
@@ -32,9 +32,10 @@ public:
     QString url() const override;
     QString completionEndpoint() const override;
     QString chatEndpoint() const override;
-    void prepareRequest(QJsonObject &request) override;
+    bool supportsModelListing() const override;
+    void prepareRequest(QJsonObject &request, LLMCore::RequestType type) override;
     bool handleResponse(QNetworkReply *reply, QString &accumulatedResponse) override;
-    QList<QString> getInstalledModels(const Utils::Environment &env, const QString &url) override;
+    QList<QString> getInstalledModels(const QString &url) override;
 };
 
 } // namespace QodeAssist::Providers

providers/OpenAICompatProvider.cpp

@@ -18,14 +18,14 @@
  */
 
 #include "OpenAICompatProvider.hpp"
+#include "settings/ChatAssistantSettings.hpp"
+#include "settings/CodeCompletionSettings.hpp"
 
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QNetworkReply>
 
-#include "settings/PresetPromptsSettings.hpp"
-
 namespace QodeAssist::Providers {
 
 OpenAICompatProvider::OpenAICompatProvider() {}
@@ -50,40 +50,53 @@ QString OpenAICompatProvider::chatEndpoint() const
     return "/v1/chat/completions";
 }
 
-void OpenAICompatProvider::prepareRequest(QJsonObject &request)
+bool OpenAICompatProvider::supportsModelListing() const
 {
-    auto &settings = Settings::presetPromptsSettings();
-    QJsonArray messages;
+    return false;
+}
 
-    if (request.contains("system")) {
-        QJsonObject systemMessage{{"role", "system"},
-                                  {"content", request.take("system").toString()}};
-        messages.append(systemMessage);
-    }
+void OpenAICompatProvider::prepareRequest(QJsonObject &request, LLMCore::RequestType type)
+{
+    auto prepareMessages = [](QJsonObject &req) -> QJsonArray {
+        QJsonArray messages;
+        if (req.contains("system")) {
+            messages.append(
+                QJsonObject{{"role", "system"}, {"content", req.take("system").toString()}});
+        }
+        if (req.contains("prompt")) {
+            messages.append(
+                QJsonObject{{"role", "user"}, {"content", req.take("prompt").toString()}});
+        }
+        return messages;
+    };
 
-    if (request.contains("prompt")) {
-        QJsonObject userMessage{{"role", "user"}, {"content", request.take("prompt").toString()}};
-        messages.append(userMessage);
-    }
+    auto applyModelParams = [&request](const auto &settings) {
+        request["max_tokens"] = settings.maxTokens();
+        request["temperature"] = settings.temperature();
 
+        if (settings.useTopP())
+            request["top_p"] = settings.topP();
+        if (settings.useTopK())
+            request["top_k"] = settings.topK();
+        if (settings.useFrequencyPenalty())
+            request["frequency_penalty"] = settings.frequencyPenalty();
+        if (settings.usePresencePenalty())
+            request["presence_penalty"] = settings.presencePenalty();
+        const QString &apiKey = settings.apiKey();
+        if (!apiKey.isEmpty()) {
+            request["api_key"] = apiKey;
+        }
+    };
+
+    QJsonArray messages = prepareMessages(request);
     if (!messages.isEmpty()) {
         request["messages"] = std::move(messages);
     }
 
-    request["max_tokens"] = settings.maxTokens();
-    request["temperature"] = settings.temperature();
-    if (settings.useTopP())
-        request["top_p"] = settings.topP();
-    if (settings.useTopK())
-        request["top_k"] = settings.topK();
-    if (settings.useFrequencyPenalty())
-        request["frequency_penalty"] = settings.frequencyPenalty();
-    if (settings.usePresencePenalty())
-        request["presence_penalty"] = settings.presencePenalty();
-
-    const QString &apiKey = settings.apiKey.value();
-    if (!apiKey.isEmpty()) {
-        request["api_key"] = apiKey;
+    if (type == LLMCore::RequestType::Fim) {
+        applyModelParams(Settings::codeCompletionSettings());
+    } else {
+        applyModelParams(Settings::chatAssistantSettings());
     }
 }
 
@@ -128,8 +141,7 @@ bool OpenAICompatProvider::handleResponse(QNetworkReply *reply, QString &accumul
     return isComplete;
 }
 
-QList<QString> OpenAICompatProvider::getInstalledModels(const Utils::Environment &env,
-                                                        const QString &url)
+QList<QString> OpenAICompatProvider::getInstalledModels(const QString &url)
 {
     return QStringList();
 }

providers/OpenAICompatProvider.hpp

@@ -19,11 +19,11 @@
 
 #pragma once
 
-#include "LLMProvider.hpp"
+#include "llmcore/Provider.hpp"
 
 namespace QodeAssist::Providers {
 
-class OpenAICompatProvider : public LLMProvider
+class OpenAICompatProvider : public LLMCore::Provider
 {
 public:
     OpenAICompatProvider();
@@ -32,9 +32,10 @@ public:
     QString url() const override;
     QString completionEndpoint() const override;
     QString chatEndpoint() const override;
-    void prepareRequest(QJsonObject &request) override;
+    bool supportsModelListing() const override;
+    void prepareRequest(QJsonObject &request, LLMCore::RequestType type) override;
     bool handleResponse(QNetworkReply *reply, QString &accumulatedResponse) override;
-    QList<QString> getInstalledModels(const Utils::Environment &env, const QString &url) override;
+    QList<QString> getInstalledModels(const QString &url) override;
 };
 
 } // namespace QodeAssist::Providers

qodeassist.cpp

@@ -39,21 +39,26 @@
 #include <texteditor/texteditor.h>
 #include <utils/icon.h>
 
-#include "LLMProvidersManager.hpp"
-#include "PromptTemplateManager.hpp"
+#include "ConfigurationManager.hpp"
 #include "QodeAssistClient.hpp"
 #include "chat/ChatOutputPane.h"
+#include "chat/NavigationPanel.hpp"
+#include "llmcore/PromptTemplateManager.hpp"
+#include "llmcore/ProvidersManager.hpp"
 #include "providers/LMStudioProvider.hpp"
 #include "providers/OllamaProvider.hpp"
 #include "providers/OpenAICompatProvider.hpp"
 
-#include "settings/GeneralSettings.hpp"
-#include "templates/CodeLlamaFimTemplate.hpp"
-#include "templates/CodeLlamaInstruct.hpp"
-#include "templates/CustomTemplate.hpp"
-#include "templates/DeepSeekCoderChatTemplate.hpp"
-#include "templates/DeepSeekCoderV2.hpp"
-#include "templates/StarCoder2Template.hpp"
+#include "templates/BasicChat.hpp"
+#include "templates/CodeLlamaChat.hpp"
+#include "templates/CodeLlamaFim.hpp"
+#include "templates/CustomFimTemplate.hpp"
+#include "templates/DeepSeekCoderChat.hpp"
+#include "templates/DeepSeekCoderFim.hpp"
+#include "templates/Ollama.hpp"
+#include "templates/Qwen.hpp"
+#include "templates/StarCoder2Fim.hpp"
+#include "templates/StarCoderChat.hpp"
 
 using namespace Utils;
 using namespace Core;
@@ -73,23 +78,32 @@ public:
 
     ~QodeAssistPlugin() final
     {
-
+        delete m_qodeAssistClient;
+        delete m_chatOutputPane;
+        delete m_navigationPanel;
     }
 
     void initialize() final
     {
-        auto &providerManager = LLMProvidersManager::instance();
+        auto &providerManager = LLMCore::ProvidersManager::instance();
         providerManager.registerProvider<Providers::OllamaProvider>();
         providerManager.registerProvider<Providers::LMStudioProvider>();
         providerManager.registerProvider<Providers::OpenAICompatProvider>();
 
-        auto &templateManager = PromptTemplateManager::instance();
-        templateManager.registerTemplate<Templates::CodeLlamaFimTemplate>();
-        templateManager.registerTemplate<Templates::StarCoder2Template>();
-        templateManager.registerTemplate<Templates::DeepSeekCoderV2Template>();
+        auto &templateManager = LLMCore::PromptTemplateManager::instance();
+        templateManager.registerTemplate<Templates::CodeLlamaFim>();
+        templateManager.registerTemplate<Templates::StarCoder2Fim>();
+        templateManager.registerTemplate<Templates::DeepSeekCoderFim>();
         templateManager.registerTemplate<Templates::CustomTemplate>();
-        templateManager.registerTemplate<Templates::DeepSeekCoderChatTemplate>();
-        templateManager.registerTemplate<Templates::CodeLlamaInstructTemplate>();
+        templateManager.registerTemplate<Templates::DeepSeekCoderChat>();
+        templateManager.registerTemplate<Templates::CodeLlamaChat>();
+        templateManager.registerTemplate<Templates::LlamaChat>();
+        templateManager.registerTemplate<Templates::StarCoderChat>();
+        templateManager.registerTemplate<Templates::QwenChat>();
+        templateManager.registerTemplate<Templates::QwenFim>();
+        templateManager.registerTemplate<Templates::OllamaAutoFim>();
+        templateManager.registerTemplate<Templates::OllamaAutoChat>();
+        templateManager.registerTemplate<Templates::BasicChat>();
 
         Utils::Icon QCODEASSIST_ICON(
             {{":/resources/images/qoderassist-icon.png", Utils::Theme::IconsBaseColor}});
@@ -116,6 +130,9 @@ public:
         StatusBarManager::addStatusBarWidget(toggleButton, StatusBarManager::RightCorner);
 
         m_chatOutputPane = new Chat::ChatOutputPane(this);
+        m_navigationPanel = new Chat::NavigationPanel();
+
+        ConfigurationManager::instance().init();
     }
 
     void extensionsInitialized() final
@@ -150,6 +167,7 @@ public:
 private:
     QPointer<QodeAssistClient> m_qodeAssistClient;
     QPointer<Chat::ChatOutputPane> m_chatOutputPane;
+    QPointer<Chat::NavigationPanel> m_navigationPanel;
 };
 
 } // namespace QodeAssist::Internal

settings/Assisttr.h

@@ -0,0 +1,31 @@
+/* 
+ * 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 <QCoreApplication>
+
+namespace QodeAssist {
+
+struct Tr
+{
+    Q_DECLARE_TR_FUNCTIONS(QtC::QodeAssist)
+};
+
+} // namespace QodeAssist

settings/ButtonAspect.hpp

@@ -0,0 +1,45 @@
+/* 
+ * 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 <QPushButton>
+#include <utils/aspects.h>
+#include <utils/layoutbuilder.h>
+
+class ButtonAspect : public Utils::BaseAspect
+{
+    Q_OBJECT
+
+public:
+    ButtonAspect(Utils::AspectContainer *container = nullptr)
+        : Utils::BaseAspect(container)
+    {}
+
+    void addToLayout(Layouting::Layout &parent) override
+    {
+        auto button = new QPushButton(m_buttonText);
+        connect(button, &QPushButton::clicked, this, &ButtonAspect::clicked);
+        parent.addItem(button);
+    }
+
+    QString m_buttonText;
+signals:
+    void clicked();
+};

settings/CMakeLists.txt

@@ -0,0 +1,21 @@
+add_library(QodeAssistSettings STATIC
+    GeneralSettings.hpp GeneralSettings.cpp
+    CustomPromptSettings.hpp CustomPromptSettings.cpp
+    SettingsUtils.hpp
+    SettingsConstants.hpp
+    ButtonAspect.hpp
+    SettingsTr.hpp
+    CodeCompletionSettings.hpp CodeCompletionSettings.cpp
+    ChatAssistantSettings.hpp ChatAssistantSettings.cpp
+    SettingsDialog.hpp SettingsDialog.cpp
+)
+
+target_link_libraries(QodeAssistSettings
+    PUBLIC
+    Qt::Core
+    Qt::Network
+    QtCreator::Core
+    QtCreator::Utils
+    QodeAssistLogger
+)
+target_include_directories(QodeAssistSettings PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

settings/ChatAssistantSettings.cpp

@@ -0,0 +1,236 @@
+/* 
+ * 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);
+
+    sharingCurrentFile.setSettingsKey(Constants::CA_SHARING_CURRENT_FILE);
+    sharingCurrentFile.setLabelText(Tr::tr("Share Current File With Assistant by Default"));
+    sharingCurrentFile.setDefaultValue(true);
+
+    // 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")),
+                            Column{Row{chatTokensThreshold, Stretch{1}}, sharingCurrentFile}},
+                      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

@@ -19,19 +19,28 @@
 
 #pragma once
 
-#include "settings/SettingsUtils.hpp"
 #include <utils/aspects.h>
 
+#include "ButtonAspect.hpp"
+
 namespace QodeAssist::Settings {
 
-class PresetPromptsSettings : public Utils::AspectContainer
+class ChatAssistantSettings : public Utils::AspectContainer
 {
 public:
-    PresetPromptsSettings();
+    ChatAssistantSettings();
 
+    ButtonAspect resetToDefaults{this};
+
+    // Chat settings
+    Utils::IntegerAspect chatTokensThreshold{this};
+    Utils::BoolAspect sharingCurrentFile{this};
+
+    // General Parameters Settings
     Utils::DoubleAspect temperature{this};
     Utils::IntegerAspect maxTokens{this};
 
+    // Advanced Parameters
     Utils::BoolAspect useTopP{this};
     Utils::DoubleAspect topP{this};
 
@@ -44,16 +53,22 @@ public:
     Utils::BoolAspect useFrequencyPenalty{this};
     Utils::DoubleAspect frequencyPenalty{this};
 
-    Utils::StringAspect ollamaLivetime{this};
-    Utils::StringAspect apiKey{this};
+    // Context Settings
+    Utils::BoolAspect useSystemPrompt{this};
+    Utils::StringAspect systemPrompt{this};
 
-    ButtonAspect resetToDefaults{this};
+    // Ollama Settings
+    Utils::StringAspect ollamaLivetime{this};
+    Utils::IntegerAspect contextWindow{this};
+
+    // API Configuration Settings
+    Utils::StringAspect apiKey{this};
 
 private:
     void setupConnections();
     void resetSettingsToDefaults();
 };
 
-PresetPromptsSettings &presetPromptsSettings();
+ChatAssistantSettings &chatAssistantSettings();
 
 } // namespace QodeAssist::Settings

settings/CodeCompletionSettings.cpp

@@ -0,0 +1,317 @@
+/* 
+ * 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 "CodeCompletionSettings.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 {
+
+CodeCompletionSettings &codeCompletionSettings()
+{
+    static CodeCompletionSettings settings;
+    return settings;
+}
+
+CodeCompletionSettings::CodeCompletionSettings()
+{
+    setAutoApply(false);
+
+    setDisplayName(Tr::tr("Code Completion"));
+
+    // Auto Completion Settings
+    autoCompletion.setSettingsKey(Constants::CC_AUTO_COMPLETION);
+    autoCompletion.setLabelText(Tr::tr("Enable Auto Complete"));
+    autoCompletion.setDefaultValue(true);
+
+    multiLineCompletion.setSettingsKey(Constants::CC_MULTILINE_COMPLETION);
+    multiLineCompletion.setDefaultValue(false);
+    multiLineCompletion.setLabelText(Tr::tr("Enable Multiline Completion(experimental)"));
+
+    startSuggestionTimer.setSettingsKey(Constants::СС_START_SUGGESTION_TIMER);
+    startSuggestionTimer.setLabelText(Tr::tr("with delay(ms)"));
+    startSuggestionTimer.setRange(10, 10000);
+    startSuggestionTimer.setDefaultValue(500);
+
+    autoCompletionCharThreshold.setSettingsKey(Constants::СС_AUTO_COMPLETION_CHAR_THRESHOLD);
+    autoCompletionCharThreshold.setLabelText(Tr::tr("AI suggestion triggers after typing"));
+    autoCompletionCharThreshold.setToolTip(
+        Tr::tr("The number of characters that need to be typed within the typing interval "
+               "before an AI suggestion request is sent."));
+    autoCompletionCharThreshold.setRange(0, 10);
+    autoCompletionCharThreshold.setDefaultValue(0);
+
+    autoCompletionTypingInterval.setSettingsKey(Constants::СС_AUTO_COMPLETION_TYPING_INTERVAL);
+    autoCompletionTypingInterval.setLabelText(Tr::tr("character(s) within(ms)"));
+    autoCompletionTypingInterval.setToolTip(
+        Tr::tr("The time window (in milliseconds) during which the character threshold "
+               "must be met to trigger an AI suggestion request."));
+    autoCompletionTypingInterval.setRange(500, 5000);
+    autoCompletionTypingInterval.setDefaultValue(2000);
+
+    // General Parameters Settings
+    temperature.setSettingsKey(Constants::CC_TEMPERATURE);
+    temperature.setLabelText(Tr::tr("Temperature:"));
+    temperature.setDefaultValue(0.2);
+    temperature.setRange(0.0, 2.0);
+    temperature.setSingleStep(0.1);
+
+    maxTokens.setSettingsKey(Constants::CC_MAX_TOKENS);
+    maxTokens.setLabelText(Tr::tr("Max Tokens:"));
+    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:"));
+
+    topP.setSettingsKey(Constants::CC_TOP_P);
+    topP.setDefaultValue(0.9);
+    topP.setRange(0.0, 1.0);
+    topP.setSingleStep(0.1);
+
+    useTopK.setSettingsKey(Constants::CC_USE_TOP_K);
+    useTopK.setDefaultValue(false);
+    useTopK.setLabelText(Tr::tr("Top K:"));
+
+    topK.setSettingsKey(Constants::CC_TOP_K);
+    topK.setDefaultValue(50);
+    topK.setRange(1, 1000);
+
+    usePresencePenalty.setSettingsKey(Constants::CC_USE_PRESENCE_PENALTY);
+    usePresencePenalty.setDefaultValue(false);
+    usePresencePenalty.setLabelText(Tr::tr("Presence Penalty:"));
+
+    presencePenalty.setSettingsKey(Constants::CC_PRESENCE_PENALTY);
+    presencePenalty.setDefaultValue(0.0);
+    presencePenalty.setRange(-2.0, 2.0);
+    presencePenalty.setSingleStep(0.1);
+
+    useFrequencyPenalty.setSettingsKey(Constants::CC_USE_FREQUENCY_PENALTY);
+    useFrequencyPenalty.setDefaultValue(false);
+    useFrequencyPenalty.setLabelText(Tr::tr("Frequency Penalty:"));
+
+    frequencyPenalty.setSettingsKey(Constants::CC_FREQUENCY_PENALTY);
+    frequencyPenalty.setDefaultValue(0.0);
+    frequencyPenalty.setRange(-2.0, 2.0);
+    frequencyPenalty.setSingleStep(0.1);
+
+    // Context Settings
+    readFullFile.setSettingsKey(Constants::CC_READ_FULL_FILE);
+    readFullFile.setLabelText(Tr::tr("Read Full File"));
+    readFullFile.setDefaultValue(false);
+
+    readFileParts.setLabelText(Tr::tr("Read Strings Before Cursor:"));
+    readFileParts.setDefaultValue(true);
+
+    readStringsBeforeCursor.setSettingsKey(Constants::CC_READ_STRINGS_BEFORE_CURSOR);
+    readStringsBeforeCursor.setRange(0, 10000);
+    readStringsBeforeCursor.setDefaultValue(50);
+
+    readStringsAfterCursor.setSettingsKey(Constants::CC_READ_STRINGS_AFTER_CURSOR);
+    readStringsAfterCursor.setLabelText(Tr::tr("Read Strings After Cursor:"));
+    readStringsAfterCursor.setRange(0, 10000);
+    readStringsAfterCursor.setDefaultValue(30);
+
+    useSystemPrompt.setSettingsKey(Constants::CC_USE_SYSTEM_PROMPT);
+    useSystemPrompt.setDefaultValue(true);
+    useSystemPrompt.setLabelText(Tr::tr("Use System Prompt"));
+
+    systemPrompt.setSettingsKey(Constants::CC_SYSTEM_PROMPT);
+    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 contextually appropriate code suggestions.");
+
+    useFilePathInContext.setSettingsKey(Constants::CC_USE_FILE_PATH_IN_CONTEXT);
+    useFilePathInContext.setDefaultValue(true);
+    useFilePathInContext.setLabelText(Tr::tr("Use File Path in Context"));
+
+    useProjectChangesCache.setSettingsKey(Constants::CC_USE_PROJECT_CHANGES_CACHE);
+    useProjectChangesCache.setDefaultValue(true);
+    useProjectChangesCache.setLabelText(Tr::tr("Max Changes Cache Size:"));
+
+    maxChangesCacheSize.setSettingsKey(Constants::CC_MAX_CHANGES_CACHE_SIZE);
+    maxChangesCacheSize.setRange(2, 1000);
+    maxChangesCacheSize.setDefaultValue(10);
+
+    // Ollama Settings
+    ollamaLivetime.setSettingsKey(Constants::CC_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::CC_OLLAMA_CONTEXT_WINDOW);
+    contextWindow.setLabelText(Tr::tr("Context Window:"));
+    contextWindow.setRange(-1, 10000);
+    contextWindow.setDefaultValue(2048);
+
+    // API Configuration Settings
+    apiKey.setSettingsKey(Constants::CC_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 = Tr::tr("Reset Page to Defaults");
+
+    readSettings();
+
+    readFileParts.setValue(!readFullFile.value());
+
+    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});
+
+        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,
+                                  Row{useFilePathInContext, Stretch{1}},
+                                  Row{useProjectChangesCache, maxChangesCacheSize, Stretch{1}}};
+
+        return Column{Row{Stretch{1}, resetToDefaults},
+                      Space{8},
+                      Group{title(Tr::tr("Auto Completion Settings")),
+                            Column{autoCompletion,
+                                   Space{8},
+                                   multiLineCompletion,
+                                   Row{autoCompletionCharThreshold,
+                                       autoCompletionTypingInterval,
+                                       startSuggestionTimer,
+                                       Stretch{1}}}},
+                      Space{8},
+                      Group{title(Tr::tr("General Parameters")),
+                            Column{
+                                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")), contextItem},
+                      Space{8},
+                      Group{title(Tr::tr("Ollama Settings")), Column{Row{ollamaGrid, Stretch{1}}}},
+                      Space{8},
+                      Group{title(Tr::tr("API Configuration")), Column{apiKey}},
+                      Stretch{1}};
+    });
+}
+
+void CodeCompletionSettings::setupConnections()
+{
+    connect(&resetToDefaults,
+            &ButtonAspect::clicked,
+            this,
+            &CodeCompletionSettings::resetSettingsToDefaults);
+
+    connect(&readFullFile, &Utils::BoolAspect::volatileValueChanged, this, [this]() {
+        if (readFullFile.volatileValue()) {
+            readFileParts.setValue(false);
+            writeSettings();
+        }
+    });
+
+    connect(&readFileParts, &Utils::BoolAspect::volatileValueChanged, this, [this]() {
+        if (readFileParts.volatileValue()) {
+            readFullFile.setValue(false);
+            writeSettings();
+        }
+    });
+}
+
+void CodeCompletionSettings::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(autoCompletion);
+        resetAspect(multiLineCompletion);
+        resetAspect(temperature);
+        resetAspect(maxTokens);
+        resetAspect(useTopP);
+        resetAspect(topP);
+        resetAspect(useTopK);
+        resetAspect(topK);
+        resetAspect(usePresencePenalty);
+        resetAspect(presencePenalty);
+        resetAspect(useFrequencyPenalty);
+        resetAspect(frequencyPenalty);
+        resetAspect(readFullFile);
+        resetAspect(readFileParts);
+        resetAspect(readStringsBeforeCursor);
+        resetAspect(readStringsAfterCursor);
+        resetAspect(useSystemPrompt);
+        resetAspect(systemPrompt);
+        resetAspect(useFilePathInContext);
+        resetAspect(useProjectChangesCache);
+        resetAspect(maxChangesCacheSize);
+        resetAspect(ollamaLivetime);
+        resetAspect(contextWindow);
+    }
+}
+
+class CodeCompletionSettingsPage : public Core::IOptionsPage
+{
+public:
+    CodeCompletionSettingsPage()
+    {
+        setId(Constants::QODE_ASSIST_CODE_COMPLETION_SETTINGS_PAGE_ID);
+        setDisplayName(Tr::tr("Code Completion"));
+        setCategory(Constants::QODE_ASSIST_GENERAL_OPTIONS_CATEGORY);
+        setSettingsProvider([] { return &codeCompletionSettings(); });
+    }
+};
+
+const CodeCompletionSettingsPage codeCompletionSettingsPage;
+
+} // namespace QodeAssist::Settings

settings/CodeCompletionSettings.hpp

@@ -0,0 +1,85 @@
+/* 
+ * 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 CodeCompletionSettings : public Utils::AspectContainer
+{
+public:
+    CodeCompletionSettings();
+
+    ButtonAspect resetToDefaults{this};
+
+    // Auto Completion Settings
+    Utils::BoolAspect autoCompletion{this};
+    Utils::BoolAspect multiLineCompletion{this};
+
+    Utils::IntegerAspect startSuggestionTimer{this};
+    Utils::IntegerAspect autoCompletionCharThreshold{this};
+    Utils::IntegerAspect autoCompletionTypingInterval{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 readFullFile{this};
+    Utils::BoolAspect readFileParts{this};
+    Utils::IntegerAspect readStringsBeforeCursor{this};
+    Utils::IntegerAspect readStringsAfterCursor{this};
+    Utils::BoolAspect useSystemPrompt{this};
+    Utils::StringAspect systemPrompt{this};
+    Utils::BoolAspect useFilePathInContext{this};
+    Utils::BoolAspect useProjectChangesCache{this};
+    Utils::IntegerAspect maxChangesCacheSize{this};
+
+    // Ollama Settings
+    Utils::StringAspect ollamaLivetime{this};
+    Utils::IntegerAspect contextWindow{this};
+
+    // API Configuration Settings
+    Utils::StringAspect apiKey{this};
+
+private:
+    void setupConnections();
+    void resetSettingsToDefaults();
+};
+
+CodeCompletionSettings &codeCompletionSettings();
+
+} // namespace QodeAssist::Settings

settings/ContextSettings.cpp

@@ -1,153 +0,0 @@
-/* 
- * 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 "ContextSettings.hpp"
-
-#include <QMessageBox>
-#include <coreplugin/dialogs/ioptionspage.h>
-#include <coreplugin/icore.h>
-#include <utils/layoutbuilder.h>
-
-#include "QodeAssistConstants.hpp"
-#include "QodeAssisttr.h"
-
-namespace QodeAssist::Settings {
-ContextSettings &contextSettings()
-{
-    static ContextSettings settings;
-    return settings;
-}
-
-ContextSettings::ContextSettings()
-{
-    setAutoApply(false);
-
-    setDisplayName(Tr::tr("Context"));
-
-    readFullFile.setSettingsKey(Constants::READ_FULL_FILE);
-    readFullFile.setLabelText(Tr::tr("Read Full File"));
-    readFullFile.setDefaultValue(false);
-
-    readStringsBeforeCursor.setSettingsKey(Constants::READ_STRINGS_BEFORE_CURSOR);
-    readStringsBeforeCursor.setLabelText(Tr::tr("Read Strings Before Cursor"));
-    readStringsBeforeCursor.setRange(0, 10000);
-    readStringsBeforeCursor.setDefaultValue(50);
-
-    readStringsAfterCursor.setSettingsKey(Constants::READ_STRINGS_AFTER_CURSOR);
-    readStringsAfterCursor.setLabelText(Tr::tr("Read Strings After Cursor"));
-    readStringsAfterCursor.setRange(0, 10000);
-    readStringsAfterCursor.setDefaultValue(30);
-
-    useFilePathInContext.setSettingsKey(Constants::USE_FILE_PATH_IN_CONTEXT);
-    useFilePathInContext.setDefaultValue(false);
-    useFilePathInContext.setLabelText(Tr::tr("Use File Path in Context"));
-
-    useSpecificInstructions.setSettingsKey(Constants::USE_SYSTEM_PROMPT);
-    useSpecificInstructions.setDefaultValue(true);
-    useSpecificInstructions.setLabelText(Tr::tr("Use System Prompt"));
-
-    specificInstractions.setSettingsKey(Constants::SYSTEM_PROMPT);
-    specificInstractions.setDisplayStyle(Utils::StringAspect::TextEditDisplay);
-    specificInstractions.setLabelText(
-        Tr::tr("Instructions: Please keep %1 for languge name, warning, it shouldn't too big"));
-    specificInstractions.setDefaultValue(
-        "You are an expert %1 code completion AI."
-        "CRITICAL: Please provide minimal the best possible code completion suggestions.\n");
-
-    resetToDefaults.m_buttonText = Tr::tr("Reset Page to Defaults");
-
-    useProjectChangesCache.setSettingsKey(Constants::USE_PROJECT_CHANGES_CACHE);
-    useProjectChangesCache.setDefaultValue(true);
-    useProjectChangesCache.setLabelText(Tr::tr("Use Project Changes Cache"));
-
-    maxChangesCacheSize.setSettingsKey(Constants::MAX_CHANGES_CACHE_SIZE);
-    maxChangesCacheSize.setLabelText(Tr::tr("Max Changes Cache Size"));
-    maxChangesCacheSize.setRange(2, 1000);
-    maxChangesCacheSize.setDefaultValue(20);
-
-    readSettings();
-
-    readStringsAfterCursor.setEnabled(!readFullFile());
-    readStringsBeforeCursor.setEnabled(!readFullFile());
-    specificInstractions.setEnabled(useSpecificInstructions());
-
-    setupConnection();
-
-    setLayouter([this]() {
-        using namespace Layouting;
-        return Column{Row{readFullFile, Stretch{1}, resetToDefaults},
-                      Row{readStringsBeforeCursor, Stretch{1}},
-                      Row{readStringsAfterCursor, Stretch{1}},
-                      useFilePathInContext,
-                      useSpecificInstructions,
-                      specificInstractions,
-                      useProjectChangesCache,
-                      Row{maxChangesCacheSize, Stretch{1}},
-                      Stretch{1}};
-    });
-}
-
-void ContextSettings::setupConnection()
-{
-    connect(&readFullFile, &Utils::BoolAspect::volatileValueChanged, this, [this]() {
-        readStringsAfterCursor.setEnabled(!readFullFile.volatileValue());
-        readStringsBeforeCursor.setEnabled(!readFullFile.volatileValue());
-    });
-    connect(&useSpecificInstructions, &Utils::BoolAspect::volatileValueChanged, this, [this]() {
-        specificInstractions.setEnabled(useSpecificInstructions.volatileValue());
-    });
-    connect(&resetToDefaults, &ButtonAspect::clicked, this, &ContextSettings::resetPageToDefaults);
-}
-
-void ContextSettings::resetPageToDefaults()
-{
-    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(readFullFile);
-        resetAspect(readStringsBeforeCursor);
-        resetAspect(readStringsAfterCursor);
-        resetAspect(useFilePathInContext);
-        resetAspect(useSpecificInstructions);
-        resetAspect(specificInstractions);
-    }
-}
-
-class ContextSettingsPage : public Core::IOptionsPage
-{
-public:
-    ContextSettingsPage()
-    {
-        setId(Constants::QODE_ASSIST_CONTEXT_SETTINGS_PAGE_ID);
-        setDisplayName(Tr::tr("Context"));
-        setCategory(Constants::QODE_ASSIST_GENERAL_OPTIONS_CATEGORY);
-        setDisplayCategory(Constants::QODE_ASSIST_GENERAL_OPTIONS_DISPLAY_CATEGORY);
-        setCategoryIconPath(":/resources/images/qoderassist-icon.png");
-        setSettingsProvider([] { return &contextSettings(); });
-    }
-};
-
-const ContextSettingsPage contextSettingsPage;
-
-} // namespace QodeAssist::Settings

settings/CustomPromptSettings.cpp

@@ -26,8 +26,9 @@
 #include <coreplugin/icore.h>
 #include <utils/layoutbuilder.h>
 
-#include "QodeAssistConstants.hpp"
-#include "QodeAssisttr.h"
+#include "SettingsConstants.hpp"
+#include "SettingsTr.hpp"
+#include "SettingsUtils.hpp"
 
 namespace QodeAssist::Settings {
 
@@ -85,12 +86,13 @@ CustomPromptSettings::CustomPromptSettings()
 
     setLayouter([this]() {
         using namespace Layouting;
-        return Column{Row{customJsonLabel, Stretch{1}, resetToDefaults},
-                      Row{customJsonTemplate,
-                          Column{saveCustomTemplateButton,
-                                 loadCustomTemplateButton,
-                                 customJsonLegend,
-                                 Stretch{1}}}};
+        return Column{Group{title(Tr::tr("Custom prompt for FIM model")),
+                            Column{Row{customJsonLabel, Stretch{1}, resetToDefaults},
+                                   Row{customJsonTemplate,
+                                       Column{saveCustomTemplateButton,
+                                              loadCustomTemplateButton,
+                                              customJsonLegend,
+                                              Stretch{1}}}}}};
     });
 }
 

settings/CustomPromptSettings.hpp

@@ -19,9 +19,10 @@
 
 #pragma once
 
-#include "settings/SettingsUtils.hpp"
 #include <utils/aspects.h>
 
+#include "ButtonAspect.hpp"
+
 namespace QodeAssist::Settings {
 
 class CustomPromptSettings : public Utils::AspectContainer

settings/GeneralSettings.cpp

@@ -19,18 +19,24 @@
 
 #include "GeneralSettings.hpp"
 
-#include <QInputDialog>
-#include <QMessageBox>
 #include <coreplugin/dialogs/ioptionspage.h>
 #include <coreplugin/icore.h>
 #include <utils/layoutbuilder.h>
 #include <utils/utilsicons.h>
+#include <QInputDialog>
+#include <QMessageBox>
+#include <QTimer>
+#include <QtWidgets/qboxlayout.h>
+#include <QtWidgets/qcompleter.h>
+#include <QtWidgets/qgroupbox.h>
+#include <QtWidgets/qradiobutton.h>
+#include <QtWidgets/qstackedwidget.h>
 
-#include "LLMProvidersManager.hpp"
-#include "PromptTemplateManager.hpp"
-#include "QodeAssistConstants.hpp"
-#include "QodeAssistUtils.hpp"
-#include "QodeAssisttr.h"
+#include "Logger.hpp"
+#include "SettingsConstants.hpp"
+#include "SettingsDialog.hpp"
+#include "SettingsTr.hpp"
+#include "SettingsUtils.hpp"
 
 namespace QodeAssist::Settings {
 
@@ -44,334 +50,275 @@ GeneralSettings::GeneralSettings()
 {
     setAutoApply(false);
 
-    setDisplayName(Tr::tr("General"));
+    setDisplayName(TrConstants::GENERAL);
 
     enableQodeAssist.setSettingsKey(Constants::ENABLE_QODE_ASSIST);
-    enableQodeAssist.setLabelText(Tr::tr("Enable Qode Assist"));
+    enableQodeAssist.setLabelText(TrConstants::ENABLE_QODE_ASSIST);
     enableQodeAssist.setDefaultValue(true);
 
-    enableAutoComplete.setSettingsKey(Constants::ENABLE_AUTO_COMPLETE);
-    enableAutoComplete.setLabelText(Tr::tr("Enable Auto Complete"));
-    enableAutoComplete.setDefaultValue(true);
-
     enableLogging.setSettingsKey(Constants::ENABLE_LOGGING);
-    enableLogging.setLabelText(Tr::tr("Enable Logging"));
+    enableLogging.setLabelText(TrConstants::ENABLE_LOG);
     enableLogging.setDefaultValue(false);
 
-    multiLineCompletion.setSettingsKey(Constants::MULTILINE_COMPLETION);
-    multiLineCompletion.setDefaultValue(false);
-    multiLineCompletion.setLabelText(Tr::tr("Enable Multiline Completion(experimental)"));
+    resetToDefaults.m_buttonText = TrConstants::RESET_TO_DEFAULTS;
 
-    startSuggestionTimer.setSettingsKey(Constants::START_SUGGESTION_TIMER);
-    startSuggestionTimer.setLabelText(Tr::tr("with delay(ms)"));
-    startSuggestionTimer.setRange(10, 10000);
-    startSuggestionTimer.setDefaultValue(500);
+    initStringAspect(ccProvider, Constants::CC_PROVIDER, TrConstants::PROVIDER, "Ollama");
+    ccProvider.setReadOnly(true);
+    ccSelectProvider.m_buttonText = TrConstants::SELECT;
 
-    autoCompletionCharThreshold.setSettingsKey(Constants::AUTO_COMPLETION_CHAR_THRESHOLD);
-    autoCompletionCharThreshold.setLabelText(Tr::tr("AI suggestion triggers after typing"));
-    autoCompletionCharThreshold.setToolTip(
-        Tr::tr("The number of characters that need to be typed within the typing interval "
-               "before an AI suggestion request is sent."));
-    autoCompletionCharThreshold.setRange(0, 10);
-    autoCompletionCharThreshold.setDefaultValue(0);
+    initStringAspect(ccModel, Constants::CC_MODEL, TrConstants::MODEL, "qwen2.5-coder:7b");
+    ccModel.setHistoryCompleter(Constants::CC_MODEL_HISTORY);
+    ccSelectModel.m_buttonText = TrConstants::SELECT;
 
-    autoCompletionTypingInterval.setSettingsKey(Constants::AUTO_COMPLETION_TYPING_INTERVAL);
-    autoCompletionTypingInterval.setLabelText(Tr::tr("character(s) within(ms)"));
-    autoCompletionTypingInterval.setToolTip(
-        Tr::tr("The time window (in milliseconds) during which the character threshold "
-               "must be met to trigger an AI suggestion request."));
-    autoCompletionTypingInterval.setRange(500, 5000);
-    autoCompletionTypingInterval.setDefaultValue(2000);
+    initStringAspect(ccTemplate, Constants::CC_TEMPLATE, TrConstants::TEMPLATE, "Ollama Auto FIM");
+    ccTemplate.setReadOnly(true);
+    ccSelectTemplate.m_buttonText = TrConstants::SELECT;
 
-    llmProviders.setSettingsKey(Constants::LLM_PROVIDERS);
-    llmProviders.setDisplayName(Tr::tr("AI Suggest Provider:"));
-    llmProviders.setDisplayStyle(Utils::SelectionAspect::DisplayStyle::ComboBox);
+    initStringAspect(ccUrl, Constants::CC_URL, TrConstants::URL, "http://localhost:11434");
+    ccUrl.setHistoryCompleter(Constants::CC_URL_HISTORY);
+    ccSetUrl.m_buttonText = TrConstants::SELECT;
 
-    url.setSettingsKey(Constants::URL);
-    url.setLabelText(Tr::tr("URL:"));
-    url.setDisplayStyle(Utils::StringAspect::LineEditDisplay);
+    ccStatus.setDisplayStyle(Utils::StringAspect::LabelDisplay);
+    ccStatus.setLabelText(TrConstants::STATUS);
+    ccStatus.setDefaultValue("");
+    ccTest.m_buttonText = TrConstants::TEST;
 
-    endPoint.setSettingsKey(Constants::END_POINT);
-    endPoint.setLabelText(Tr::tr("FIM Endpoint:"));
-    endPoint.setDisplayStyle(Utils::StringAspect::LineEditDisplay);
+    initStringAspect(caProvider, Constants::CA_PROVIDER, TrConstants::PROVIDER, "Ollama");
+    caProvider.setReadOnly(true);
+    caSelectProvider.m_buttonText = TrConstants::SELECT;
 
-    modelName.setSettingsKey(Constants::MODEL_NAME);
-    modelName.setLabelText(Tr::tr("Model name:"));
-    modelName.setDisplayStyle(Utils::StringAspect::LineEditDisplay);
+    initStringAspect(caModel, Constants::CA_MODEL, TrConstants::MODEL, "qwen2.5-coder:7b");
+    caModel.setHistoryCompleter(Constants::CA_MODEL_HISTORY);
+    caSelectModel.m_buttonText = TrConstants::SELECT;
 
-    selectModels.m_buttonText = Tr::tr("Select Fill-In-the-Middle Model");
+    initStringAspect(caTemplate, Constants::CA_TEMPLATE, TrConstants::TEMPLATE, "Ollama Auto Chat");
+    caTemplate.setReadOnly(true);
 
-    fimPrompts.setDisplayName(Tr::tr("Fill-In-the-Middle Prompt"));
-    fimPrompts.setSettingsKey(Constants::FIM_PROMPTS);
-    fimPrompts.setDisplayStyle(Utils::SelectionAspect::DisplayStyle::ComboBox);
-    resetToDefaults.m_buttonText = Tr::tr("Reset Page to Defaults");
+    caSelectTemplate.m_buttonText = TrConstants::SELECT;
 
-    chatLlmProviders.setSettingsKey(Constants::CHAT_LLM_PROVIDERS);
-    chatLlmProviders.setDisplayName(Tr::tr("AI Chat Provider:"));
-    chatLlmProviders.setDisplayStyle(Utils::SelectionAspect::DisplayStyle::ComboBox);
+    initStringAspect(caUrl, Constants::CA_URL, TrConstants::URL, "http://localhost:11434");
+    caUrl.setHistoryCompleter(Constants::CA_URL_HISTORY);
+    caSetUrl.m_buttonText = TrConstants::SELECT;
 
-    chatUrl.setSettingsKey(Constants::CHAT_URL);
-    chatUrl.setLabelText(Tr::tr("URL:"));
-    chatUrl.setDisplayStyle(Utils::StringAspect::LineEditDisplay);
-
-    chatEndPoint.setSettingsKey(Constants::CHAT_END_POINT);
-    chatEndPoint.setLabelText(Tr::tr("Chat Endpoint:"));
-    chatEndPoint.setDisplayStyle(Utils::StringAspect::LineEditDisplay);
-
-    chatModelName.setSettingsKey(Constants::CHAT_MODEL_NAME);
-    chatModelName.setLabelText(Tr::tr("Model name:"));
-    chatModelName.setDisplayStyle(Utils::StringAspect::LineEditDisplay);
-
-    chatSelectModels.m_buttonText = Tr::tr("Select Chat Model");
-
-    chatPrompts.setDisplayName(Tr::tr("Chat Prompt"));
-    chatPrompts.setSettingsKey(Constants::CHAT_PROMPTS);
-    chatPrompts.setDisplayStyle(Utils::SelectionAspect::DisplayStyle::ComboBox);
-
-    loadProviders();
-    loadPrompts();
-
-    llmProviders.setDefaultValue(llmProviders.indexForDisplay("Ollama"));
-    chatLlmProviders.setDefaultValue(chatLlmProviders.indexForDisplay("Ollama"));
-    fimPrompts.setDefaultValue(fimPrompts.indexForDisplay("CodeLLama FIM"));
-    chatPrompts.setDefaultValue(chatPrompts.indexForDisplay("CodeLLama Chat"));
+    caStatus.setDisplayStyle(Utils::StringAspect::LabelDisplay);
+    caStatus.setLabelText(TrConstants::STATUS);
+    caStatus.setDefaultValue("");
+    caTest.m_buttonText = TrConstants::TEST;
 
     readSettings();
 
-    auto fimProviderName = llmProviders.displayForIndex(llmProviders.value());
-    setCurrentFimProvider(fimProviderName);
-    auto chatProviderName = chatLlmProviders.displayForIndex(chatLlmProviders.value());
-    setCurrentChatProvider(chatProviderName);
-
-    auto nameFimPromts = fimPrompts.displayForIndex(fimPrompts.value());
-    PromptTemplateManager::instance().setCurrentFimTemplate(nameFimPromts);
-    auto nameChatPromts = chatPrompts.displayForIndex(chatPrompts.value());
-    PromptTemplateManager::instance().setCurrentChatTemplate(nameChatPromts);
-
-    setLoggingEnabled(enableLogging());
+    Logger::instance().setLoggingEnabled(enableLogging());
 
     setupConnections();
 
     setLayouter([this]() {
         using namespace Layouting;
 
-        auto rootLayout
-            = Column{Row{enableQodeAssist, Stretch{1}, resetToDefaults},
-                     enableAutoComplete,
-                     multiLineCompletion,
-                     Row{autoCompletionCharThreshold,
-                         autoCompletionTypingInterval,
-                         startSuggestionTimer,
-                         Stretch{1}},
-                     Space{8},
-                     enableLogging,
-                     Space{8},
-                     Group{title(Tr::tr("AI Suggestions")),
-                           Column{Row{llmProviders, Stretch{1}},
-                                  Row{url, endPoint, fimUrlIndicator},
-                                  Row{selectModels, modelName, fimModelIndicator},
-                                  Row{fimPrompts, Stretch{1}}}},
-                     Space{16},
-                     Group{title(Tr::tr("AI Chat(experimental)")),
-                           Column{Row{chatLlmProviders, Stretch{1}},
-                                  Row{chatUrl, chatEndPoint, chatUrlIndicator},
-                                  Row{chatSelectModels, chatModelName, chatModelIndicator},
-                                  Row{chatPrompts, Stretch{1}}}},
-                     Stretch{1}};
+        auto ccGrid = Grid{};
+        ccGrid.addRow({ccProvider, ccSelectProvider});
+        ccGrid.addRow({ccUrl, ccSetUrl});
+        ccGrid.addRow({ccModel, ccSelectModel});
+        ccGrid.addRow({ccTemplate, ccSelectTemplate});
+        ccGrid.addRow({ccStatus, ccTest});
+
+        auto caGrid = Grid{};
+        caGrid.addRow({caProvider, caSelectProvider});
+        caGrid.addRow({caUrl, caSetUrl});
+        caGrid.addRow({caModel, caSelectModel});
+        caGrid.addRow({caTemplate, caSelectTemplate});
+        caGrid.addRow({caStatus, caTest});
+
+        auto ccGroup = Group{title(TrConstants::CODE_COMPLETION), ccGrid};
+        auto caGroup = Group{title(TrConstants::CHAT_ASSISTANT), caGrid};
+
+        auto rootLayout = Column{Row{enableQodeAssist, Stretch{1}, resetToDefaults},
+                                 Row{enableLogging, Stretch{1}},
+                                 Space{8},
+                                 ccGroup,
+                                 Space{8},
+                                 caGroup,
+                                 Stretch{1}};
+
         return rootLayout;
     });
-
-    updateStatusIndicators();
 }
 
-void GeneralSettings::setupConnections()
+void GeneralSettings::showSelectionDialog(const QStringList &data,
+                                          Utils::StringAspect &aspect,
+                                          const QString &title,
+                                          const QString &text)
 {
-    connect(&llmProviders, &Utils::SelectionAspect::volatileValueChanged, this, [this]() {
-        auto providerName = llmProviders.displayForIndex(llmProviders.volatileValue());
-        setCurrentFimProvider(providerName);
-        modelName.setVolatileValue("");
-    });
-    connect(&chatLlmProviders, &Utils::SelectionAspect::volatileValueChanged, this, [this]() {
-        auto providerName = chatLlmProviders.displayForIndex(chatLlmProviders.volatileValue());
-        setCurrentChatProvider(providerName);
-        chatModelName.setVolatileValue("");        
-    });
+    if (data.isEmpty())
+        return;
 
-    connect(&fimPrompts, &Utils::SelectionAspect::volatileValueChanged, this, [this]() {
-        int index = fimPrompts.volatileValue();
-        PromptTemplateManager::instance().setCurrentFimTemplate(fimPrompts.displayForIndex(index));
-    });
-    connect(&chatPrompts, &Utils::SelectionAspect::volatileValueChanged, this, [this]() {
-        int index = chatPrompts.volatileValue();
-        PromptTemplateManager::instance().setCurrentChatTemplate(chatPrompts.displayForIndex(index));
-    });
+    bool ok;
+    QInputDialog dialog(Core::ICore::dialogParent());
+    dialog.setWindowTitle(title);
+    dialog.setLabelText(text);
+    dialog.setComboBoxItems(data);
+    dialog.setComboBoxEditable(false);
+    dialog.setFixedSize(400, 150);
 
-    connect(&selectModels, &ButtonAspect::clicked, this, [this]() {
-        auto *provider = LLMProvidersManager::instance().getCurrentFimProvider();
-        showModelSelectionDialog(&modelName, provider);
-    });
-    connect(&chatSelectModels, &ButtonAspect::clicked, this, [this]() {
-        auto *provider = LLMProvidersManager::instance().getCurrentChatProvider();
-        showModelSelectionDialog(&chatModelName, provider);
-    });
-
-    connect(&enableLogging, &Utils::BoolAspect::volatileValueChanged, this, [this]() {
-        setLoggingEnabled(enableLogging.volatileValue());
-    });
-    connect(&resetToDefaults, &ButtonAspect::clicked, this, &GeneralSettings::resetPageToDefaults);
-
-    connect(&url,
-            &Utils::StringAspect::volatileValueChanged,
-            this,
-            &GeneralSettings::updateStatusIndicators);
-    connect(&modelName,
-            &Utils::StringAspect::volatileValueChanged,
-            this,
-            &GeneralSettings::updateStatusIndicators);
-    connect(&chatUrl,
-            &Utils::StringAspect::volatileValueChanged,
-            this,
-            &GeneralSettings::updateStatusIndicators);
-    connect(&chatModelName,
-            &Utils::StringAspect::volatileValueChanged,
-            this,
-            &GeneralSettings::updateStatusIndicators);
-}
-
-void GeneralSettings::showModelSelectionDialog(Utils::StringAspect *modelNameObj,
-                                               Providers::LLMProvider *provider)
-{
-    Utils::Environment env = Utils::Environment::systemEnvironment();
-    QString providerUrl = (modelNameObj == &modelName) ? url() : chatUrl();
-
-    if (provider) {
-        QStringList models = provider->getInstalledModels(env, providerUrl);
-        bool ok;
-        QString selectedModel = QInputDialog::getItem(Core::ICore::dialogParent(),
-                                                      Tr::tr("Select LLM Model"),
-                                                      Tr::tr("Choose a model:"),
-                                                      models,
-                                                      0,
-                                                      false,
-                                                      &ok);
-
-        if (ok && !selectedModel.isEmpty()) {
-            modelNameObj->setVolatileValue(selectedModel);
+    if (dialog.exec() == QDialog::Accepted) {
+        QString result = dialog.textValue();
+        if (!result.isEmpty()) {
+            aspect.setValue(result);
             writeSettings();
         }
     }
 }
 
+void GeneralSettings::showModelsNotFoundDialog(Utils::StringAspect &aspect)
+{
+    SettingsDialog dialog(TrConstants::CONNECTION_ERROR);
+    dialog.addLabel(TrConstants::NO_MODELS_FOUND);
+    dialog.addLabel(TrConstants::CHECK_CONNECTION);
+    dialog.addSpacing();
+
+    ButtonAspect *providerButton = nullptr;
+    ButtonAspect *urlButton = nullptr;
+
+    if (&aspect == &ccModel) {
+        providerButton = &ccSelectProvider;
+        urlButton = &ccSetUrl;
+    } else if (&aspect == &caModel) {
+        providerButton = &caSelectProvider;
+        urlButton = &caSetUrl;
+    }
+
+    if (providerButton && urlButton) {
+        auto selectProviderBtn = new QPushButton(TrConstants::SELECT_PROVIDER);
+        auto selectUrlBtn = new QPushButton(TrConstants::SELECT_URL);
+        auto enterManuallyBtn = new QPushButton(TrConstants::ENTER_MODEL_MANUALLY);
+
+        connect(selectProviderBtn, &QPushButton::clicked, &dialog, [this, providerButton, &dialog]() {
+            dialog.close();
+            emit providerButton->clicked();
+        });
+
+        connect(selectUrlBtn, &QPushButton::clicked, &dialog, [this, urlButton, &dialog]() {
+            dialog.close();
+            emit urlButton->clicked();
+        });
+
+        connect(enterManuallyBtn, &QPushButton::clicked, &dialog, [this, &aspect, &dialog]() {
+            dialog.close();
+            showModelsNotSupportedDialog(aspect);
+        });
+
+        dialog.buttonLayout()->addWidget(selectProviderBtn);
+        dialog.buttonLayout()->addWidget(selectUrlBtn);
+        dialog.buttonLayout()->addWidget(enterManuallyBtn);
+    }
+
+    auto closeBtn = new QPushButton(TrConstants::CLOSE);
+    connect(closeBtn, &QPushButton::clicked, &dialog, &QDialog::close);
+    dialog.buttonLayout()->addWidget(closeBtn);
+
+    dialog.exec();
+}
+
+void GeneralSettings::showModelsNotSupportedDialog(Utils::StringAspect &aspect)
+{
+    SettingsDialog dialog(TrConstants::MODEL_SELECTION);
+    dialog.addLabel(TrConstants::MODEL_LISTING_NOT_SUPPORTED_INFO);
+    dialog.addSpacing();
+
+    QString key = QString("CompleterHistory/")
+                      .append(
+                          (&aspect == &ccModel) ? Constants::CC_MODEL_HISTORY
+                                                : Constants::CA_MODEL_HISTORY);
+    QStringList historyList = qtcSettings()->value(Utils::Key(key.toLocal8Bit())).toStringList();
+
+    auto modelList = dialog.addComboBox(historyList, aspect.value());
+    dialog.addSpacing();
+
+    auto okButton = new QPushButton(TrConstants::OK);
+    connect(okButton, &QPushButton::clicked, &dialog, [this, &aspect, modelList, &dialog]() {
+        QString value = modelList->currentText().trimmed();
+        if (!value.isEmpty()) {
+            aspect.setValue(value);
+            writeSettings();
+            dialog.accept();
+        }
+    });
+
+    auto cancelButton = new QPushButton(TrConstants::CANCEL);
+    connect(cancelButton, &QPushButton::clicked, &dialog, &QDialog::reject);
+
+    dialog.buttonLayout()->addWidget(cancelButton);
+    dialog.buttonLayout()->addWidget(okButton);
+
+    modelList->setFocus();
+    dialog.exec();
+}
+
+void GeneralSettings::showUrlSelectionDialog(
+    Utils::StringAspect &aspect, const QStringList &predefinedUrls)
+{
+    SettingsDialog dialog(TrConstants::URL_SELECTION);
+    dialog.addLabel(TrConstants::URL_SELECTION_INFO);
+    dialog.addSpacing();
+
+    QStringList allUrls = predefinedUrls;
+    QString key
+        = QString("CompleterHistory/")
+              .append((&aspect == &ccUrl) ? Constants::CC_URL_HISTORY : Constants::CA_URL_HISTORY);
+    QStringList historyList = qtcSettings()->value(Utils::Key(key.toLocal8Bit())).toStringList();
+    allUrls.append(historyList);
+    allUrls.removeDuplicates();
+
+    auto urlList = dialog.addComboBox(allUrls, aspect.value());
+    dialog.addSpacing();
+
+    auto okButton = new QPushButton(TrConstants::OK);
+    connect(okButton, &QPushButton::clicked, &dialog, [this, &aspect, urlList, &dialog]() {
+        QString value = urlList->currentText().trimmed();
+        if (!value.isEmpty()) {
+            aspect.setValue(value);
+            writeSettings();
+            dialog.accept();
+        }
+    });
+
+    auto cancelButton = new QPushButton(TrConstants::CANCEL);
+    connect(cancelButton, &QPushButton::clicked, &dialog, &QDialog::reject);
+
+    dialog.buttonLayout()->addWidget(cancelButton);
+    dialog.buttonLayout()->addWidget(okButton);
+
+    urlList->setFocus();
+    dialog.exec();
+}
+
+void GeneralSettings::setupConnections()
+{
+    connect(&enableLogging, &Utils::BoolAspect::volatileValueChanged, this, [this]() {
+        Logger::instance().setLoggingEnabled(enableLogging.volatileValue());
+    });
+    connect(&resetToDefaults, &ButtonAspect::clicked, this, &GeneralSettings::resetPageToDefaults);
+}
+
 void GeneralSettings::resetPageToDefaults()
 {
     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);
+    reply = QMessageBox::question(Core::ICore::dialogParent(),
+                                  TrConstants::RESET_SETTINGS,
+                                  TrConstants::CONFIRMATION,
+                                  QMessageBox::Yes | QMessageBox::No);
 
     if (reply == QMessageBox::Yes) {
         resetAspect(enableQodeAssist);
-        resetAspect(enableAutoComplete);
         resetAspect(enableLogging);
-        resetAspect(startSuggestionTimer);
-        resetAspect(autoCompletionTypingInterval);
-        resetAspect(autoCompletionCharThreshold);
-        resetAspect(llmProviders);
-        resetAspect(chatLlmProviders);
-        resetAspect(fimPrompts);
-        resetAspect(chatPrompts);
-    }
-
-    modelName.setVolatileValue("");
-    chatModelName.setVolatileValue("");
-
-    updateStatusIndicators();
-}
-
-void GeneralSettings::updateStatusIndicators()
-{
-    bool fimUrlValid = !url.volatileValue().isEmpty() && !endPoint.volatileValue().isEmpty();
-    bool fimModelValid = !modelName.volatileValue().isEmpty();
-    bool chatUrlValid = !chatUrl.volatileValue().isEmpty()
-                        && !chatEndPoint.volatileValue().isEmpty();
-    bool chatModelValid = !chatModelName.volatileValue().isEmpty();
-
-    bool fimPingSuccessful = false;
-    if (fimUrlValid) {
-        QUrl pingUrl(url.volatileValue());
-        fimPingSuccessful = QodeAssist::pingUrl(pingUrl);
-    }
-    bool chatPingSuccessful = false;
-    if (chatUrlValid) {
-        QUrl pingUrl(chatUrl.volatileValue());
-        chatPingSuccessful = QodeAssist::pingUrl(pingUrl);
-    }
-
-    setIndicatorStatus(fimModelIndicator,
-                       fimModelValid ? tr("Model is properly configured")
-                                     : tr("No model selected or model name is invalid"),
-                       fimModelValid);
-    setIndicatorStatus(fimUrlIndicator,
-                       fimPingSuccessful ? tr("Server is reachable")
-                                         : tr("Server is not reachable or URL is invalid"),
-                       fimPingSuccessful);
-
-    setIndicatorStatus(chatModelIndicator,
-                       chatModelValid ? tr("Model is properly configured")
-                                      : tr("No model selected or model name is invalid"),
-                       chatModelValid);
-    setIndicatorStatus(chatUrlIndicator,
-                       chatPingSuccessful ? tr("Server is reachable")
-                                          : tr("Server is not reachable or URL is invalid"),
-                       chatPingSuccessful);
-}
-
-void GeneralSettings::setIndicatorStatus(Utils::StringAspect &indicator,
-                                         const QString &tooltip,
-                                         bool isValid)
-{
-    const Utils::Icon &icon = isValid ? Utils::Icons::OK : Utils::Icons::WARNING;
-    indicator.setLabelPixmap(icon.pixmap());
-    indicator.setToolTip(tooltip);
-}
-
-void GeneralSettings::setCurrentFimProvider(const QString &name)
-{
-    const auto provider = LLMProvidersManager::instance().setCurrentFimProvider(name);
-    if (!provider)
-        return;
-
-    url.setValue(provider->url());
-    endPoint.setValue(provider->completionEndpoint());
-}
-
-void GeneralSettings::setCurrentChatProvider(const QString &name)
-{
-    const auto provider = LLMProvidersManager::instance().setCurrentChatProvider(name);
-    if (!provider)
-        return;
-
-    chatUrl.setValue(provider->url());
-    chatEndPoint.setValue(provider->chatEndpoint());
-}
-
-void GeneralSettings::loadProviders()
-{
-    for (const auto &name : LLMProvidersManager::instance().providersNames()) {
-        llmProviders.addOption(name);
-        chatLlmProviders.addOption(name);
-    }
-}
-
-void GeneralSettings::loadPrompts()
-{
-    for (const auto &name : PromptTemplateManager::instance().fimTemplatesNames()) {
-        fimPrompts.addOption(name);
-    }
-    for (const auto &name : PromptTemplateManager::instance().chatTemplatesNames()) {
-        chatPrompts.addOption(name);
+        resetAspect(ccProvider);
+        resetAspect(ccModel);
+        resetAspect(ccTemplate);
+        resetAspect(ccUrl);
+        resetAspect(caProvider);
+        resetAspect(caModel);
+        resetAspect(caTemplate);
+        resetAspect(caUrl);
+        writeSettings();
     }
 }
 
@@ -381,8 +328,10 @@ public:
     GeneralSettingsPage()
     {
         setId(Constants::QODE_ASSIST_GENERAL_SETTINGS_PAGE_ID);
-        setDisplayName(Tr::tr("General"));
+        setDisplayName(TrConstants::GENERAL);
         setCategory(Constants::QODE_ASSIST_GENERAL_OPTIONS_CATEGORY);
+        setDisplayCategory(Constants::QODE_ASSIST_GENERAL_OPTIONS_DISPLAY_CATEGORY);
+        setCategoryIconPath(":/resources/images/qoderassist-icon.png");
         setSettingsProvider([] { return &generalSettings(); });
     }
 };

settings/GeneralSettings.hpp

@@ -21,9 +21,11 @@
 
 #include <utils/aspects.h>
 
-#include "providers/LLMProvider.hpp"
-#include "settings/SettingsUtils.hpp"
+#include "ButtonAspect.hpp"
 
+namespace QodeAssist::LLMCore {
+class Provider;
+}
 namespace QodeAssist::Settings {
 
 class GeneralSettings : public Utils::AspectContainer
@@ -32,49 +34,55 @@ public:
     GeneralSettings();
 
     Utils::BoolAspect enableQodeAssist{this};
-    Utils::BoolAspect enableAutoComplete{this};
-    Utils::BoolAspect multiLineCompletion{this};
     Utils::BoolAspect enableLogging{this};
-    Utils::IntegerAspect startSuggestionTimer{this};
-    Utils::IntegerAspect autoCompletionCharThreshold{this};
-    Utils::IntegerAspect autoCompletionTypingInterval{this};
-
-    Utils::SelectionAspect llmProviders{this};
-    Utils::StringAspect url{this};
-    Utils::StringAspect endPoint{this};
-
-    Utils::StringAspect modelName{this};
-    ButtonAspect selectModels{this};
-    Utils::SelectionAspect fimPrompts{this};
     ButtonAspect resetToDefaults{this};
 
-    Utils::SelectionAspect chatLlmProviders{this};
-    Utils::StringAspect chatUrl{this};
-    Utils::StringAspect chatEndPoint{this};
+    // code completion setttings
+    Utils::StringAspect ccProvider{this};
+    ButtonAspect ccSelectProvider{this};
 
-    Utils::StringAspect chatModelName{this};
-    ButtonAspect chatSelectModels{this};
-    Utils::SelectionAspect chatPrompts{this};
+    Utils::StringAspect ccModel{this};
+    ButtonAspect ccSelectModel{this};
 
-    Utils::StringAspect fimModelIndicator{this};
-    Utils::StringAspect fimUrlIndicator{this};
-    Utils::StringAspect chatModelIndicator{this};
-    Utils::StringAspect chatUrlIndicator{this};
+    Utils::StringAspect ccTemplate{this};
+    ButtonAspect ccSelectTemplate{this};
+
+    Utils::StringAspect ccUrl{this};
+    ButtonAspect ccSetUrl{this};
+
+    Utils::StringAspect ccStatus{this};
+    ButtonAspect ccTest{this};
+
+    // chat assistant settings
+    Utils::StringAspect caProvider{this};
+    ButtonAspect caSelectProvider{this};
+
+    Utils::StringAspect caModel{this};
+    ButtonAspect caSelectModel{this};
+
+    Utils::StringAspect caTemplate{this};
+    ButtonAspect caSelectTemplate{this};
+
+    Utils::StringAspect caUrl{this};
+    ButtonAspect caSetUrl{this};
+
+    Utils::StringAspect caStatus{this};
+    ButtonAspect caTest{this};
+
+    void showSelectionDialog(const QStringList &data,
+                             Utils::StringAspect &aspect,
+                             const QString &title = {},
+                             const QString &text = {});
+
+    void showModelsNotFoundDialog(Utils::StringAspect &aspect);
+
+    void showModelsNotSupportedDialog(Utils::StringAspect &aspect);
+
+    void showUrlSelectionDialog(Utils::StringAspect &aspect, const QStringList &predefinedUrls);
 
 private:
     void setupConnections();
-    void showModelSelectionDialog(Utils::StringAspect *modelNameObj,
-                                  Providers::LLMProvider *provider);
     void resetPageToDefaults();
-
-    void updateStatusIndicators();
-    void setIndicatorStatus(Utils::StringAspect &indicator, const QString &tooltip, bool isValid);
-
-    void setCurrentFimProvider(const QString &name);
-    void setCurrentChatProvider(const QString &name);
-
-    void loadProviders();
-    void loadPrompts();
 };
 
 GeneralSettings &generalSettings();

settings/PresetPromptsSettings.cpp

@@ -1,167 +0,0 @@
-/* 
- * 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 "PresetPromptsSettings.hpp"
-
-#include <QMessageBox>
-#include <coreplugin/dialogs/ioptionspage.h>
-#include <coreplugin/icore.h>
-#include <utils/layoutbuilder.h>
-
-#include "QodeAssistConstants.hpp"
-#include "QodeAssisttr.h"
-
-namespace QodeAssist::Settings {
-
-PresetPromptsSettings &presetPromptsSettings()
-{
-    static PresetPromptsSettings settings;
-    return settings;
-}
-
-PresetPromptsSettings::PresetPromptsSettings()
-{
-    setAutoApply(false);
-
-    setDisplayName(Tr::tr("Preset Prompts Params"));
-
-    temperature.setSettingsKey(Constants::TEMPERATURE);
-    temperature.setLabelText(Tr::tr("Temperature:"));
-    temperature.setDefaultValue(0.2);
-    temperature.setRange(0.0, 10.0);
-    temperature.setSingleStep(0.1);
-
-    ollamaLivetime.setSettingsKey(Constants::OLLAMA_LIVETIME);
-    ollamaLivetime.setLabelText(
-        Tr::tr("Time to suspend Ollama after completion request (in minutes), "
-               "Only Ollama,  -1 to disable"));
-    ollamaLivetime.setDefaultValue("5m");
-    ollamaLivetime.setDisplayStyle(Utils::StringAspect::LineEditDisplay);
-
-    maxTokens.setSettingsKey(Constants::MAX_TOKENS);
-    maxTokens.setLabelText(Tr::tr("Max Tokens"));
-    maxTokens.setRange(-1, 10000);
-    maxTokens.setDefaultValue(150);
-
-    useTopP.setSettingsKey(Constants::USE_TOP_P);
-    useTopP.setDefaultValue(false);
-
-    topP.setSettingsKey(Constants::TOP_P);
-    topP.setLabelText(Tr::tr("use top_p"));
-    topP.setDefaultValue(0.9);
-    topP.setRange(0.0, 1.0);
-    topP.setSingleStep(0.1);
-
-    useTopK.setSettingsKey(Constants::USE_TOP_K);
-    useTopK.setDefaultValue(false);
-
-    topK.setSettingsKey(Constants::TOP_K);
-    topK.setLabelText(Tr::tr("use top_k"));
-    topK.setDefaultValue(50);
-    topK.setRange(1, 1000);
-
-    usePresencePenalty.setSettingsKey(Constants::USE_PRESENCE_PENALTY);
-    usePresencePenalty.setDefaultValue(false);
-
-    presencePenalty.setSettingsKey(Constants::PRESENCE_PENALTY);
-    presencePenalty.setLabelText(Tr::tr("use presence_penalty"));
-    presencePenalty.setDefaultValue(0.0);
-    presencePenalty.setRange(-2.0, 2.0);
-    presencePenalty.setSingleStep(0.1);
-
-    useFrequencyPenalty.setSettingsKey(Constants::USE_FREQUENCY_PENALTY);
-    useFrequencyPenalty.setDefaultValue(false);
-
-    frequencyPenalty.setSettingsKey(Constants::FREQUENCY_PENALTY);
-    frequencyPenalty.setLabelText(Tr::tr("use frequency_penalty"));
-    frequencyPenalty.setDefaultValue(0.0);
-    frequencyPenalty.setRange(-2.0, 2.0);
-    frequencyPenalty.setSingleStep(0.1);
-
-    apiKey.setSettingsKey(Constants::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 = Tr::tr("Reset Page to Defaults");
-
-    readSettings();
-
-    setupConnections();
-
-    setLayouter([this]() {
-        using namespace Layouting;
-        return Column{Row{temperature, Stretch{1}, resetToDefaults},
-                      Row{maxTokens, Stretch{1}},
-                      Row{useTopP, topP, Stretch{1}},
-                      Row{useTopK, topK, Stretch{1}},
-                      Row{usePresencePenalty, presencePenalty, Stretch{1}},
-                      Row{useFrequencyPenalty, frequencyPenalty, Stretch{1}},
-                      apiKey,
-                      Stretch{1}};
-    });
-}
-
-void PresetPromptsSettings::setupConnections()
-{
-    connect(&resetToDefaults,
-            &ButtonAspect::clicked,
-            this,
-            &PresetPromptsSettings::resetSettingsToDefaults);
-}
-
-void PresetPromptsSettings::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(temperature);
-        resetAspect(maxTokens);
-        resetAspect(ollamaLivetime);
-        resetAspect(useTopP);
-        resetAspect(topP);
-        resetAspect(useTopK);
-        resetAspect(topK);
-        resetAspect(usePresencePenalty);
-        resetAspect(presencePenalty);
-        resetAspect(useFrequencyPenalty);
-        resetAspect(frequencyPenalty);
-    }
-}
-
-class PresetPromptsSettingsPage : public Core::IOptionsPage
-{
-public:
-    PresetPromptsSettingsPage()
-    {
-        setId(Constants::QODE_ASSIST_PRESET_PROMPTS_SETTINGS_PAGE_ID);
-        setDisplayName(Tr::tr("Preset Prompts Params"));
-        setCategory(Constants::QODE_ASSIST_GENERAL_OPTIONS_CATEGORY);
-        setSettingsProvider([] { return &presetPromptsSettings(); });
-    }
-};
-
-const PresetPromptsSettingsPage presetPromptsSettingsPage;
-
-} // namespace QodeAssist::Settings

settings/SettingsConstants.hpp

@@ -0,0 +1,109 @@
+/* 
+ * 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
+
+namespace QodeAssist::Constants {
+
+const char ACTION_ID[] = "QodeAssist.Action";
+const char MENU_ID[] = "QodeAssist.Menu";
+
+// new settings
+const char CC_PROVIDER[] = "QodeAssist.ccProvider";
+const char CC_MODEL[] = "QodeAssist.ccModel";
+const char CC_MODEL_HISTORY[] = "QodeAssist.ccModelHistory";
+const char CC_TEMPLATE[] = "QodeAssist.ccTemplate";
+const char CC_URL[] = "QodeAssist.ccUrl";
+const char CC_URL_HISTORY[] = "QodeAssist.ccUrlHistory";
+
+const char CA_PROVIDER[] = "QodeAssist.caProvider";
+const char CA_MODEL[] = "QodeAssist.caModel";
+const char CA_MODEL_HISTORY[] = "QodeAssist.caModelHistory";
+const char CA_TEMPLATE[] = "QodeAssist.caTemplate";
+const char CA_URL[] = "QodeAssist.caUrl";
+const char CA_URL_HISTORY[] = "QodeAssist.caUrlHistory";
+
+// settings
+const char ENABLE_QODE_ASSIST[] = "QodeAssist.enableQodeAssist";
+const char CC_AUTO_COMPLETION[] = "QodeAssist.ccAutoCompletion";
+const char ENABLE_LOGGING[] = "QodeAssist.enableLogging";
+const char PROVIDER_PATHS[] = "QodeAssist.providerPaths";
+const char СС_START_SUGGESTION_TIMER[] = "QodeAssist.startSuggestionTimer";
+const char СС_AUTO_COMPLETION_CHAR_THRESHOLD[] = "QodeAssist.autoCompletionCharThreshold";
+const char СС_AUTO_COMPLETION_TYPING_INTERVAL[] = "QodeAssist.autoCompletionTypingInterval";
+const char MAX_FILE_THRESHOLD[] = "QodeAssist.maxFileThreshold";
+const char CC_MULTILINE_COMPLETION[] = "QodeAssist.ccMultilineCompletion";
+const char CUSTOM_JSON_TEMPLATE[] = "QodeAssist.customJsonTemplate";
+const char CA_TOKENS_THRESHOLD[] = "QodeAssist.caTokensThreshold";
+const char CA_SHARING_CURRENT_FILE[] = "QodeAssist.caSharingCurrentFile";
+
+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_CHAT_ASSISTANT_SETTINGS_PAGE_ID[]
+    = "QodeAssist.3ChatAssistantSettingsPageId";
+const char QODE_ASSIST_CUSTOM_PROMPT_SETTINGS_PAGE_ID[] = "QodeAssist.4CustomPromptSettingsPageId";
+
+const char QODE_ASSIST_GENERAL_OPTIONS_CATEGORY[] = "QodeAssist.Category";
+const char QODE_ASSIST_GENERAL_OPTIONS_DISPLAY_CATEGORY[] = "Qode Assist";
+
+const char QODE_ASSIST_REQUEST_SUGGESTION[] = "QodeAssist.RequestSuggestion";
+
+// context settings
+const char CC_READ_FULL_FILE[] = "QodeAssist.ccReadFullFile";
+const char CC_READ_STRINGS_BEFORE_CURSOR[] = "QodeAssist.ccReadStringsBeforeCursor";
+const char CC_READ_STRINGS_AFTER_CURSOR[] = "QodeAssist.ccReadStringsAfterCursor";
+const char CC_USE_SYSTEM_PROMPT[] = "QodeAssist.ccUseSystemPrompt";
+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 CA_USE_SYSTEM_PROMPT[] = "QodeAssist.useChatSystemPrompt";
+const char CA_SYSTEM_PROMPT[] = "QodeAssist.chatSystemPrompt";
+
+// preset prompt settings
+const char CC_TEMPERATURE[] = "QodeAssist.ccTemperature";
+const char CC_MAX_TOKENS[] = "QodeAssist.ccMaxTokens";
+const char CC_USE_TOP_P[] = "QodeAssist.ccUseTopP";
+const char CC_TOP_P[] = "QodeAssist.ccTopP";
+const char CC_USE_TOP_K[] = "QodeAssist.ccUseTopK";
+const char CC_TOP_K[] = "QodeAssist.ccTopK";
+const char CC_USE_PRESENCE_PENALTY[] = "QodeAssist.ccUsePresencePenalty";
+const char CC_PRESENCE_PENALTY[] = "QodeAssist.ccPresencePenalty";
+const char CC_USE_FREQUENCY_PENALTY[] = "QodeAssist.fimUseFrequencyPenalty";
+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 CA_TEMPERATURE[] = "QodeAssist.chatTemperature";
+const char CA_MAX_TOKENS[] = "QodeAssist.chatMaxTokens";
+const char CA_USE_TOP_P[] = "QodeAssist.chatUseTopP";
+const char CA_TOP_P[] = "QodeAssist.chatTopP";
+const char CA_USE_TOP_K[] = "QodeAssist.chatUseTopK";
+const char CA_TOP_K[] = "QodeAssist.chatTopK";
+const char CA_USE_PRESENCE_PENALTY[] = "QodeAssist.chatUsePresencePenalty";
+const char CA_PRESENCE_PENALTY[] = "QodeAssist.chatPresencePenalty";
+const char CA_USE_FREQUENCY_PENALTY[] = "QodeAssist.chatUseFrequencyPenalty";
+const char CA_FREQUENCY_PENALTY[] = "QodeAssist.chatFrequencyPenalty";
+const char CA_OLLAMA_LIVETIME[] = "QodeAssist.chatOllamaLivetime";
+const char CA_OLLAMA_CONTEXT_WINDOW[] = "QodeAssist.caOllamaContextWindow";
+const char CA_API_KEY[] = "QodeAssist.chatApiKey";
+
+} // namespace QodeAssist::Constants

settings/SettingsDialog.cpp

@@ -0,0 +1,89 @@
+/* 
+ * 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 "SettingsDialog.hpp"
+
+namespace QodeAssist::Settings {
+
+SettingsDialog::SettingsDialog(const QString &title, QWidget *parent)
+    : QDialog(parent)
+    , m_mainLayout(new QVBoxLayout(this))
+    , m_buttonLayout(nullptr)
+{
+    setWindowTitle(title);
+    m_mainLayout->setSizeConstraint(QLayout::SetMinAndMaxSize);
+}
+
+QLabel *SettingsDialog::addLabel(const QString &text)
+{
+    auto label = new QLabel(text, this);
+    label->setWordWrap(true);
+    label->setMinimumWidth(300);
+    m_mainLayout->addWidget(label);
+    return label;
+}
+
+QLineEdit *SettingsDialog::addInputField(const QString &labelText, const QString &value)
+{
+    auto inputLayout = new QGridLayout;
+    auto inputLabel = new QLabel(labelText, this);
+    auto inputField = new QLineEdit(value, this);
+    inputField->setMinimumWidth(200);
+
+    inputLayout->addWidget(inputLabel, 0, 0);
+    inputLayout->addWidget(inputField, 0, 1);
+    inputLayout->setColumnStretch(1, 1);
+    m_mainLayout->addLayout(inputLayout);
+
+    return inputField;
+}
+
+void SettingsDialog::addSpacing(int space)
+{
+    m_mainLayout->addSpacing(space);
+}
+
+QHBoxLayout *SettingsDialog::buttonLayout()
+{
+    if (!m_buttonLayout) {
+        m_buttonLayout = new QHBoxLayout;
+        m_buttonLayout->addStretch();
+        m_mainLayout->addLayout(m_buttonLayout);
+    }
+    return m_buttonLayout;
+}
+
+QComboBox *SettingsDialog::addComboBox(
+    const QStringList &items, const QString &currentText, bool editable)
+{
+    auto comboBox = new QComboBox(this);
+    comboBox->addItems(items);
+    comboBox->setCurrentText(currentText);
+    comboBox->setMinimumWidth(300);
+    comboBox->setEditable(editable);
+    m_mainLayout->addWidget(comboBox);
+    return comboBox;
+}
+
+QVBoxLayout *SettingsDialog::mainLayout() const
+{
+    return m_mainLayout;
+}
+
+} // namespace QodeAssist::Settings

settings/SettingsDialog.hpp

@@ -17,36 +17,34 @@
  * along with QodeAssist. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#pragma once
+#include <QComboBox>
+#include <QDialog>
+#include <QLabel>
+#include <QLayout>
+#include <QLineEdit>
+#include <QWidget>
 
-#include <utils/aspects.h>
-
-#include "SettingsUtils.hpp"
+#include <coreplugin/icore.h>
 
 namespace QodeAssist::Settings {
 
-class ContextSettings : public Utils::AspectContainer
+class SettingsDialog : public QDialog
 {
 public:
-    ContextSettings();
+    explicit SettingsDialog(const QString &title, QWidget *parent = Core::ICore::dialogParent());
 
-    Utils::BoolAspect readFullFile{this};
-    Utils::IntegerAspect readStringsBeforeCursor{this};
-    Utils::IntegerAspect readStringsAfterCursor{this};
+    QLabel *addLabel(const QString &text);
+    QLineEdit *addInputField(const QString &labelText, const QString &value);
+    void addSpacing(int space = 12);
+    QHBoxLayout *buttonLayout();
+    QVBoxLayout *mainLayout() const;
 
-    Utils::StringAspect specificInstractions{this};
-    Utils::BoolAspect useSpecificInstructions{this};
-    Utils::BoolAspect useFilePathInContext{this};
-    Utils::BoolAspect useProjectChangesCache{this};
-    Utils::IntegerAspect maxChangesCacheSize{this};
-
-    ButtonAspect resetToDefaults{this};
+    QComboBox *addComboBox(
+        const QStringList &items, const QString &currentText = QString(), bool editable = true);
 
 private:
-    void setupConnection();
-    void resetPageToDefaults();
+    QVBoxLayout *m_mainLayout;
+    QHBoxLayout *m_buttonLayout;
 };
 
-ContextSettings &contextSettings();
-
 } // namespace QodeAssist::Settings

settings/SettingsTr.hpp

@@ -0,0 +1,90 @@
+/* 
+ * 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 <QCoreApplication>
+
+namespace QodeAssist::Settings {
+
+namespace TrConstants {
+inline const char *ENABLE_QODE_ASSIST = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Enable Qode Assist");
+inline const char *GENERAL = QT_TRANSLATE_NOOP("QtC::QodeAssist", "General");
+inline const char *RESET_TO_DEFAULTS = QT_TRANSLATE_NOOP("QtC::QodeAssist",
+                                                         "Reset Page to Defaults");
+inline const char *SELECT = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Select...");
+inline const char *PROVIDER = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Provider:");
+inline const char *MODEL = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Model:");
+inline const char *TEMPLATE = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Template:");
+inline const char *URL = QT_TRANSLATE_NOOP("QtC::QodeAssist", "URL:");
+inline const char *STATUS = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Status:");
+inline const char *TEST = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Test");
+inline const char *ENABLE_LOG = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Enable Logging");
+inline const char *CODE_COMPLETION = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Code Completion");
+inline const char *CHAT_ASSISTANT = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Chat Assistant");
+inline const char *RESET_SETTINGS = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Reset Settings");
+inline const char *CONFIRMATION
+    = QT_TRANSLATE_NOOP("QtC::QodeAssist",
+                        "Are you sure you want to reset all settings to default values?");
+
+inline const char CONNECTION_ERROR[] = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Connection Error");
+inline const char NO_MODELS_FOUND[]
+    = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Unable to retrieve the list of models from the server.");
+inline const char CHECK_CONNECTION[] = QT_TRANSLATE_NOOP(
+    "QtC::QodeAssist",
+    "Please verify the following:\n"
+    "- Server is running and accessible\n"
+    "- URL is correct\n"
+    "- Provider is properly configured\n\n"
+    "You can try selecting a different provider or changing the URL:");
+inline const char SELECT_PROVIDER[] = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Select Provider");
+inline const char SELECT_URL[] = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Select URL");
+inline const char CLOSE[] = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Close");
+inline const char MODEL_SELECTION[] = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Model Selection");
+inline const char MODEL_LISTING_NOT_SUPPORTED_INFO[] = QT_TRANSLATE_NOOP(
+    "QtC::QodeAssist",
+    "Select from previously used models or enter a new model name.\n\n"
+    "If entering a new model name:\n"
+    "• For providers with automatic listing - ensure the model is installed\n"
+    "• For providers without listing support - check provider's documentation\n"
+    "• Make sure the model name matches exactly");
+inline const char MODEL_NAME[] = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Model name:");
+inline const char OK[] = QT_TRANSLATE_NOOP("QtC::QodeAssist", "OK");
+inline const char CANCEL[] = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Cancel");
+inline const char ENTER_MODEL_MANUALLY[]
+    = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Enter Model Manually");
+inline const char URL_SELECTION[] = QT_TRANSLATE_NOOP("QtC::QodeAssist", "URL Selection");
+inline const char URL_SELECTION_INFO[] = QT_TRANSLATE_NOOP(
+    "QtC::QodeAssist",
+    "Select from the list of default and previously used URLs, or enter a custom one.\n"
+    "Please ensure the selected URL is accessible and the service is running.");
+inline const char PREDEFINED_URL[]
+    = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Use default provider URL or from history");
+inline const char CUSTOM_URL[] = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Enter custom URL");
+inline const char ENTER_MODEL_MANUALLY_BUTTON[]
+    = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Enter Model Name Manually");
+
+} // namespace TrConstants
+
+struct Tr
+{
+    Q_DECLARE_TR_FUNCTIONS(QtC::QodeAssist)
+};
+
+} // namespace QodeAssist::Settings

settings/SettingsUtils.hpp

@@ -19,37 +19,63 @@
 
 #pragma once
 
+#include <QCoreApplication>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
 #include <QPushButton>
+#include <QtCore/qtimer.h>
 #include <utils/aspects.h>
 #include <utils/layoutbuilder.h>
 
 namespace QodeAssist::Settings {
 
+inline bool pingUrl(const QUrl &url, int timeout = 5000)
+{
+    if (!url.isValid()) {
+        return false;
+    }
+
+    QNetworkAccessManager manager;
+    QNetworkRequest request(url);
+    request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, true);
+
+    QScopedPointer<QNetworkReply> reply(manager.get(request));
+
+    QTimer timer;
+    timer.setSingleShot(true);
+
+    QEventLoop loop;
+    QObject::connect(reply.data(), &QNetworkReply::finished, &loop, &QEventLoop::quit);
+    QObject::connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
+
+    timer.start(timeout);
+    loop.exec();
+
+    if (timer.isActive()) {
+        timer.stop();
+        return (reply->error() == QNetworkReply::NoError);
+    } else {
+        QObject::disconnect(reply.data(), &QNetworkReply::finished, &loop, &QEventLoop::quit);
+        reply->abort();
+        return false;
+    }
+}
+
 template<typename AspectType>
 void resetAspect(AspectType &aspect)
 {
     aspect.setVolatileValue(aspect.defaultValue());
 }
 
-class ButtonAspect : public Utils::BaseAspect
+inline void initStringAspect(Utils::StringAspect &aspect,
+                             const Utils::Key &settingsKey,
+                             const QString &labelText,
+                             const QString &defaultValue)
 {
-    Q_OBJECT
-
-public:
-    ButtonAspect(Utils::AspectContainer *container = nullptr)
-        : Utils::BaseAspect(container)
-    {}
-
-    void addToLayout(Layouting::Layout &parent) override
-    {
-        auto button = new QPushButton(m_buttonText);
-        connect(button, &QPushButton::clicked, this, &ButtonAspect::clicked);
-        parent.addItem(button);
-    }
-
-    QString m_buttonText;
-signals:
-    void clicked();
-};
+    aspect.setSettingsKey(settingsKey);
+    aspect.setLabelText(labelText);
+    aspect.setDisplayStyle(Utils::StringAspect::LineEditDisplay);
+    aspect.setDefaultValue(defaultValue);
+}
 
 } // namespace QodeAssist::Settings

templates/BasicChat.hpp

@@ -0,0 +1,49 @@
+/* 
+ * 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 <QJsonArray>
+
+#include "llmcore/PromptTemplate.hpp"
+
+namespace QodeAssist::Templates {
+
+class BasicChat : public LLMCore::PromptTemplate
+{
+public:
+    LLMCore::TemplateType type() const override { return LLMCore::TemplateType::Chat; }
+    QString name() const override { return "Basic Chat"; }
+    QString promptTemplate() const override { return {}; }
+    QStringList stopWords() const override { return QStringList(); }
+
+    void prepareRequest(QJsonObject &request, const LLMCore::ContextData &context) const override
+    {
+        QJsonArray messages = request["messages"].toArray();
+
+        QJsonObject newMessage;
+        newMessage["role"] = "user";
+        newMessage["content"] = context.prefix;
+        messages.append(newMessage);
+
+        request["messages"] = messages;
+    }
+};
+
+} // namespace QodeAssist::Templates

templates/CodeLlamaChat.hpp

@@ -19,20 +19,21 @@
 
 #pragma once
 
-#include <QtCore/qjsonarray.h>
-#include "PromptTemplate.hpp"
+#include <QJsonArray>
+
+#include "llmcore/PromptTemplate.hpp"
 
 namespace QodeAssist::Templates {
 
-class CodeLlamaInstructTemplate : public PromptTemplate
+class CodeLlamaChat : public LLMCore::PromptTemplate
 {
 public:
-    TemplateType type() const override { return TemplateType::Chat; }
-    QString name() const override { return "CodeLLama Chat"; }
+    LLMCore::TemplateType type() const override { return LLMCore::TemplateType::Chat; }
+    QString name() const override { return "CodeLlama Chat"; }
     QString promptTemplate() const override { return "[INST] %1 [/INST]"; }
     QStringList stopWords() const override { return QStringList() << "[INST]" << "[/INST]"; }
 
-    void prepareRequest(QJsonObject &request, const ContextData &context) const override
+    void prepareRequest(QJsonObject &request, const LLMCore::ContextData &context) const override
     {
         QString formattedPrompt = promptTemplate().arg(context.prefix);
         QJsonArray messages = request["messages"].toArray();
@@ -46,4 +47,10 @@ public:
     }
 };
 
+class LlamaChat : public CodeLlamaChat
+{
+public:
+    QString name() const override { return "Llama Chat"; }
+};
+
 } // namespace QodeAssist::Templates

templates/CodeLlamaFim.hpp

@@ -19,26 +19,24 @@
 
 #pragma once
 
-#include "PromptTemplate.hpp"
+#include "llmcore/PromptTemplate.hpp"
 
 namespace QodeAssist::Templates {
 
-class CodeLlamaFimTemplate : public PromptTemplate
+class CodeLlamaFim : public LLMCore::PromptTemplate
 {
 public:
-    TemplateType type() const override { return TemplateType::Fim; }
-    QString name() const override { return "CodeLLama FIM"; }
-    QString promptTemplate() const override { return "%1<PRE> %2 <SUF>%3 <MID>"; }
+    LLMCore::TemplateType type() const override { return LLMCore::TemplateType::Fim; }
+    QString name() const override { return "CodeLlama FIM"; }
+    QString promptTemplate() const override { return "<PRE> %1 <SUF>%2 <MID>"; }
     QStringList stopWords() const override
     {
         return QStringList() << "<EOT>" << "<PRE>" << "<SUF" << "<MID>";
     }
 
-    void prepareRequest(QJsonObject &request, const ContextData &context) const override
+    void prepareRequest(QJsonObject &request, const LLMCore::ContextData &context) const override
     {
-        QString formattedPrompt = promptTemplate().arg(context.instriuctions,
-                                                       context.prefix,
-                                                       context.suffix);
+        QString formattedPrompt = promptTemplate().arg(context.prefix, context.suffix);
         request["prompt"] = formattedPrompt;
     }
 };

templates/CustomFimTemplate.hpp

@@ -19,20 +19,20 @@
 
 #pragma once
 
-#include "PromptTemplate.hpp"
+#include "llmcore/PromptTemplate.hpp"
 
 #include <QJsonArray>
 #include <QJsonDocument>
 
-#include "QodeAssistUtils.hpp"
+#include "logger/Logger.hpp"
 #include "settings/CustomPromptSettings.hpp"
 
 namespace QodeAssist::Templates {
 
-class CustomTemplate : public PromptTemplate
+class CustomTemplate : public LLMCore::PromptTemplate
 {
 public:
-    TemplateType type() const override { return TemplateType::Fim; }
+    LLMCore::TemplateType type() const override { return LLMCore::TemplateType::Fim; }
     QString name() const override { return "Custom FIM Template"; }
     QString promptTemplate() const override
     {
@@ -40,11 +40,11 @@ public:
     }
     QStringList stopWords() const override { return QStringList(); }
 
-    void prepareRequest(QJsonObject &request, const ContextData &context) const override
+    void prepareRequest(QJsonObject &request, const LLMCore::ContextData &context) const override
     {
         QJsonDocument doc = QJsonDocument::fromJson(promptTemplate().toUtf8());
         if (doc.isNull() || !doc.isObject()) {
-            logMessage(QString("Invalid JSON template in settings"));
+            LOG_MESSAGE(QString("Invalid JSON template in settings"));
 
             return;
         }
@@ -58,11 +58,10 @@ public:
     }
 
 private:
-    QJsonValue processJsonValue(const QJsonValue &value, const ContextData &context) const
+    QJsonValue processJsonValue(const QJsonValue &value, const LLMCore::ContextData &context) const
     {
         if (value.isString()) {
             QString str = value.toString();
-            str.replace("{{QODE_INSTRUCTIONS}}", context.instriuctions);
             str.replace("{{QODE_PREFIX}}", context.prefix);
             str.replace("{{QODE_SUFFIX}}", context.suffix);
             return str;
@@ -78,7 +77,8 @@ private:
         return value;
     }
 
-    QJsonObject processJsonTemplate(const QJsonObject &templateObj, const ContextData &context) const
+    QJsonObject processJsonTemplate(const QJsonObject &templateObj,
+                                    const LLMCore::ContextData &context) const
     {
         QJsonObject result;
         for (auto it = templateObj.begin(); it != templateObj.end(); ++it) {

templates/DeepSeekCoderChat.hpp

@@ -20,15 +20,15 @@
 #pragma once
 
 #include <QJsonArray>
-#include "PromptTemplate.hpp"
+#include "llmcore/PromptTemplate.hpp"
 
 namespace QodeAssist::Templates {
 
-class DeepSeekCoderChatTemplate : public PromptTemplate
+class DeepSeekCoderChat : public LLMCore::PromptTemplate
 {
 public:
-    QString name() const override { return "DeepSeek Coder Chat"; }
-    TemplateType type() const override { return TemplateType::Chat; }
+    QString name() const override { return "DeepSeekCoder Chat"; }
+    LLMCore::TemplateType type() const override { return LLMCore::TemplateType::Chat; }
 
     QString promptTemplate() const override { return "### Instruction:\n%1\n### Response:\n"; }
 
@@ -37,7 +37,7 @@ public:
         return QStringList() << "### Instruction:" << "### Response:" << "\n\n### " << "<|EOT|>";
     }
 
-    void prepareRequest(QJsonObject &request, const ContextData &context) const override
+    void prepareRequest(QJsonObject &request, const LLMCore::ContextData &context) const override
     {
         QString formattedPrompt = promptTemplate().arg(context.prefix);
         QJsonArray messages = request["messages"].toArray();

templates/DeepSeekCoderFim.hpp

@@ -19,25 +19,23 @@
 
 #pragma once
 
-#include "PromptTemplate.hpp"
+#include "llmcore/PromptTemplate.hpp"
 
 namespace QodeAssist::Templates {
 
-class DeepSeekCoderV2Template : public PromptTemplate
+class DeepSeekCoderFim : public LLMCore::PromptTemplate
 {
 public:
-    TemplateType type() const override { return TemplateType::Fim; }
+    LLMCore::TemplateType type() const override { return LLMCore::TemplateType::Fim; }
     QString name() const override { return "DeepSeekCoder FIM"; }
     QString promptTemplate() const override
     {
-        return "%1<｜fim▁begin｜>%2<｜fim▁hole｜>%3<｜fim▁end｜>";
+        return "<｜fim▁begin｜>%1<｜fim▁hole｜>%2<｜fim▁end｜>";
     }
     QStringList stopWords() const override { return QStringList(); }
-    void prepareRequest(QJsonObject &request, const ContextData &context) const override
+    void prepareRequest(QJsonObject &request, const LLMCore::ContextData &context) const override
     {
-        QString formattedPrompt = promptTemplate().arg(context.instriuctions,
-                                                       context.prefix,
-                                                       context.suffix);
+        QString formattedPrompt = promptTemplate().arg(context.prefix, context.suffix);
         request["prompt"] = formattedPrompt;
     }
 };

templates/Ollama.hpp

@@ -0,0 +1,64 @@
+/* 
+ * 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 <QJsonArray>
+
+#include "llmcore/PromptTemplate.hpp"
+
+namespace QodeAssist::Templates {
+
+class OllamaAutoFim : public LLMCore::PromptTemplate
+{
+public:
+    LLMCore::TemplateType type() const override { return LLMCore::TemplateType::Fim; }
+    QString name() const override { return "Ollama Auto FIM"; }
+    QString promptTemplate() const override { return {}; }
+    QStringList stopWords() const override { return QStringList(); }
+
+    void prepareRequest(QJsonObject &request, const LLMCore::ContextData &context) const override
+    {
+        request["prompt"] = context.prefix;
+        request["suffix"] = context.suffix;
+    }
+};
+
+class OllamaAutoChat : public LLMCore::PromptTemplate
+{
+public:
+    LLMCore::TemplateType type() const override { return LLMCore::TemplateType::Chat; }
+    QString name() const override { return "Ollama Auto Chat"; }
+    QString promptTemplate() const override { return {}; }
+    QStringList stopWords() const override { return QStringList(); }
+
+    void prepareRequest(QJsonObject &request, const LLMCore::ContextData &context) const override
+    {
+        QJsonArray messages = request["messages"].toArray();
+
+        QJsonObject newMessage;
+        newMessage["role"] = "user";
+        newMessage["content"] = context.prefix;
+        messages.append(newMessage);
+
+        request["messages"] = messages;
+    }
+};
+
+} // namespace QodeAssist::Templates

templates/Qwen.hpp

@@ -0,0 +1,71 @@
+/* 
+ * 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 <QJsonArray>
+#include "llmcore/PromptTemplate.hpp"
+
+namespace QodeAssist::Templates {
+
+class QwenChat : public LLMCore::PromptTemplate
+{
+public:
+    QString name() const override { return "Qwen Chat"; }
+    LLMCore::TemplateType type() const override { return LLMCore::TemplateType::Chat; }
+
+    QString promptTemplate() const override { return "### Instruction:\n%1\n### Response:\n"; }
+
+    QStringList stopWords() const override
+    {
+        return QStringList() << "### Instruction:" << "### Response:" << "\n\n### " << "<|EOT|>";
+    }
+
+    void prepareRequest(QJsonObject &request, const LLMCore::ContextData &context) const override
+    {
+        QString formattedPrompt = promptTemplate().arg(context.prefix);
+        QJsonArray messages = request["messages"].toArray();
+
+        QJsonObject newMessage;
+        newMessage["role"] = "user";
+        newMessage["content"] = formattedPrompt;
+        messages.append(newMessage);
+
+        request["messages"] = messages;
+    }
+};
+
+class QwenFim : public LLMCore::PromptTemplate
+{
+public:
+    QString name() const override { return "Qwen FIM"; }
+    LLMCore::TemplateType type() const override { return LLMCore::TemplateType::Fim; }
+    QString promptTemplate() const override
+    {
+        return "<|fim_prefix|>%1<|fim_suffix|>%2<|fim_middle|>";
+    }
+    QStringList stopWords() const override { return QStringList() << "<|endoftext|>" << "<|EOT|>"; }
+    void prepareRequest(QJsonObject &request, const LLMCore::ContextData &context) const override
+    {
+        QString formattedPrompt = promptTemplate().arg(context.prefix, context.suffix);
+        request["prompt"] = formattedPrompt;
+    }
+};
+
+} // namespace QodeAssist::Templates

templates/StarCoder2Fim.hpp

@@ -19,26 +19,24 @@
 
 #pragma once
 
-#include "PromptTemplate.hpp"
+#include "llmcore/PromptTemplate.hpp"
 
 namespace QodeAssist::Templates {
 
-class StarCoder2Template : public PromptTemplate
+class StarCoder2Fim : public LLMCore::PromptTemplate
 {
 public:
-    TemplateType type() const override { return TemplateType::Fim; }
+    LLMCore::TemplateType type() const override { return LLMCore::TemplateType::Fim; }
     QString name() const override { return "StarCoder2 FIM"; }
-    QString promptTemplate() const override { return "%1<fim_prefix>%2<fim_suffix>%3<fim_middle>"; }
+    QString promptTemplate() const override { return "<fim_prefix>%1<fim_suffix>%2<fim_middle>"; }
     QStringList stopWords() const override
     {
         return QStringList() << "<|endoftext|>" << "<file_sep>" << "<fim_prefix>" << "<fim_suffix>"
                              << "<fim_middle>";
     }
-    void prepareRequest(QJsonObject &request, const ContextData &context) const override
+    void prepareRequest(QJsonObject &request, const LLMCore::ContextData &context) const override
     {
-        QString formattedPrompt = promptTemplate().arg(context.instriuctions,
-                                                       context.prefix,
-                                                       context.suffix);
+        QString formattedPrompt = promptTemplate().arg(context.prefix, context.suffix);
         request["prompt"] = formattedPrompt;
     }
 };

templates/StarCoderChat.hpp

@@ -0,0 +1,51 @@
+/* 
+ * 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 <QJsonArray>
+#include "llmcore/PromptTemplate.hpp"
+
+namespace QodeAssist::Templates {
+
+class StarCoderChat : public LLMCore::PromptTemplate
+{
+public:
+    QString name() const override { return "StarCoder Chat"; }
+    LLMCore::TemplateType type() const override { return LLMCore::TemplateType::Chat; }
+    QString promptTemplate() const override { return "### Instruction:\n%1\n### Response:\n"; }
+    QStringList stopWords() const override
+    {
+        return QStringList() << "###"
+                             << "<|endoftext|>" << "<file_sep>";
+    }
+    void prepareRequest(QJsonObject &request, const LLMCore::ContextData &context) const override
+    {
+        QString formattedPrompt = promptTemplate().arg(context.prefix);
+        QJsonArray messages = request["messages"].toArray();
+
+        QJsonObject newMessage;
+        newMessage["role"] = "user";
+        newMessage["content"] = formattedPrompt;
+        messages.append(newMessage);
+
+        request["messages"] = messages;
+    }
+};
+} // namespace QodeAssist::Templates