✨ feat: Add using instruct model in code completion

* ✨ feat: Add MessageBuilder for code completion
* ✨ feat: Add move text from request to comments
* ✨ feat: Add settings for process text of instruct model
* 🐛 fix: Add stop to ollama request validator
* 🐛 fix: Template double delete

llmcore/CMakeLists.txt

@@ -10,6 +10,7 @@ add_library(LLMCore STATIC
     OllamaMessage.hpp OllamaMessage.cpp
     OpenAIMessage.hpp OpenAIMessage.cpp
     ValidationUtils.hpp ValidationUtils.cpp
+    MessageBuilder.hpp MessageBuilder.cpp
 )
 
 target_link_libraries(LLMCore

llmcore/MessageBuilder.cpp

@@ -0,0 +1,3 @@
+#include "MessageBuilder.hpp"
+
+namespace QodeAssist::LLMCore {} // namespace QodeAssist::LLMCore

llmcore/MessageBuilder.hpp

@@ -0,0 +1,127 @@
+/* 
+ * 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 <QJsonObject>
+#include <QString>
+#include <QVector>
+
+#include "PromptTemplate.hpp"
+
+namespace QodeAssist::LLMCore {
+
+enum class MessageRole { System, User, Assistant };
+
+enum class OllamaFormat { Messages, Completions };
+
+enum class ProvidersApi { Ollama, OpenAI };
+
+static const QString ROLE_SYSTEM = "system";
+static const QString ROLE_USER = "user";
+static const QString ROLE_ASSISTANT = "assistant";
+
+struct Message
+{
+    MessageRole role;
+    QString content;
+};
+
+class MessageBuilder
+{
+public:
+    MessageBuilder &addSystemMessage(const QString &content)
+    {
+        m_systemMessage = content;
+        return *this;
+    }
+
+    MessageBuilder &addUserMessage(const QString &content)
+    {
+        m_messages.append({MessageRole::User, content});
+        return *this;
+    }
+
+    MessageBuilder &addSuffix(const QString &content)
+    {
+        m_suffix = content;
+        return *this;
+    }
+
+    MessageBuilder &addtTokenizer(PromptTemplate *promptTemplate)
+    {
+        m_promptTemplate = promptTemplate;
+        return *this;
+    }
+
+    QString roleToString(MessageRole role) const
+    {
+        switch (role) {
+        case MessageRole::System:
+            return ROLE_SYSTEM;
+        case MessageRole::User:
+            return ROLE_USER;
+        case MessageRole::Assistant:
+            return ROLE_ASSISTANT;
+        default:
+            return ROLE_USER;
+        }
+    }
+
+    void saveTo(QJsonObject &request, ProvidersApi api)
+    {
+        if (!m_promptTemplate) {
+            return;
+        }
+
+        if (api == ProvidersApi::Ollama) {
+            ContextData context{
+                m_messages.isEmpty() ? QString() : m_messages.last().content,
+                m_suffix,
+                m_systemMessage};
+
+            if (m_promptTemplate->type() == TemplateType::Fim) {
+                m_promptTemplate->prepareRequest(request, context);
+            } else {
+                QJsonArray messages;
+
+                messages.append(QJsonObject{{"role", "system"}, {"content", m_systemMessage}});
+                messages.append(
+                    QJsonObject{{"role", "user"}, {"content", m_messages.last().content}});
+                request["messages"] = messages;
+                m_promptTemplate->prepareRequest(request, {});
+            }
+        } else if (api == ProvidersApi::OpenAI) {
+            QJsonArray messages;
+
+            messages.append(QJsonObject{{"role", "system"}, {"content", m_systemMessage}});
+            messages.append(QJsonObject{{"role", "user"}, {"content", m_messages.last().content}});
+            request["messages"] = messages;
+            m_promptTemplate->prepareRequest(request, {});
+        }
+    }
+
+private:
+    QString m_systemMessage;
+    QString m_suffix;
+    QVector<Message> m_messages;
+    PromptTemplate *m_promptTemplate;
+};
+} // namespace QodeAssist::LLMCore

llmcore/PromptTemplateManager.cpp

@@ -40,7 +40,6 @@ QStringList PromptTemplateManager::chatTemplatesNames() const
 PromptTemplateManager::~PromptTemplateManager()
 {
     qDeleteAll(m_fimTemplates);
-    qDeleteAll(m_chatTemplates);
 }
 
 PromptTemplate *PromptTemplateManager::getFimTemplateByName(const QString &templateName)

llmcore/PromptTemplateManager.hpp

@@ -39,9 +39,8 @@ public:
                       "T must inherit from PromptTemplate");
         T *template_ptr = new T();
         QString name = template_ptr->name();
-        if (template_ptr->type() == TemplateType::Fim) {
-            m_fimTemplates[name] = template_ptr;
-        } else if (template_ptr->type() == TemplateType::Chat) {
+        m_fimTemplates[name] = template_ptr;
+        if (template_ptr->type() == TemplateType::Chat) {
             m_chatTemplates[name] = template_ptr;
         }
     }

llmcore/RequestHandler.cpp

@@ -75,7 +75,7 @@ void RequestHandler::handleLLMResponse(QNetworkReply *reply,
 
     bool isComplete = config.provider->handleResponse(reply, accumulatedResponse);
 
-    if (config.requestType == RequestType::Fim) {
+    if (config.requestType == RequestType::CodeCompletion) {
         if (!config.multiLineCompletion
             && processSingleLineCompletion(reply, request, accumulatedResponse, config)) {
             return;
@@ -84,7 +84,6 @@ void RequestHandler::handleLLMResponse(QNetworkReply *reply,
         if (isComplete) {
             auto cleanedCompletion = removeStopWords(accumulatedResponse,
                                                      config.promptTemplate->stopWords());
-            removeCodeBlockWrappers(cleanedCompletion);
 
             emit completionReceived(cleanedCompletion, request, true);
         }
@@ -126,7 +125,6 @@ bool RequestHandler::processSingleLineCompletion(
     const LLMConfig &config)
 {
     QString cleanedResponse = accumulatedResponse;
-    removeCodeBlockWrappers(cleanedResponse);
 
     int newlinePos = cleanedResponse.indexOf('\n');
     if (newlinePos != -1) {

llmcore/RequestType.hpp

@@ -21,5 +21,5 @@
 
 namespace QodeAssist::LLMCore {
 
-enum RequestType { Fim, Chat };
+enum RequestType { CodeCompletion, Chat };
 }