mirror/QodeAssist
1
0
Fork 0
mirror of https://github.com/Palm1r/QodeAssist.git synced 2025-05-28 03:10:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix getting models list

Browse Source
This commit is contained in:
Petr Mironychev 2024-09-24 08:59:26 +02:00
parent 9745997952
commit b559a17407
8 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
providers/LLMProvider.hpp
View File

@ -39,7 +39,7 @@ public:
virtual void prepareRequest(QJsonObject &request) = 0; virtual void prepareRequest(QJsonObject &request) = 0;
virtual bool handleResponse(QNetworkReply *reply, QString &accumulatedResponse) = 0; virtual bool handleResponse(QNetworkReply *reply, QString &accumulatedResponse) = 0;
virtual QList<QString> getInstalledModels(const Utils::Environment &env) = 0; virtual QList<QString> getInstalledModels(const Utils::Environment &env, const QString &url) = 0;
}; };
} // namespace QodeAssist::Providers } // namespace QodeAssist::Providers

6
providers/LMStudioProvider.cpp
View File

@ -25,7 +25,6 @@
#include <QJsonObject> #include <QJsonObject>
#include <QNetworkReply> #include <QNetworkReply>
#include "PromptTemplateManager.hpp"
#include "QodeAssistUtils.hpp" #include "QodeAssistUtils.hpp"
#include "settings/PresetPromptsSettings.hpp" #include "settings/PresetPromptsSettings.hpp"
@ -115,11 +114,12 @@ bool LMStudioProvider::handleResponse(QNetworkReply *reply, QString &accumulated
return isComplete; return isComplete;
} }
QList<QString> LMStudioProvider::getInstalledModels(const Utils::Environment &env) QList<QString> LMStudioProvider::getInstalledModels(const Utils::Environment &env,
const QString &url)
{ {
QList<QString> models; QList<QString> models;
QNetworkAccessManager manager; QNetworkAccessManager manager;
QNetworkRequest request(QUrl(url() + "/v1/models")); QNetworkRequest request(QString("%1%2").arg(url, "/v1/models"));
QNetworkReply *reply = manager.get(request); QNetworkReply *reply = manager.get(request);

2
providers/LMStudioProvider.hpp
View File

@ -34,7 +34,7 @@ public:
QString chatEndpoint() const override; QString chatEndpoint() const override;
void prepareRequest(QJsonObject &request) override; void prepareRequest(QJsonObject &request) override;
bool handleResponse(QNetworkReply *reply, QString &accumulatedResponse) override; bool handleResponse(QNetworkReply *reply, QString &accumulatedResponse) override;
QList<QString> getInstalledModels(const Utils::Environment &env) override; QList<QString> getInstalledModels(const Utils::Environment &env, const QString &url) override;
}; };
} // namespace QodeAssist::Providers } // namespace QodeAssist::Providers

4
providers/OllamaProvider.cpp
View File

@ -123,11 +123,11 @@ bool OllamaProvider::handleResponse(QNetworkReply *reply, QString &accumulatedRe
return isComplete; return isComplete;
} }
QList<QString> OllamaProvider::getInstalledModels(const Utils::Environment &env) QList<QString> OllamaProvider::getInstalledModels(const Utils::Environment &env, const QString &url)
{ {
QList<QString> models; QList<QString> models;
QNetworkAccessManager manager; QNetworkAccessManager manager;
QNetworkRequest request(QUrl(url() + "/api/tags")); QNetworkRequest request(QString("%1%2").arg(url, "/api/tags"));
QNetworkReply *reply = manager.get(request); QNetworkReply *reply = manager.get(request);
QEventLoop loop; QEventLoop loop;

2
providers/OllamaProvider.hpp
View File

@ -34,7 +34,7 @@ public:
QString chatEndpoint() const override; QString chatEndpoint() const override;
void prepareRequest(QJsonObject &request) override; void prepareRequest(QJsonObject &request) override;
bool handleResponse(QNetworkReply *reply, QString &accumulatedResponse) override; bool handleResponse(QNetworkReply *reply, QString &accumulatedResponse) override;
QList<QString> getInstalledModels(const Utils::Environment &env) override; QList<QString> getInstalledModels(const Utils::Environment &env, const QString &url) override;
}; };
} // namespace QodeAssist::Providers } // namespace QodeAssist::Providers

3
providers/OpenAICompatProvider.cpp
View File

@ -118,7 +118,8 @@ bool OpenAICompatProvider::handleResponse(QNetworkReply *reply, QString &accumul
return isComplete; return isComplete;
} }
QList<QString> OpenAICompatProvider::getInstalledModels(const Utils::Environment &env) QList<QString> OpenAICompatProvider::getInstalledModels(const Utils::Environment &env,
const QString &url)
{ {
return QStringList(); return QStringList();
} }

2
providers/OpenAICompatProvider.hpp
View File

@ -34,7 +34,7 @@ public:
QString chatEndpoint() const override; QString chatEndpoint() const override;
void prepareRequest(QJsonObject &request) override; void prepareRequest(QJsonObject &request) override;
bool handleResponse(QNetworkReply *reply, QString &accumulatedResponse) override; bool handleResponse(QNetworkReply *reply, QString &accumulatedResponse) override;
QList<QString> getInstalledModels(const Utils::Environment &env) override; QList<QString> getInstalledModels(const Utils::Environment &env, const QString &url) override;
}; };
} // namespace QodeAssist::Providers } // namespace QodeAssist::Providers

3
settings/GeneralSettings.cpp
View File

@ -237,9 +237,10 @@ void GeneralSettings::showModelSelectionDialog(Utils::StringAspect *modelNameObj
Providers::LLMProvider *provider) Providers::LLMProvider *provider)
{ {
Utils::Environment env = Utils::Environment::systemEnvironment(); Utils::Environment env = Utils::Environment::systemEnvironment();
QString providerUrl = (modelNameObj == &modelName) ? url() : chatUrl();
if (provider) { if (provider) {
QStringList models = provider->getInstalledModels(env); QStringList models = provider->getInstalledModels(env, providerUrl);
bool ok; bool ok;
QString selectedModel = QInputDialog::getItem(Core::ICore::dialogParent(), QString selectedModel = QInputDialog::getItem(Core::ICore::dialogParent(),
Tr::tr("Select LLM Model"), Tr::tr("Select LLM Model"),