Archives/gpt4all
2
0
Fork 0
mirror of https://github.com/nomic-ai/gpt4all synced 2024-11-06 09:20:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add MPT info to the download list and fix it so that isDefault will work even if the required version isn't there.

Browse Source
This commit is contained in:
Adam Treat 2023-05-09 12:09:49 -04:00
parent 5d95085cbe
commit ff257eb52c
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
download.cpp
View File

@ -69,34 +69,39 @@ QList<ModelInfo> Download::modelList() const
{ {
// We make sure the default model is listed first // We make sure the default model is listed first
QList<ModelInfo> values = m_modelMap.values(); QList<ModelInfo> values = m_modelMap.values();
const QString currentVersion = QCoreApplication::applicationVersion();
ModelInfo defaultInfo; ModelInfo defaultInfo;
ModelInfo bestGPTJInfo; ModelInfo bestGPTJInfo;
ModelInfo bestLlamaInfo; ModelInfo bestLlamaInfo;
ModelInfo bestMPTInfo;
QList<ModelInfo> filtered; QList<ModelInfo> filtered;
for (ModelInfo v : values) { for (ModelInfo v : values) {
if (!v.requires.isEmpty()
&& v.requires != currentVersion
&& compareVersions(v.requires, currentVersion)) {
continue;
}
if (v.isDefault) if (v.isDefault)
defaultInfo = v; defaultInfo = v;
if (v.bestGPTJ) if (v.bestGPTJ)
bestGPTJInfo = v; bestGPTJInfo = v;
if (v.bestLlama) if (v.bestLlama)
bestLlamaInfo = v; bestLlamaInfo = v;
if (v.bestMPT)
bestMPTInfo = v;
filtered.append(v); filtered.append(v);
} }
Q_ASSERT(defaultInfo == bestGPTJInfo || defaultInfo == bestLlamaInfo); Q_ASSERT(defaultInfo == bestGPTJInfo || defaultInfo == bestLlamaInfo || defaultInfo == bestMPTInfo);
filtered.removeAll(bestLlamaInfo); if (bestLlamaInfo.bestLlama) {
filtered.prepend(bestLlamaInfo); filtered.removeAll(bestLlamaInfo);
filtered.prepend(bestLlamaInfo);
}
filtered.removeAll(bestGPTJInfo); if (bestGPTJInfo.bestGPTJ) {
filtered.prepend(bestGPTJInfo); filtered.removeAll(bestGPTJInfo);
filtered.prepend(bestGPTJInfo);
}
if (bestMPTInfo.bestMPT) {
filtered.removeAll(bestMPTInfo);
filtered.prepend(bestMPTInfo);
}
return filtered; return filtered;
} }
@ -316,6 +321,7 @@ void Download::parseModelsJsonFile(const QByteArray &jsonData)
QString defaultModel; QString defaultModel;
QJsonArray jsonArray = document.array(); QJsonArray jsonArray = document.array();
const QString currentVersion = QCoreApplication::applicationVersion();
m_modelMap.clear(); m_modelMap.clear();
for (const QJsonValue &value : jsonArray) { for (const QJsonValue &value : jsonArray) {
@ -328,8 +334,15 @@ void Download::parseModelsJsonFile(const QByteArray &jsonData)
bool isDefault = obj.contains("isDefault") && obj["isDefault"] == QString("true"); bool isDefault = obj.contains("isDefault") && obj["isDefault"] == QString("true");
bool bestGPTJ = obj.contains("bestGPTJ") && obj["bestGPTJ"] == QString("true"); bool bestGPTJ = obj.contains("bestGPTJ") && obj["bestGPTJ"] == QString("true");
bool bestLlama = obj.contains("bestLlama") && obj["bestLlama"] == QString("true"); bool bestLlama = obj.contains("bestLlama") && obj["bestLlama"] == QString("true");
bool bestMPT = obj.contains("bestMPT") && obj["bestMPT"] == QString("true");
QString description = obj["description"].toString(); QString description = obj["description"].toString();
if (!requires.isEmpty()
&& requires != currentVersion
&& compareVersions(requires, currentVersion)) {
continue;
}
if (isDefault) if (isDefault)
defaultModel = modelFilename; defaultModel = modelFilename;
quint64 sz = modelFilesize.toULongLong(); quint64 sz = modelFilesize.toULongLong();

1
download.h
View File

@ -31,6 +31,7 @@ public:
bool isDefault = false; bool isDefault = false;
bool bestGPTJ = false; bool bestGPTJ = false;
bool bestLlama = false; bool bestLlama = false;
bool bestMPT = false;
QString description; QString description;
QString requires; QString requires;
}; };