catalog: product, assembly and std operations say what every parameter is

The product operators keep taking py::object (they check the type inside the operation), now as
Typed<Name> (typed_args.hpp), which accepts anything as before and prints the type in the signature:
Part, Assembly, Part | Assembly, Placement, ConnectorRef, ScalarLimit | None, str ids, Length
radii (phase_offset is a pitch-circle arc length), Angle drive angles, Point3 / Direction3 frames,
dict[str, Direction3] explode directions. The std factories wrap their double / int arguments as
Shown<T, Name> (converted exactly as T) to read Length, Angle, Count; fastener styles are Literal.
apply_tag_rselection (ShapeSelector | Sequence[AnyShape], Literal enums), load_brep_region (str |
os.PathLike), render_screenshot_rpath and the Python make_ball_bearing_rassembly are annotated with
simplecadapi.types.

catalog.classify: split unions before matching Literal/Sequence (a Literal-first union gave garbage
choices); new kinds path, scalar_limit, <kind>_map, joined union kinds (enum|numbers, query|shape);
str-enum defaults read as their value. SDK_DEFECTS 21-24.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
NiJingzhe
2026-11-04 04:58:19 +08:00
parent c6149f483d
commit cbebe6f74a
9 changed files with 429 additions and 113 deletions
+20 -2
View File
@@ -5,6 +5,7 @@
// the member or its string value ("local"), and returns members. The casters below are the only
// ones for these types in the module.
#include "bindings.hpp"
#include "typed_args.hpp"
#include <algorithm>
#include <type_traits>
@@ -614,6 +615,22 @@ TagTargets targets_from_py(const py::object& targets) {
return TagTargets(std::move(shapes));
}
// `targets` of apply_tag_rselection, for the signature (the body checks it: targets_from_py). ShapeSelector is bound
// after this module, so the names are written out.
struct TagTargetsName {
static constexpr auto name = py::detail::const_name(
"simplecadapi._cpp._native.ShapeSelector | collections.abc.Sequence[simplecadapi._cpp._native.AnyShape]");
};
// The str enums by their values (members of the Python enums are str too).
struct TopologyPropagationName {
static constexpr auto name = py::detail::const_name("typing.Literal['local', 'downward']");
};
struct LineagePolicyName {
static constexpr auto name =
py::detail::const_name("typing.Literal['none', 'continuation', 'continuation_fragment', 'explicit']");
};
void bind_operators(py::module_& m) {
m.def(
"apply_tag",
@@ -634,8 +651,9 @@ void bind_operators(py::module_& m) {
m.def(
"apply_tag_rselection",
[](const Shape& scope, const py::object& targets, const std::string& tag, TopologyPropagation topology,
LineagePolicy lineage) {
[](const Shape& scope, const scad::pybind::Typed<TagTargetsName>& targets, const std::string& tag,
scad::pybind::Shown<TopologyPropagation, TopologyPropagationName> topology,
scad::pybind::Shown<LineagePolicy, LineagePolicyName> lineage) {
static const ErrorSpec spec{
"apply_tag_rselection",
"Failed to attach the tag to the selected shapes.",