Merge branch 'main' into mike/solid-modeling-apis

Author: mlfarrell

modeling-cmds/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "kittycad-modeling-cmds"
-version = "0.2.152"
+version = "0.2.153"
 edition = "2021"
 authors = ["KittyCAD, Inc."]
 description = "Commands in the KittyCAD Modeling API"

modeling-cmds/openapi/api.json

@@ -1605,24 +1605,6 @@
             "description": "ISO 10303-21 (STEP) format.",
             "type": "object",
             "properties": {
-              "coords": {
-                "description": "Co-ordinate system of input data.\n\nDefaults to the [KittyCAD co-ordinate system].\n\n[KittyCAD co-ordinate system]: ../coord/constant.KITTYCAD.html",
-                "default": {
-                  "forward": {
-                    "axis": "y",
-                    "direction": "negative"
-                  },
-                  "up": {
-                    "axis": "z",
-                    "direction": "positive"
-                  }
-                },
-                "allOf": [
-                  {
-                    "$ref": "#/components/schemas/System"
-                  }
-                ]
-              },
               "split_closed_faces": {
                 "description": "Splits all closed faces into two open faces.\n\nDefaults to `false` but is implicitly `true` when importing into the engine.",
                 "default": false,

modeling-cmds/src/convert_client_crate.rs

@@ -144,7 +144,7 @@ mod format {
                 InputFormat3d::Sldprt(sldprt::import::Options { split_closed_faces }) => {
                     kt::InputFormat3D::Sldprt { split_closed_faces }
                 }
-                InputFormat3d::Step(step::import::Options { split_closed_faces, .. }) => {
+                InputFormat3d::Step(step::import::Options { split_closed_faces }) => {
                     kt::InputFormat3D::Step { split_closed_faces }
                 }
                 InputFormat3d::Stl(stl::import::Options { coords, units }) => kt::InputFormat3D::Stl {
@@ -171,10 +171,9 @@ mod format {
                 kt::InputFormat3D::Sldprt { split_closed_faces } => {
                     Self::Sldprt(crate::format::sldprt::import::Options { split_closed_faces })
                 }
-                kt::InputFormat3D::Step { split_closed_faces } => Self::Step(crate::format::step::import::Options {
-                    split_closed_faces,
-                    ..Default::default()
-                }),
+                kt::InputFormat3D::Step { split_closed_faces } => {
+                    Self::Step(crate::format::step::import::Options { split_closed_faces })
+                }
                 kt::InputFormat3D::Stl { coords, units } => Self::Stl(crate::format::stl::import::Options {
                     coords: coords.into(),
                     units: units.into(),

modeling-cmds/src/format/step.rs

@@ -9,8 +9,8 @@ pub mod import {
     use super::*;
 
     /// Options for importing STEP format.
-    #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, JsonSchema, Display, FromStr)]
-    #[display("coords: {coords}, split_closed_faces: {split_closed_faces}")]
+    #[derive(Clone, Debug, Default, Eq, Hash, PartialEq, Serialize, Deserialize, JsonSchema, Display, FromStr)]
+    #[display("split_closed_faces: {split_closed_faces}")]
     #[serde(default, rename = "StepImportOptions")]
     #[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))]
     #[cfg_attr(feature = "ts-rs", ts(export_to = "ModelingCmd.ts"))]
@@ -20,13 +20,6 @@ pub mod import {
         pyo3::pyclass(name = "StepImportOptions")
     )]
     pub struct Options {
-        /// Co-ordinate system of input data.
-        ///
-        /// Defaults to the [KittyCAD co-ordinate system].
-        ///
-        /// [KittyCAD co-ordinate system]: ../coord/constant.KITTYCAD.html
-        pub coords: coord::System,
-
         /// Splits all closed faces into two open faces.
         ///
         /// Defaults to `false` but is implicitly `true` when importing into the engine.
@@ -43,15 +36,6 @@ pub mod import {
             Default::default()
         }
     }
-
-    impl Default for Options {
-        fn default() -> Self {
-            Self {
-                coords: *coord::KITTYCAD,
-                split_closed_faces: false,
-            }
-        }
-    }
 }
 
 /// Export models in STEP format.