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

localdocs: load model before checking which model is loaded (#2284)

Browse Source 
* localdocs: load model before checking what we loaded

Fixes "WARNING: Request to generate sync embeddings for non-local model
invalid"

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

* fix inverted assertion

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

---------

Signed-off-by: Jared Van Bortel <jared@nomic.ai>
This commit is contained in:
Jared Van Bortel 2024-05-02 09:30:36 -04:00 committed by GitHub
parent adaecb7a72
commit 855fd22417
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gpt4all-chat/embllm.cpp
View File

@ -97,16 +97,7 @@ bool EmbeddingLLMWorker::isNomic() const
// this function is always called for retrieval tasks // this function is always called for retrieval tasks
std::vector<float> EmbeddingLLMWorker::generateSyncEmbedding(const QString &text) std::vector<float> EmbeddingLLMWorker::generateSyncEmbedding(const QString &text)
{ {
if (!hasModel() && !loadModel()) { Q_ASSERT(!isNomic());
qWarning() << "WARNING: Could not load model for embeddings";
return {};
}
if (isNomic()) {
qWarning() << "WARNING: Request to generate sync embeddings for non-local model invalid";
return {};
}
std::vector<float> embedding(m_model->embeddingSize()); std::vector<float> embedding(m_model->embeddingSize());
try { try {
m_model->embed({text.toStdString()}, embedding.data(), true); m_model->embed({text.toStdString()}, embedding.data(), true);
@ -306,16 +297,21 @@ EmbeddingLLM::~EmbeddingLLM()
std::vector<float> EmbeddingLLM::generateEmbeddings(const QString &text) std::vector<float> EmbeddingLLM::generateEmbeddings(const QString &text)
{ {
if (!m_embeddingWorker->hasModel() && !m_embeddingWorker->loadModel()) {
qWarning() << "WARNING: Could not load model for embeddings";
return {};
}
if (!m_embeddingWorker->isNomic()) { if (!m_embeddingWorker->isNomic()) {
return m_embeddingWorker->generateSyncEmbedding(text); return m_embeddingWorker->generateSyncEmbedding(text);
} else { }
EmbeddingLLMWorker worker; EmbeddingLLMWorker worker;
connect(this, &EmbeddingLLM::requestSyncEmbedding, &worker, connect(this, &EmbeddingLLM::requestSyncEmbedding, &worker,
&EmbeddingLLMWorker::requestSyncEmbedding, Qt::QueuedConnection); &EmbeddingLLMWorker::requestSyncEmbedding, Qt::QueuedConnection);
emit requestSyncEmbedding(text); emit requestSyncEmbedding(text);
worker.wait(); worker.wait();
return worker.lastResponse(); return worker.lastResponse();
}
} }
void EmbeddingLLM::generateAsyncEmbeddings(const QVector<EmbeddingChunk> &chunks) void EmbeddingLLM::generateAsyncEmbeddings(const QVector<EmbeddingChunk> &chunks)