Merge pull request #436 from 3dgeo-heidelberg/package-default-xmls

Ship essential data as part of the Python package

pytests/test_demo_scenes.py

@@ -49,7 +49,7 @@ def run_helios_pyhelios(survey_path: Path, las_output: bool = True, zip_output:
     pyhelios.setDefaultRandomnessGeneratorSeed("43")
     simB = pyhelios.SimulationBuilder(
         surveyPath=str(survey_path.absolute()),
-        assetsDir=[str(Path("assets")), os.getcwd()],
+        assetsDir=[str(Path("assets"))],
         outputDir=str(Path("output")),
     )
     simB.setLasOutput(las_output)

python/pyhelios/__main__.py

@@ -10,13 +10,22 @@ def _get_executable():
 
 
 def helios_exec(args):
+    #
     # Inject additional arguments to account for standard paths
+    #
+
+    # We always look for assets in the current working directory
     args = args + ["--assets", os.getcwd()]
 
+    # We always look in the Python installation tree
+    args = args + ["--assets", resources.files("pyhelios")]
+    args = args + ["--assets", resources.files("pyhelios") / "data"]
+
     # Inject the legacy model switch. This is part of our transitioning strategy
     # to the new energy model.
     args = args + ["--legacyEnergyModel"]
 
+    # Call the executable
     executable = _get_executable()
     return subprocess.call([executable] + args)
 

python/pyhelios/simulation_builder.py

@@ -4,6 +4,8 @@
 from math import isnan
 import os
 import time
+import importlib_resources as resources
+
 
 SimulationBuilderRotateFilter = namedtuple(
     'SimulationBuilderRotateFilter',
@@ -64,6 +66,9 @@ class SimulationBuilder:
     # ---  CONSTRUCTOR  --- #
     # --------------------- #
     def __init__(self, surveyPath, assetsDir, outputDir):
+        # Add default values for asset directories
+        assetsDir = assetsDir + [os.getcwd(), str(resources.files("pyhelios")), str(resources.files("pyhelios") / "data")]
+
         # Base values
         self.setSurveyPath(surveyPath)
         self.setAssetsDir(assetsDir)