mirror of
https://github.com/nomic-ai/gpt4all.git
synced 2025-07-26 00:02:44 -04:00
Compare commits
No commits in common. "34555c4934030c6fa65a5b5801bcf6717d49c9cd" and "c1809a23ba3918d732b478c0b57aba7f1b91d8c4" have entirely different histories.
34555c4934
...
c1809a23ba
@ -18,7 +18,7 @@ endif()
|
|||||||
|
|
||||||
set(APP_VERSION_MAJOR 2)
|
set(APP_VERSION_MAJOR 2)
|
||||||
set(APP_VERSION_MINOR 5)
|
set(APP_VERSION_MINOR 5)
|
||||||
set(APP_VERSION_PATCH 4)
|
set(APP_VERSION_PATCH 3)
|
||||||
set(APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_PATCH}")
|
set(APP_VERSION "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_PATCH}")
|
||||||
|
|
||||||
# Include the binary directory for the generated header file
|
# Include the binary directory for the generated header file
|
||||||
|
@ -385,9 +385,8 @@ void HashAndSaveFile::hashAndSave(const QString &expectedHash, const QString &sa
|
|||||||
qWarning() << errorString;
|
qWarning() << errorString;
|
||||||
tempFile->close();
|
tempFile->close();
|
||||||
emit hashAndSaveFinished(false, errorString, tempFile, modelReply);
|
emit hashAndSaveFinished(false, errorString, tempFile, modelReply);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ModelList::globalInstance()->updateModelsFromDirectory();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Download::handleModelDownloadFinished()
|
void Download::handleModelDownloadFinished()
|
||||||
|
@ -582,24 +582,6 @@
|
|||||||
* Jared Van Bortel (Nomic AI)
|
* Jared Van Bortel (Nomic AI)
|
||||||
* Adam Treat (Nomic AI)
|
* Adam Treat (Nomic AI)
|
||||||
* Community (beta testers, bug reporters, bindings authors)
|
* Community (beta testers, bug reporters, bindings authors)
|
||||||
"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"version": "2.5.3",
|
|
||||||
"notes":
|
|
||||||
"
|
|
||||||
* Major feature update for localdocs!
|
|
||||||
* Localdocs now uses an embedding model for retrieval augmented generation
|
|
||||||
* Localdocs can now search while your collections are indexing
|
|
||||||
* You're guaranteed to get hits from localdocs for every prompt you enter
|
|
||||||
* Fix: AMD gpu fixes
|
|
||||||
* Fix: Better error messages
|
|
||||||
",
|
|
||||||
"contributors":
|
|
||||||
"
|
|
||||||
* Jared Van Bortel (Nomic AI)
|
|
||||||
* Adam Treat (Nomic AI)
|
|
||||||
* Community (beta testers, bug reporters, bindings authors)
|
|
||||||
"
|
"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
@ -264,7 +264,11 @@ ModelList::ModelList()
|
|||||||
m_embeddingModels->setSourceModel(this);
|
m_embeddingModels->setSourceModel(this);
|
||||||
m_installedModels->setSourceModel(this);
|
m_installedModels->setSourceModel(this);
|
||||||
m_downloadableModels->setSourceModel(this);
|
m_downloadableModels->setSourceModel(this);
|
||||||
|
m_watcher = new QFileSystemWatcher(this);
|
||||||
|
const QString exePath = QCoreApplication::applicationDirPath() + QDir::separator();
|
||||||
|
m_watcher->addPath(exePath);
|
||||||
|
m_watcher->addPath(MySettings::globalInstance()->modelPath());
|
||||||
|
connect(m_watcher, &QFileSystemWatcher::directoryChanged, this, &ModelList::updateModelsFromDirectory);
|
||||||
connect(MySettings::globalInstance(), &MySettings::modelPathChanged, this, &ModelList::updateModelsFromDirectory);
|
connect(MySettings::globalInstance(), &MySettings::modelPathChanged, this, &ModelList::updateModelsFromDirectory);
|
||||||
connect(MySettings::globalInstance(), &MySettings::modelPathChanged, this, &ModelList::updateModelsFromJson);
|
connect(MySettings::globalInstance(), &MySettings::modelPathChanged, this, &ModelList::updateModelsFromJson);
|
||||||
connect(MySettings::globalInstance(), &MySettings::modelPathChanged, this, &ModelList::updateModelsFromSettings);
|
connect(MySettings::globalInstance(), &MySettings::modelPathChanged, this, &ModelList::updateModelsFromSettings);
|
||||||
|
@ -320,8 +320,6 @@ public:
|
|||||||
QString incompleteDownloadPath(const QString &modelFile);
|
QString incompleteDownloadPath(const QString &modelFile);
|
||||||
bool asyncModelRequestOngoing() const { return m_asyncModelRequestOngoing; }
|
bool asyncModelRequestOngoing() const { return m_asyncModelRequestOngoing; }
|
||||||
|
|
||||||
void updateModelsFromDirectory();
|
|
||||||
|
|
||||||
Q_SIGNALS:
|
Q_SIGNALS:
|
||||||
void countChanged();
|
void countChanged();
|
||||||
void embeddingModelsChanged();
|
void embeddingModelsChanged();
|
||||||
@ -335,6 +333,7 @@ private Q_SLOTS:
|
|||||||
void updateModelsFromJson();
|
void updateModelsFromJson();
|
||||||
void updateModelsFromJsonAsync();
|
void updateModelsFromJsonAsync();
|
||||||
void updateModelsFromSettings();
|
void updateModelsFromSettings();
|
||||||
|
void updateModelsFromDirectory();
|
||||||
void updateDataForSettings();
|
void updateDataForSettings();
|
||||||
void handleModelsJsonDownloadFinished();
|
void handleModelsJsonDownloadFinished();
|
||||||
void handleModelsJsonDownloadErrorOccurred(QNetworkReply::NetworkError code);
|
void handleModelsJsonDownloadErrorOccurred(QNetworkReply::NetworkError code);
|
||||||
@ -356,6 +355,7 @@ private:
|
|||||||
DownloadableModels *m_downloadableModels;
|
DownloadableModels *m_downloadableModels;
|
||||||
QList<ModelInfo*> m_models;
|
QList<ModelInfo*> m_models;
|
||||||
QHash<QString, ModelInfo*> m_modelMap;
|
QHash<QString, ModelInfo*> m_modelMap;
|
||||||
|
QFileSystemWatcher *m_watcher;
|
||||||
bool m_asyncModelRequestOngoing;
|
bool m_asyncModelRequestOngoing;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user