From e592a5890ef54dbe045a83130303cf93d1b0477c Mon Sep 17 00:00:00 2001
From: Jared Van Bortel <jared@nomic.ai>
Date: Tue, 25 Feb 2025 13:12:22 -0500
Subject: [PATCH] fix test

---
 gpt4all-backend-test/CMakeLists.txt     |  2 ++
 gpt4all-backend-test/src/CMakeLists.txt | 12 +++---------
 gpt4all-backend-test/src/config.cppm.in | 10 ----------
 gpt4all-backend-test/src/config.h.in    |  6 ++++++
 gpt4all-backend-test/src/main.cpp       | 24 ++++++++++++++++--------
 5 files changed, 27 insertions(+), 27 deletions(-)
 delete mode 100644 gpt4all-backend-test/src/config.cppm.in
 create mode 100644 gpt4all-backend-test/src/config.h.in

diff --git a/gpt4all-backend-test/CMakeLists.txt b/gpt4all-backend-test/CMakeLists.txt
index 62f3fc00..25d32eec 100644
--- a/gpt4all-backend-test/CMakeLists.txt
+++ b/gpt4all-backend-test/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.29)
 project(gpt4all-backend-test VERSION 0.1 LANGUAGES CXX)
 
+set(G4A_TEST_OLLAMA_URL "http://localhost:11434/" CACHE STRING "The base URL of the Ollama server to use.")
+
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 include(../common/common.cmake)
 
diff --git a/gpt4all-backend-test/src/CMakeLists.txt b/gpt4all-backend-test/src/CMakeLists.txt
index 7b6a4a70..932921a3 100644
--- a/gpt4all-backend-test/src/CMakeLists.txt
+++ b/gpt4all-backend-test/src/CMakeLists.txt
@@ -1,19 +1,13 @@
 set(TARGET test-backend)
 
-configure_file(config.cppm.in "${CMAKE_CURRENT_BINARY_DIR}/config.cppm")
+configure_file(config.h.in "${CMAKE_CURRENT_BINARY_DIR}/include/config.h")
 
 add_executable(${TARGET}
     main.cpp
 )
 target_compile_features(${TARGET} PUBLIC cxx_std_23)
-if (CMAKE_COMPILER_IS_GNUCXX)
-    target_compile_options(${TARGET} PUBLIC -fmodules-ts)
-endif()
-target_sources(${TARGET} PRIVATE
-    FILE_SET gpt4all_backend TYPE CXX_MODULES BASE_DIRS
-        "${CMAKE_CURRENT_BINARY_DIR}"
-    FILES
-        "${CMAKE_CURRENT_BINARY_DIR}/config.cppm"
+target_include_directories(${TARGET} PRIVATE
+    "${CMAKE_CURRENT_BINARY_DIR}/include"
 )
 gpt4all_add_warning_options(${TARGET})
 target_link_libraries(${TARGET} PRIVATE
diff --git a/gpt4all-backend-test/src/config.cppm.in b/gpt4all-backend-test/src/config.cppm.in
deleted file mode 100644
index 2a641e27..00000000
--- a/gpt4all-backend-test/src/config.cppm.in
+++ /dev/null
@@ -1,10 +0,0 @@
-module;
-
-#include <QString>
-
-export module gpt4all.test.config;
-
-using namespace Qt::Literals::StringLiterals;
-
-
-export inline QString OLLAMA_URL = u"@G4A_TEST_OLLAMA_URL@"_s;
diff --git a/gpt4all-backend-test/src/config.h.in b/gpt4all-backend-test/src/config.h.in
new file mode 100644
index 00000000..45f97af5
--- /dev/null
+++ b/gpt4all-backend-test/src/config.h.in
@@ -0,0 +1,6 @@
+#pragma once
+
+#include <QString>
+
+
+inline const QString OLLAMA_URL = QStringLiteral("@G4A_TEST_OLLAMA_URL@");
diff --git a/gpt4all-backend-test/src/main.cpp b/gpt4all-backend-test/src/main.cpp
index 66bdbf4a..abd5f390 100644
--- a/gpt4all-backend-test/src/main.cpp
+++ b/gpt4all-backend-test/src/main.cpp
@@ -1,20 +1,28 @@
-#include <QCoro/QCoroTask>
-#include <QLatin1StringView>
 
-import fmt;
-import gpt4all.backend.main;
-import gpt4all.test.config;
+#include "config.h"
+
+#include <QCoro/QCoroTask>
+#include <fmt/format.h>
+#include <gpt4all-backend/formatters.h>
+#include <gpt4all-backend/main.h>
+
+#include <QCoreApplication>
+#include <QLatin1StringView>
 
 using gpt4all::backend::LLMProvider;
 
 
-int main()
+int main(int argc, char *argv[])
 {
+    QCoreApplication app(argc, argv);
+
+    fmt::print("Connecting to server at {}\n", OLLAMA_URL);
     LLMProvider provider(OLLAMA_URL);
     auto version = QCoro::waitFor(provider.getVersion());
     if (version) {
-        fmt::print("Server version: {}", *version);
+        fmt::print("Server version: {}\n", *version);
     } else {
-        fmt::print("Network error: {}", version.unexpected().errorString);
+        fmt::print("Network error: {}\n", version.error().errorString);
+        return 1;
     }
 }