PyOpenMagnetics 1.2.0__tar.gz → 1.2.2__tar.gz

{pyopenmagnetics-1.2.0 → pyopenmagnetics-1.2.2}/.github/workflows/publish.yml

@@ -4,6 +4,12 @@ on:
   release:
     types: [published]
   workflow_dispatch:  # Allow manual trigger for testing
+    inputs:
+      skip_macos:
+        description: 'Skip macOS builds (useful when macOS builds are failing due to infrastructure issues)'
+        required: false
+        default: false
+        type: boolean
 
 env:
   GIT_LFS_SKIP_SMUDGE: 1  # Skip LFS to avoid bandwidth quota issues
@@ -12,16 +18,36 @@ jobs:
   build_wheels:
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.os == 'macos-15' }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, windows-2022, macos-15]
+        os: ${{ github.event_name == 'workflow_dispatch' && inputs.skip_macos && fromJson('["ubuntu-22.04", "windows-2022"]') || fromJson('["ubuntu-22.04", "windows-2022", "macos-15"]') }}
 
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
 
+      - name: Cache cibuildwheel
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cache/cibuildwheel
+            ~/Library/Caches/cibuildwheel
+            C:\Users\runneradmin\AppData\Local\pypa\cibuildwheel\Cache
+          key: cibuildwheel-${{ runner.os }}-${{ hashFiles('**/pyproject.toml') }}
+          restore-keys: |
+            cibuildwheel-${{ runner.os }}-
+
+      - name: Cache npm
+        uses: actions/cache@v4
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-npm-
+
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
@@ -33,11 +59,51 @@ jobs:
           node-version: "18"
 
       - name: Install quicktype
-        run: npm install -g quicktype
+        shell: bash
+        run: |
+          for i in {1..5}; do
+            npm install -g quicktype && break
+            if [ $i -lt 5 ]; then
+              echo "Retry $i failed, waiting 60s..."
+              sleep 60
+            fi
+          done
 
       - name: Install cibuildwheel
         run: python -m pip install cibuildwheel==2.21.3
 
+      - name: Pre-download virtualenv
+        shell: bash
+        run: |
+          # Create cache directory
+          if [[ "$RUNNER_OS" == "Windows" ]]; then
+            CACHE_DIR="$LOCALAPPDATA/pypa/cibuildwheel/Cache"
+          elif [[ "$RUNNER_OS" == "macOS" ]]; then
+            CACHE_DIR="$HOME/Library/Caches/cibuildwheel"
+          else
+            CACHE_DIR="$HOME/.cache/cibuildwheel"
+          fi
+          mkdir -p "$CACHE_DIR"
+          
+          # Download virtualenv.pyz with retry
+          VENV_VERSION="20.26.6"
+          VENV_FILE="$CACHE_DIR/virtualenv-$VENV_VERSION.pyz"
+          VENV_URL="https://github.com/pypa/get-virtualenv/blob/$VENV_VERSION/public/virtualenv.pyz?raw=true"
+          
+          if [[ ! -f "$VENV_FILE" ]]; then
+            echo "Downloading virtualenv.pyz..."
+            for i in {1..10}; do
+              if curl -fsSL --max-time 30 "$VENV_URL" -o "$VENV_FILE"; then
+                echo "Downloaded successfully"
+                break
+              fi
+              echo "Download attempt $i failed, waiting 60s..."
+              sleep 60
+            done
+          else
+            echo "virtualenv.pyz already cached"
+          fi
+
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse
         env:
@@ -50,19 +116,26 @@ jobs:
           # Install Node.js 18 and quicktype in the build container (Linux)
           # Also install gcc-toolset-13 for C++23 support
           CIBW_BEFORE_ALL_LINUX: |
-            dnf install -y gcc-toolset-13 && \
-            source /opt/rh/gcc-toolset-13/enable && \
-            curl -fsSL https://rpm.nodesource.com/setup_18.x | bash - && \
-            dnf install -y nodejs && \
-            npm install -g quicktype
-          CIBW_BEFORE_ALL_MACOS: npm install -g quicktype
+            for i in {1..3}; do
+              (dnf install -y gcc-toolset-13 eigen3-devel && \
+              source /opt/rh/gcc-toolset-13/enable && \
+              curl -fsSL --max-time 10 https://rpm.nodesource.com/setup_18.x | bash - && \
+              dnf install -y nodejs && \
+              npm install -g quicktype) && break
+              if [ $i -lt 3 ]; then sleep 60; fi
+            done
+          CIBW_BEFORE_ALL_MACOS: |
+            for i in {1..5}; do
+              npm install -g quicktype && break
+              if [ $i -lt 5 ]; then sleep 60; fi
+            done
           CIBW_BEFORE_ALL_WINDOWS: npm install -g quicktype
           # Set macOS deployment target to 15.0 for arm64 (Homebrew libraries require it)
           CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=15.0
           # Enable gcc-toolset-13 before build for C++23
           CIBW_ENVIRONMENT_LINUX: PATH=/opt/rh/gcc-toolset-13/root/usr/bin:$PATH LD_LIBRARY_PATH=/opt/rh/gcc-toolset-13/root/usr/lib64:$LD_LIBRARY_PATH
-          # Install build dependencies
-          CIBW_BEFORE_BUILD: pip install scikit-build-core cmake ninja pybind11
+          # Install build dependencies with retry
+          CIBW_BEFORE_BUILD: pip install --default-timeout=60 --retries 5 scikit-build-core cmake ninja pybind11
           # Test the wheel
           CIBW_TEST_COMMAND: python -c "import PyOpenMagnetics; print(f'PyOpenMagnetics loaded successfully with {len(dir(PyOpenMagnetics))} functions')"
 
@@ -79,6 +152,14 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Cache npm
+        uses: actions/cache@v4
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-npm-
+
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
@@ -90,7 +171,15 @@ jobs:
           node-version: "18"
 
       - name: Install quicktype
-        run: npm install -g quicktype
+        shell: bash
+        run: |
+          for i in {1..5}; do
+            npm install -g quicktype && break
+            if [ $i -lt 5 ]; then
+              echo "Retry $i failed, waiting 60s..."
+              sleep 60
+            fi
+          done
 
       - name: Install build
         run: python -m pip install build
@@ -121,9 +210,10 @@ jobs:
         with:
           path: dist
           merge-multiple: true
+        continue-on-error: true
 
       - name: List distribution files
-        run: ls -la dist/
+        run: ls -la dist/ 2>/dev/null || echo "No distribution files found"
 
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
@@ -150,6 +240,7 @@ jobs:
         with:
           path: dist
           merge-multiple: true
+        continue-on-error: true
 
       - name: Publish to TestPyPI
         uses: pypa/gh-action-pypi-publish@release/v1

{pyopenmagnetics-1.2.0 → pyopenmagnetics-1.2.2}/CMakeLists.txt

@@ -106,6 +106,15 @@ FetchContent_Declare(rapidfuzz
   GIT_TAG main)
 FetchContent_MakeAvailable(rapidfuzz)
 
+message(STATUS "Fetching Eigen")
+FetchContent_Declare(eigen
+  GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git
+  GIT_TAG 3.4.0
+  GIT_PROGRESS TRUE
+  GIT_SHALLOW TRUE)
+FetchContent_MakeAvailable(eigen)
+include_directories("${CMAKE_BINARY_DIR}/_deps/eigen-src")
+
 message(STATUS "Fetching MKF")
 # Force fresh clone by using a unique timestamp - update this when MKF changes
 set(MKF_FORCE_REFRESH "2025-02-26-01")
@@ -266,6 +275,7 @@ include_directories("${CMAKE_BINARY_DIR}/_deps/mkf-src/src/converter_models/")
 include_directories("${CMAKE_BINARY_DIR}/_deps/mkf-src/src/physical_models/")
 include_directories("${CMAKE_BINARY_DIR}/_deps/mkf-src/src/processors/")
 include_directories("${CMAKE_BINARY_DIR}/_deps/mkf-src/src/support/")
+include_directories("${CMAKE_BINARY_DIR}/_deps/eigen-src")
 include_directories("${CMAKE_BINARY_DIR}/_cmrc/include")
 include_directories("${MAS_DIRECTORY}")
 include_directories("src/")

{pyopenmagnetics-1.2.0 → pyopenmagnetics-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PyOpenMagnetics
-Version: 1.2.0
+Version: 1.2.2
 Summary: Python wrapper for OpenMagnetics
 Author-Email: Alfonso Martinez <Alfonso_VII@hotmail.com>
 Classifier: Development Status :: 4 - Beta

{pyopenmagnetics-1.2.0 → pyopenmagnetics-1.2.2}/PyOpenMagnetics.pyi

@@ -685,11 +685,60 @@ def get_default_models() -> JsonDict:
     """Get default model selections."""
     ...
 
-# =============================================================================
-# CONVERTER TOPOLOGY PROCESSORS
-# =============================================================================
-
-def process_flyback(flyback: JsonDict) -> Inputs:
+# =============================================================================
+# CONVERTER TOPOLOGY PROCESSORS
+# =============================================================================
+
+def process_converter(topology: str, converter: JsonDict, use_ngspice: bool = True) -> JsonDict:
+    """Process a converter topology specification to Inputs.
+    
+    Generic endpoint that dispatches to the appropriate topology processor.
+    
+    Args:
+        topology: Topology name ("flyback", "buck", "boost", "single_switch_forward",
+                 "two_switch_forward", "active_clamp_forward", "push_pull", "llc",
+                 "cllc", "dab", "phase_shifted_full_bridge", "phase_shifted_half_bridge",
+                 "isolated_buck", "isolated_buck_boost", "current_transformer")
+        converter: JSON object with converter specification per MAS schema
+        use_ngspice: If True, uses ngspice simulation for waveform extraction
+    
+    Returns:
+        JSON object with "designRequirements" and "operatingPoints"
+        On error, returns {"error": "..."}
+    """
+    ...
+
+def design_magnetics_from_converter(
+    topology: str,
+    converter: JsonDict,
+    max_results: int = 1,
+    core_mode: str = "AVAILABLE_CORES",
+    use_ngspice: bool = True,
+    weights: Optional[Dict[str, float]] = None
+) -> JsonDict:
+    """Design magnetic components from a converter specification.
+    
+    High-level endpoint that combines converter processing with magnetic adviser
+    to go from converter specification directly to ranked magnetic designs.
+    
+    Args:
+        topology: Topology name (see process_converter for list)
+        converter: JSON object with converter specification per MAS schema
+        max_results: Maximum number of magnetic designs to return
+        core_mode: Core selection mode - "AVAILABLE_CORES" or "STANDARD_CORES"
+        use_ngspice: If True, uses ngspice simulation for waveform extraction
+        weights: Optional filter weights (e.g., {"COST": 1.0, "LOSSES": 2.0})
+    
+    Returns:
+        JSON object with "data" array containing ranked results.
+        Each result has:
+        - "mas": Mas object with magnetic design
+        - "scoring": Overall float score
+        - "scoringPerFilter": Object with individual filter scores
+    """
+    ...
+
+def process_flyback(flyback: JsonDict) -> Inputs:
     """Process Flyback converter specification to Inputs."""
     ...
 

{pyopenmagnetics-1.2.0 → pyopenmagnetics-1.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "PyOpenMagnetics"
-version = "1.2.0"
+version = "1.2.2"
 requires-python = ">=3.8"
 authors = [
   { name="Alfonso Martinez", email="Alfonso_VII@hotmail.com" },
@@ -48,15 +48,15 @@ manylinux-pypy_aarch64-image = "manylinux_2_28"
 environment = { GIT_LFS_SKIP_SMUDGE=1 }
 build-verbosity = 1
 
-[tool.cibuildwheel.linux]
-before-all = [
-  "rm -rf /project/build /root/.cmake",
-  "dnf -y module reset nodejs",
-  "dnf -y module enable nodejs:20",
-  "dnf -y install nodejs npm",
-  "npm --version",
-  "npm install -g quicktype@23.0.170"
-]
+[tool.cibuildwheel.linux]
+before-all = [
+  "rm -rf /project/build /root/.cmake",
+  "dnf -y module reset nodejs",
+  "dnf -y module enable nodejs:20",
+  "dnf -y install nodejs npm",
+  "npm --version",
+  "npm install -g quicktype@23.0.170"
+]
 environment = { GIT_LFS_SKIP_SMUDGE=1, CMAKE_BUILD_PARALLEL_LEVEL="3" }
 
 [tool.cibuildwheel.macos]

{pyopenmagnetics-1.2.0 → pyopenmagnetics-1.2.2}/src/common.h

@@ -20,6 +20,7 @@
 #include "physical_models/MagneticEnergy.h"
 #include "physical_models/Reluctance.h"
 #include "physical_models/Temperature.h"
+#include "physical_models/ThermalResistance.h"
 #include "physical_models/MagnetizingInductance.h"
 #include "physical_models/CoreLosses.h"
 #include "physical_models/Resistivity.h"
@@ -33,6 +34,7 @@
 #include "processors/Inputs.h"
 #include "processors/MagneticSimulator.h"
 #include "processors/CircuitSimulatorInterface.h"
+#include "processors/NgspiceRunner.h"
 #include "support/Painter.h"
 #include "support/Utils.h"