PyOpenMagnetics 1.3.4__tar.gz → 1.3.6__tar.gz

{pyopenmagnetics-1.3.4 → pyopenmagnetics-1.3.6}/.github/workflows/publish.yml

@@ -184,20 +184,22 @@ jobs:
           CIBW_BEFORE_BUILD: pip install --default-timeout=60 --retries 5 scikit-build-core cmake ninja pybind11
           CIBW_TEST_COMMAND: python -c "import PyOpenMagnetics; print(f'PyOpenMagnetics loaded successfully with {len(dir(PyOpenMagnetics))} functions')"
 
+      - name: Install twine
+        run: python -m pip install twine
+
       - name: Publish Windows wheels to PyPI
         if: github.event_name == 'release'
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages-dir: wheelhouse/
+        run: python -m twine upload wheelhouse/*.whl
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
 
       - name: Publish Windows wheels to TestPyPI
         if: github.event_name == 'workflow_dispatch'
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          repository-url: https://test.pypi.org/legacy/
-          password: ${{ secrets.TEST_PYPI_API_TOKEN }}
-          packages-dir: wheelhouse/
+        run: python -m twine upload --repository-url https://test.pypi.org/legacy/ wheelhouse/*.whl
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.TEST_PYPI_API_TOKEN }}
 
   # Build and publish macOS wheels independently
   build_and_publish_macos:
@@ -267,20 +269,22 @@ jobs:
           CIBW_BEFORE_BUILD: pip install --default-timeout=60 --retries 5 scikit-build-core cmake ninja pybind11
           CIBW_TEST_COMMAND: python -c "import PyOpenMagnetics; print(f'PyOpenMagnetics loaded successfully with {len(dir(PyOpenMagnetics))} functions')"
 
+      - name: Install twine
+        run: python -m pip install twine
+
       - name: Publish macOS wheels to PyPI
         if: github.event_name == 'release'
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages-dir: wheelhouse/
+        run: python -m twine upload wheelhouse/*.whl
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
 
       - name: Publish macOS wheels to TestPyPI
         if: github.event_name == 'workflow_dispatch'
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          repository-url: https://test.pypi.org/legacy/
-          password: ${{ secrets.TEST_PYPI_API_TOKEN }}
-          packages-dir: wheelhouse/
+        run: python -m twine upload --repository-url https://test.pypi.org/legacy/ wheelhouse/*.whl
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.TEST_PYPI_API_TOKEN }}
 
   # Build and publish source distribution independently
   build_and_publish_sdist:

{pyopenmagnetics-1.3.4 → pyopenmagnetics-1.3.6}/PKG-INFO

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

{pyopenmagnetics-1.3.4 → pyopenmagnetics-1.3.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "PyOpenMagnetics"
-version = "1.3.4"
+version = "1.3.6"
 requires-python = ">=3.8"
 authors = [
   { name="Alfonso Martinez", email="Alfonso_VII@hotmail.com" },

{pyopenmagnetics-1.3.4 → pyopenmagnetics-1.3.6}/src/advisers.cpp

@@ -104,6 +104,37 @@ json calculate_advised_magnetics(json inputsJson, int maximumNumberResults, json
     }
 }
 
+json calculate_advised_magnetics_fast(json inputsJson, int maximumNumberResults, json coreModeJson) {
+    try {
+        OpenMagnetics::Inputs inputs(inputsJson);
+        OpenMagnetics::CoreAdviser::CoreAdviserModes coreMode;
+        from_json(coreModeJson, coreMode);
+
+        OpenMagnetics::MagneticAdviser magneticAdviser;
+        magneticAdviser.set_core_mode(coreMode);
+        auto masMagnetics = magneticAdviser.get_advised_magnetic_fast(inputs, maximumNumberResults);
+
+        json results = json();
+        results["data"] = json::array();
+        for (auto& [masMagnetic, scoring] : masMagnetics) {
+            std::string name = masMagnetic.get_magnetic().get_manufacturer_info().value().get_reference().value();
+            json result;
+            json masJson;
+            to_json(masJson, masMagnetic);
+            result["mas"] = masJson;
+            result["scoring"] = scoring;
+            results["data"].push_back(result);
+        }
+
+        return results;
+    }
+    catch (const std::exception &exc) {
+        json exception;
+        exception["data"] = "Exception: " + std::string{exc.what()};
+        return exception;
+    }
+}
+
 json calculate_advised_magnetics_from_catalog(json inputsJson, json catalogJson, int maximumNumberResults) {
     try {
         OpenMagnetics::settings.set_coil_delimit_and_compact(true);
@@ -269,6 +300,38 @@ void register_adviser_bindings(py::module& m) {
         )pbdoc",
         py::arg("inputs_json"), py::arg("max_results"), py::arg("core_mode_json"));
     
+    m.def("calculate_advised_magnetics_fast", &calculate_advised_magnetics_fast,
+        R"pbdoc(
+        Get recommended complete magnetic designs using fast analytical mode.
+
+        Performs rapid magnetic design exploration using analytical turn/gap
+        calculation and simplified loss evaluation (DC ohmic + core losses only).
+        Bypasses CoilAdviser optimization and full MagneticSimulator for speed.
+        Results are sorted by ascending total losses (lower losses = better rank).
+
+        Suitable for design space exploration and Pareto front generation.
+        For production designs use calculate_advised_magnetics() instead.
+
+        Args:
+            inputs_json: JSON object containing design requirements and operating points.
+                         Should be processed using process_inputs() first.
+            max_results: Maximum number of magnetic recommendations to return.
+            core_mode_json: Core selection mode - "AVAILABLE_CORES" or "STANDARD_CORES".
+
+        Returns:
+            JSON object with "data" array containing results sorted by total losses.
+            Each result has:
+            - "mas": Mas object with magnetic, inputs, and outputs (losses data)
+            - "scoring": Total losses value in watts (lower is better)
+
+        Example:
+            >>> inputs = PyMKF.process_inputs(raw_inputs)
+            >>> result = PyMKF.calculate_advised_magnetics_fast(inputs, 5, "STANDARD_CORES")
+            >>> for item in result["data"]:
+            ...     print(f"Total losses: {item['scoring']} W")
+        )pbdoc",
+        py::arg("inputs_json"), py::arg("max_results"), py::arg("core_mode_json"));
+
     m.def("calculate_advised_magnetics_from_catalog", &calculate_advised_magnetics_from_catalog,
         R"pbdoc(
         Get recommended magnetics from a custom component catalog.

{pyopenmagnetics-1.3.4 → pyopenmagnetics-1.3.6}/src/advisers.h

@@ -9,6 +9,7 @@ json calculate_advised_cores(json inputsJson, json weightsJson, int maximumNumbe
 
 // Magnetic adviser
 json calculate_advised_magnetics(json inputsJson, int maximumNumberResults, json coreModeJson);
+json calculate_advised_magnetics_fast(json inputsJson, int maximumNumberResults, json coreModeJson);
 json calculate_advised_magnetics_from_catalog(json inputsJson, json catalogJson, int maximumNumberResults);
 json calculate_advised_magnetics_from_cache(json inputsJson, json filterFlowJson, int maximumNumberResults);