PyOpenMagnetics 1.7.0__tar.gz → 1.7.2__tar.gz

{pyopenmagnetics-1.7.0 → pyopenmagnetics-1.7.2}/CMakeLists.txt

@@ -142,7 +142,7 @@ if(NOT LOCAL_MKF_MAS)
     set(MKF_GIT_TAG "main"
         CACHE STRING "MKF git ref for the vendored PyOM build")
     # Force fresh clone by using a unique timestamp - update this when the pin changes
-    set(MKF_FORCE_REFRESH "2026-08-10-v1.7.0-mkf-d9293885")
+    set(MKF_FORCE_REFRESH "2026-08-21-v1.7.2-mkf-75afbb6f")
     # Tell MKF to disable matplotplusplus and use SVG-based Painter instead
     set(INCLUDE_PYMKF ON CACHE BOOL "Build Python interface" FORCE)
     # GIT_SUBMODULES_RECURSE pulls in CAS/PEAS (added 2026-04 alongside the
@@ -166,7 +166,7 @@ if(NOT LOCAL_MKF_MAS)
     # Skip Git LFS to avoid bandwidth quota issues - data files are optional for build
     set(ENV{GIT_LFS_SKIP_SMUDGE} "1")
     # Force fresh clone by using a unique timestamp - update this when MAS changes
-    set(MAS_FORCE_REFRESH "2026-08-10-v1.7.0-mas-f736d41")
+    set(MAS_FORCE_REFRESH "2026-08-14-v1.7.0-mas-934d1392")
     FetchContent_Declare(
            mas
            GIT_REPOSITORY https://github.com/OpenMagnetics/MAS.git

{pyopenmagnetics-1.7.0 → pyopenmagnetics-1.7.2}/PKG-INFO

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

{pyopenmagnetics-1.7.0 → pyopenmagnetics-1.7.2}/pyproject.toml

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

{pyopenmagnetics-1.7.0 → pyopenmagnetics-1.7.2}/src/advisers.cpp

@@ -2,6 +2,24 @@
 
 namespace PyMKF {
 
+namespace {
+
+// A result's reference is only the lookup key for the per-filter scoring breakdown, and BOTH
+// manufacturerInfo and its reference are optional in MAS. Six result loops dereferenced both
+// unconditionally, so a catalogue entry carrying no reference killed the whole call with an
+// anonymous "bad optional access" — at the very end, after every candidate had already been
+// advised and scored. (One of the six did not even use the value it dereferenced; that line is
+// gone.) An absent reference is not an error, it just means there is no per-filter breakdown to
+// attach to that result.
+std::optional<std::string> magnetic_reference(const OpenMagnetics::Magnetic& magnetic) {
+    if (!magnetic.get_manufacturer_info()) {
+        return std::nullopt;
+    }
+    return magnetic.get_manufacturer_info()->get_reference();
+}
+
+} // namespace
+
 json calculate_advised_cores(json inputsJson, json weightsJson, int maximumNumberResults, json coreModeJson) {
     OpenMagnetics::Inputs inputs(inputsJson);
     OpenMagnetics::CoreAdviser::CoreAdviserModes coreMode;
@@ -28,15 +46,15 @@ json calculate_advised_cores(json inputsJson, json weightsJson, int maximumNumbe
     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();
+        auto name = magnetic_reference(masMagnetic.get_magnetic());
         json result;
         json masJson;
         to_json(masJson, masMagnetic);
         result["mas"] = masJson;
         result["scoring"] = scoring;
-        if (scoringsPerFilter.count(name)) {
+        if (name && scoringsPerFilter.count(*name)) {
             json filterScorings;
-            for (auto& [filter, filterScore] : scoringsPerFilter[name]) {
+            for (auto& [filter, filterScore] : scoringsPerFilter[*name]) {
                 filterScorings[std::string(magic_enum::enum_name(filter))] = filterScore;
             }
             result["scoringPerFilter"] = filterScorings;
@@ -67,15 +85,15 @@ json calculate_advised_magnetics(json inputsJson, int maximumNumberResults, json
     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();
+        auto name = magnetic_reference(masMagnetic.get_magnetic());
         json result;
         json masJson;
         to_json(masJson, masMagnetic);
         result["mas"] = masJson;
         result["scoring"] = scoring;
-        if (scoringsPerFilter.count(name)) {
+        if (name && scoringsPerFilter.count(*name)) {
             json filterScorings;
-            for (auto& [filter, filterScore] : scoringsPerFilter[name]) {
+            for (auto& [filter, filterScore] : scoringsPerFilter[*name]) {
                 filterScorings[std::string(magic_enum::enum_name(filter))] = filterScore;
             }
             result["scoringPerFilter"] = filterScorings;
@@ -115,15 +133,15 @@ json calculate_advised_magnetics_with_filters(json inputsJson, json filterFlowJs
     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();
+        auto name = magnetic_reference(masMagnetic.get_magnetic());
         json result;
         json masJson;
         to_json(masJson, masMagnetic);
         result["mas"] = masJson;
         result["scoring"] = scoring;
-        if (scoringsPerFilter.count(name)) {
+        if (name && scoringsPerFilter.count(*name)) {
             json filterScorings;
-            for (auto& [filter, filterScore] : scoringsPerFilter[name]) {
+            for (auto& [filter, filterScore] : scoringsPerFilter[*name]) {
                 filterScorings[std::string(magic_enum::enum_name(filter))] = filterScore;
             }
             result["scoringPerFilter"] = filterScorings;
@@ -150,7 +168,6 @@ json calculate_advised_magnetics_fast(json inputsJson, int 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);
@@ -182,15 +199,15 @@ json calculate_advised_magnetics_from_catalog(json inputsJson, json catalogJson,
     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();
+        auto name = magnetic_reference(masMagnetic.get_magnetic());
         json result;
         json masJson;
         to_json(masJson, masMagnetic);
         result["mas"] = masJson;
         result["scoring"] = scoring;
-        if (scoringsPerFilter.count(name)) {
+        if (name && scoringsPerFilter.count(*name)) {
             json filterScorings;
-            for (auto& [filter, filterScore] : scoringsPerFilter[name]) {
+            for (auto& [filter, filterScore] : scoringsPerFilter[*name]) {
                 filterScorings[std::string(magic_enum::enum_name(filter))] = filterScore;
             }
             result["scoringPerFilter"] = filterScorings;
@@ -227,15 +244,15 @@ json calculate_advised_magnetics_from_cache(json inputsJson, json filterFlowJson
     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();
+        auto name = magnetic_reference(masMagnetic.get_magnetic());
         json result;
         json masJson;
         to_json(masJson, masMagnetic);
         result["mas"] = masJson;
         result["scoring"] = scoring;
-        if (scoringsPerFilter.count(name)) {
+        if (name && scoringsPerFilter.count(*name)) {
             json filterScorings;
-            for (auto& [filter, filterScore] : scoringsPerFilter[name]) {
+            for (auto& [filter, filterScore] : scoringsPerFilter[*name]) {
                 filterScorings[std::string(magic_enum::enum_name(filter))] = filterScore;
             }
             result["scoringPerFilter"] = filterScorings;
@@ -359,7 +376,8 @@ void register_adviser_bindings(py::module& m) {
             ...     print(f"Score: {item['scoring']}, Per filter: {item['scoringPerFilter']}")
         )pbdoc",
         py::arg("inputs_json"), py::arg("weights_json"), 
-        py::arg("max_results"), py::arg("core_mode_json"));
+        py::arg("max_results"), py::arg("core_mode_json"),
+        py::call_guard<py::gil_scoped_release>());
     
     m.def("calculate_advised_magnetics", &calculate_advised_magnetics,
         R"pbdoc(
@@ -389,7 +407,8 @@ void register_adviser_bindings(py::module& m) {
             >>> for item in result["data"]:
             ...     print(f"Score: {item['scoring']}, Per filter: {item['scoringPerFilter']}")
         )pbdoc",
-        py::arg("inputs_json"), py::arg("max_results"), py::arg("core_mode_json"));
+        py::arg("inputs_json"), py::arg("max_results"), py::arg("core_mode_json"),
+        py::call_guard<py::gil_scoped_release>());
 
     m.def("calculate_advised_magnetics_with_filters", &calculate_advised_magnetics_with_filters,
         R"pbdoc(
@@ -402,7 +421,8 @@ void register_adviser_bindings(py::module& m) {
         {"filter": <TitleCaseName>, "invert": bool, "log": bool,
          "strictlyRequired": bool, "weight": float}.
         )pbdoc",
-        py::arg("inputs_json"), py::arg("filter_flow_json"), py::arg("max_results"), py::arg("core_mode_json"));
+        py::arg("inputs_json"), py::arg("filter_flow_json"), py::arg("max_results"), py::arg("core_mode_json"),
+        py::call_guard<py::gil_scoped_release>());
 
     m.def("calculate_advised_magnetics_fast", &calculate_advised_magnetics_fast,
         R"pbdoc(
@@ -434,7 +454,8 @@ void register_adviser_bindings(py::module& m) {
             >>> 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"));
+        py::arg("inputs_json"), py::arg("max_results"), py::arg("core_mode_json"),
+        py::call_guard<py::gil_scoped_release>());
 
     m.def("calculate_advised_magnetics_from_catalog", &calculate_advised_magnetics_from_catalog,
         R"pbdoc(
@@ -462,7 +483,8 @@ void register_adviser_bindings(py::module& m) {
             >>> for item in result["data"]:
             ...     print(f"Score: {item['scoring']}, Per filter: {item['scoringPerFilter']}")
         )pbdoc",
-        py::arg("inputs_json"), py::arg("catalog_json"), py::arg("max_results"));
+        py::arg("inputs_json"), py::arg("catalog_json"), py::arg("max_results"),
+        py::call_guard<py::gil_scoped_release>());
     
     m.def("calculate_advised_magnetics_from_cache", &calculate_advised_magnetics_from_cache,
         R"pbdoc(
@@ -489,21 +511,25 @@ void register_adviser_bindings(py::module& m) {
             Cache must be populated before calling this function.
             Raises PyOpenMagnetics.EngineError if the cache is empty.
         )pbdoc",
-        py::arg("inputs_json"), py::arg("filter_flow_json"), py::arg("max_results"));
+        py::arg("inputs_json"), py::arg("filter_flow_json"), py::arg("max_results"),
+        py::call_guard<py::gil_scoped_release>());
 
     m.def("calculate_advised_sections", &calculate_advised_sections,
         "Get advised coil sections.",
-        py::arg("mas"), py::arg("pattern"), py::arg("repetitions"));
+        py::arg("mas"), py::arg("pattern"), py::arg("repetitions"),
+        py::call_guard<py::gil_scoped_release>());
 
     m.def("calculate_advised_coil", &calculate_advised_coil,
         "Get full coil design advice.",
-        py::arg("mas"));
+        py::arg("mas"),
+        py::call_guard<py::gil_scoped_release>());
 
     m.def("calculate_advised_wires", &calculate_advised_wires,
         "Get wire selection advice.",
         py::arg("winding"), py::arg("section"), py::arg("current"),
         py::arg("solid_insulation_requirements"), py::arg("temperature"), py::arg("number_sections"),
-        py::arg("max_results"), py::arg("use_planar_wires") = false);
+        py::arg("max_results"), py::arg("use_planar_wires") = false,
+        py::call_guard<py::gil_scoped_release>());
 }
 
 } // namespace PyMKF

{pyopenmagnetics-1.7.0 → pyopenmagnetics-1.7.2}/src/bobbin.cpp

@@ -111,14 +111,36 @@ json create_simple_bobbin_from_core_with_custom_thicknesses(json coreJson, doubl
 }
 
 void register_bobbin_bindings(py::module& m) {
-    m.def("get_bobbins", &get_bobbins, "Retrieve all available bobbins as JSON objects");
-    m.def("get_bobbin_names", &get_bobbin_names, "Retrieve list of all bobbin names");
-    m.def("find_bobbin_by_name", &find_bobbin_by_name, "Find bobbin data by name");
-    m.def("create_basic_bobbin", &create_basic_bobbin, "Create a basic bobbin from core data");
-    m.def("create_basic_bobbin_by_thickness", &create_basic_bobbin_by_thickness, "Create a basic bobbin with specified thickness");
-    m.def("calculate_bobbin_data", &calculate_bobbin_data, "Calculate bobbin specifications");
-    m.def("process_bobbin", &process_bobbin, "Process bobbin geometry");
-    m.def("check_if_fits", &check_if_fits, "Check if winding fits in available space");
+    m.def("get_bobbins", &get_bobbins, "Retrieve all available bobbins as JSON objects",
+        py::call_guard<py::gil_scoped_release>());
+    m.def("get_bobbin_names", &get_bobbin_names, "Retrieve list of all bobbin names",
+        py::call_guard<py::gil_scoped_release>());
+    m.def("find_bobbin_by_name", &find_bobbin_by_name, "Find bobbin data by name",
+        py::call_guard<py::gil_scoped_release>());
+    m.def("create_basic_bobbin", &create_basic_bobbin, "Create a basic bobbin from core data",
+        py::call_guard<py::gil_scoped_release>());
+    m.def("create_basic_bobbin_by_thickness", &create_basic_bobbin_by_thickness, "Create a basic bobbin with specified thickness",
+        py::call_guard<py::gil_scoped_release>());
+    m.def("calculate_bobbin_data", &calculate_bobbin_data, "Calculate bobbin specifications",
+        py::call_guard<py::gil_scoped_release>());
+    m.def("process_bobbin", &process_bobbin,
+        R"pbdoc(
+        Process a bobbin's functionalDescription into its processedDescription
+        (winding window, column/wall thickness, coordinates).
+
+        Args:
+            bobbin_json: JSON Bobbin OBJECT — a Python dict, e.g. a row of MAS's
+                data/bobbins.ndjson. It must NOT be pre-serialised: passing
+                json.dumps(row) hands the engine a json *string*, which carries no
+                functionalDescription and is refused (ABT #763).
+
+        Returns:
+            JSON Bobbin object with processedDescription filled in.
+        )pbdoc",
+        py::arg("bobbin_json"),
+        py::call_guard<py::gil_scoped_release>());
+    m.def("check_if_fits", &check_if_fits, "Check if winding fits in available space",
+        py::call_guard<py::gil_scoped_release>());
 
     m.def("create_simple_bobbin_from_core", &create_simple_bobbin_from_core,
         R"pbdoc(
@@ -130,7 +152,8 @@ void register_bobbin_bindings(py::module& m) {
         Returns:
             JSON Bobbin object.
         )pbdoc",
-        py::arg("core_json"));
+        py::arg("core_json"),
+        py::call_guard<py::gil_scoped_release>());
 
     m.def("create_simple_bobbin_from_core_with_custom_thickness", &create_simple_bobbin_from_core_with_custom_thickness,
         R"pbdoc(
@@ -143,7 +166,8 @@ void register_bobbin_bindings(py::module& m) {
         Returns:
             JSON Bobbin object.
         )pbdoc",
-        py::arg("core_json"), py::arg("thickness"));
+        py::arg("core_json"), py::arg("thickness"),
+        py::call_guard<py::gil_scoped_release>());
 
     m.def("create_simple_bobbin_from_core_with_custom_thicknesses", &create_simple_bobbin_from_core_with_custom_thicknesses,
         R"pbdoc(
@@ -157,7 +181,8 @@ void register_bobbin_bindings(py::module& m) {
         Returns:
             JSON Bobbin object.
         )pbdoc",
-        py::arg("core_json"), py::arg("wall_thickness"), py::arg("column_thickness"));
+        py::arg("core_json"), py::arg("wall_thickness"), py::arg("column_thickness"),
+        py::call_guard<py::gil_scoped_release>());
 }
 
 } // namespace PyMKF

{pyopenmagnetics-1.7.0 → pyopenmagnetics-1.7.2}/src/cmc.cpp

@@ -58,12 +58,14 @@ void register_cmc_bindings(py::module& m) {
         "numberOfWindings, and an impedance/insertion-loss/noise spec). Mirrors "
         "the WASM `calculate_cmc_inputs` used by el-choker's CMC wizard. "
         "Delegates to Kirchhoff api::design_cmc.",
-        py::arg("cmc_inputs"));
+        py::arg("cmc_inputs"),
+        py::call_guard<py::gil_scoped_release>());
     m.def("calculate_advanced_cmc_inputs", &calculate_advanced_cmc_inputs,
         "Advanced-mode CMC inputs builder (user supplies `desiredInductance` + "
         "`designFrequency` directly rather than a spec). Delegates to Kirchhoff "
         "api::design_cmc.",
-        py::arg("cmc_inputs"));
+        py::arg("cmc_inputs"),
+        py::call_guard<py::gil_scoped_release>());
 }
 
 } // namespace PyMKF