openscad-cpp-evaluator 0.45.0__tar.gz → 0.45.1__tar.gz

{openscad_cpp_evaluator-0.45.0 → openscad_cpp_evaluator-0.45.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openscad_cpp_evaluator
-Version: 0.45.0
+Version: 0.45.1
 Summary: C++ OpenSCAD evaluator with Python bindings
 Author: NeuSCAD Contributors
 License-Expression: MIT

{openscad_cpp_evaluator-0.45.0 → openscad_cpp_evaluator-0.45.1}/bindings/module.cpp

@@ -385,17 +385,36 @@ nb::object evaluate(const std::string& path, nb::dict viewportParams,
     {
         nb::gil_scoped_release rel;
         auto logFn = [&echoes](const std::string& m) { echoes.push_back(m); };
-        std::vector<std::unique_ptr<oscad::ASTNode>> ast = oscad::getASTFromFile(path);
-        oscadeval::ResolvedUseScopes used = oscadeval::resolveUseScopes(ast, path, logFn);
-        oscadeval::Evaluator ev(logFn, nullptr, manifoldCache, oscadeval::DebugHooks{}, profile);
-        oscadeval::EvalContext ctx = oscadeval::EvalContext::makeRoot(used.rootScope.get());
-        bodies = oscadeval::toRenderableBodies(ev.evaluate(used.processedNodes, ctx, vp));
-        collectIdSpans(ev, idSpans);
-        csgTree = std::move(ev.csgTree);
-        profileResult = std::move(ev.profileResult);
-        {
-            nb::gil_scoped_acquire g; // building Python objects needs the GIL back
-            std::tie(dyn, dynExplicit) = dynStateToPy(ctx);
+        try {
+            std::vector<std::unique_ptr<oscad::ASTNode>> ast = oscad::getASTFromFile(path);
+            oscadeval::ResolvedUseScopes used = oscadeval::resolveUseScopes(ast, path, logFn);
+            oscadeval::Evaluator ev(logFn, nullptr, manifoldCache, oscadeval::DebugHooks{}, profile);
+            oscadeval::EvalContext ctx = oscadeval::EvalContext::makeRoot(used.rootScope.get());
+            bodies = oscadeval::toRenderableBodies(ev.evaluate(used.processedNodes, ctx, vp));
+            collectIdSpans(ev, idSpans);
+            csgTree = std::move(ev.csgTree);
+            profileResult = std::move(ev.profileResult);
+            {
+                nb::gil_scoped_acquire g; // building Python objects needs the GIL back
+                std::tie(dyn, dynExplicit) = dynStateToPy(ctx);
+            }
+        } catch (const std::exception& e) {
+            // `echoes` is a local, so letting this unwind past here loses
+            // every echo and warning the script produced BEFORE it failed --
+            // which is exactly the output you want when something fails. The
+            // batching that makes them cheap (no GIL round-trip per line) is
+            // also what made them disposable.
+            //
+            // Carry them out on the exception itself: args = (message,
+            // [echo, ...]). The facade replays them through echo_fn and then
+            // re-raises. Anything that only looks at str(e) is unaffected,
+            // since args[0] is still the formatted diagnostic.
+            nb::gil_scoped_acquire g;
+            nb::list partial;
+            for (const std::string& s : echoes) partial.append(s);
+            nb::object args = nb::make_tuple(nb::str(e.what()), partial);
+            PyErr_SetObject(PyExc_RuntimeError, args.ptr());
+            throw nb::python_error();
         }
     }
 

{openscad_cpp_evaluator-0.45.0 → openscad_cpp_evaluator-0.45.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "openscad_cpp_evaluator"
-version = "0.45.0"
+version = "0.45.1"
 description = "C++ OpenSCAD evaluator with Python bindings"
 readme = "README.md"
 requires-python = ">=3.12"

{openscad_cpp_evaluator-0.45.0 → openscad_cpp_evaluator-0.45.1}/python/openscad_cpp_evaluator/__init__.py

@@ -504,6 +504,17 @@ class Evaluator:
         except EvalError:
             raise
         except Exception as e:  # ParseError/EvalError from C++ arrive as RuntimeError
+            # The binding attaches whatever the script echoed before it failed
+            # as args[1] (see bindings/module.cpp). Replay it first: a failed
+            # run's own output is the most useful thing it produced, and
+            # dropping it means the console shows the error with none of the
+            # context that led to it.
+            args = getattr(e, "args", ())
+            if len(args) == 2 and isinstance(args[1], list):
+                if self._echo_fn:
+                    for line in args[1]:
+                        self._echo_fn(line)
+                raise EvalError(str(args[0])) from e
             raise EvalError(str(e)) from e
         bodies = bodies_from_dicts(body_dicts)
         # originalID -> a node with `.position` (start/end offsets) for WYSIWYG