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

Change the suggestion mode to turn on for tool calls by default.

Browse Source 
Signed-off-by: Adam Treat <treat.adam@gmail.com>
This commit is contained in:
Adam Treat 2024-07-27 11:43:32 -04:00
parent dda59a97a6
commit d2ee235388
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gpt4all-chat/chatllm.cpp
View File

@ -770,14 +770,14 @@ bool ChatLLM::prompt(const QList<QString> &collectionList, const QString &prompt
bool ChatLLM::promptInternal(const QList<QString> &collectionList, const QString &prompt, const QString &promptTemplate, bool ChatLLM::promptInternal(const QList<QString> &collectionList, const QString &prompt, const QString &promptTemplate,
int32_t n_predict, int32_t top_k, float top_p, float min_p, float temp, int32_t n_batch, float repeat_penalty, int32_t n_predict, int32_t top_k, float top_p, float min_p, float temp, int32_t n_batch, float repeat_penalty,
int32_t repeat_penalty_tokens) int32_t repeat_penalty_tokens, bool isToolCallResponse)
{ {
if (!isModelLoaded()) if (!isModelLoaded())
return false; return false;
QList<SourceExcerpt> databaseResults; QList<SourceExcerpt> databaseResults;
const int retrievalSize = MySettings::globalInstance()->localDocsRetrievalSize(); const int retrievalSize = MySettings::globalInstance()->localDocsRetrievalSize();
if (!collectionList.isEmpty()) { if (!collectionList.isEmpty() && !isToolCallResponse) {
emit requestRetrieveFromDB(collectionList, prompt, retrievalSize, &databaseResults); // blocks emit requestRetrieveFromDB(collectionList, prompt, retrievalSize, &databaseResults); // blocks
emit sourceExcerptsChanged(databaseResults); emit sourceExcerptsChanged(databaseResults);
} }
@ -847,7 +847,7 @@ bool ChatLLM::promptInternal(const QList<QString> &collectionList, const QString
} }
SuggestionMode mode = MySettings::globalInstance()->suggestionMode(); SuggestionMode mode = MySettings::globalInstance()->suggestionMode();
if (mode == SuggestionMode::On || (!databaseResults.isEmpty() && mode == SuggestionMode::LocalDocsOnly)) if (mode == SuggestionMode::On || (mode == SuggestionMode::SourceExcerptsOnly && (!databaseResults.isEmpty() || isToolCallResponse)))
generateQuestions(elapsed); generateQuestions(elapsed);
else else
emit responseStopped(elapsed); emit responseStopped(elapsed);
@ -876,7 +876,7 @@ bool ChatLLM::toolCallInternal(const QString &toolCall, int32_t n_predict, int32
} else { } else {
qWarning() << "WARNING: Could not find the tool for " << toolCall; qWarning() << "WARNING: Could not find the tool for " << toolCall;
return promptInternal(QList<QString>()/*collectionList*/, QString() /*prompt*/, promptTemplate, return promptInternal(QList<QString>()/*collectionList*/, QString() /*prompt*/, promptTemplate,
n_predict, top_k, top_p, min_p, temp, n_batch, repeat_penalty, repeat_penalty_tokens); n_predict, top_k, top_p, min_p, temp, n_batch, repeat_penalty, repeat_penalty_tokens, true /*isToolCallResponse*/);
} }
const QString apiKey = MySettings::globalInstance()->braveSearchAPIKey(); const QString apiKey = MySettings::globalInstance()->braveSearchAPIKey();
@ -888,7 +888,7 @@ bool ChatLLM::toolCallInternal(const QString &toolCall, int32_t n_predict, int32
emit sourceExcerptsChanged(braveResponse.second); emit sourceExcerptsChanged(braveResponse.second);
return promptInternal(QList<QString>()/*collectionList*/, braveResponse.first, promptTemplate, return promptInternal(QList<QString>()/*collectionList*/, braveResponse.first, promptTemplate,
n_predict, top_k, top_p, min_p, temp, n_batch, repeat_penalty, repeat_penalty_tokens); n_predict, top_k, top_p, min_p, temp, n_batch, repeat_penalty, repeat_penalty_tokens, true /*isToolCallResponse*/);
} }
void ChatLLM::setShouldBeLoaded(bool b) void ChatLLM::setShouldBeLoaded(bool b)

2
gpt4all-chat/chatllm.h
View File

@ -199,7 +199,7 @@ Q_SIGNALS:
protected: protected:
bool promptInternal(const QList<QString> &collectionList, const QString &prompt, const QString &promptTemplate, bool promptInternal(const QList<QString> &collectionList, const QString &prompt, const QString &promptTemplate,
int32_t n_predict, int32_t top_k, float top_p, float min_p, float temp, int32_t n_batch, float repeat_penalty, int32_t n_predict, int32_t top_k, float top_p, float min_p, float temp, int32_t n_batch, float repeat_penalty,
int32_t repeat_penalty_tokens); int32_t repeat_penalty_tokens, bool isToolCallResponse = false);
bool toolCallInternal(const QString &toolcall, int32_t n_predict, int32_t top_k, float top_p, float min_p, float temp, int32_t n_batch, float repeat_penalty, bool toolCallInternal(const QString &toolcall, int32_t n_predict, int32_t top_k, float top_p, float min_p, float temp, int32_t n_batch, float repeat_penalty,
int32_t repeat_penalty_tokens); int32_t repeat_penalty_tokens);
bool handlePrompt(int32_t token); bool handlePrompt(int32_t token);

2
gpt4all-chat/mysettings.cpp
View File

@ -51,7 +51,7 @@ static const QVariantMap basicDefaults {
{ "saveChatsContext", false }, { "saveChatsContext", false },
{ "serverChat", false }, { "serverChat", false },
{ "userDefaultModel", "Application default" }, { "userDefaultModel", "Application default" },
{ "suggestionMode", QVariant::fromValue(SuggestionMode::LocalDocsOnly) }, { "suggestionMode", QVariant::fromValue(SuggestionMode::SourceExcerptsOnly) },
{ "localdocs/chunkSize", 512 }, { "localdocs/chunkSize", 512 },
{ "localdocs/retrievalSize", 3 }, { "localdocs/retrievalSize", 3 },
{ "localdocs/showReferences", true }, { "localdocs/showReferences", true },

6
gpt4all-chat/mysettings.h
View File

@ -21,9 +21,9 @@ namespace MySettingsEnums {
* ApplicationSettings.qml, as well as the corresponding name lists in mysettings.cpp */ * ApplicationSettings.qml, as well as the corresponding name lists in mysettings.cpp */
enum class SuggestionMode { enum class SuggestionMode {
LocalDocsOnly = 0, SourceExcerptsOnly = 0,
On = 1, On = 1,
Off = 2, Off = 2,
}; };
Q_ENUM_NS(SuggestionMode) Q_ENUM_NS(SuggestionMode)

2
gpt4all-chat/qml/ApplicationSettings.qml
View File

@ -350,7 +350,7 @@ MySettingsTab {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
// NOTE: indices match values of SuggestionMode enum, keep them in sync // NOTE: indices match values of SuggestionMode enum, keep them in sync
model: ListModel { model: ListModel {
ListElement { name: qsTr("When chatting with LocalDocs") } ListElement { name: qsTr("When source excerpts are cited") }
ListElement { name: qsTr("Whenever possible") } ListElement { name: qsTr("Whenever possible") }
ListElement { name: qsTr("Never") } ListElement { name: qsTr("Never") }
} }