Upgrade to version 0.3.0

new QML Chat
Qwen chat model

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

@@ -0,0 +1,33 @@
+/* 
+ * 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 <QString>
+
+namespace QodeAssist::LLMCore {
+
+struct ContextData
+{
+    QString prefix;
+    QString suffix;
+    QString systemPrompt;
+};
+
+} // namespace QodeAssist::LLMCore

llmcore/PromptTemplate.hpp

@@ -0,0 +1,42 @@
+/* 
+ * 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 <QJsonObject>
+#include <QList>
+#include <QString>
+
+#include "ContextData.hpp"
+
+namespace QodeAssist::LLMCore {
+
+enum class TemplateType { Chat, Fim };
+
+class PromptTemplate
+{
+public:
+    virtual ~PromptTemplate() = default;
+    virtual TemplateType type() const = 0;
+    virtual QString name() const = 0;
+    virtual QString promptTemplate() const = 0;
+    virtual QStringList stopWords() const = 0;
+    virtual void prepareRequest(QJsonObject &request, const ContextData &context) const = 0;
+};
+} // namespace QodeAssist::LLMCore

llmcore/PromptTemplateManager.cpp

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

llmcore/PromptTemplateManager.hpp

@@ -0,0 +1,69 @@
+/* 
+ * 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 <QMap>
+#include <QString>
+
+#include "PromptTemplate.hpp"
+
+namespace QodeAssist::LLMCore {
+
+class PromptTemplateManager
+{
+public:
+    static PromptTemplateManager &instance();
+    ~PromptTemplateManager();
+
+    template<typename T>
+    void registerTemplate()
+    {
+        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() == TemplateType::Fim) {
+            m_fimTemplates[name] = template_ptr;
+        } else if (template_ptr->type() == TemplateType::Chat) {
+            m_chatTemplates[name] = template_ptr;
+        }
+    }
+
+    void setCurrentFimTemplate(const QString &name);
+    PromptTemplate *getCurrentFimTemplate();
+
+    void setCurrentChatTemplate(const QString &name);
+    PromptTemplate *getCurrentChatTemplate();
+
+    QStringList fimTemplatesNames() const;
+    QStringList chatTemplatesNames() const;
+
+private:
+    PromptTemplateManager() = default;
+    PromptTemplateManager(const PromptTemplateManager &) = delete;
+    PromptTemplateManager &operator=(const PromptTemplateManager &) = delete;
+
+    QMap<QString, PromptTemplate *> m_fimTemplates;
+    QMap<QString, PromptTemplate *> m_chatTemplates;
+    PromptTemplate *m_currentFimTemplate;
+    PromptTemplate *m_currentChatTemplate;
+};
+
+} // namespace QodeAssist::LLMCore

llmcore/Provider.hpp

@@ -0,0 +1,46 @@
+/* 
+ * 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 <QString>
+#include "RequestType.hpp"
+#include <utils/environment.h>
+
+class QNetworkReply;
+class QJsonObject;
+
+namespace QodeAssist::LLMCore {
+
+class Provider
+{
+public:
+    virtual ~Provider() = default;
+
+    virtual QString name() const = 0;
+    virtual QString url() const = 0;
+    virtual QString completionEndpoint() const = 0;
+    virtual QString chatEndpoint() const = 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;
+};
+
+} // namespace QodeAssist::LLMCore

llmcore/ProvidersManager.cpp

@@ -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/>.
+ */
+
+#include "ProvidersManager.hpp"
+#include "Logger.hpp"
+#include <coreplugin/messagemanager.h>
+
+namespace QodeAssist::LLMCore {
+
+ProvidersManager &ProvidersManager::instance()
+{
+    static ProvidersManager instance;
+    return instance;
+}
+
+Provider *ProvidersManager::setCurrentFimProvider(const QString &name)
+{
+    LOG_MESSAGE("Setting current FIM provider to: " + name);
+    if (!m_providers.contains(name)) {
+        LOG_MESSAGE("Can't find provider with name: " + name);
+        return nullptr;
+    }
+
+    m_currentFimProvider = m_providers[name];
+    return m_currentFimProvider;
+}
+
+Provider *ProvidersManager::setCurrentChatProvider(const QString &name)
+{
+    LOG_MESSAGE("Setting current chat provider to: " + name);
+    if (!m_providers.contains(name)) {
+        LOG_MESSAGE("Can't find chat provider with name: " + name);
+        return nullptr;
+    }
+
+    m_currentChatProvider = m_providers[name];
+    return m_currentChatProvider;
+}
+
+Provider *ProvidersManager::getCurrentFimProvider()
+{
+    if (m_currentFimProvider == nullptr) {
+        LOG_MESSAGE("Current fim provider is null");
+        return nullptr;
+    }
+
+    return m_currentFimProvider;
+}
+
+Provider *ProvidersManager::getCurrentChatProvider()
+{
+    if (m_currentChatProvider == nullptr) {
+        LOG_MESSAGE("Current chat provider is null");
+        return nullptr;
+    }
+
+    return m_currentChatProvider;
+}
+
+QStringList ProvidersManager::providersNames() const
+{
+    return m_providers.keys();
+}
+
+ProvidersManager::~ProvidersManager()
+{
+    qDeleteAll(m_providers);
+}
+
+} // namespace QodeAssist::LLMCore

llmcore/ProvidersManager.hpp

@@ -0,0 +1,61 @@
+/* 
+ * 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 <QString>
+
+#include "Provider.hpp"
+
+namespace QodeAssist::LLMCore {
+
+class ProvidersManager
+{
+public:
+    static ProvidersManager &instance();
+    ~ProvidersManager();
+
+    template<typename T>
+    void registerProvider()
+    {
+        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;
+    }
+
+    Provider *setCurrentFimProvider(const QString &name);
+    Provider *setCurrentChatProvider(const QString &name);
+
+    Provider *getCurrentFimProvider();
+    Provider *getCurrentChatProvider();
+
+    QStringList providersNames() const;
+
+private:
+    ProvidersManager() = default;
+    ProvidersManager(const ProvidersManager &) = delete;
+    ProvidersManager &operator=(const ProvidersManager &) = delete;
+
+    QMap<QString, Provider *> m_providers;
+    Provider *m_currentFimProvider = nullptr;
+    Provider *m_currentChatProvider = nullptr;
+};
+
+} // namespace QodeAssist::LLMCore

llmcore/RequestConfig.hpp

@@ -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 <QJsonObject>
+#include <QUrl>
+#include "PromptTemplate.hpp"
+#include "Provider.hpp"
+#include "RequestType.hpp"
+
+namespace QodeAssist::LLMCore {
+
+struct LLMConfig
+{
+    QUrl url;
+    Provider *provider;
+    PromptTemplate *promptTemplate;
+    QJsonObject providerRequest;
+    RequestType requestType;
+    bool multiLineCompletion;
+};
+
+} // namespace QodeAssist::LLMCore

llmcore/RequestHandler.cpp

@@ -0,0 +1,157 @@
+/* 
+ * 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 "RequestHandler.hpp"
+#include "Logger.hpp"
+
+#include <QJsonDocument>
+#include <QNetworkReply>
+
+namespace QodeAssist::LLMCore {
+
+RequestHandler::RequestHandler(QObject *parent)
+    : QObject(parent)
+    , m_manager(new QNetworkAccessManager(this))
+{}
+
+void RequestHandler::sendLLMRequest(const LLMConfig &config, const QJsonObject &request)
+{
+    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))));
+
+    QNetworkRequest networkRequest(config.url);
+    prepareNetworkRequest(networkRequest, config.providerRequest);
+
+    QNetworkReply *reply = m_manager->post(networkRequest,
+                                           QJsonDocument(config.providerRequest).toJson());
+    if (!reply) {
+        LOG_MESSAGE("Error: Failed to create network reply");
+        return;
+    }
+
+    QString requestId = request["id"].toString();
+    m_activeRequests[requestId] = reply;
+
+    connect(reply, &QNetworkReply::readyRead, this, [this, reply, request, config]() {
+        handleLLMResponse(reply, request, config);
+    });
+
+    connect(reply, &QNetworkReply::finished, this, [this, reply, requestId]() {
+        reply->deleteLater();
+        m_activeRequests.remove(requestId);
+        if (reply->error() != QNetworkReply::NoError) {
+            LOG_MESSAGE(QString("Error in QodeAssist request: %1").arg(reply->errorString()));
+            emit requestFinished(requestId, false, reply->errorString());
+        } else {
+            LOG_MESSAGE("Request finished successfully");
+            emit requestFinished(requestId, true, QString());
+        }
+    });
+}
+
+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 (!config.multiLineCompletion
+            && processSingleLineCompletion(reply, request, accumulatedResponse, config)) {
+            return;
+        }
+    }
+
+    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);
+        }
+        m_accumulatedResponses.remove(reply);
+    }
+}
+
+bool RequestHandler::cancelRequest(const QString &id)
+{
+    if (m_activeRequests.contains(id)) {
+        QNetworkReply *reply = m_activeRequests[id];
+        reply->abort();
+        m_activeRequests.remove(id);
+        m_accumulatedResponses.remove(reply);
+        emit requestCancelled(id);
+        return true;
+    }
+    return false;
+}
+
+void RequestHandler::prepareNetworkRequest(QNetworkRequest &networkRequest,
+                                           const QJsonObject &providerRequest)
+{
+    networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+
+    if (providerRequest.contains("api_key")) {
+        QString apiKey = providerRequest["api_key"].toString();
+        networkRequest.setRawHeader("Authorization", QString("Bearer %1").arg(apiKey).toUtf8());
+    }
+}
+
+bool RequestHandler::processSingleLineCompletion(QNetworkReply *reply,
+                                                 const QJsonObject &request,
+                                                 const QString &accumulatedResponse,
+                                                 const LLMConfig &config)
+{
+    int newlinePos = accumulatedResponse.indexOf('\n');
+
+    if (newlinePos != -1) {
+        QString singleLineCompletion = accumulatedResponse.left(newlinePos).trimmed();
+        singleLineCompletion = removeStopWords(singleLineCompletion,
+                                               config.promptTemplate->stopWords());
+
+        emit completionReceived(singleLineCompletion, request, true);
+        m_accumulatedResponses.remove(reply);
+        reply->abort();
+
+        return true;
+    }
+    return false;
+}
+
+QString RequestHandler::removeStopWords(const QStringView &completion, const QStringList &stopWords)
+{
+    QString filteredCompletion = completion.toString();
+
+    for (const QString &stopWord : stopWords) {
+        filteredCompletion = filteredCompletion.replace(stopWord, "");
+    }
+
+    return filteredCompletion;
+}
+
+} // namespace QodeAssist::LLMCore

llmcore/RequestHandler.hpp

@@ -0,0 +1,63 @@
+/* 
+ * 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 <QJsonObject>
+#include <QNetworkAccessManager>
+#include <QObject>
+
+#include "RequestConfig.hpp"
+
+class QNetworkReply;
+
+namespace QodeAssist::LLMCore {
+
+class RequestHandler : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit RequestHandler(QObject *parent = nullptr);
+
+    void sendLLMRequest(const LLMConfig &config, const QJsonObject &request);
+    void handleLLMResponse(QNetworkReply *reply,
+                           const QJsonObject &request,
+                           const LLMConfig &config);
+    bool cancelRequest(const QString &id);
+
+signals:
+    void completionReceived(const QString &completion, const QJsonObject &request, bool isComplete);
+    void requestFinished(const QString &requestId, bool success, const QString &errorString);
+    void requestCancelled(const QString &id);
+
+private:
+    QNetworkAccessManager *m_manager;
+    QMap<QString, QNetworkReply *> m_activeRequests;
+    QMap<QNetworkReply *, QString> m_accumulatedResponses;
+
+    void prepareNetworkRequest(QNetworkRequest &networkRequest, const QJsonObject &providerRequest);
+    bool processSingleLineCompletion(QNetworkReply *reply,
+                                     const QJsonObject &request,
+                                     const QString &accumulatedResponse,
+                                     const LLMConfig &config);
+    QString removeStopWords(const QStringView &completion, const QStringList &stopWords);
+};
+
+} // namespace QodeAssist::LLMCore

llmcore/RequestType.hpp

@@ -0,0 +1,6 @@
+#pragma once
+
+namespace QodeAssist::LLMCore {
+
+enum RequestType { Fim, Chat };
+}