modellist: rename "deprecated" to "removedIn", disable if equal (#2063)

Signed-off-by: Jared Van Bortel <jared@nomic.ai>

gpt4all-chat/modellist.cpp

@@ -6,6 +6,7 @@
 #include <QFile>
 #include <QStandardPaths>
 #include <algorithm>
+#include <compare>
 
 //#define USE_LOCAL_MODELSJSON
 
@@ -691,8 +692,8 @@ QVariant ModelList::dataInternal(const ModelInfo *info, int role) const
             return info->description();
         case RequiresVersionRole:
             return info->requiresVersion;
-        case DeprecatedVersionRole:
+        case VersionRemovedRole:
-            return info->deprecatedVersion;
+            return info->versionRemoved;
         case UrlRole:
             return info->url();
         case BytesReceivedRole:
@@ -840,8 +841,8 @@ void ModelList::updateData(const QString &id, const QVector<QPair<int, QVariant>
                 info->setDescription(value.toString()); break;
             case RequiresVersionRole:
                 info->requiresVersion = value.toString(); break;
-            case DeprecatedVersionRole:
+            case VersionRemovedRole:
-                info->deprecatedVersion = value.toString(); break;
+                info->versionRemoved = value.toString(); break;
             case UrlRole:
                 info->setUrl(value.toString()); break;
             case BytesReceivedRole:
@@ -1277,22 +1278,19 @@ void ModelList::updateDataForSettings()
     emit dataChanged(index(0, 0), index(m_models.size() - 1, 0));
 }
 
-static bool compareVersions(const QString &a, const QString &b) {
+static std::strong_ordering compareVersions(const QString &a, const QString &b) {
     QStringList aParts = a.split('.');
     QStringList bParts = b.split('.');
 
     for (int i = 0; i < std::min(aParts.size(), bParts.size()); ++i) {
         int aInt = aParts[i].toInt();
         int bInt = bParts[i].toInt();
-
+        if (auto diff = aInt <=> bInt; diff != 0) {
-        if (aInt > bInt) {
+            return diff;
-            return true;
-        } else if (aInt < bInt) {
-            return false;
         }
     }
 
-    return aParts.size() > bParts.size();
+    return aParts.size() <=> bParts.size();
 }
 
 void ModelList::parseModelsJsonFile(const QByteArray &jsonData, bool save)
@@ -1328,7 +1326,7 @@ void ModelList::parseModelsJsonFile(const QByteArray &jsonData, bool save)
         QString modelFilename = obj["filename"].toString();
         QString modelFilesize = obj["filesize"].toString();
         QString requiresVersion = obj["requires"].toString();
-        QString deprecatedVersion = obj["deprecated"].toString();
+        QString versionRemoved = obj["removedIn"].toString();
         QString url = obj["url"].toString();
         QByteArray modelHash = obj["md5sum"].toString().toLatin1().constData();
         bool isDefault = obj.contains("isDefault") && obj["isDefault"] == QString("true");
@@ -1340,16 +1338,13 @@ void ModelList::parseModelsJsonFile(const QByteArray &jsonData, bool save)
         QString quant = obj["quant"].toString();
         QString type = obj["type"].toString();
 
-        // If the currentVersion version is strictly less than required version, then continue
+        // If the current version is strictly less than required version, then skip
-        if (!requiresVersion.isEmpty()
+        if (!requiresVersion.isEmpty() && compareVersions(currentVersion, requiresVersion) < 0) {
-            && requiresVersion != currentVersion
-            && compareVersions(requiresVersion, currentVersion)) {
             continue;
         }
 
-        // If the current version is strictly greater than the deprecated version, then continue
+        // If the version removed is less than or equal to the current version, then skip
-        if (!deprecatedVersion.isEmpty()
+        if (!versionRemoved.isEmpty() && compareVersions(versionRemoved, currentVersion) <= 0) {
-            && compareVersions(currentVersion, deprecatedVersion)) {
             continue;
         }
 
@@ -1372,7 +1367,7 @@ void ModelList::parseModelsJsonFile(const QByteArray &jsonData, bool save)
         updateData(id, ModelList::DefaultRole, isDefault);
         updateData(id, ModelList::DescriptionRole, description);
         updateData(id, ModelList::RequiresVersionRole, requiresVersion);
-        updateData(id, ModelList::DeprecatedVersionRole, deprecatedVersion);
+        updateData(id, ModelList::VersionRemovedRole, versionRemoved);
         updateData(id, ModelList::UrlRole, url);
         updateData(id, ModelList::DisableGUIRole, disableGUI);
         updateData(id, ModelList::OrderRole, order);

gpt4all-chat/modellist.h

@@ -20,7 +20,7 @@ struct ModelInfo {
     Q_PROPERTY(bool isOnline MEMBER isOnline)
     Q_PROPERTY(QString description READ description WRITE setDescription)
     Q_PROPERTY(QString requiresVersion MEMBER requiresVersion)
-    Q_PROPERTY(QString deprecatedVersion MEMBER deprecatedVersion)
+    Q_PROPERTY(QString versionRemoved MEMBER versionRemoved)
     Q_PROPERTY(QString url READ url WRITE setUrl)
     Q_PROPERTY(qint64 bytesReceived MEMBER bytesReceived)
     Q_PROPERTY(qint64 bytesTotal MEMBER bytesTotal)
@@ -106,7 +106,7 @@ public:
     bool isOnline = false;
     bool disableGUI = false;
     QString requiresVersion;
-    QString deprecatedVersion;
+    QString versionRemoved;
     qint64 bytesReceived = 0;
     qint64 bytesTotal = 0;
     qint64 timestamp = 0;
@@ -285,7 +285,7 @@ public:
         DisableGUIRole,
         DescriptionRole,
         RequiresVersionRole,
-        DeprecatedVersionRole,
+        VersionRemovedRole,
         UrlRole,
         BytesReceivedRole,
         BytesTotalRole,
@@ -335,7 +335,7 @@ public:
         roles[DisableGUIRole] = "disableGUI";
         roles[DescriptionRole] = "description";
         roles[RequiresVersionRole] = "requiresVersion";
-        roles[DeprecatedVersionRole] = "deprecatedVersion";
+        roles[VersionRemovedRole] = "versionRemoved";
         roles[UrlRole] = "url";
         roles[BytesReceivedRole] = "bytesReceived";
         roles[BytesTotalRole] = "bytesTotal";