update to glb export in client

app.py

@@ -23,8 +23,13 @@ import pandas as pd
 import plotly.graph_objs as go
 import spaces
 from embed4d import model3d_viewer
+from myo_tools.mj.core.mj_api import get_model
 from myo_tools.mjs.marker.marker_api import get_marker_names
-from myo_tools.utils.file_ops.dataframe_utils import from_array_to_dataframe
+from myo_tools.utils.file_ops.dataframe_utils import (
+    from_array_to_dataframe,
+    from_dataframe_to_array,
+)
+from myo_tools.utils.file_ops.gltf_utils import MujocoGLTFExporter
 from myo_tools.utils.file_ops.io_utils import from_qpos_to_joint_angles
 from myo_tools.utils.mocap_ops.mocap_utils import rotate_mocap_ydown_to_zup
 from myosdk import Client
@@ -216,7 +221,6 @@ def run_retargeting_c3d(api_key, c3d_files, markerset_file):
             result = client.create_retarget_job(
                 tracker=f,
                 markerset=markerset_path,
-                export_glb=True,
                 stream_status=True,  # Stream status updates automatically
             )
 
@@ -238,16 +242,20 @@ def run_retargeting_c3d(api_key, c3d_files, markerset_file):
             # Download qpos file
             result.download_qpos(out_path)
             output_files.append(out_path)
-
-            # Download GLB file for rendering (model3d_viewer needs local file path)
-            if result.output.motion:
-                output_glb_path = os.path.join(
-                    tempfile.gettempdir(), base + f"_{int(time.time())}_" + ".glb"
-                )
-                result.output.motion.download(output_glb_path)
-                output_glb_files.append(output_glb_path)
-            else:
-                output_glb_files.append(None)
+            mjb_path = out_path.replace(".parquet", ".mjb")
+            glb_path = out_path.replace(".parquet", ".glb")
+            result.download_model(mjb_path)
+
+            mj_model = get_model(mjb_path)[0]
+            [sim_time, qpos, _] = from_dataframe_to_array(out_path)
+            exporter = MujocoGLTFExporter(mj_model)
+            exporter.export_glb(
+                glb_path,
+                [{"qpos": qpos[t, :]} for t in range(qpos.shape[0])],
+                1 / (sim_time[1] - sim_time[0]),
+            )
+            output_glb_files.append(glb_path)
+            print(f"Exported GLB file to {glb_path}")
 
         assert os.path.exists(
             output_files[0]
@@ -443,7 +451,9 @@ def run_retargeting_video(
             f"🔹 MyoSDK client initialized in { time.time() - init_time:.2f} seconds"
         )
 
-        markerset_file_name = "./markersets/movi_metrabs_markerset.xml"
+        markerset_file_name = (
+            os.path.dirname(__file__) + "/./markersets/movi_metrabs_markerset.xml"
+        )
         marker_names = get_marker_names(markerset_file_name)
 
         from_array_to_dataframe(
@@ -470,7 +480,6 @@ def run_retargeting_video(
         result = client.create_retarget_job(
             tracker=fn_parquet,
             markerset=markerset_file_name,
-            export_glb=True,
             stream_status=True,  # Stream status updates automatically
         )
 
@@ -497,14 +506,18 @@ def run_retargeting_video(
             out_path
         ), f"Failed to download retargeted data for {os.path.basename(video_path)}"
 
-        # Download GLB file for rendering (model3d_viewer needs local file path)
-        glb_path = None
-        if result.output.motion:
-            glb_path = os.path.join(
-                tempfile.gettempdir(), base + f"_{int(time.time())}_" + ".glb"
-            )
-            result.output.motion.download(glb_path)
-
+        mjb_path = out_path.replace(".parquet", ".mjb")
+        glb_path = out_path.replace(".parquet", ".glb")
+        result.download_model(mjb_path)
+
+        mj_model = get_model(mjb_path)[0]
+        [sim_time, qpos, _] = from_dataframe_to_array(out_path)
+        exporter = MujocoGLTFExporter(mj_model)
+        exporter.export_glb(
+            glb_path,
+            [{"qpos": qpos[t, :]} for t in range(qpos.shape[0])],
+            1 / (sim_time[1] - sim_time[0]),
+        )
         # Load angles from first output file
         status.append("🔹 Loading animation and angle data...")
         yield "\n".join(status), None, None, gr.update(visible=False), gr.update(
@@ -805,4 +818,4 @@ if __name__ == "__main__":
     app.launch(
         share=True,
         # server_port=7860,
-    )
+    )