Merge branch 'main' into jinja-substitutions

Author: cebtenzzre

gpt4all-chat/CHANGELOG.md

@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 ### Fixed
 - Fix remote model template to allow for XML in messages ([#3318](https://github.com/nomic-ai/gpt4all/pull/3318))
 - Fix Jinja2Cpp bug that broke system message detection in chat templates ([#3325](https://github.com/nomic-ai/gpt4all/pull/3325))
+- Fix LocalDocs sources displaying in unconsolidated form after v3.5.0 ([#3328](https://github.com/nomic-ai/gpt4all/pull/3328))
 
 ## [3.5.3] - 2024-12-16
 

gpt4all-chat/src/chatmodel.h

@@ -275,7 +275,7 @@ class ChatModel : public QAbstractListModel
                     QList<ResultInfo> data;
                     if (item->type() == ChatItem::Type::Response) {
                         if (auto prompt = getPeerUnlocked(item))
-                            data = (*prompt)->consolidatedSources;
+                            data = (*prompt)->sources;
                     }
                     return QVariant::fromValue(data);
                 }
@@ -284,7 +284,7 @@ class ChatModel : public QAbstractListModel
                     QList<ResultInfo> data;
                     if (item->type() == ChatItem::Type::Response) {
                         if (auto prompt = getPeerUnlocked(item))
-                            data = (*prompt)->sources;
+                            data = (*prompt)->consolidatedSources;
                     }
                     return QVariant::fromValue(data);
                 }