refactor: Inject settings into LLMClientInterface (#114)

p12tic · web-flow · commit 6c323642e477 · 2025-03-08T15:08:15.000+01:00
This reduces reliance on global state and makes it more possible to test
the code.
diff --git a/LLMClientInterface.cpp b/LLMClientInterface.cpp
@@ -45,8 +45,12 @@ QString extractFilePathFromRequest(const QJsonObject &request)
     return QUrl(uri).toLocalFile();
 }
 
-LLMClientInterface::LLMClientInterface()
+LLMClientInterface::LLMClientInterface(
+    const Settings::GeneralSettings &generalSettings,
+    const Settings::CodeCompletionSettings &completeSettings)
     : m_requestHandler(this)
+    , m_generalSettings(generalSettings)
+    , m_completeSettings(completeSettings)
 {
     connect(
         &m_requestHandler,
@@ -158,16 +162,15 @@ void LLMClientInterface::handleExit(const QJsonObject &request)
 void LLMClientInterface::handleCompletion(const QJsonObject &request)
 {
     auto updatedContext = prepareContext(request);
-    auto &completeSettings = Settings::codeCompletionSettings();
-    auto &generalSettings = Settings::generalSettings();
 
-    bool isPreset1Active = Context::ContextManager::isSpecifyCompletion(request, generalSettings);
+    bool isPreset1Active = Context::ContextManager::isSpecifyCompletion(request, m_generalSettings);
 
-    const auto providerName = !isPreset1Active ? generalSettings.ccProvider()
-                                               : generalSettings.ccPreset1Provider();
-    const auto modelName = !isPreset1Active ? generalSettings.ccModel()
-                                            : generalSettings.ccPreset1Model();
-    const auto url = !isPreset1Active ? generalSettings.ccUrl() : generalSettings.ccPreset1Url();
+    const auto providerName = !isPreset1Active ? m_generalSettings.ccProvider()
+                                               : m_generalSettings.ccPreset1Provider();
+    const auto modelName = !isPreset1Active ? m_generalSettings.ccModel()
+                                            : m_generalSettings.ccPreset1Model();
+    const auto url = !isPreset1Active ? m_generalSettings.ccUrl()
+                                      : m_generalSettings.ccPreset1Url();
 
     const auto provider = LLMCore::ProvidersManager::instance().getProviderByName(providerName);
 
@@ -176,8 +179,8 @@ void LLMClientInterface::handleCompletion(const QJsonObject &request)
         return;
     }
 
-    auto templateName = !isPreset1Active ? generalSettings.ccTemplate()
-                                         : generalSettings.ccPreset1Template();
+    auto templateName = !isPreset1Active ? m_generalSettings.ccTemplate()
+                                         : m_generalSettings.ccPreset1Template();
 
     auto promptTemplate = LLMCore::PromptTemplateManager::instance().getFimTemplateByName(
         templateName);
@@ -194,39 +197,39 @@ void LLMClientInterface::handleCompletion(const QJsonObject &request)
     config.promptTemplate = promptTemplate;
     // TODO refactor networking
     if (provider->providerID() == LLMCore::ProviderID::GoogleAI) {
-        QString stream = completeSettings.stream() ? QString{"streamGenerateContent?alt=sse"}
-                                                   : QString{"generateContent?"};
+        QString stream = m_completeSettings.stream() ? QString{"streamGenerateContent?alt=sse"}
+                                                     : QString{"generateContent?"};
         config.url = QUrl(QString("%1/models/%2:%3").arg(url, modelName, stream));
     } else {
         config.url = QUrl(QString("%1%2").arg(
             url,
             promptTemplate->type() == LLMCore::TemplateType::FIM ? provider->completionEndpoint()
                                                                  : provider->chatEndpoint()));
-        config.providerRequest = {{"model", modelName}, {"stream", completeSettings.stream()}};
+        config.providerRequest = {{"model", modelName}, {"stream", m_completeSettings.stream()}};
     }
     config.apiKey = provider->apiKey();
-    config.multiLineCompletion = completeSettings.multiLineCompletion();
+    config.multiLineCompletion = m_completeSettings.multiLineCompletion();
 
     const auto stopWords = QJsonArray::fromStringList(config.promptTemplate->stopWords());
     if (!stopWords.isEmpty())
         config.providerRequest["stop"] = stopWords;
 
     QString systemPrompt;
-    if (completeSettings.useSystemPrompt())
+    if (m_completeSettings.useSystemPrompt())
         systemPrompt.append(
-            completeSettings.useUserMessageTemplateForCC()
+            m_completeSettings.useUserMessageTemplateForCC()
                     && promptTemplate->type() == LLMCore::TemplateType::Chat
-                ? completeSettings.systemPromptForNonFimModels()
-                : completeSettings.systemPrompt());
+                ? m_completeSettings.systemPromptForNonFimModels()
+                : m_completeSettings.systemPrompt());
     if (updatedContext.fileContext.has_value())
         systemPrompt.append(updatedContext.fileContext.value());
 
     updatedContext.systemPrompt = systemPrompt;
 
     if (promptTemplate->type() == LLMCore::TemplateType::Chat) {
         QString userMessage;
-        if (completeSettings.useUserMessageTemplateForCC()) {
-            userMessage = completeSettings.processMessageToFIM(
+        if (m_completeSettings.useUserMessageTemplateForCC()) {
+            userMessage = m_completeSettings.processMessageToFIM(
                 updatedContext.prefix.value_or(""), updatedContext.suffix.value_or(""));
         } else {
             userMessage = updatedContext.prefix.value_or("") + updatedContext.suffix.value_or("");
@@ -274,17 +277,16 @@ LLMCore::ContextData LLMClientInterface::prepareContext(
 
     Context::DocumentContextReader reader(
         textDocument->document(), textDocument->mimeType(), textDocument->filePath().toString());
-    return reader.prepareContext(lineNumber, cursorPosition, Settings::codeCompletionSettings());
+    return reader.prepareContext(lineNumber, cursorPosition, m_completeSettings);
 }
 
 void LLMClientInterface::sendCompletionToClient(
     const QString &completion, const QJsonObject &request, bool isComplete)
 {
-    auto &generalSettings = Settings::generalSettings();
-    bool isPreset1Active = Context::ContextManager::isSpecifyCompletion(request, generalSettings);
+    bool isPreset1Active = Context::ContextManager::isSpecifyCompletion(request, m_generalSettings);
 
-    auto templateName = !isPreset1Active ? generalSettings.ccTemplate()
-                                         : generalSettings.ccPreset1Template();
+    auto templateName = !isPreset1Active ? m_generalSettings.ccTemplate()
+                                         : m_generalSettings.ccPreset1Template();
 
     auto promptTemplate = LLMCore::PromptTemplateManager::instance().getFimTemplateByName(
         templateName);
@@ -303,7 +305,7 @@ void LLMClientInterface::sendCompletionToClient(
 
     QString processedCompletion
         = promptTemplate->type() == LLMCore::TemplateType::Chat
-                  && Settings::codeCompletionSettings().smartProcessInstuctText()
+                  && m_completeSettings.smartProcessInstuctText()
               ? CodeHandler::processText(completion, extractFilePathFromRequest(request))
               : completion;
 
diff --git a/LLMClientInterface.hpp b/LLMClientInterface.hpp
@@ -25,6 +25,8 @@
 #include <context/ProgrammingLanguage.hpp>
 #include <llmcore/ContextData.hpp>
 #include <llmcore/RequestHandler.hpp>
+#include <settings/CodeCompletionSettings.hpp>
+#include <settings/GeneralSettings.hpp>
 
 class QNetworkReply;
 class QNetworkAccessManager;
@@ -36,7 +38,9 @@ class LLMClientInterface : public LanguageClient::BaseClientInterface
     Q_OBJECT
 
 public:
-    LLMClientInterface();
+    LLMClientInterface(
+        const Settings::GeneralSettings &generalSettings,
+        const Settings::CodeCompletionSettings &completeSettings);
 
     Utils::FilePath serverDeviceTemplate() const override;
 
@@ -61,6 +65,8 @@ class LLMClientInterface : public LanguageClient::BaseClientInterface
     LLMCore::ContextData prepareContext(
         const QJsonObject &request, const QStringView &accumulatedCompletion = QString{});
 
+    const Settings::CodeCompletionSettings &m_completeSettings;
+    const Settings::GeneralSettings &m_generalSettings;
     LLMCore::RequestHandler m_requestHandler;
     QElapsedTimer m_completionTimer;
     QMap<QString, qint64> m_requestStartTimes;
diff --git a/QodeAssistClient.cpp b/QodeAssistClient.cpp
@@ -45,7 +45,8 @@ using namespace Core;
 namespace QodeAssist {
 
 QodeAssistClient::QodeAssistClient()
-    : LanguageClient::Client(new LLMClientInterface())
+    : LanguageClient::Client(
+          new LLMClientInterface(Settings::generalSettings(), Settings::codeCompletionSettings()))
     , m_recentCharCount(0)
 {
     setName("Qode Assist");
diff --git a/settings/CodeCompletionSettings.cpp b/settings/CodeCompletionSettings.cpp
@@ -358,7 +358,7 @@ void CodeCompletionSettings::resetSettingsToDefaults()
     }
 }
 
-QString CodeCompletionSettings::processMessageToFIM(const QString &prefix, const QString &suffix)
+QString CodeCompletionSettings::processMessageToFIM(const QString &prefix, const QString &suffix) const
 {
     QString result = userMessageTemplateForCC();
     result.replace("${prefix}", prefix);
diff --git a/settings/CodeCompletionSettings.hpp b/settings/CodeCompletionSettings.hpp
@@ -79,7 +79,7 @@ class CodeCompletionSettings : public Utils::AspectContainer
     // API Configuration Settings
     Utils::StringAspect apiKey{this};
 
-    QString processMessageToFIM(const QString &prefix, const QString &suffix);
+    QString processMessageToFIM(const QString &prefix, const QString &suffix) const;
 
 private:
     void setupConnections();

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,8 @@ using namespace Core;`
`45`	`45`	`namespace QodeAssist {`
`46`	`46`
`47`	`47`	`QodeAssistClient::QodeAssistClient()`
`48`		`- : LanguageClient::Client(new LLMClientInterface())`
	`48`	`+ : LanguageClient::Client(`
	`49`	`+ new LLMClientInterface(Settings::generalSettings(), Settings::codeCompletionSettings()))`
`49`	`50`	`, m_recentCharCount(0)`
`50`	`51`	`{`
`51`	`52`	`setName("Qode Assist");`
Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ void CodeCompletionSettings::resetSettingsToDefaults()`
`358`	`358`	`}`
`359`	`359`	`}`
`360`	`360`
`361`		`-QString CodeCompletionSettings::processMessageToFIM(const QString &prefix, const QString &suffix)`
	`361`	`+QString CodeCompletionSettings::processMessageToFIM(const QString &prefix, const QString &suffix) const`
`362`	`362`	`{`
`363`	`363`	`QString result = userMessageTemplateForCC();`
`364`	`364`	`result.replace("${prefix}", prefix);`