Merge pull request #32 from lucaromagnoli/fix/optional-params

Fix/optional params

Author: lucaromagnoli

.github/workflows/ci.yml

@@ -18,7 +18,6 @@ on:
 
 jobs:
   build-and-test:
-    if: github.event_name != 'push' || !startsWith(github.ref, 'refs/tags/')
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false

.github/workflows/release.yml

@@ -33,38 +33,10 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  check-ci-status:
-    needs: check-open-prs
-    if: needs.check-open-prs.outputs.has_open_prs == 'false'
-    runs-on: ubuntu-latest
-    outputs:
-      ci_passed: ${{ steps.check.outputs.ci_passed }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
 
-      - name: Check if CI has already passed
-        id: check
-        run: |
-          # Get the commit SHA
-          COMMIT_SHA="${{ github.sha }}"
-          echo "Checking CI status for commit: $COMMIT_SHA"
-
-          # Check if there's a successful CI run for this commit
-          CI_STATUS=$(gh api repos/${{ github.repository }}/commits/$COMMIT_SHA/status --jq '.statuses[] | select(.context == "CI") | .state' 2>/dev/null || echo "unknown")
-
-          if [ "$CI_STATUS" = "success" ]; then
-            echo "ci_passed=true" >> $GITHUB_OUTPUT
-            echo "✅ CI has already passed for this commit. Skipping build-and-test."
-          else
-            echo "ci_passed=false" >> $GITHUB_OUTPUT
-            echo "⚠️ CI has not passed yet or status unknown. Running build-and-test."
-          fi
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   validate-version:
-    needs: [check-open-prs, check-ci-status]
+    needs: [check-open-prs]
     if: needs.check-open-prs.outputs.has_open_prs == 'false'
     runs-on: ubuntu-latest
     outputs:
@@ -135,113 +107,8 @@ jobs:
           fi
           echo "✅ Changelog validation passed: version $VERSION found in CHANGELOG.md"
 
-  build-and-test:
-    needs: [check-open-prs, check-ci-status, validate-version]
-    if: needs.check-open-prs.outputs.has_open_prs == 'false' && needs.check-ci-status.outputs.ci_passed == 'false'
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-        build_type: [Release]
-        include:
-          - os: ubuntu-latest
-            cmake_args: "-DLLMCPP_BUILD_TESTS=ON -DLLMCPP_BUILD_EXAMPLES=ON"
-          - os: windows-latest
-            cmake_args: "-DLLMCPP_BUILD_TESTS=ON -DLLMCPP_BUILD_EXAMPLES=ON"
-
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30  # Add timeout to prevent runaway builds
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      # Improved caching for release builds
-      - name: Cache CMake build
-        uses: actions/cache@v4
-        with:
-          path: |
-            build
-            !build/tests/llmcpp_tests
-            !build/examples
-          key: release-cmake-${{ matrix.os }}-${{ matrix.build_type }}-${{ hashFiles('CMakeLists.txt', '**/CMakeLists.txt', 'src/**/*', 'include/**/*') }}
-          restore-keys: |
-            release-cmake-${{ matrix.os }}-${{ matrix.build_type }}-
-
-      # Cache vcpkg packages (Windows)
-      - name: Cache vcpkg packages
-        if: matrix.os == 'windows-latest'
-        uses: actions/cache@v4
-        with:
-          path: |
-            ${{ github.workspace }}/vcpkg
-            ${{ github.workspace }}/vcpkg_installed
-          key: release-vcpkg-${{ matrix.os }}-${{ hashFiles('vcpkg.json') }}
-          restore-keys: |
-            release-vcpkg-${{ matrix.os }}-
-
-      - name: Setup CMake
-        uses: jwlawson/actions-setup-cmake@v1.14
-        with:
-          cmake-version: ${{ env.CMAKE_VERSION }}
-
-      - name: Setup vcpkg (Windows)
-        if: runner.os == 'Windows'
-        uses: lukka/run-vcpkg@v11
-        with:
-          vcpkgJsonGlob: '**/vcpkg.json'
-
-      - name: Install dependencies (Ubuntu)
-        if: runner.os == 'Linux'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libssl-dev nlohmann-json3-dev
-
-      - 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 }}
-
-      - name: Build
-        timeout-minutes: 20  # Reduced timeout for faster failure detection
-        run: |
-          cmake --build build --config ${{ matrix.build_type }} --parallel
-
-      - name: Test
-        timeout-minutes: 10  # Add timeout to tests
-        run: |
-          cd build
-          ctest --output-on-failure -C ${{ matrix.build_type }} --exclude-regex "integration"
-
-      - name: Package (Linux/macOS)
-        if: runner.os != 'Windows'
-        run: |
-          cd build
-          cpack -G TGZ
-          ls -la *.tar.gz
-
-      - name: Package (Windows)
-        if: runner.os == 'Windows'
-        run: |
-          cd build
-          cpack -G ZIP
-          dir *.zip
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: llmcpp-${{ needs.validate-version.outputs.version }}-${{ runner.os }}
-          path: |
-            build/*.tar.gz
-            build/*.zip
-          retention-days: 30
-
   create-release:
-    needs: [check-open-prs, check-ci-status, validate-version, build-and-test]
+    needs: [check-open-prs, validate-version]
     if: needs.check-open-prs.outputs.has_open_prs == 'false'
     runs-on: ubuntu-latest
     permissions:
@@ -253,11 +120,6 @@ jobs:
         with:
           fetch-depth: 0  # Fetch all history for changelog generation
 
-      - name: Download all artifacts
-        uses: actions/download-artifact@v4
-        with:
-          path: release-assets
-
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
@@ -279,18 +141,15 @@ jobs:
           body: ${{ steps.changelog.outputs.changelog }}
           prerelease: ${{ needs.validate-version.outputs.is_prerelease }}
           draft: false
-          files: |
-            release-assets/**/*
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create release summary
         run: |
           echo "## 🎉 Release ${{ needs.validate-version.outputs.version }} Created!" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
-          echo "### 📦 Assets:" >> $GITHUB_STEP_SUMMARY
-          echo "- Linux (Ubuntu) build artifacts" >> $GITHUB_STEP_SUMMARY
-          echo "- Windows build artifacts" >> $GITHUB_STEP_SUMMARY
+          echo "### 📝 Release Notes:" >> $GITHUB_STEP_SUMMARY
+          echo "Release notes generated from CHANGELOG.md" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "### 🔗 Links:" >> $GITHUB_STEP_SUMMARY
           echo "- [Release Page](https://github.com/${{ github.repository }}/releases/tag/${{ github.ref_name }})" >> $GITHUB_STEP_SUMMARY

CHANGELOG.md

@@ -4,6 +4,21 @@
 
 
 
+## [1.0.19] - 2025-07-13
+
+### Added
+- skip release build-and-test if CI has already passed for the commit
+
+### Fixed
+- simplify CI condition to prevent tag builds
+
+### Other
+- Merge pull request #30 from lucaromagnoli/feat/add-models
+- Remove o3 model integration test; only test o3-mini (no temperature or maxTokens)
+- Commit remaining changes: core, openai, and unit test updates for optional params and o3-mini logic
+- Fix maxTokens test: now optional instead of defaulting to 200
+- Bump version to 1.0.18 for patch release
+
 ## [1.0.17] - 2025-07-13
 
 ### Fixed

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22)
 
-project(llmcpp VERSION 1.0.17 LANGUAGES CXX)
+project(llmcpp VERSION 1.0.19 LANGUAGES CXX)
 
 # Set version variables for easier access
 set(LLMCPP_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})

include/core/LLMTypes.h

@@ -18,8 +18,8 @@ struct LLMRequestConfig {
     std::string jsonSchema;
     std::optional<json> schemaObject;  // Structured schema data
 
-    float temperature = 0.8f;
-    int maxTokens = 200;
+    std::optional<float> temperature;  // Optional temperature (filtered by model support)
+    std::optional<int> maxTokens;      // Optional max tokens
 
     // Convenience method for any model name
     void setModel(const std::string& modelName) { model = modelName; }
@@ -30,10 +30,11 @@ struct LLMRequestConfig {
 
     std::string toString() const {
         std::string schemaStr = schemaObject.has_value() ? schemaObject->dump() : jsonSchema;
+        std::string tempStr = temperature.has_value() ? std::to_string(*temperature) : "not set";
         return "LLMRequestConfig { client: " + client + ", model: " + getModelString() +
                ", functionName: " + functionName + ", schema: " + schemaStr +
-               ", temperature: " + std::to_string(temperature) +
-               ", maxTokens: " + std::to_string(maxTokens) + " }";
+               ", temperature: " + tempStr +
+               ", maxTokens: " + std::to_string(maxTokens.has_value() ? *maxTokens : 0) + " }";
     }
 };
 

include/openai/OpenAIClient.h

@@ -63,11 +63,13 @@ class OpenAIClient : public LLMClient {
      * Convenience methods with Model enum
      */
     LLMResponse sendRequest(OpenAI::Model model, const std::string& prompt, LLMContext context = {},
-                            int maxTokens = 200, float temperature = 0.7f);
+                            std::optional<int> maxTokens = std::nullopt,
+                            std::optional<float> temperature = std::nullopt);
     std::future<LLMResponse> sendRequestAsync(OpenAI::Model model, const std::string& prompt,
                                               LLMResponseCallback callback = nullptr,
-                                              LLMContext context = {}, int maxTokens = 200,
-                                              float temperature = 0.7f);
+                                              LLMContext context = {},
+                                              std::optional<int> maxTokens = std::nullopt,
+                                              std::optional<float> temperature = std::nullopt);
 
     /**
      * Configuration methods

include/openai/OpenAITypes.h

@@ -1054,11 +1054,12 @@ inline ResponsesRequest ResponsesRequest::fromLLMRequest(const LLMRequest& reque
     }
     responsesReq.toolChoice =
         ToolChoiceMode::Auto;  // Explicitly initialize to fix cppcheck warning
-    if (request.config.maxTokens > 0) {
-        responsesReq.maxOutputTokens = request.config.maxTokens;
+    if (request.config.maxTokens.has_value() && *request.config.maxTokens > 0) {
+        responsesReq.maxOutputTokens = *request.config.maxTokens;
     }
-    if (request.config.temperature >= 0.0f) {
-        responsesReq.temperature = static_cast<double>(request.config.temperature);
+    // Only set temperature if it's provided and valid
+    if (request.config.temperature.has_value() && *request.config.temperature >= 0.0f) {
+        responsesReq.temperature = static_cast<double>(*request.config.temperature);
     }
     if (!request.previousResponseId.empty()) {
         responsesReq.previousResponseID = request.previousResponseId;
@@ -1303,11 +1304,12 @@ inline ChatCompletionRequest ChatCompletionRequest::fromLLMRequest(const LLMRequ
         chatReq.messages.push_back(userMsg);
     }
 
-    if (request.config.maxTokens > 0) {
-        chatReq.maxTokens = request.config.maxTokens;
+    if (request.config.maxTokens.has_value() && *request.config.maxTokens > 0) {
+        chatReq.maxTokens = *request.config.maxTokens;
     }
-    if (request.config.temperature >= 0.0f) {
-        chatReq.temperature = static_cast<double>(request.config.temperature);
+    // Only set temperature if it's provided and valid
+    if (request.config.temperature.has_value() && *request.config.temperature >= 0.0f) {
+        chatReq.temperature = static_cast<double>(*request.config.temperature);
     }
 
     return chatReq;

src/openai/OpenAIClient.cpp

@@ -83,27 +83,34 @@ std::future<LLMResponse> OpenAIClient::sendStreamingRequestAsync(
 
 // Convenience methods with Model enum
 LLMResponse OpenAIClient::sendRequest(OpenAI::Model model, const std::string& prompt,
-                                      LLMContext context, int maxTokens, float temperature) {
+                                      LLMContext context, std::optional<int> maxTokens,
+                                      std::optional<float> temperature) {
     LLMRequestConfig config;
     config.client = "openai";
     config.model = modelToString(model);
-    config.maxTokens = maxTokens;
-    config.temperature = temperature;
+    if (maxTokens.has_value()) {
+        config.maxTokens = *maxTokens;
+    }
+    if (temperature.has_value()) {
+        config.temperature = *temperature;
+    }
 
     LLMRequest request(config, prompt, context);
     return sendRequest(request);
 }
 
-std::future<LLMResponse> OpenAIClient::sendRequestAsync(OpenAI::Model model,
-                                                        const std::string& prompt,
-                                                        LLMResponseCallback callback,
-                                                        LLMContext context, int maxTokens,
-                                                        float temperature) {
+std::future<LLMResponse> OpenAIClient::sendRequestAsync(
+    OpenAI::Model model, const std::string& prompt, LLMResponseCallback callback,
+    LLMContext context, std::optional<int> maxTokens, std::optional<float> temperature) {
     LLMRequestConfig config;
     config.client = "openai";
     config.model = modelToString(model);
-    config.maxTokens = maxTokens;
-    config.temperature = temperature;
+    if (maxTokens.has_value()) {
+        config.maxTokens = *maxTokens;
+    }
+    if (temperature.has_value()) {
+        config.temperature = *temperature;
+    }
 
     LLMRequest request(config, prompt, context);
     return sendRequestAsync(request, callback);

src/openai/OpenAIResponsesApi.cpp

@@ -26,6 +26,8 @@ OpenAI::ResponsesResponse OpenAIResponsesApi::create(const OpenAI::ResponsesRequ
         auto httpResponse = httpClient_->post(url, requestJson);
 
         if (!httpResponse.success) {
+            std::cerr << "❌ HTTP request failed! Status: " << httpResponse.statusCode << std::endl;
+            std::cerr << "❌ HTTP response body: " << httpResponse.body << std::endl;
             throw std::runtime_error("HTTP request failed: " + httpResponse.errorMessage);
         }
 
@@ -47,8 +49,10 @@ OpenAI::ResponsesResponse OpenAIResponsesApi::create(const OpenAI::ResponsesRequ
         return response;
 
     } catch (const json::exception& e) {
+        std::cerr << "❌ JSON parsing error: " << e.what() << std::endl;
         throw std::runtime_error("JSON parsing error: " + std::string(e.what()));
     } catch (const std::exception& e) {
+        std::cerr << "❌ Exception: " << e.what() << std::endl;
         throw std::runtime_error("API call failed: " + std::string(e.what()));
     }
 }