chat: require Qt 6.8 and fix #includes (#3498)

Signed-off-by: Jared Van Bortel <[email protected]>

Author: cebtenzzre

gpt4all-chat/CMakeLists.txt

@@ -104,7 +104,7 @@ elseif (GPT4ALL_USE_QTPDF MATCHES "^(ON|AUTO)$")
     set(GPT4ALL_USING_QTPDF ON)
     list(APPEND GPT4ALL_QT_COMPONENTS Pdf)
 endif()
-find_package(Qt6 6.5 COMPONENTS ${GPT4ALL_QT_COMPONENTS} REQUIRED)
+find_package(Qt6 6.8 COMPONENTS ${GPT4ALL_QT_COMPONENTS} REQUIRED)
 
 if (QT_KNOWN_POLICY_QTP0004)
     qt_policy(SET QTP0004 NEW)  # generate extra qmldir files on Qt 6.8+

gpt4all-chat/src/chat.cpp

@@ -7,24 +7,26 @@
 #include "toolcallparser.h"
 #include "toolmodel.h"
 
-#include <QBuffer>
+#include <QByteArray>
 #include <QDataStream>
 #include <QDebug>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonValue>
+#include <QFile>
+#include <QFileInfo>
+#include <QIODevice>
 #include <QLatin1String>
 #include <QMap>
 #include <QRegularExpression>
 #include <QString>
-#include <QVariant>
 #include <Qt>
+#include <QtAssert>
 #include <QtLogging>
 
+#include <optional>
 #include <utility>
 
 using namespace ToolEnums;
 
+
 Chat::Chat(QObject *parent)
     : QObject(parent)
     , m_id(Network::globalInstance()->generateUniqueId())

gpt4all-chat/src/chat.h

@@ -3,21 +3,26 @@
 
 #include "chatllm.h"
 #include "chatmodel.h"
-#include "database.h" // IWYU pragma: keep
-#include "localdocsmodel.h" // IWYU pragma: keep
+#include "database.h"
+#include "localdocsmodel.h"
 #include "modellist.h"
+#include "tool.h"
 
 #include <QDateTime>
 #include <QList>
 #include <QObject>
-#include <QQmlEngine>
+#include <QQmlEngine> // IWYU pragma: keep
 #include <QString>
 #include <QStringList> // IWYU pragma: keep
-#include <QStringView>
-#include <QtGlobal>
+#include <QUrl>
+#include <QVariant>
+#include <QtTypes>
 
+// IWYU pragma: no_forward_declare LocalDocsCollectionsModel
+// IWYU pragma: no_forward_declare ToolCallInfo
 class QDataStream;
 
+
 class Chat : public QObject
 {
     Q_OBJECT

gpt4all-chat/src/chatapi.cpp

@@ -2,22 +2,27 @@
 
 #include "utils.h"
 
+#include <fmt/format.h>
+
+#include <QAnyStringView>
 #include <QCoreApplication>
 #include <QDebug>
 #include <QGuiApplication>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonValue>
+#include <QLatin1String>
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
+#include <QStringView>
 #include <QThread>
 #include <QUrl>
-#include <QUtf8StringView>
+#include <QUtf8StringView> // IWYU pragma: keep
 #include <QVariant>
 #include <QXmlStreamReader>
 #include <Qt>
-#include <QtGlobal>
+#include <QtAssert>
 #include <QtLogging>
 
 #include <expected>
@@ -29,6 +34,7 @@ using namespace Qt::Literals::StringLiterals;
 
 //#define DEBUG
 
+
 ChatAPI::ChatAPI()
     : QObject(nullptr)
     , m_modelName("gpt-3.5-turbo")

gpt4all-chat/src/chatapi.h

@@ -3,10 +3,11 @@
 
 #include <gpt4all-backend/llmodel.h>
 
-#include <QByteArray> // IWYU pragma: keep
+#include <QByteArray>
 #include <QNetworkReply>
 #include <QObject>
 #include <QString>
+#include <QtPreprocessorSupport>
 
 #include <cstddef>
 #include <cstdint>
@@ -17,9 +18,11 @@
 #include <unordered_map>
 #include <vector>
 
+// IWYU pragma: no_forward_declare QByteArray
+class ChatAPI;
 class QNetworkAccessManager;
 
-class ChatAPI;
+
 class ChatAPIWorker : public QObject {
     Q_OBJECT
 public:

gpt4all-chat/src/chatlistmodel.cpp

@@ -1,23 +1,24 @@
 #include "chatlistmodel.h"
 
-#include "database.h" // IWYU pragma: keep
 #include "mysettings.h"
 
+#include <QCoreApplication>
 #include <QDataStream>
 #include <QDir>
 #include <QElapsedTimer>
+#include <QEvent>
 #include <QFile>
 #include <QFileInfo>
 #include <QGlobalStatic>
 #include <QGuiApplication>
 #include <QIODevice>
 #include <QSettings>
-#include <QString>
-#include <QStringList>
+#include <QStringList> // IWYU pragma: keep
 #include <Qt>
+#include <QtTypes>
 
 #include <algorithm>
-#include <memory>
+
 
 static constexpr quint32 CHAT_FORMAT_MAGIC   = 0xF5D553CC;
 static constexpr qint32  CHAT_FORMAT_VERSION = 12;

gpt4all-chat/src/chatlistmodel.h

@@ -7,17 +7,20 @@
 
 #include <QAbstractListModel>
 #include <QByteArray>
+#include <QDate>
 #include <QDebug>
 #include <QHash>
 #include <QList>
 #include <QMutex>
 #include <QObject>
+#include <QString>
 #include <QThread>
 #include <QVariant>
-#include <QVector>
+#include <QVector> // IWYU pragma: keep
 #include <Qt>
-#include <QtGlobal>
+#include <QtAssert>
 #include <QtLogging>
+#include <QtPreprocessorSupport>
 
 #include <memory>
 

gpt4all-chat/src/chatllm.cpp

@@ -15,32 +15,40 @@
 #include <minja/minja.hpp>
 #include <nlohmann/json.hpp>
 
+#include <QChar>
 #include <QDataStream>
 #include <QDebug>
 #include <QFile>
 #include <QGlobalStatic>
-#include <QIODevice>
+#include <QIODevice> // IWYU pragma: keep
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonValue>
 #include <QMap>
-#include <QMutex>
+#include <QMutex> // IWYU pragma: keep
 #include <QMutexLocker> // IWYU pragma: keep
-#include <QRegularExpression>
-#include <QRegularExpressionMatch>
+#include <QRegularExpression> // IWYU pragma: keep
+#include <QRegularExpressionMatch> // IWYU pragma: keep
 #include <QSet>
+#include <QStringView>
 #include <QTextStream>
 #include <QUrl>
+#include <QVariant>
 #include <QWaitCondition>
 #include <Qt>
+#include <QtAssert>
 #include <QtLogging>
+#include <QtTypes> // IWYU pragma: keep
 
 #include <algorithm>
 #include <chrono>
 #include <cmath>
+#include <concepts>
 #include <cstddef>
+#include <cstdint>
 #include <ctime>
 #include <exception>
+#include <functional>
 #include <iomanip>
 #include <limits>
 #include <optional>

gpt4all-chat/src/chatllm.h

@@ -2,37 +2,38 @@
 #define CHATLLM_H
 
 #include "chatmodel.h"
-#include "database.h" // IWYU pragma: keep
+#include "database.h"
 #include "modellist.h"
 
 #include <gpt4all-backend/llmodel.h>
 
 #include <QByteArray>
 #include <QElapsedTimer>
 #include <QFileInfo>
-#include <QList>      // IWYU pragma: keep
+#include <QList>
 #include <QObject>
 #include <QPointer>
 #include <QString>
 #include <QStringList> // IWYU pragma: keep
-#include <QStringView>
 #include <QThread>
 #include <QVariantMap> // IWYU pragma: keep
-#include <QtGlobal>
+#include <QtNumeric>
 
 #include <atomic>
-#include <cstdint>
 #include <memory>
 #include <optional>
 #include <span>
 #include <string>
+#include <string_view>
 #include <variant>
+#include <vector>
 
 using namespace Qt::Literals::StringLiterals;
 
-class ChatViewResponseHandler;
+class ChatLLM;
 class QDataStream;
 
+
 // NOTE: values serialized to disk, do not change or reuse
 enum class LLModelTypeV0 { // chat versions 2-5
     MPT       = 0,
@@ -89,9 +90,6 @@ inline LLModelTypeV1 parseLLModelTypeV0(int v0)
     }
 }
 
-class ChatLLM;
-class ChatModel;
-
 struct LLModelInfo {
     std::unique_ptr<LLModel> model;
     QFileInfo fileInfo;

gpt4all-chat/src/chatmodel.cpp

@@ -2,9 +2,11 @@
 
 #include <QDebug>
 #include <QMap>
-#include <QtGlobal>
+#include <QTextStream>
 #include <QtLogging>
 
+#include <exception>
+
 
 QList<ResultInfo> ChatItem::consolidateSources(const QList<ResultInfo> &sources)
 {