mirror of
https://github.com/Palm1r/QodeAssist.git
synced 2025-05-28 03:10:28 -04:00
refactor: Decouple LLMClientInterface from ProvidersManager (#120)
This will be needed for tests.
This commit is contained in:
parent
98e1047bf1
commit
58c3e26e7f
@ -41,10 +41,12 @@ namespace QodeAssist {
|
|||||||
LLMClientInterface::LLMClientInterface(
|
LLMClientInterface::LLMClientInterface(
|
||||||
const Settings::GeneralSettings &generalSettings,
|
const Settings::GeneralSettings &generalSettings,
|
||||||
const Settings::CodeCompletionSettings &completeSettings,
|
const Settings::CodeCompletionSettings &completeSettings,
|
||||||
|
LLMCore::IProviderRegistry &providerRegistry,
|
||||||
LLMCore::IPromptProvider *promptProvider)
|
LLMCore::IPromptProvider *promptProvider)
|
||||||
: m_requestHandler(this)
|
: m_requestHandler(this)
|
||||||
, m_generalSettings(generalSettings)
|
, m_generalSettings(generalSettings)
|
||||||
, m_completeSettings(completeSettings)
|
, m_completeSettings(completeSettings)
|
||||||
|
, m_providerRegistry(providerRegistry)
|
||||||
, m_promptProvider(promptProvider)
|
, m_promptProvider(promptProvider)
|
||||||
{
|
{
|
||||||
connect(
|
connect(
|
||||||
@ -167,7 +169,7 @@ void LLMClientInterface::handleCompletion(const QJsonObject &request)
|
|||||||
const auto url = !isPreset1Active ? m_generalSettings.ccUrl()
|
const auto url = !isPreset1Active ? m_generalSettings.ccUrl()
|
||||||
: m_generalSettings.ccPreset1Url();
|
: m_generalSettings.ccPreset1Url();
|
||||||
|
|
||||||
const auto provider = LLMCore::ProvidersManager::instance().getProviderByName(providerName);
|
const auto provider = m_providerRegistry.getProviderByName(providerName);
|
||||||
|
|
||||||
if (!provider) {
|
if (!provider) {
|
||||||
LOG_MESSAGE(QString("No provider found with name: %1").arg(providerName));
|
LOG_MESSAGE(QString("No provider found with name: %1").arg(providerName));
|
||||||
|
@ -25,6 +25,7 @@
|
|||||||
#include <context/ProgrammingLanguage.hpp>
|
#include <context/ProgrammingLanguage.hpp>
|
||||||
#include <llmcore/ContextData.hpp>
|
#include <llmcore/ContextData.hpp>
|
||||||
#include <llmcore/IPromptProvider.hpp>
|
#include <llmcore/IPromptProvider.hpp>
|
||||||
|
#include <llmcore/IProviderRegistry.hpp>
|
||||||
#include <llmcore/RequestHandler.hpp>
|
#include <llmcore/RequestHandler.hpp>
|
||||||
#include <settings/CodeCompletionSettings.hpp>
|
#include <settings/CodeCompletionSettings.hpp>
|
||||||
#include <settings/GeneralSettings.hpp>
|
#include <settings/GeneralSettings.hpp>
|
||||||
@ -42,6 +43,7 @@ public:
|
|||||||
LLMClientInterface(
|
LLMClientInterface(
|
||||||
const Settings::GeneralSettings &generalSettings,
|
const Settings::GeneralSettings &generalSettings,
|
||||||
const Settings::CodeCompletionSettings &completeSettings,
|
const Settings::CodeCompletionSettings &completeSettings,
|
||||||
|
LLMCore::IProviderRegistry &providerRegistry,
|
||||||
LLMCore::IPromptProvider *promptProvider);
|
LLMCore::IPromptProvider *promptProvider);
|
||||||
|
|
||||||
Utils::FilePath serverDeviceTemplate() const override;
|
Utils::FilePath serverDeviceTemplate() const override;
|
||||||
@ -70,6 +72,7 @@ private:
|
|||||||
const Settings::CodeCompletionSettings &m_completeSettings;
|
const Settings::CodeCompletionSettings &m_completeSettings;
|
||||||
const Settings::GeneralSettings &m_generalSettings;
|
const Settings::GeneralSettings &m_generalSettings;
|
||||||
LLMCore::IPromptProvider *m_promptProvider = nullptr;
|
LLMCore::IPromptProvider *m_promptProvider = nullptr;
|
||||||
|
LLMCore::IProviderRegistry &m_providerRegistry;
|
||||||
LLMCore::RequestHandler m_requestHandler;
|
LLMCore::RequestHandler m_requestHandler;
|
||||||
QElapsedTimer m_completionTimer;
|
QElapsedTimer m_completionTimer;
|
||||||
QMap<QString, qint64> m_requestStartTimes;
|
QMap<QString, qint64> m_requestStartTimes;
|
||||||
|
@ -44,9 +44,13 @@ using namespace Core;
|
|||||||
|
|
||||||
namespace QodeAssist {
|
namespace QodeAssist {
|
||||||
|
|
||||||
QodeAssistClient::QodeAssistClient(LLMCore::IPromptProvider *promptProvider)
|
QodeAssistClient::QodeAssistClient(
|
||||||
|
LLMCore::IProviderRegistry &providerRegistry, LLMCore::IPromptProvider *promptProvider)
|
||||||
: LanguageClient::Client(new LLMClientInterface(
|
: LanguageClient::Client(new LLMClientInterface(
|
||||||
Settings::generalSettings(), Settings::codeCompletionSettings(), promptProvider))
|
Settings::generalSettings(),
|
||||||
|
Settings::codeCompletionSettings(),
|
||||||
|
providerRegistry,
|
||||||
|
promptProvider))
|
||||||
, m_recentCharCount(0)
|
, m_recentCharCount(0)
|
||||||
{
|
{
|
||||||
setName("Qode Assist");
|
setName("Qode Assist");
|
||||||
|
@ -27,13 +27,15 @@
|
|||||||
#include "LSPCompletion.hpp"
|
#include "LSPCompletion.hpp"
|
||||||
#include <languageclient/client.h>
|
#include <languageclient/client.h>
|
||||||
#include <llmcore/IPromptProvider.hpp>
|
#include <llmcore/IPromptProvider.hpp>
|
||||||
|
#include <llmcore/IProviderRegistry.hpp>
|
||||||
|
|
||||||
namespace QodeAssist {
|
namespace QodeAssist {
|
||||||
|
|
||||||
class QodeAssistClient : public LanguageClient::Client
|
class QodeAssistClient : public LanguageClient::Client
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit QodeAssistClient(LLMCore::IPromptProvider *promptProvider);
|
explicit QodeAssistClient(
|
||||||
|
LLMCore::IProviderRegistry &providerRegistry, LLMCore::IPromptProvider *promptProvider);
|
||||||
~QodeAssistClient() override;
|
~QodeAssistClient() override;
|
||||||
|
|
||||||
void openDocument(TextEditor::TextDocument *document) override;
|
void openDocument(TextEditor::TextDocument *document) override;
|
||||||
|
@ -4,6 +4,7 @@ add_library(LLMCore STATIC
|
|||||||
ProvidersManager.hpp ProvidersManager.cpp
|
ProvidersManager.hpp ProvidersManager.cpp
|
||||||
ContextData.hpp
|
ContextData.hpp
|
||||||
IPromptProvider.hpp
|
IPromptProvider.hpp
|
||||||
|
IProviderRegistry.hpp
|
||||||
PromptProviderChat.hpp
|
PromptProviderChat.hpp
|
||||||
PromptProviderFim.hpp
|
PromptProviderFim.hpp
|
||||||
PromptTemplate.hpp
|
PromptTemplate.hpp
|
||||||
|
36
llmcore/IProviderRegistry.hpp
Normal file
36
llmcore/IProviderRegistry.hpp
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2025 Povilas Kanapickas <povilas@radix.lt>
|
||||||
|
*
|
||||||
|
* 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 "Provider.hpp"
|
||||||
|
|
||||||
|
namespace QodeAssist::LLMCore {
|
||||||
|
|
||||||
|
class IProviderRegistry
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
virtual ~IProviderRegistry() = default;
|
||||||
|
|
||||||
|
virtual Provider *getProviderByName(const QString &providerName) = 0;
|
||||||
|
|
||||||
|
virtual QStringList providersNames() const = 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace QodeAssist::LLMCore
|
@ -21,12 +21,12 @@
|
|||||||
|
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
#include "Provider.hpp"
|
#include "IProviderRegistry.hpp"
|
||||||
#include <QMap>
|
#include <QMap>
|
||||||
|
|
||||||
namespace QodeAssist::LLMCore {
|
namespace QodeAssist::LLMCore {
|
||||||
|
|
||||||
class ProvidersManager
|
class ProvidersManager : public IProviderRegistry
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static ProvidersManager &instance();
|
static ProvidersManager &instance();
|
||||||
@ -41,9 +41,9 @@ public:
|
|||||||
m_providers[name] = provider;
|
m_providers[name] = provider;
|
||||||
}
|
}
|
||||||
|
|
||||||
Provider *getProviderByName(const QString &providerName);
|
Provider *getProviderByName(const QString &providerName) override;
|
||||||
|
|
||||||
QStringList providersNames() const;
|
QStringList providersNames() const override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
ProvidersManager() = default;
|
ProvidersManager() = default;
|
||||||
|
@ -47,6 +47,7 @@
|
|||||||
#include "chat/ChatOutputPane.h"
|
#include "chat/ChatOutputPane.h"
|
||||||
#include "chat/NavigationPanel.hpp"
|
#include "chat/NavigationPanel.hpp"
|
||||||
#include "llmcore/PromptProviderFim.hpp"
|
#include "llmcore/PromptProviderFim.hpp"
|
||||||
|
#include "llmcore/ProvidersManager.hpp"
|
||||||
#include "settings/GeneralSettings.hpp"
|
#include "settings/GeneralSettings.hpp"
|
||||||
#include "settings/ProjectSettingsPanel.hpp"
|
#include "settings/ProjectSettingsPanel.hpp"
|
||||||
#include "settings/SettingsConstants.hpp"
|
#include "settings/SettingsConstants.hpp"
|
||||||
@ -137,7 +138,8 @@ public:
|
|||||||
void restartClient()
|
void restartClient()
|
||||||
{
|
{
|
||||||
LanguageClient::LanguageClientManager::shutdownClient(m_qodeAssistClient);
|
LanguageClient::LanguageClientManager::shutdownClient(m_qodeAssistClient);
|
||||||
m_qodeAssistClient = new QodeAssistClient(&m_promptProvider);
|
m_qodeAssistClient
|
||||||
|
= new QodeAssistClient(LLMCore::ProvidersManager::instance(), &m_promptProvider);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool delayedInitialize() final
|
bool delayedInitialize() final
|
||||||
|
Loading…
Reference in New Issue
Block a user