LLMClientInterface.cpp

@@ -218,8 +218,10 @@ void LLMClientInterface::handleCompletion(const QJsonObject &request)
                                                      : QString{"generateContent?"};
         config.url = QUrl(QString("%1/models/%2:%3").arg(url, modelName, stream));
     } else {
-        config.url = QUrl(
+        config.url = QUrl(QString("%1%2").arg(
-            QString("%1%2").arg(url, endpoint(provider, promptTemplate->type(), isPreset1Active)));
+            url,
+            promptTemplate->type() == LLMCore::TemplateType::FIM ? provider->completionEndpoint()
+                                                                 : provider->chatEndpoint()));
         config.providerRequest = {{"model", modelName}, {"stream", m_completeSettings.stream()}};
     }
     config.apiKey = provider->apiKey();
@@ -298,26 +300,6 @@ LLMCore::ContextData LLMClientInterface::prepareContext(
     return reader.prepareContext(lineNumber, cursorPosition, m_completeSettings);
 }
 
-QString LLMClientInterface::endpoint(
-    LLMCore::Provider *provider, LLMCore::TemplateType type, bool isLanguageSpecify)
-{
-    QString endpoint;
-    auto endpointMode = isLanguageSpecify ? m_generalSettings.ccPreset1EndpointMode.stringValue()
-                                          : m_generalSettings.ccEndpointMode.stringValue();
-    if (endpointMode == "Auto") {
-        endpoint = type == LLMCore::TemplateType::FIM ? provider->completionEndpoint()
-                                                      : provider->chatEndpoint();
-    } else if (endpointMode == "Custom") {
-        endpoint = isLanguageSpecify ? m_generalSettings.ccPreset1CustomEndpoint()
-                                     : m_generalSettings.ccCustomEndpoint();
-    } else if (endpointMode == "FIM") {
-        endpoint = provider->completionEndpoint();
-    } else if (endpointMode == "Chat") {
-        endpoint = provider->chatEndpoint();
-    }
-    return endpoint;
-}
-
 Context::ContextManager *LLMClientInterface::contextManager() const
 {
     return m_contextManager;

LLMClientInterface.hpp

@@ -77,7 +77,6 @@ private:
 
     LLMCore::ContextData prepareContext(
         const QJsonObject &request, const Context::DocumentInfo &documentInfo);
-    QString endpoint(LLMCore::Provider *provider, LLMCore::TemplateType type, bool isLanguageSpecify);
 
     const Settings::CodeCompletionSettings &m_completeSettings;
     const Settings::GeneralSettings &m_generalSettings;

README.md

@@ -3,7 +3,6 @@
 ![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-16.0.1-brightgreen)
-![Static Badge](https://img.shields.io/badge/QtCreator-16.0.2-brightgreen)
 [![](https://dcbadge.limes.pink/api/server/BGMkUsXUgf?style=flat)](https://discord.gg/BGMkUsXUgf)
 
 ![qodeassist-icon](https://github.com/user-attachments/assets/dc336712-83cb-440d-8761-8d0a31de898d) 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.
@@ -251,7 +250,6 @@ Linked files provide persistent context throughout the conversation:
 
 ## QtCreator Version Compatibility
 
-- QtCreator 16.0.2 - 0.5.13 - 0.x.x
 - QtCreator 16.0.1 - 0.5.7 - 0.x.x
 - QtCreator 16.0.0 - 0.5.2 - 0.5.6
 - QtCreator 15.0.1 - 0.4.8 - 0.5.1

settings/GeneralSettings.cpp

@@ -99,20 +99,9 @@ GeneralSettings::GeneralSettings()
     ccSelectTemplate.m_buttonText = TrConstants::SELECT;
 
     initStringAspect(ccUrl, Constants::CC_URL, TrConstants::URL, "http://localhost:11434");
-    ccUrl.setHistoryCompleter(Constants::CC_CUSTOM_ENDPOINT_HISTORY);
+    ccUrl.setHistoryCompleter(Constants::CC_URL_HISTORY);
     ccSetUrl.m_buttonText = TrConstants::SELECT;
 
-    ccEndpointMode.setSettingsKey(Constants::CC_ENDPOINT_MODE);
-    ccEndpointMode.setDisplayStyle(Utils::SelectionAspect::DisplayStyle::ComboBox);
-    ccEndpointMode.addOption("Auto");
-    ccEndpointMode.addOption("Custom");
-    ccEndpointMode.addOption("FIM");
-    ccEndpointMode.addOption("Chat");
-    ccEndpointMode.setDefaultValue("Auto");
-
-    initStringAspect(ccCustomEndpoint, Constants::CC_CUSTOM_ENDPOINT, TrConstants::ENDPOINT_MODE, "");
-    ccCustomEndpoint.setHistoryCompleter(Constants::CC_CUSTOM_ENDPOINT_HISTORY);
-
     ccStatus.setDisplayStyle(Utils::StringAspect::LabelDisplay);
     ccStatus.setLabelText(TrConstants::STATUS);
     ccStatus.setDefaultValue("");
@@ -145,21 +134,6 @@ GeneralSettings::GeneralSettings()
     ccPreset1Url.setHistoryCompleter(Constants::CC_PRESET1_URL_HISTORY);
     ccPreset1SetUrl.m_buttonText = TrConstants::SELECT;
 
-    ccPreset1EndpointMode.setSettingsKey(Constants::CC_PRESET1_ENDPOINT_MODE);
-    ccPreset1EndpointMode.setDisplayStyle(Utils::SelectionAspect::DisplayStyle::ComboBox);
-    ccPreset1EndpointMode.addOption("Auto");
-    ccPreset1EndpointMode.addOption("Custom");
-    ccPreset1EndpointMode.addOption("FIM");
-    ccPreset1EndpointMode.addOption("Chat");
-    ccPreset1EndpointMode.setDefaultValue("Auto");
-
-    initStringAspect(
-        ccPreset1CustomEndpoint,
-        Constants::CC_PRESET1_CUSTOM_ENDPOINT,
-        TrConstants::ENDPOINT_MODE,
-        "");
-    ccPreset1CustomEndpoint.setHistoryCompleter(Constants::CC_PRESET1_CUSTOM_ENDPOINT_HISTORY);
-
     initStringAspect(
         ccPreset1Model, Constants::CC_PRESET1_MODEL, TrConstants::MODEL, "qwen2.5-coder:7b");
     ccPreset1Model.setHistoryCompleter(Constants::CC_PRESET1_MODEL_HISTORY);
@@ -188,17 +162,6 @@ GeneralSettings::GeneralSettings()
     caUrl.setHistoryCompleter(Constants::CA_URL_HISTORY);
     caSetUrl.m_buttonText = TrConstants::SELECT;
 
-    caEndpointMode.setSettingsKey(Constants::CA_ENDPOINT_MODE);
-    caEndpointMode.setDisplayStyle(Utils::SelectionAspect::DisplayStyle::ComboBox);
-    caEndpointMode.addOption("Auto");
-    caEndpointMode.addOption("Custom");
-    caEndpointMode.addOption("FIM");
-    caEndpointMode.addOption("Chat");
-    caEndpointMode.setDefaultValue("Auto");
-
-    initStringAspect(caCustomEndpoint, Constants::CA_CUSTOM_ENDPOINT, TrConstants::ENDPOINT_MODE, "");
-    caCustomEndpoint.setHistoryCompleter(Constants::CA_CUSTOM_ENDPOINT_HISTORY);
-
     caStatus.setDisplayStyle(Utils::StringAspect::LabelDisplay);
     caStatus.setLabelText(TrConstants::STATUS);
     caStatus.setDefaultValue("");
@@ -216,9 +179,6 @@ GeneralSettings::GeneralSettings()
     setupConnections();
 
     updatePreset1Visiblity(specifyPreset1.value());
-    ccCustomEndpoint.setEnabled(ccEndpointMode.stringValue() == "Custom");
-    ccPreset1CustomEndpoint.setEnabled(ccPreset1EndpointMode.stringValue() == "Custom");
-    caCustomEndpoint.setEnabled(caEndpointMode.stringValue() == "Custom");
 
     setLayouter([this]() {
         using namespace Layouting;
@@ -226,21 +186,18 @@ GeneralSettings::GeneralSettings()
         auto ccGrid = Grid{};
         ccGrid.addRow({ccProvider, ccSelectProvider});
         ccGrid.addRow({ccUrl, ccSetUrl});
-        ccGrid.addRow({ccCustomEndpoint, ccEndpointMode});
         ccGrid.addRow({ccModel, ccSelectModel});
         ccGrid.addRow({ccTemplate, ccSelectTemplate});
 
         auto ccPreset1Grid = Grid{};
         ccPreset1Grid.addRow({ccPreset1Provider, ccPreset1SelectProvider});
         ccPreset1Grid.addRow({ccPreset1Url, ccPreset1SetUrl});
-        ccPreset1Grid.addRow({ccPreset1CustomEndpoint, ccPreset1EndpointMode});
         ccPreset1Grid.addRow({ccPreset1Model, ccPreset1SelectModel});
         ccPreset1Grid.addRow({ccPreset1Template, ccPreset1SelectTemplate});
 
         auto caGrid = Grid{};
         caGrid.addRow({caProvider, caSelectProvider});
         caGrid.addRow({caUrl, caSetUrl});
-        caGrid.addRow({caCustomEndpoint, caEndpointMode});
         caGrid.addRow({caModel, caSelectModel});
         caGrid.addRow({caTemplate, caSelectTemplate});
 
@@ -432,8 +389,6 @@ void GeneralSettings::updatePreset1Visiblity(bool state)
     ccPreset1SelectModel.updateVisibility(specifyPreset1.volatileValue());
     ccPreset1Template.setVisible(specifyPreset1.volatileValue());
     ccPreset1SelectTemplate.updateVisibility(specifyPreset1.volatileValue());
-    ccPreset1EndpointMode.setVisible(specifyPreset1.volatileValue());
-    ccPreset1CustomEndpoint.setVisible(specifyPreset1.volatileValue());
 }
 
 void GeneralSettings::setupConnections()
@@ -449,19 +404,6 @@ void GeneralSettings::setupConnections()
     connect(&specifyPreset1, &Utils::BoolAspect::volatileValueChanged, this, [this]() {
         updatePreset1Visiblity(specifyPreset1.volatileValue());
     });
-    connect(&ccEndpointMode, &Utils::BaseAspect::volatileValueChanged, this, [this]() {
-        ccCustomEndpoint.setEnabled(
-            ccEndpointMode.volatileValue() == ccEndpointMode.indexForDisplay("Custom"));
-    });
-    connect(&ccPreset1EndpointMode, &Utils::BaseAspect::volatileValueChanged, this, [this]() {
-        ccPreset1CustomEndpoint.setEnabled(
-            ccPreset1EndpointMode.volatileValue()
-            == ccPreset1EndpointMode.indexForDisplay("Custom"));
-    });
-    connect(&caEndpointMode, &Utils::BaseAspect::volatileValueChanged, this, [this]() {
-        caCustomEndpoint.setEnabled(
-            caEndpointMode.volatileValue() == caEndpointMode.indexForDisplay("Custom"));
-    });
 }
 
 void GeneralSettings::resetPageToDefaults()
@@ -491,12 +433,6 @@ void GeneralSettings::resetPageToDefaults()
         resetAspect(ccPreset1Model);
         resetAspect(ccPreset1Template);
         resetAspect(ccPreset1Url);
-        resetAspect(ccEndpointMode);
-        resetAspect(ccCustomEndpoint);
-        resetAspect(ccPreset1EndpointMode);
-        resetAspect(ccPreset1CustomEndpoint);
-        resetAspect(caEndpointMode);
-        resetAspect(caCustomEndpoint);
         writeSettings();
     }
 }

settings/GeneralSettings.hpp

@@ -54,9 +54,6 @@ public:
     Utils::StringAspect ccUrl{this};
     ButtonAspect ccSetUrl{this};
 
-    Utils::SelectionAspect ccEndpointMode{this};
-    Utils::StringAspect ccCustomEndpoint{this};
-
     Utils::StringAspect ccStatus{this};
     ButtonAspect ccTest{this};
 
@@ -73,9 +70,6 @@ public:
     Utils::StringAspect ccPreset1Url{this};
     ButtonAspect ccPreset1SetUrl{this};
 
-    Utils::SelectionAspect ccPreset1EndpointMode{this};
-    Utils::StringAspect ccPreset1CustomEndpoint{this};
-
     Utils::StringAspect ccPreset1Model{this};
     ButtonAspect ccPreset1SelectModel{this};
 
@@ -95,9 +89,6 @@ public:
     Utils::StringAspect caUrl{this};
     ButtonAspect caSetUrl{this};
 
-    Utils::SelectionAspect caEndpointMode{this};
-    Utils::StringAspect caCustomEndpoint{this};
-
     Utils::StringAspect caStatus{this};
     ButtonAspect caTest{this};
 

settings/SettingsConstants.hpp

@@ -35,9 +35,6 @@ 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 CC_ENDPOINT_MODE[] = "QodeAssist.ccEndpointMode";
-const char CC_CUSTOM_ENDPOINT[] = "QodeAssist.ccCustomEndpoint";
-const char CC_CUSTOM_ENDPOINT_HISTORY[] = "QodeAssist.ccCustomEndpointHistory";
 
 const char CA_PROVIDER[] = "QodeAssist.caProvider";
 const char CA_MODEL[] = "QodeAssist.caModel";
@@ -45,9 +42,6 @@ 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";
-const char CA_ENDPOINT_MODE[] = "QodeAssist.caEndpointMode";
-const char CA_CUSTOM_ENDPOINT[] = "QodeAssist.caCustomEndpoint";
-const char CA_CUSTOM_ENDPOINT_HISTORY[] = "QodeAssist.caCustomEndpointHistory";
 
 const char CC_SPECIFY_PRESET1[] = "QodeAssist.ccSpecifyPreset1";
 const char CC_PRESET1_LANGUAGE[] = "QodeAssist.ccPreset1Language";
@@ -57,9 +51,6 @@ const char CC_PRESET1_MODEL_HISTORY[] = "QodeAssist.ccPreset1ModelHistory";
 const char CC_PRESET1_TEMPLATE[] = "QodeAssist.ccPreset1Template";
 const char CC_PRESET1_URL[] = "QodeAssist.ccPreset1Url";
 const char CC_PRESET1_URL_HISTORY[] = "QodeAssist.ccPreset1UrlHistory";
-const char CC_PRESET1_ENDPOINT_MODE[] = "QodeAssist.caPreset1EndpointMode";
-const char CC_PRESET1_CUSTOM_ENDPOINT[] = "QodeAssist.caPreset1CustomEndpointHistory";
-const char CC_PRESET1_CUSTOM_ENDPOINT_HISTORY[] = "QodeAssist.caPreset1CustomEndpointHistory";
 
 // settings
 const char ENABLE_QODE_ASSIST[] = "QodeAssist.enableQodeAssist";

settings/SettingsTr.hpp

@@ -44,7 +44,6 @@ inline const char *ENABLE_CHECK_UPDATE_ON_START
 inline const char *ENABLE_CHAT = QT_TRANSLATE_NOOP(
     "QtC::QodeAssist",
     "Enable Chat(If you have performance issues try disabling this, need restart QtC)");
-inline const char *ENDPOINT_MODE = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Endpoint Mode:");
 
 inline const char *CODE_COMPLETION = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Code Completion");
 inline const char *CHAT_ASSISTANT = QT_TRANSLATE_NOOP("QtC::QodeAssist", "Chat Assistant");