Merge pull request #16 from lucaromagnoli/fix/windows-build

Fix Windows build: Add SSL support configuration and conditional comp…

Author: lucaromagnoli

.github/workflows/release.yml

@@ -99,7 +99,13 @@ jobs:
         run: |
           brew install openssl
 
-      - name: Configure CMake
+      - name: Configure CMake (Windows)
+        if: runner.os == 'Windows'
+        run: |
+          cmake -B build ${{ matrix.cmake_args }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_ROOT\scripts\buildsystems\vcpkg.cmake"
+
+      - name: Configure CMake (Non-Windows)
+        if: runner.os != 'Windows'
         run: |
           cmake -B build ${{ matrix.cmake_args }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
 

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22)
 
-project(llmcpp VERSION 1.0.1 LANGUAGES CXX)
+project(llmcpp VERSION 1.0.2 LANGUAGES CXX)
 
 # Set version variables for easier access
 set(LLMCPP_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
@@ -50,6 +50,9 @@ FetchContent_Declare(
     GIT_REPOSITORY https://github.com/yhirose/cpp-httplib.git
     GIT_TAG v0.15.3
 )
+
+# Configure httplib to use OpenSSL
+set(HTTPLIB_USE_OPENSSL ON)
 FetchContent_MakeAvailable(httplib)
 
 # Source files

scripts/release.sh

@@ -164,7 +164,8 @@ main() {
     echo "  1. Update version in CMakeLists.txt and vcpkg.json"
     echo "  2. Create a git commit with the version changes"
     echo "  3. Create and push a git tag v$new_version"
-    echo "  4. Trigger GitHub Actions to create a release"
+    echo "  4. Push the current branch to origin"
+    echo "  5. Trigger GitHub Actions to create a release (if on main branch)"
     echo ""
     read -p "Continue? (y/N): " -n 1 -r
     echo ""
@@ -185,7 +186,12 @@ main() {
     # Create and push tag
     print_info "Creating and pushing tag v$new_version..."
     git tag "v$new_version"
-    git push origin main
+    
+    # Get current branch name
+    local current_branch
+    current_branch=$(git branch --show-current)
+    print_info "Pushing current branch: $current_branch"
+    git push origin "$current_branch"
     git push origin "v$new_version"
 
     print_success "Release v$new_version created!"

src/openai/OpenAIHttpClient.cpp

@@ -32,6 +32,7 @@ class OpenAIHttpClient::HttpClientImpl {
             basePath_ = "/v1";
         }
 
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
         client_ = std::make_unique<httplib::SSLClient>(hostname_);
 
         // Configure client
@@ -41,40 +42,66 @@ class OpenAIHttpClient::HttpClientImpl {
 
         // Enable SSL verification
         client_->enable_server_certificate_verification(true);
+#else
+        throw std::runtime_error(
+            "SSL support not available. Please ensure OpenSSL is properly linked.");
+#endif
     }
 
     OpenAIHttpClient::HttpResponse post(const std::string& endpoint, const json& requestBody) {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
         auto headers = buildHeaders();
         auto url = buildUrl(endpoint);
         auto bodyStr = requestBody.dump();
 
         auto result = client_->Post(url, headers, bodyStr, "application/json");
 
         return processResponse(result);
+#else
+        OpenAIHttpClient::HttpResponse response;
+        response.success = false;
+        response.statusCode = 0;
+        response.errorMessage = "SSL support not available";
+        return response;
+#endif
     }
 
     OpenAIHttpClient::HttpResponse get(const std::string& endpoint) {
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
         auto headers = buildHeaders();
         auto url = buildUrl(endpoint);
 
         auto result = client_->Get(url, headers);
 
         return processResponse(result);
+#else
+        OpenAIHttpClient::HttpResponse response;
+        response.success = false;
+        response.statusCode = 0;
+        response.errorMessage = "SSL support not available";
+        return response;
+#endif
     }
 
     void setConfig(const OpenAI::OpenAIConfig& config) {
         config_ = config;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
         // Update client timeouts
         client_->set_connection_timeout(config_.timeoutSeconds);
         client_->set_read_timeout(config_.timeoutSeconds);
         client_->set_write_timeout(config_.timeoutSeconds);
+#endif
     }
 
     OpenAI::OpenAIConfig getConfig() const { return config_; }
 
    private:
     OpenAI::OpenAIConfig config_;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
     std::unique_ptr<httplib::SSLClient> client_;
+#else
+    std::unique_ptr<void> client_;  // Placeholder when SSL not available
+#endif
     std::string hostname_;
     std::string basePath_;
 

vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "llmcpp",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "dependencies": [
     "openssl"
   ],