github/gpt4all
1
0
Fork 0
mirror of https://github.com/nomic-ai/gpt4all.git synced 2025-07-19 17:50:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

mysettings: eraseModel only needs an id

Browse Source 
Signed-off-by: Jared Van Bortel <jared@nomic.ai>
This commit is contained in:
Jared Van Bortel 2024-10-04 18:36:17 -04:00
parent d0158d2013
commit 9ec0f92f67
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gpt4all-chat/src/download.cpp
View File

@ -340,7 +340,7 @@ void Download::removeModel(const QString &modelFile)
QFile file(filePath); QFile file(filePath);
if (file.exists()) { if (file.exists()) {
const ModelInfo info = ModelList::globalInstance()->modelInfoByFilename(modelFile); const ModelInfo info = ModelList::globalInstance()->modelInfoByFilename(modelFile);
MySettings::globalInstance()->eraseModel(info); MySettings::globalInstance()->eraseModel(info.id());
shouldRemoveInstalled = info.installed && !info.isClone() && (info.isDiscovered() || info.isCompatibleApi || info.description() == "" /*indicates sideloaded*/); shouldRemoveInstalled = info.installed && !info.isClone() && (info.isDiscovered() || info.isCompatibleApi || info.description() == "" /*indicates sideloaded*/);
if (shouldRemoveInstalled) if (shouldRemoveInstalled)
ModelList::globalInstance()->removeInstalled(info); ModelList::globalInstance()->removeInstalled(info);

2
gpt4all-chat/src/modellist.cpp
View File

@ -1157,7 +1157,7 @@ void ModelList::removeInternal(const ModelInfo &model)
} }
endRemoveRows(); endRemoveRows();
emit selectableModelListChanged(); emit selectableModelListChanged();
MySettings::globalInstance()->eraseModel(model); MySettings::globalInstance()->eraseModel(model.id());
} }
QString ModelList::uniqueModelName(const ModelInfo &model) const QString ModelList::uniqueModelName(const ModelInfo &model) const

4
gpt4all-chat/src/mysettings.cpp
View File

@ -226,9 +226,9 @@ void MySettings::restoreLocalDocsDefaults()
setLocalDocsEmbedDevice(basicDefaults.value("localdocs/embedDevice").toString()); setLocalDocsEmbedDevice(basicDefaults.value("localdocs/embedDevice").toString());
} }
void MySettings::eraseModel(const ModelInfo &info) void MySettings::eraseModel(QStringView id)
{ {
m_settings.remove(u"model-%1"_s.arg(info.id())); m_settings.remove(u"model-%1"_s.arg(id));
} }
QString MySettings::modelName(const ModelInfo &info) const QString MySettings::modelName(const ModelInfo &info) const

3
gpt4all-chat/src/mysettings.h
View File

@ -8,6 +8,7 @@
#include <QSettings> #include <QSettings>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
#include <QStringView>
#include <QTranslator> #include <QTranslator>
#include <QVector> #include <QVector>
@ -83,7 +84,7 @@ public:
Q_INVOKABLE void restoreLocalDocsDefaults(); Q_INVOKABLE void restoreLocalDocsDefaults();
// Model/Character settings // Model/Character settings
void eraseModel(const ModelInfo &info); void eraseModel(QStringView id);
QString modelName(const ModelInfo &info) const; QString modelName(const ModelInfo &info) const;
Q_INVOKABLE void setModelName(const ModelInfo &info, const QString &name, bool force = false); Q_INVOKABLE void setModelName(const ModelInfo &info, const QString &name, bool force = false);
QString modelFilename(const ModelInfo &info) const; QString modelFilename(const ModelInfo &info) const;