Refactor lasindex runner

Author: balazsdukai

packages/core/src/bag3d/core/assets/ahn/index.py

@@ -1,8 +1,8 @@
-from dagster import asset, get_dagster_logger, Config
+from dagster import asset, get_dagster_logger, Config, AssetExecutionContext
 from pydantic import Field
 
 from bag3d.core.assets.ahn.core import partition_definition_ahn
-
+from bag3d.core.assets.ahn.download import LAZDownload
 
 logger = get_dagster_logger("ahn.index")
 
@@ -22,15 +22,9 @@ class LasIndexConfig(Config):
     )
 
 
-@asset(
-    required_resource_keys={"lastools"},
-    partitions_def=partition_definition_ahn,
-)
-def lasindex_ahn3(context, config: LasIndexConfig, laz_files_ahn3):
-    """Append a spatial index to the AHN3 LAZ file, using LASTools's `lasindex`.
-
-    See https://lastools.osgeo.org/download/lasindex_README.txt.
-    """
+def run_lasindex(
+    context: AssetExecutionContext, config: LasIndexConfig, lazdownload: LAZDownload
+):
     silent = not config.verbose
     cmd_list = [
         "{exe}",
@@ -41,51 +35,47 @@ def lasindex_ahn3(context, config: LasIndexConfig, laz_files_ahn3):
     if not config.force:
         cmd_list.append("-dont_reindex")
     context.resources.lastools.app.execute(
-        "lasindex", " ".join(cmd_list), local_path=laz_files_ahn3.path, silent=silent
+        "lasindex", " ".join(cmd_list), local_path=lazdownload.path, silent=silent
     )
 
 
 @asset(
     required_resource_keys={"lastools"},
     partitions_def=partition_definition_ahn,
 )
-def lasindex_ahn4(context, config: LasIndexConfig, laz_files_ahn4):
+def lasindex_ahn3(
+    context: AssetExecutionContext, config: LasIndexConfig, laz_files_ahn3: LAZDownload
+):
+    """Append a spatial index to the AHN3 LAZ file, using LASTools's `lasindex`.
+
+    See https://lastools.osgeo.org/download/lasindex_README.txt.
+    """
+    run_lasindex(context, config, laz_files_ahn3)
+
+
+@asset(
+    required_resource_keys={"lastools"},
+    partitions_def=partition_definition_ahn,
+)
+def lasindex_ahn4(
+    context: AssetExecutionContext, config: LasIndexConfig, laz_files_ahn4: LAZDownload
+):
     """Append a spatial index to the AHN4 LAZ file, using LASTools's `lasindex`.
 
     See https://lastools.osgeo.org/download/lasindex_README.txt.
     """
-    silent = not config.verbose
-    cmd_list = [
-        "{exe}",
-        "-i {local_path}",
-        "-tile_size",
-        str(config.tile_size),
-    ]
-    if not config.force:
-        cmd_list.append("-dont_reindex")
-    context.resources.lastools.app.execute(
-        "lasindex", " ".join(cmd_list), local_path=laz_files_ahn4.path, silent=silent
-    )
+    run_lasindex(context, config, laz_files_ahn4)
 
 
 @asset(
     required_resource_keys={"lastools"},
     partitions_def=partition_definition_ahn,
 )
-def lasindex_ahn5(context, config: LasIndexConfig, laz_files_ahn5):
+def lasindex_ahn5(
+    context: AssetExecutionContext, config: LasIndexConfig, laz_files_ahn5: LAZDownload
+):
     """Append a spatial index to the AHN5 LAZ file, using LASTools's `lasindex`.
 
     See https://lastools.osgeo.org/download/lasindex_README.txt.
     """
-    silent = not config.verbose
-    cmd_list = [
-        "{exe}",
-        "-i {local_path}",
-        "-tile_size",
-        str(config.tile_size),
-    ]
-    if not config.force:
-        cmd_list.append("-dont_reindex")
-    context.resources.lastools.app.execute(
-        "lasindex", " ".join(cmd_list), local_path=laz_files_ahn5.path, silent=silent
-    )
+    run_lasindex(context, config, laz_files_ahn5)