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

use the settings dialog settings when generating

Browse Source
This commit is contained in:
Aaron Miller 2023-04-15 22:51:28 -07:00 committed by AT
parent 17c3fa820b
commit cb6d2128d3
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
llm.cpp
View File

@ -109,23 +109,20 @@ bool LLMObject::handleResponse(const std::string &response)
return !m_stopGenerating; return !m_stopGenerating;
} }
bool LLMObject::prompt(const QString &prompt) bool LLMObject::prompt(const QString &prompt, const QString &prompt_template, int32_t n_predict, int32_t top_k, float top_p,
float temp, int32_t n_batch)
{ {
if (!isModelLoaded()) if (!isModelLoaded())
return false; return false;
QString instructPrompt = QString("Below is a prompt for either a task to complete " QString instructPrompt = prompt_template.arg(prompt);
"or a piece of conversation."
"Decide which and write an appropriate response to the prompt.\n"
"### Prompt:\n"
"%1"
"### Response:\n").arg(prompt);
m_stopGenerating = false; m_stopGenerating = false;
auto func = std::bind(&LLMObject::handleResponse, this, std::placeholders::_1); auto func = std::bind(&LLMObject::handleResponse, this, std::placeholders::_1);
emit responseStarted(); emit responseStarted();
qint32 logitsBefore = s_ctx.logits.size(); qint32 logitsBefore = s_ctx.logits.size();
m_llmodel->prompt(instructPrompt.toStdString(), func, s_ctx, 4096 /*number of chars to predict*/); qInfo() << instructPrompt << "\n";
m_llmodel->prompt(instructPrompt.toStdString(), func, s_ctx, n_predict, top_k, top_p, temp, n_batch);
m_responseLogits += s_ctx.logits.size() - logitsBefore; m_responseLogits += s_ctx.logits.size() - logitsBefore;
emit responseStopped(); emit responseStopped();
return true; return true;
@ -152,9 +149,10 @@ bool LLM::isModelLoaded() const
return m_llmodel->isModelLoaded(); return m_llmodel->isModelLoaded();
} }
void LLM::prompt(const QString &prompt) void LLM::prompt(const QString &prompt, const QString &prompt_template, int32_t n_predict, int32_t top_k, float top_p,
float temp, int32_t n_batch)
{ {
emit promptRequested(prompt); emit promptRequested(prompt, prompt_template, n_predict, top_k, top_p, temp, n_batch);
} }
void LLM::resetResponse() void LLM::resetResponse()

9
llm.h
View File

@ -26,7 +26,8 @@ public:
QString modelName() const; QString modelName() const;
public Q_SLOTS: public Q_SLOTS:
bool prompt(const QString &prompt); bool prompt(const QString &prompt, const QString &prompt_template, int32_t n_predict, int32_t top_k, float top_p,
float temp, int32_t n_batch);
Q_SIGNALS: Q_SIGNALS:
void isModelLoadedChanged(); void isModelLoadedChanged();
@ -60,7 +61,8 @@ public:
static LLM *globalInstance(); static LLM *globalInstance();
Q_INVOKABLE bool isModelLoaded() const; Q_INVOKABLE bool isModelLoaded() const;
Q_INVOKABLE void prompt(const QString &prompt); Q_INVOKABLE void prompt(const QString &prompt, const QString &prompt_template, int32_t n_predict, int32_t top_k, float top_p,
float temp, int32_t n_batch);
Q_INVOKABLE void resetContext(); Q_INVOKABLE void resetContext();
Q_INVOKABLE void resetResponse(); Q_INVOKABLE void resetResponse();
Q_INVOKABLE void stopGenerating(); Q_INVOKABLE void stopGenerating();
@ -76,7 +78,8 @@ Q_SIGNALS:
void isModelLoadedChanged(); void isModelLoadedChanged();
void responseChanged(); void responseChanged();
void responseInProgressChanged(); void responseInProgressChanged();
void promptRequested(const QString &prompt); void promptRequested(const QString &prompt, const QString &prompt_template, int32_t n_predict, int32_t top_k, float top_p,
float temp, int32_t n_batch);
void resetResponseRequested(); void resetResponseRequested();
void resetContextRequested(); void resetContextRequested();
void modelNameChanged(); void modelNameChanged();

7
main.qml
View File

@ -591,7 +591,9 @@ Window {
if (listElement.name === qsTr("Response: ")) { if (listElement.name === qsTr("Response: ")) {
listElement.currentResponse = true listElement.currentResponse = true
listElement.value = LLM.response listElement.value = LLM.response
LLM.prompt(listElement.prompt) LLM.prompt(listElement.prompt, settingsDialog.promptTemplate, settingsDialog.maxLength,
settingsDialog.topK, settingsDialog.topP, settingsDialog.temperature,
settingsDialog.promptBatchSize)
} }
} }
} }
@ -642,7 +644,8 @@ Window {
chatModel.append({"name": qsTr("Prompt: "), "currentResponse": false, "value": textInput.text}) chatModel.append({"name": qsTr("Prompt: "), "currentResponse": false, "value": textInput.text})
chatModel.append({"name": qsTr("Response: "), "currentResponse": true, "value": "", "prompt": prompt}) chatModel.append({"name": qsTr("Response: "), "currentResponse": true, "value": "", "prompt": prompt})
LLM.resetResponse() LLM.resetResponse()
LLM.prompt(prompt) LLM.prompt(prompt, settingsDialog.promptTemplate, settingsDialog.maxLength, settingsDialog.topK,
settingsDialog.topP, settingsDialog.temperature, settingsDialog.promptBatchSize)
textInput.text = "" textInput.text = ""
} }