WIP: Qt Network replacement of CURL @ Win #1514

dvorka · Jan 29, 2024 · 218671e · 218671e
1 parent 2fc8c7e
commit 218671e
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 0 deletions.
diff --git a/lib/lib.pro b/lib/lib.pro
@@ -20,6 +20,12 @@ TEMPLATE = lib
 CONFIG += staticlib
 CONFIG -= qt
 
+# Qt Network as CURL replacement on Windows
+win32 {
+  CONFIG += qt
+  QT += network
+}
+
 # Dependencies:
 # - INCLUDEPATH is used during compilation to find included header files.
 # - DEPENDPATH is used to resolve dependencies between header and source files,

diff --git a/lib/src/debug.h b/lib/src/debug.h
@@ -23,6 +23,9 @@
 //   - configuration: DEFINES = DO_MF_DEBUG
 //   - command line: CONFIG+=mfunits
 
+// use Qt Network instead of CURL for the communication with OpenAI
+// #define MF_OPENAI_QT_NETWORK
+
 #ifdef DO_MF_DEBUG
     #include <chrono>
     #include <iostream>

diff --git a/lib/src/mind/ai/llm/openai_wingman.cpp b/lib/src/mind/ai/llm/openai_wingman.cpp
@@ -100,6 +100,45 @@ void OpenAiWingman::curlGet(CommandWingmanChat& command) {
             << "<<<"
             << endl);
 
+#ifdef MF_OPENAI_QT_NETWORK
+// Set up Qt networking options
+        QNetworkRequest request;
+        request.setUrl(QUrl("https://api.openai.com/v1/chat/completions"));
+
+        QByteArray requestBody(requestJSonStr.toUtf8());
+        request.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("application/json"));
+        request.setRawHeader("Authorization", "Bearer " + apiKey.toUtf8());
+
+        // Create a network access manager
+        QNetworkAccessManager manager;
+
+        // Send the request
+        QNetworkReply *reply = manager.post(request, requestBody);
+
+        // Connect to the finished signal to handle the response
+        connect(reply, &QNetworkReply::finished, [&]() {
+            if (reply->error() == QNetworkReply::NoError) {
+                command.httpResponse = reply->readAll().toUtf8();
+                command.answerHtml = parseHtmlFromJson(command.httpResponse);
+                command.answerTokens = countTokens(command.answerHtml);
+                command.answerLlmModel = llmModel;
+                command.status = WingmanStatusCode::WINGMAN_STATUS_CODE_SUCCESS;
+            } else {
+                command.status = WingmanStatusCode::WINGMAN_STATUS_CODE_ERROR;
+                command.errorMessage = reply->errorString();
+                std::cerr << "Error: Wingman OpenAI Qt networking request failed: " << command.errorMessage << std::endl;
+
+                command.httpResponse.clear();
+                command.answerHtml.clear();
+                command.answerTokens = 0;
+                command.answerLlmModel = llmModel;
+                return;
+            }
+        });
+
+        // Delete the network reply when it's finished
+        connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
+#else
         // set up cURL options
         command.httpResponse.clear();
         curl_easy_setopt(
@@ -139,6 +178,7 @@ void OpenAiWingman::curlGet(CommandWingmanChat& command) {
 
             return;
         }
+#endif
 
         // parse JSon
         /*

diff --git a/lib/src/mind/ai/llm/openai_wingman.h b/lib/src/mind/ai/llm/openai_wingman.h
@@ -25,6 +25,10 @@
 
 #include "wingman.h"
 
+#ifdef MF_OPENAI_QT_NETWORK
+#include <QtNetwork>
+#endif
+
 namespace m8r {
 
 /**