From 068845e1a203316b9b1d4f4b0001d20943f786df Mon Sep 17 00:00:00 2001
From: Jared Van Bortel <jared@nomic.ai>
Date: Thu, 27 Feb 2025 14:56:14 -0500
Subject: [PATCH] don't duplicate QCoro's exception passing

---
 .../include/gpt4all-backend/ollama-client.h   | 19 ++--------------
 gpt4all-backend/src/ollama-client.cpp         | 22 ++++++++-----------
 2 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/gpt4all-backend/include/gpt4all-backend/ollama-client.h b/gpt4all-backend/include/gpt4all-backend/ollama-client.h
index f96e0dcd..f288d35e 100644
--- a/gpt4all-backend/include/gpt4all-backend/ollama-client.h
+++ b/gpt4all-backend/include/gpt4all-backend/ollama-client.h
@@ -10,7 +10,6 @@
 #include <QUrl>
 
 #include <cassert>
-#include <exception>
 #include <expected>
 #include <utility>
 #include <variant>
@@ -22,15 +21,8 @@ namespace boost::json { class value; }
 namespace gpt4all::backend {
 
 struct ResponseError {
-private:
-    using ErrorCode = std::variant<
-        QNetworkReply::NetworkError,
-        std::exception_ptr
-    >;
-
-public:
-    ErrorCode error;
-    QString   errorString;
+    QNetworkReply::NetworkError error;
+    QString                     errorString;
 
     ResponseError(const QNetworkReply *reply)
         : error(reply->error())
@@ -38,13 +30,6 @@ public:
     {
         assert(reply->error());
     }
-
-    ResponseError(const std::exception &e, std::exception_ptr err)
-        : error(std::move(err))
-        , errorString(e.what())
-    {
-        assert(std::get<std::exception_ptr>(error));
-    }
 };
 
 template <typename T>
diff --git a/gpt4all-backend/src/ollama-client.cpp b/gpt4all-backend/src/ollama-client.cpp
index 14ec7614..c621f3f9 100644
--- a/gpt4all-backend/src/ollama-client.cpp
+++ b/gpt4all-backend/src/ollama-client.cpp
@@ -27,20 +27,16 @@ static auto processResponse(QNetworkReply &reply) -> QCoro::Task<DataOrRespErr<j
     if (reply.error())
         co_return std::unexpected(&reply);
 
-    try {
-        json::parser p;
-        auto coroReply = qCoro(reply);
-        do {
-            auto chunk = co_await coroReply.readAll();
-            if (reply.error())
-                co_return std::unexpected(&reply);
-            p.write(chunk.data(), chunk.size());
-        } while (!reply.atEnd());
+    json::parser p;
+    auto coroReply = qCoro(reply);
+    do {
+        auto chunk = co_await coroReply.readAll();
+        if (reply.error())
+            co_return std::unexpected(&reply);
+        p.write(chunk.data(), chunk.size());
+    } while (!reply.atEnd());
 
-        co_return p.release();
-    } catch (const std::exception &e) {
-        co_return std::unexpected(ResponseError(e, std::current_exception()));
-    }
+    co_return p.release();
 }