Archives/gpt4all
2
0
Fork 0
mirror of https://github.com/nomic-ai/gpt4all synced 2024-11-18 03:25:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Generate the new prompt/response pair before model loading in server mode.

Browse Source
This commit is contained in:
Adam Treat 2023-05-15 18:48:24 -04:00 committed by AT
parent f931de21c5
commit 748e7977ca
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gpt4all-chat/chatllm.cpp
View File

@ -465,7 +465,7 @@ void ChatLLM::forceUnloadModel()
void ChatLLM::unloadModel() void ChatLLM::unloadModel()
{ {
if (!isModelLoaded() || m_isServer) // FIXME: What if server switches models? if (!isModelLoaded() || m_isServer)
return; return;
saveState(); saveState();
@ -479,7 +479,7 @@ void ChatLLM::unloadModel()
void ChatLLM::reloadModel() void ChatLLM::reloadModel()
{ {
if (isModelLoaded() || m_isServer) // FIXME: What if server switches models? if (isModelLoaded() || m_isServer)
return; return;
#if defined(DEBUG_MODEL_LOADING) #if defined(DEBUG_MODEL_LOADING)

25
gpt4all-chat/server.cpp
View File

@ -170,18 +170,6 @@ QHttpServerResponse Server::handleCompletionRequest(const QHttpServerRequest &re
} }
} }
setShouldBeLoaded(true);
if (!foundModel) {
if (!loadDefaultModel()) {
std::cerr << "ERROR: couldn't load default model " << model.toStdString() << std::endl;
return QHttpServerResponse(QHttpServerResponder::StatusCode::BadRequest);
}
} else if (!loadModel(model)) {
std::cerr << "ERROR: couldn't load model " << model.toStdString() << std::endl;
return QHttpServerResponse(QHttpServerResponder::StatusCode::InternalServerError);
}
// We only support one prompt for now // We only support one prompt for now
QList<QString> prompts; QList<QString> prompts;
if (body.contains("prompt")) { if (body.contains("prompt")) {
@ -284,6 +272,19 @@ QHttpServerResponse Server::handleCompletionRequest(const QHttpServerRequest &re
// adds prompt/response items to GUI // adds prompt/response items to GUI
emit requestServerNewPromptResponsePair(actualPrompt); // blocks emit requestServerNewPromptResponsePair(actualPrompt); // blocks
// load the new model if necessary
setShouldBeLoaded(true);
if (!foundModel) {
if (!loadDefaultModel()) {
std::cerr << "ERROR: couldn't load default model " << model.toStdString() << std::endl;
return QHttpServerResponse(QHttpServerResponder::StatusCode::BadRequest);
}
} else if (!loadModel(model)) {
std::cerr << "ERROR: couldn't load model " << model.toStdString() << std::endl;
return QHttpServerResponse(QHttpServerResponder::StatusCode::InternalServerError);
}
// don't remember any context // don't remember any context
resetContextProtected(); resetContextProtected();