Return the correct stage path when using layer_structure=False (#42)

Author: LouRohanNV

mujoco_usd_converter/_impl/_flatten.py

@@ -11,7 +11,7 @@
 from .utils import get_authoring_metadata
 
 
-def export_flattened(asset_stage: Usd.Stage, output_dir: str, asset_dir: str, asset_stem: str, asset_format: str, comment: str):
+def export_flattened(asset_stage: Usd.Stage, output_dir: str, asset_dir: str, asset_stem: str, asset_format: str, comment: str) -> str:
     output_path = pathlib.Path(output_dir)
     layer: Sdf.Layer = asset_stage.Flatten()
     asset_identifier = f"{output_path.absolute().as_posix()}/{asset_stem}.{asset_format}"
@@ -40,3 +40,4 @@ def export_flattened(asset_stage: Usd.Stage, output_dir: str, asset_dir: str, as
         Tf.Status(f"Copied textures from {temp_textures_dir} to {output_textures_dir}")
 
     shutil.rmtree(asset_dir, ignore_errors=True)
+    return asset_identifier

mujoco_usd_converter/_impl/convert.py

@@ -126,7 +126,7 @@ def convert(self, input_file: str, output_dir: str) -> Sdf.AssetPath:
 
         # optionally flatten the asset
         if not self.params.layer_structure:
-            export_flattened(asset_stage, output_dir, asset_dir, asset_stem, asset_format, self.params.comment)
+            asset_identifier = export_flattened(asset_stage, output_dir, asset_dir, asset_stem, asset_format, self.params.comment)
         else:
             usdex.core.saveStage(asset_stage, comment=self.params.comment)
 

tests/testAssetStructure.py

@@ -360,7 +360,11 @@ def test_no_layer_structure_material_texture(self):
             [(Tf.TF_DIAGNOSTIC_WARNING_TYPE, ".*will discard textures at render time")],
             level=usdex.core.DiagnosticsLevel.eWarning,
         ):
-            mujoco_usd_converter.Converter(layer_structure=False).convert(model, output_dir)
+            asset_identifier = mujoco_usd_converter.Converter(layer_structure=False).convert(model, output_dir)
+
+        # check that the asset identifier returned from convert() is the same as the usdc path
+        flattened_usdc_path = pathlib.Path(asset_identifier.path).absolute().as_posix()
+        self.assertEqual(flattened_usdc_path, usdc_path.absolute().as_posix())
 
         # check usdc and texture
         self.assertTrue(usdc_path.exists(), f"{usdc_path} not found")