Merging Dev

Author: Dhruv-0-Arora

.github/workflows/FusionWebUI.yml

@@ -0,0 +1,73 @@
+name: Fusion - WebUI Build and Format
+
+on:
+  workflow_dispatch: {}
+
+  push: 
+    branches: [ prod, dev ]
+    paths:
+      - 'exporter/SynthesisFusionAddin/web/**'
+  pull_request:
+    branches: [ prod, dev ]
+    paths:
+      - 'exporter/SynthesisFusionAddin/web/**'
+
+
+jobs:
+  runFormatValidationScript:
+    defaults:
+      run:
+        working-directory: exporter/SynthesisFusionAddin/web
+    name: Biome Format Validation
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout Code
+      uses: actions/checkout@v4
+    - name: Bun Runtime Setup
+      uses: oven-sh/setup-bun@v2
+      with:
+        bun-version: latest
+    - name: Cache Node Dependencies
+      uses: actions/cache@v3
+      with:
+        key: "${{runner.os}}-npm-fusion-${{hashFiles('exporter/SynthesisFusionAddin/web/bun.lock')}}"
+        path: 'exporter/SynthesisFusionAddin/web/node_modules'
+        restore-keys: |
+          ${{runner.os}}-npm-fusion-
+          ${{runner.os}}-npm
+
+    - name: Install Dependencies
+      run: bun install --frozen-lockfile
+
+    - name: Linter & Formatter
+      run: |
+        bunx biome --version
+        bunx biome ci --error-on-warnings
+
+  runBuildScript:
+    name: Build
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: exporter/SynthesisFusionAddin/web
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+      - name: Bun Runtime Setup
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+      - name: Cache Node Dependencies
+        uses: actions/cache@v3
+        with:
+          key: "${{runner.os}}-npm-fusion-${{hashFiles('exporter/SynthesisFusionAddin/web/bun.lock')}}"
+          path: 'exporter/SynthesisFusionAddin/web/node_modules'
+          restore-keys: |
+            ${{runner.os}}-npm-fusion-
+            ${{runner.os}}-npm
+
+      - name: Install Dependencies
+        run: bun install --frozen-lockfile
+
+      - name: Build
+        run: bun run build

exporter/SynthesisFusionAddin/.gitignore

@@ -110,3 +110,6 @@ site-packages
 proto/proto_out
 
 .aps_auth
+
+
+src/Resources/**/*.png

exporter/SynthesisFusionAddin/src/Parser/ExporterOptions.py

@@ -7,12 +7,13 @@
 import os
 import platform
 from dataclasses import dataclass, field, fields
+from typing import Any
 
 import adsk.core
 from adsk.fusion import CalculationAccuracy, TriangleMeshQualityOptions
 
 from src import INTERNAL_ID
-from src.Logging import logFailure, timed
+from src.Logging import getLogger, logFailure, timed
 from src.Types import (
     KG,
     ExportLocation,
@@ -68,7 +69,19 @@ def readFromDesign(self) -> "ExporterOptions":
         for field in fields(self):
             attribute = designAttributes.itemByName(INTERNAL_ID, field.name)
             if attribute:
-                attrJsonData = makeObjectFromJson(type(field.type), json.loads(attribute.value))
+                attrJsonData = makeObjectFromJson(field.type, json.loads(attribute.value))
+                setattr(self, field.name, attrJsonData)
+
+        self.visualQuality = TriangleMeshQualityOptions.LowQualityTriangleMesh
+        return self
+
+    @logFailure
+    @timed
+    def readFromJSON(self, data: dict[str, Any]) -> "ExporterOptions":
+        for field in fields(self):
+            attribute = data.get(field.name)
+            if attribute is not None:
+                attrJsonData = makeObjectFromJson(field.type, attribute)
                 setattr(self, field.name, attrJsonData)
 
         self.visualQuality = TriangleMeshQualityOptions.LowQualityTriangleMesh
@@ -81,3 +94,12 @@ def writeToDesign(self) -> None:
         for field in fields(self):
             data = json.dumps(getattr(self, field.name), default=encodeNestedObjects, indent=4)
             designAttributes.add(INTERNAL_ID, field.name, data)
+
+    @logFailure
+    @timed
+    def writeToJson(self) -> dict[str, Any]:
+        out = {}
+        for field in fields(self):
+            data = json.dumps(getattr(self, field.name), default=encodeNestedObjects, indent=4)
+            out[field.name] = json.loads(data)
+        return out

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

@@ -45,6 +45,7 @@ def __init__(self, options: ExporterOptions):
 
     @timed
     def export(self) -> None:
+        getLogger().info(f"Exporting with options {self.exporterOptions}")
         app = adsk.core.Application.get()
         design: adsk.fusion.Design = app.activeDocument.design
 

exporter/SynthesisFusionAddin/src/Types.py

@@ -104,19 +104,19 @@ def encodeNestedObjects(obj: Any) -> Any:
         return obj
 
 
-def makeObjectFromJson(objType: type, data: Any) -> Any:
+# This function was previously taking type(field.type) instead of just field.type, but it didn't seem to be able to deal with lists like that, and this version does seem to be working in all the places where it's used
+def makeObjectFromJson(objType: type[Any] | str | Any, data: Any) -> Any:
     if isinstance(objType, EnumType):
         return objType(data)
-    elif isinstance(objType, PRIMITIVES) or isinstance(data, PRIMITIVES):
+    elif isinstance(objType, PRIMITIVES) or isinstance(data, PRIMITIVES) or get_origin(objType) is dict:
         return data
     elif get_origin(objType) is list:
         return [makeObjectFromJson(get_args(objType)[0], item) for item in data]
-
     obj = objType()
-    assert is_dataclass(obj) and isinstance(data, dict), "Found unsupported type to decode."
+    assert is_dataclass(obj) and isinstance(data, dict), f"Found unsupported type to decode. {objType} {data}"
     for field in fields(obj):
         if field.name in data:
-            setattr(obj, field.name, makeObjectFromJson(type(field.type), data[field.name]))
+            setattr(obj, field.name, makeObjectFromJson(field.type, data[field.name]))
         else:
             setattr(obj, field.name, field.default_factory if field.default_factory is not MISSING else field.default)