Multiple fixes for ModelList/Download

gpt4all-chat/CHANGELOG.md

@@ -22,6 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 - Fix the local server rejecting min\_p/top\_p less than 1 ([#2996](https://github.com/nomic-ai/gpt4all/pull/2996))
 - Fix "regenerate" always forgetting the most recent message ([#3011](https://github.com/nomic-ai/gpt4all/pull/3011))
 - Fix loaded chats forgetting context when there is a system prompt ([#3015](https://github.com/nomic-ai/gpt4all/pull/3015))
+- Fix scroll reset upon download, model removal sometimes not working, and models.json cache location ([#3034](https://github.com/nomic-ai/gpt4all/pull/3034))
 
 ## [3.3.1] - 2024-09-27 ([v3.3.y](https://github.com/nomic-ai/gpt4all/tree/v3.3.y))
 

gpt4all-chat/qml/AddModelView.qml

@@ -441,9 +441,7 @@ Rectangle {
                                         Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
                                         visible: !isDownloading && (installed || isIncomplete)
                                         Accessible.description: qsTr("Remove model from filesystem")
-                                        onClicked: {
-                                            Download.removeModel(filename);
-                                        }
+                                        onClicked: Download.removeModel(id)
                                     }
 
                                     MySettingsButton {

gpt4all-chat/qml/ModelSettings.qml

@@ -92,7 +92,7 @@ MySettingsTab {
                 enabled: root.currentModelInfo.isClone
                 text: qsTr("Remove")
                 onClicked: {
-                    ModelList.removeClone(root.currentModelInfo);
+                    ModelList.uninstall(root.currentModelInfo);
                     comboBox.currentIndex = 0;
                 }
             }

gpt4all-chat/qml/ModelsView.qml

@@ -221,9 +221,7 @@ Rectangle {
                                         Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
                                         visible: !isDownloading && (installed || isIncomplete)
                                         Accessible.description: qsTr("Remove model from filesystem")
-                                        onClicked: {
-                                            Download.removeModel(filename);
-                                        }
+                                        onClicked: Download.removeModel(id)
                                     }
 
                                     MySettingsButton {

gpt4all-chat/src/database.cpp

@@ -1659,7 +1659,7 @@ void Database::scanQueue()
         if (info.isPdf()) {
             QPdfDocument doc;
             if (doc.load(document_path) != QPdfDocument::Error::None) {
-                qWarning() << "ERROR: Could not load pdf" << document_id << document_path;;
+                qWarning() << "ERROR: Could not load pdf" << document_id << document_path;
                 return updateFolderToIndex(folder_id, countForFolder);
             }
             title    = doc.metaData(QPdfDocument::MetaDataField::Title).toString();

gpt4all-chat/src/download.cpp

@@ -328,38 +328,30 @@ void Download::installCompatibleModel(const QString &modelName, const QString &a
     ModelList::globalInstance()->updateDataByFilename(modelFile, {{ ModelList::InstalledRole, true }});
 }
 
-void Download::removeModel(const QString &modelFile)
+// FIXME(jared): With the current implementation, it is not possible to remove a duplicate
+//               model file (same filename, different subdirectory) from within GPT4All
+//               without restarting it.
+void Download::removeModel(const QString &id)
 {
-    const QString filePath = MySettings::globalInstance()->modelPath() + modelFile;
-    QFile incompleteFile(ModelList::globalInstance()->incompleteDownloadPath(modelFile));
-    if (incompleteFile.exists()) {
-        incompleteFile.remove();
-    }
+    auto *modelList = ModelList::globalInstance();
 
-    bool shouldRemoveInstalled = false;
-    QFile file(filePath);
-    if (file.exists()) {
-        const ModelInfo info = ModelList::globalInstance()->modelInfoByFilename(modelFile);
-        MySettings::globalInstance()->eraseModel(info);
-        shouldRemoveInstalled = info.installed && !info.isClone() && (info.isDiscovered() || info.isCompatibleApi || info.description() == "" /*indicates sideloaded*/);
-        if (shouldRemoveInstalled)
-            ModelList::globalInstance()->removeInstalled(info);
-        Network::globalInstance()->trackEvent("remove_model", { {"model", modelFile} });
-        file.remove();
-        emit toastMessage(tr("Model \"%1\" is removed.").arg(info.name()));
-    }
+    auto info = modelList->modelInfo(id);
+    if (info.id().isEmpty())
+        return;
 
-    if (!shouldRemoveInstalled) {
-        QVector<QPair<int, QVariant>> data {
-            { ModelList::InstalledRole, false },
-            { ModelList::BytesReceivedRole, 0 },
-            { ModelList::BytesTotalRole, 0 },
-            { ModelList::TimestampRole, 0 },
-            { ModelList::SpeedRole, QString() },
-            { ModelList::DownloadErrorRole, QString() },
-        };
-        ModelList::globalInstance()->updateDataByFilename(modelFile, data);
-    }
+    Network::globalInstance()->trackEvent("remove_model", { {"model", info.filename()} });
+
+    // remove incomplete download
+    QFile(modelList->incompleteDownloadPath(info.filename())).remove();
+
+    // remove file, if this is a real model
+    if (!info.isClone())
+        QFile(info.path()).remove();
+
+    // remove model list entry
+    modelList->uninstall(info);
+
+    emit toastMessage(tr("Model \"%1\" is removed.").arg(info.name()));
 }
 
 void Download::handleSslErrors(QNetworkReply *reply, const QList<QSslError> &errors)

gpt4all-chat/src/download.h

@@ -65,7 +65,7 @@ class Download : public QObject
     Q_INVOKABLE void cancelDownload(const QString &modelFile);
     Q_INVOKABLE void installModel(const QString &modelFile, const QString &apiKey);
     Q_INVOKABLE void installCompatibleModel(const QString &modelName, const QString &apiKey, const QString &baseUrl);
-    Q_INVOKABLE void removeModel(const QString &modelFile);
+    Q_INVOKABLE void removeModel(const QString &id);
     Q_INVOKABLE bool isFirstStart(bool writeVersion = false) const;
 
 public Q_SLOTS:

gpt4all-chat/src/localdocsmodel.cpp

@@ -20,7 +20,6 @@ LocalDocsCollectionsModel::LocalDocsCollectionsModel(QObject *parent)
     connect(this, &LocalDocsCollectionsModel::rowsInserted, this, &LocalDocsCollectionsModel::countChanged);
     connect(this, &LocalDocsCollectionsModel::rowsRemoved, this, &LocalDocsCollectionsModel::countChanged);
     connect(this, &LocalDocsCollectionsModel::modelReset, this, &LocalDocsCollectionsModel::countChanged);
-    connect(this, &LocalDocsCollectionsModel::layoutChanged, this, &LocalDocsCollectionsModel::countChanged);
 }
 
 bool LocalDocsCollectionsModel::filterAcceptsRow(int sourceRow,
@@ -67,7 +66,6 @@ LocalDocsModel::LocalDocsModel(QObject *parent)
     connect(this, &LocalDocsModel::rowsInserted, this, &LocalDocsModel::countChanged);
     connect(this, &LocalDocsModel::rowsRemoved, this, &LocalDocsModel::countChanged);
     connect(this, &LocalDocsModel::modelReset, this, &LocalDocsModel::countChanged);
-    connect(this, &LocalDocsModel::layoutChanged, this, &LocalDocsModel::countChanged);
 }
 
 int LocalDocsModel::rowCount(const QModelIndex &parent) const