miriamkw
diff --git a/‎.github/workflows/ci.yml‎
Lines changed: 136 additions & 37 deletions b/‎.github/workflows/ci.yml‎
Lines changed: 136 additions & 37 deletions
diff --git a/‎.gitignore‎
Lines changed: 0 additions & 1 deletion b/‎.gitignore‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎LICENSE‎
Lines changed: 21 additions & 0 deletions b/‎LICENSE‎
Lines changed: 21 additions & 0 deletions
diff --git a/‎Package.resolved‎
Lines changed: 3 additions & 3 deletions b/‎Package.resolved‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎Package.swift‎
Lines changed: 2 additions & 7 deletions b/‎Package.swift‎
Lines changed: 2 additions & 7 deletions
diff --git a/‎README.md‎
Lines changed: 53 additions & 3 deletions b/‎README.md‎
Lines changed: 53 additions & 3 deletions
diff --git a/‎Sources/LoopAlgorithmToPython/BundleFinder.swift‎
Lines changed: 1 addition & 1 deletion b/‎Sources/LoopAlgorithmToPython/BundleFinder.swift‎
Lines changed: 1 addition & 1 deletion
@@ -1,73 +1,172 @@
 name: CI Workflow
 
-# Trigger on PR events and direct pushes to main (but not PR merges)
 on:
   push:
-    branches:
-      - main
+    branches: [main]
   pull_request:
-    branches:
-      - main
-    types:
-      - opened
-      - synchronize
-      - reopened
-
-# Define the jobs to run in the workflow
+    branches: [main]
+    types: [opened, synchronize, reopened]
+
 jobs:
   build-and-test:
-    runs-on: macos-latest  # Use macOS for Swift and iOS-specific dependencies
+    strategy:
+      fail-fast: false # Prevents one OS from stopping others from building
+      matrix:
+        os: [macos-latest, ubuntu-latest, windows-2022]
+    runs-on: ${{ matrix.os }}
+    outputs:
+      target_branch: ${{ steps.vars.outputs.target_branch }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.9'  # Specify your required Python version
+          python-version: '3.9'
 
-      - name: Set up Swift
+      - name: Set up Swift (macOS)
+        if: matrix.os == 'macos-latest'
         run: |
           sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer
-          sudo xcodebuild -runFirstLaunch
+          swift --version
+
+      - name: Set up Swift (Linux)
+        if: matrix.os == 'ubuntu-latest'
+        uses: swift-actions/setup-swift@v2 # Corrected repository name
+        with:
+          swift-version: "6.0"
+
+      - name: Set up Swift (Windows)
+        if: matrix.os == 'windows-2022'
+        uses: SwiftyLab/setup-swift@latest
+        with:
+          swift-version: "6.0"
 
       - name: Install dependencies
+        shell: bash
         run: |
           python -m pip install --upgrade pip
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+          pip install pytest
 
-      - name: Run build script
+      - name: Run build script (Unix)
+        if: matrix.os != 'windows-2022'
+        shell: bash
         run: |
           chmod +x build.sh
           ./build.sh
 
+      # Windows build temporarily disabled due to Swift toolchain circular dependency issue
+      # The Windows .dll exists in the repo but is not automatically updated like .dylib/.so files
+      # TODO: Re-enable when Swift Windows CI circular dependency is resolved
+      # - name: Run build script (Windows)
+      #   if: matrix.os == 'windows-2022'
+      #   shell: cmd
+      #   run: |
+      #     :: 1. Initialize MSVC with the stable Windows SDK positional arguments
+      #     call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" x64 10.0.22621.0 -vcvars_ver=14.29
+      #     
+      #     :: 2. Explicitly set SDKROOT to the Swift Windows Platform SDK
+      #     :: This ensures Swift finds the Standard Library while using the MSVC headers above
+      #     set SDKROOT=C:\Users\runneradmin\AppData\Local\Programs\Swift\Platforms\6.0.3\Windows.platform\Developer\SDKs\Windows.sdk
+      #     
+      #     :: 3. Clear SWIFTFLAGS to prevent interference with the build process
+      #     set SWIFTFLAGS=
+      #     
+      #     :: 4. Run the build
+      #     bash ./build.sh
+
+      - name: Verify library was built
+        shell: bash
+        run: |
+          echo "Checking if library was built successfully..."
+          if [[ "${{ matrix.os }}" == "macos-latest" ]]; then
+            EXPECTED_LIB="loop_to_python_api/dlibs/macos/libLoopAlgorithmToPython.dylib"
+          elif [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then
+            EXPECTED_LIB="loop_to_python_api/dlibs/linux/libLoopAlgorithmToPython.so"
+          elif [[ "${{ matrix.os }}" == "windows-2022" ]]; then
+            echo "Windows build disabled - using existing committed .dll for tests"
+            echo "Windows .dll file exists but is not automatically updated in CI"
+            ls -la "loop_to_python_api/dlibs/windows/libLoopAlgorithmToPython.dll" || echo "Note: Windows .dll should be committed to repo"
+            exit 0
+          fi
+          
+          echo "Expected library: $EXPECTED_LIB"
+          if [ -f "$EXPECTED_LIB" ]; then
+            echo "✓ Library found: $EXPECTED_LIB"
+            ls -la "$EXPECTED_LIB"
+          else
+            echo "✗ Library NOT found: $EXPECTED_LIB"
+            echo "Contents of dlibs directory:"
+            find loop_to_python_api/dlibs/ -type f -name "*" 2>/dev/null || echo "No files found in dlibs/"
+            echo "Contents of .build/release/:"
+            find .build/release/ -name "*" -type f 2>/dev/null || echo "No files found in .build/release/"
+            exit 1
+          fi
+
       - name: Run tests
+        shell: bash
         run: |
-          pytest
+          # Help Linux find the shared library
+          export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/loop_to_python_api/dlibs/linux/
+          # Help macOS find the shared library
+          export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$(pwd)/loop_to_python_api/dlibs/macos/
+          # Help Windows find the shared library
+          export PATH=$PATH:$(pwd)/loop_to_python_api/dlibs/windows/
+          pytest -v -s
 
-      - name: Commit and push the generated .dylib file
-        # Skip if this is a PR merge (indicated by commit message containing "Merge pull request")
-        if: github.event_name == 'pull_request' || !contains(github.event.head_commit.message, 'Merge pull request')
+      - name: Upload Library Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: library-${{ matrix.os }}
+          path: |
+            loop_to_python_api/dlibs/macos/*.dylib
+            loop_to_python_api/dlibs/linux/*.so
+            loop_to_python_api/dlibs/windows/*.dll
+          if-no-files-found: error
+
+      - name: Set Target Branch
+        id: vars
+        shell: bash
         run: |
-          git config --local user.name "GitHub Action"
-          git config --local user.email "action@github.com"
-          
-          # Determine target branch
           if [ "${{ github.event_name }}" = "pull_request" ]; then
-            TARGET_BRANCH="${{ github.event.pull_request.head.ref }}"
+            echo "target_branch=${{ github.event.pull_request.head.ref }}" >> $GITHUB_OUTPUT
           else
-            TARGET_BRANCH="${{ github.ref_name }}"
+            echo "target_branch=${{ github.ref_name }}" >> $GITHUB_OUTPUT
           fi
+
+  commit-generated-files:
+    needs: build-and-test
+    runs-on: ubuntu-latest
+    if: success() && (github.event_name == 'push' || github.event_name == 'pull_request')
+    steps:
+      - name: Checkout target branch
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.build-and-test.outputs.target_branch }}
+          fetch-depth: 0
+
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: temp_libs
+
+      - name: Organize and Commit
+        run: |
+          git config --local user.name "github-actions[bot]"
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
           
-          # Fetch and checkout the target branch
-          git fetch origin
-          git checkout -B $TARGET_BRANCH origin/$TARGET_BRANCH
+          mkdir -p loop_to_python_api/dlibs/macos/
+          mkdir -p loop_to_python_api/dlibs/linux/
+          mkdir -p loop_to_python_api/dlibs/windows/
           
-          # Add and commit the .dylib file
-          git add ./loop_to_python_api/libLoopAlgorithmToPython.dylib
-          git commit -m "Add generated libLoopAlgorithmToPython.dylib" || echo "No changes to commit"
+          # Move files and clean up temp folders
+          find temp_libs/ -name "*.dylib" -exec mv {} loop_to_python_api/dlibs/macos/ \;
+          find temp_libs/ -name "*.so" -exec mv {} loop_to_python_api/dlibs/linux/ \;
+          find temp_libs/ -name "*.dll" -exec mv {} loop_to_python_api/dlibs/windows/ \;
           
-          # Push to the target branch
-          git push origin $TARGET_BRANCH
-
+          git add loop_to_python_api/dlibs/
+          git commit -m "chore: update binaries for macOS, Linux, and Windows [skip ci]" || echo "No changes to commit"
+          git push origin ${{ needs.build-and-test.outputs.target_branch }}
@@ -14,4 +14,3 @@ loop_to_python_api/__pycache__/
 python_tests/__pycache__/
 venv/
 *csv
-
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Miriam K. Wolff
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
@@ -1,19 +1,16 @@
 // swift-tools-version: 5.10
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
 import PackageDescription
 
 let package = Package(
     name: "LoopAlgorithmToPython",
     defaultLocalization: "no",
     platforms: [
         .macOS(.v13),
-        .iOS(.v15),
+        .iOS(.v15), 
         .tvOS(.v15),
         .watchOS(.v8)
     ],
     products: [
-        // Products define the executables and libraries a package produces, making them visible to other packages.
         .library(
             name: "LoopAlgorithmToPython",
             type: .dynamic,
@@ -23,8 +20,6 @@ let package = Package(
         .package(url: "https://github.com/tidepool-org/LoopAlgorithm.git", branch: "main"),
     ],
     targets: [
-        // Targets are the basic building blocks of a package, defining a module or a test suite.
-        // Targets can depend on other targets in this package and products from dependencies.
         .target(
             name: "LoopAlgorithmToPython",
             dependencies: ["LoopAlgorithm"]
@@ -36,4 +31,4 @@ let package = Package(
                 .process("TestData")
         ])
     ]
-)
+)
@@ -153,6 +153,18 @@ Fetches the active insulin based on the provided JSON input.
 
 -------------------------
 
+### Get Loop Recommendations
+
+`get_loop_recommendations(json_file)`
+
+Uses the Loop algorithm to get comprehensive recommendations in JSON format.
+
+- **Parameters**: 
+  - `json_file`: The JSON data input. See python tests and test files for example inputs.
+- **Returns**: A JSON string containing the complete Loop recommendations.
+
+-------------------------
+
 ### Insulin Percent Effect Remaining
 
 `insulin_percent_effect_remaining(minutes, action_duration, peak_activity_time, delay)`
@@ -259,18 +271,56 @@ Fetches the dynamic carbohydrates on board based on the provided JSON input.
   - `json_file`: The JSON data input. See python tests and test files for example inputs.
 - **Returns**: The dynamic carbohydrates on board as a double.
 
+⚠️ **Known Issue**: This function currently has a unit conversion error and may fail with "Conversion Error: g is not compatible with mg/dL·s". See the Known Issues section below for more details.
+
 -------------------------
 
+## Known Issues
+
+### Windows CI Build Limitation
+
+**Issue**: Windows .dll file is not automatically updated via CI  
+**Status**: Temporary limitation due to Swift toolchain issues  
+
+**Description**: While the repository includes a Windows .dll file for the LoopAlgorithmToPython library, the CI system currently cannot automatically rebuild this file for Windows due to Swift toolchain circular dependency issues (`cyclic dependency in module 'ucrt': ucrt -> _Builtin_intrinsics -> ucrt`). 
+
+**Current State**: 
+- ✅ Windows tests run successfully using the existing committed .dll file
+- ✅ macOS (.dylib) and Linux (.so) files are automatically updated via CI
+- ❌ Windows (.dll) file requires manual local builds and commits
+
+**Workaround**: The Windows .dll file can still be built locally and manually committed to the repository. The CI tests on Windows will use the committed .dll file.
+
+**Future Resolution**: This limitation will be resolved when Swift's Windows toolchain issues are fixed upstream.
+
+---
+
+### `get_dynamic_carbs_on_board()` Function
+
+**Issue**: Unit conversion error preventing function execution  
+**Error Message**: `LoopAlgorithm/LoopQuantity.swift:31: Fatal error: Conversion Error: g is not compatible with mg/dL·s`  
+**Status**: Under investigation  
+
+**Description**: The `get_dynamic_carbs_on_board()` function encounters a unit conversion error when attempting to calculate dynamic carbohydrates on board. The error occurs in the underlying LoopAlgorithm library when trying to convert between gram units (for carbohydrates) and glucose rate units (mg/dL per second).
+
+**Workaround**: Currently, no workaround is available. The function exists in the API for future compatibility but should not be used in production until this issue is resolved.
 
+**Test Status**: The corresponding test (`test_get_dynamic_carbs_on_board`) is skipped in the test suite to prevent CI failures.
 
+---
 
 ## Build Dynamic Library
 
-The file `python_api/libLoopAlgorithmToPython.dylib` contains the dynamic library that is containing the C-embedded Swift functions. 
+The dynamic libraries are organized in platform-specific directories:
+- **macOS**: `loop_to_python_api/dlibs/macos/libLoopAlgorithmToPython.dylib`
+- **Linux**: `loop_to_python_api/dlibs/linux/libLoopAlgorithmToPython.so` 
+- **Windows**: `loop_to_python_api/dlibs/windows/libLoopAlgorithmToPython.dll` (plus dependencies)
 
-After making changes in the Swift code, rebuild the dynamic library by running `chmod +x build.sh` followed by `./build.sh`.
+After making changes in the Swift code, rebuild the dynamic library by running `chmod +x build.sh` followed by `./build.sh`. The build script automatically detects your platform and places the library in the correct `dlibs/` subdirectory.
 
+## Installing on Linux
 
+See linux_setup.sh
 
 ## Run Tests
 
@@ -279,7 +329,7 @@ Run command `pytest`.
 
 ## Debugging Advice and Disclaimers
 
-This library does currently only work on Mac, but work is in progress to support other operating systems. 
+This library supports macOS, Linux, and Windows platforms with cross-platform dynamic library loading. 
 
 Debugging with this pipeline can be a pain... Calling functions with python does not give informative error messages, even though the `initialize_exception_handlers()` helps a little bit.
 
 
@@ -39,7 +39,7 @@ extension Foundation.Bundle {
 
         for candidate in candidates {
             let bundlePath = candidate?.appendingPathComponent(bundleName + ".bundle")
-            print(bundlePath)
+            print(bundlePath ?? "No bundle path found")
             if let bundle = bundlePath.flatMap(Bundle.init(url:)) {
                 print("BUNDLE:", bundle)
                 return bundle
-Original file line number
+Diff line change
 python_tests/__pycache__/
 venv/
 *csv
+-