Merge branch 'dev' into zachr/2074/configure-panel-updates

Author: rutmanz

exporter/SynthesisFusionAddin/src/ErrorHandling.py

@@ -129,6 +129,7 @@ def handle_err_top(func: Callable[..., Result[None]]) -> Callable[..., None]:
 
     def wrapper(*args, **kwargs):  # type: ignore
         result = func(*args, **kwargs)
+
         if result.is_err():
             message, severity = result.unwrap_err()
             if severity == ErrorSeverity.Fatal:

exporter/SynthesisFusionAddin/src/Parser/SynthesisParser/JointHierarchy.py

@@ -1,6 +1,7 @@
 import enum
 import sys
 from logging import ERROR
+from os import error
 from typing import Any, Iterator, cast
 
 import adsk.core
@@ -221,10 +222,10 @@ def __init__(self, design: adsk.fusion.Design) -> None:
         self.grounded = searchForGrounded(design.rootComponent)
 
         if self.grounded is None:
-            message = "These is no grounded component in this assembly, aborting kinematic export."
-            gm.ui.messageBox(message)
+            message = "There is not a pinned component in this assembly, aborting kinematic export."
+            # gm.ui.messageBox(message)
             _____: Err[None] = Err(message, ErrorSeverity.Fatal)
-            raise RuntimeError()
+            raise RuntimeError(message)
 
         self.currentTraversal: dict[str, DynamicOccurrenceNode | bool] = dict()
         self.groundedConnections: list[adsk.fusion.Occurrence] = []
@@ -247,7 +248,7 @@ def __init__(self, design: adsk.fusion.Design) -> None:
             message = populate_node_result.unwrap_err()[0]
             gm.ui.messageBox(message)
             ____: Err[None] = Err(message, ErrorSeverity.Fatal)
-            raise RuntimeError()
+            raise RuntimeError(message)
 
         rootNode = populate_node_result.unwrap()
         self.groundSimNode = SimulationNode(rootNode, None, grounded=True)
@@ -522,12 +523,9 @@ def buildJointPartHierarchy(
 
         return Ok(None)
 
-    # I'm fairly certain bubbling this back up is the way to go
-    except Warning:
-        return Err(
-            "Instantiation of the JointParser failed, likely due to a lack of a grounded component in the assembly",
-            ErrorSeverity.Fatal,
-        )
+    except RuntimeError as e:
+        progressDialog.progressDialog.hide()
+        raise e
 
 
 def populateJoint(simNode: SimulationNode, joints: joint_pb2.Joints, progressDialog: PDMessage) -> Result[None]:

exporter/SynthesisFusionAddin/src/Parser/SynthesisParser/Parser.py

@@ -148,7 +148,12 @@ def export(self) -> None:
             self.pdMessage,
         )
 
-        JointHierarchy.buildJointPartHierarchy(design, assembly_out.data.joints, self.exporterOptions, self.pdMessage)
+        try:
+            JointHierarchy.buildJointPartHierarchy(
+                design, assembly_out.data.joints, self.exporterOptions, self.pdMessage
+            )
+        except RuntimeError as e:
+            raise e
 
         # These don't have an effect, I forgot how this is suppose to work
         # progressDialog.message = "Taking Photo for thumbnail..."

exporter/SynthesisFusionAddin/src/UI/ConfigCommand.py

@@ -247,8 +247,7 @@ def notify(self, html_args: adsk.core.HTMLEventArgs) -> None:
             )
         elif html_args.action == "export":
             opts = moduleExporterOptions.ExporterOptions().readFromJSON(data)
-            export(opts)
-            html_args.returnData = "{}"
+            export(opts, html_args)
         elif html_args.action == "save":
             opts = moduleExporterOptions.ExporterOptions().readFromJSON(data)
             opts.writeToDesign()
@@ -336,7 +335,7 @@ def addChildOccurrences(childOccurrences: adsk.fusion.OccurrenceList) -> None:
 
 
 @logFailure(messageBox=True)
-def export(exporterOptions: moduleExporterOptions.ExporterOptions) -> None:
+def export(exporterOptions: moduleExporterOptions.ExporterOptions, html_args: adsk.core.HTMLEventArgs) -> None:
     logger.info("NEWUI")
     logger.info(exporterOptions)
     design = adsk.fusion.Design.cast(adsk.core.Application.get().activeProduct)
@@ -361,8 +360,13 @@ def export(exporterOptions: moduleExporterOptions.ExporterOptions) -> None:
     exporterOptions.version = docVersion
     exporterOptions.materials = 0
 
-    Parser.Parser(exporterOptions).export()
+    try:
+        Parser.Parser(exporterOptions).export()
+    except RuntimeError as e:
+        html_args.returnData = json.dumps({"_err": str(e)})
+        return
     exporterOptions.writeToDesign()
+    html_args.returnData = "{}"
 
     if exporterOptions.openSynthesisUponExport:
         res = webbrowser.open(APP_WEBSITE_URL)
@@ -431,7 +435,10 @@ def notify(self, _: adsk.core.CommandEventArgs) -> None:
         try:
             Parser.Parser(exporterOptions).export()
         except:
-            pass
+            jointConfigTab.reset()
+            gamepieceConfigTab.reset()
+
+            return
         exporterOptions.writeToDesign()
         jointConfigTab.reset()
         gamepieceConfigTab.reset()

exporter/SynthesisFusionAddin/web/src/lib/index.ts

@@ -40,6 +40,12 @@ const errorMatchers: { text: string; cb: () => void }[] = [
             Global_SetAlert("info", "Selection cancelled")
         },
     },
+    {
+        text: "not a pinned",
+        cb: () => {
+            Global_SetAlert("error", "Please pin a component to export the assembly")
+        },
+    },
 ]
 
 export async function sendData<A extends keyof Messages>(
@@ -64,9 +70,10 @@ export async function sendData<A extends keyof Messages>(
             })
             if (!wasHandled) {
                 console.error({ action, errorResponse: parsed._err })
+                return undefined
             }
 
-            return undefined
+            return parsed as Messages[A][1] & { _err: string }
         }
         return parsed as Messages[A][1]
     } catch (error) {
@@ -85,9 +92,12 @@ export async function sendDataAndToast<A extends keyof Messages>(
 
     if (resp === undefined) {
         Global_SetAlert("error", failureMsg)
-    } else {
+    } else if (resp._err === undefined) {
         Global_SetAlert("info", sucessMsg)
+    } else {
+        return undefined
     }
+
     return resp
 }
 

fission/flake.lock

@@ -0,0 +1,34 @@
+{
+  description = "Synthesis' Web-Based Robotics Simulator";
+
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+
+  outputs =
+    inputs:
+    let
+      supportedSystems = [
+        "x86_64-linux"
+        "aarch64-linux"
+        "x86_64-darwin"
+        "aarch64-darwin"
+      ];
+      forEachSupportedSystem =
+        f: inputs.nixpkgs.lib.genAttrs supportedSystems (system: f inputs.nixpkgs.legacyPackages.${system});
+    in
+    {
+      devShells = forEachSupportedSystem (pkgs: {
+        default = pkgs.mkShell {
+          nativeBuildInputs = with pkgs; [
+            playwright-driver.browsers
+          ];
+
+          env = {
+            PLAYWRIGHT_BROWSERS_PATH = pkgs.playwright-driver.browsers;
+            PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS = true;
+          };
+        };
+      });
+
+      formatter = forEachSupportedSystem (pkgs: pkgs.nixfmt-tree);
+    };
+}