Add more specific error message for trycatch landlab ImportError

princeton-vl · Sep 27, 2024 · b3ab846 · b3ab846
1 parent d55e297
commit b3ab846
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/infinigen/terrain/assets/upsidedown_mountains.py b/infinigen/terrain/assets/upsidedown_mountains.py
@@ -20,8 +20,9 @@
         FlowDirectorSteepest,
         TransportLengthHillslopeDiffuser,
     )
-except ImportError:
+except ImportError as e:
     landlab = None
+    _landlab_import_error = e
 
 from infinigen.core.util.organization import AssetFile
 from infinigen.core.util.random import random_general as rg
@@ -53,9 +54,10 @@ def upsidedown_mountains_asset(
 
     if landlab is None:
         raise ImportError(
-            "landlab must be installed to use terrain mountain simulation "
-            "Please install optional terrain dependencies via `pip install .[terrain]`"
-        )
+            "landlab import failed for terrain mountain simulation "
+            f" original error: {_landlab_import_error}\n"
+            "You may need to install terrain dependencies via `pip install .[terrain]`"
+        ) from _landlab_import_error
 
     Path(folder).mkdir(parents=True, exist_ok=True)
     N = resolution

diff --git a/infinigen/terrain/land_process/snowfall.py b/infinigen/terrain/land_process/snowfall.py
@@ -17,7 +17,8 @@
         FlowDirectorSteepest,
         TransportLengthHillslopeDiffuser,
     )
-except ImportError:
+except ImportError as e:
+    _landlab_import_error = e
     landlab = None
 
 from infinigen.core.util.organization import AssetFile, Process
@@ -57,9 +58,10 @@ def run_snowfall(
 ):
     if landlab is None:
         raise ImportError(
-            "landlab must be installed to use terrain snowfall "
-            "Please install optional terrain dependencies via `pip install .[terrain]`"
-        )
+            "landlab import failed for terrain snowfall simulation\n"
+            f" original error: {_landlab_import_error}\n"
+            "You may need to install terrain dependencies via `pip install .[terrain]`"
+        ) from _landlab_import_error
 
     heightmap_path = f"{folder}/{Process.Erosion}.{AssetFile.Heightmap}.exr"
     tile_size = float(np.loadtxt(f"{folder}/{AssetFile.TileSize}.txt"))