AI/gpt4all
1
0
Fork 0
mirror of https://github.com/nomic-ai/gpt4all.git synced 2024-10-01 01:06:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add a requires field for the models.json for future proofing.

Browse Source
This commit is contained in:
Adam Treat 2023-04-28 20:30:52 -04:00
parent 69f92d8ea8
commit bc77d95def
2 changed files with 48 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
download.cpp
View File

@ -45,42 +45,6 @@ bool operator==(const ReleaseInfo& lhs, const ReleaseInfo& rhs) {
return lhs.version == rhs.version; return lhs.version == rhs.version;
} }
QList<ModelInfo> Download::modelList() const
{
// We make sure the default model is listed first
QList<ModelInfo> values = m_modelMap.values();
ModelInfo defaultInfo;
ModelInfo bestGPTJInfo;
ModelInfo bestLlamaInfo;
for (ModelInfo v : values) {
if (v.isDefault)
defaultInfo = v;
if (v.bestGPTJ)
bestGPTJInfo = v;
if (v.bestLlama)
bestLlamaInfo = v;
}
Q_ASSERT(defaultInfo == bestGPTJInfo || defaultInfo == bestLlamaInfo);
values.removeAll(bestLlamaInfo);
values.prepend(bestLlamaInfo);
values.removeAll(bestGPTJInfo);
values.prepend(bestGPTJInfo);
return values;
}
ReleaseInfo Download::releaseInfo() const
{
const QString currentVersion = QCoreApplication::applicationVersion();
if (m_releaseMap.contains(currentVersion))
return m_releaseMap.value(currentVersion);
return ReleaseInfo();
}
bool compareVersions(const QString &a, const QString &b) { bool compareVersions(const QString &a, const QString &b) {
QStringList aParts = a.split('.'); QStringList aParts = a.split('.');
QStringList bParts = b.split('.'); QStringList bParts = b.split('.');
@ -99,6 +63,50 @@ bool compareVersions(const QString &a, const QString &b) {
return aParts.size() > bParts.size(); return aParts.size() > bParts.size();
} }
QList<ModelInfo> Download::modelList() const
{
// We make sure the default model is listed first
QList<ModelInfo> values = m_modelMap.values();
const QString currentVersion = QCoreApplication::applicationVersion();
ModelInfo defaultInfo;
ModelInfo bestGPTJInfo;
ModelInfo bestLlamaInfo;
QList<ModelInfo> filtered;
for (ModelInfo v : values) {
if (!v.requires.isEmpty()
&& v.requires != currentVersion
&& compareVersions(v.requires, currentVersion)) {
continue;
}
if (v.isDefault)
defaultInfo = v;
if (v.bestGPTJ)
bestGPTJInfo = v;
if (v.bestLlama)
bestLlamaInfo = v;
filtered.append(v);
}
Q_ASSERT(defaultInfo == bestGPTJInfo || defaultInfo == bestLlamaInfo);
filtered.removeAll(bestLlamaInfo);
filtered.prepend(bestLlamaInfo);
filtered.removeAll(bestGPTJInfo);
filtered.prepend(bestGPTJInfo);
return filtered;
}
ReleaseInfo Download::releaseInfo() const
{
const QString currentVersion = QCoreApplication::applicationVersion();
if (m_releaseMap.contains(currentVersion))
return m_releaseMap.value(currentVersion);
return ReleaseInfo();
}
bool Download::hasNewerRelease() const bool Download::hasNewerRelease() const
{ {
const QString currentVersion = QCoreApplication::applicationVersion(); const QString currentVersion = QCoreApplication::applicationVersion();
@ -290,6 +298,7 @@ void Download::parseModelsJsonFile(const QByteArray &jsonData)
QString modelFilename = obj["filename"].toString(); QString modelFilename = obj["filename"].toString();
QString modelFilesize = obj["filesize"].toString(); QString modelFilesize = obj["filesize"].toString();
QString requires = obj["requires"].toString();
QByteArray modelMd5sum = obj["md5sum"].toString().toLatin1().constData(); QByteArray modelMd5sum = obj["md5sum"].toString().toLatin1().constData();
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");
@ -320,6 +329,7 @@ void Download::parseModelsJsonFile(const QByteArray &jsonData)
modelInfo.bestGPTJ = bestGPTJ; modelInfo.bestGPTJ = bestGPTJ;
modelInfo.bestLlama = bestLlama; modelInfo.bestLlama = bestLlama;
modelInfo.description = description; modelInfo.description = description;
modelInfo.requires = requires;
m_modelMap.insert(modelInfo.filename, modelInfo); m_modelMap.insert(modelInfo.filename, modelInfo);
} }

2
download.h
View File

@ -20,6 +20,7 @@ struct ModelInfo {
Q_PROPERTY(bool bestGPTJ MEMBER bestGPTJ) Q_PROPERTY(bool bestGPTJ MEMBER bestGPTJ)
Q_PROPERTY(bool bestLlama MEMBER bestLlama) Q_PROPERTY(bool bestLlama MEMBER bestLlama)
Q_PROPERTY(QString description MEMBER description) Q_PROPERTY(QString description MEMBER description)
Q_PROPERTY(QString requires MEMBER requires)
public: public:
QString filename; QString filename;
@ -31,6 +32,7 @@ public:
bool bestGPTJ = false; bool bestGPTJ = false;
bool bestLlama = false; bool bestLlama = false;
QString description; QString description;
QString requires;
}; };
Q_DECLARE_METATYPE(ModelInfo) Q_DECLARE_METATYPE(ModelInfo)