configurable executable (path) for plotters

src/plotman/configuration.py

@@ -73,6 +73,8 @@ def get_validated_configs(config_text: str, config_path: str, preset_target_defi
 
     if loaded.plotting.type == "chia":
         if loaded.plotting.chia is None:
+            # TODO: fix all the `TODO: use the configured executable` so this is not
+            #       needed.
             raise ConfigurationException(
                 "chia selected as plotter but plotting: chia: was not specified in the config",
             )
@@ -81,6 +83,12 @@ def get_validated_configs(config_text: str, config_path: str, preset_target_defi
             raise ConfigurationException(
                 "Chia Network plotter accepts up to one of plotting: pool_pk: and pool_contract_address: but both are specified",
             )
+
+        executable_name = os.path.basename(loaded.plotting.chia.executable)
+        if executable_name != "chia":
+            raise ConfigurationException(
+                "plotting: chia: executable: must refer to an executable named chia"
+            )
     elif loaded.plotting.type == "madmax":
         if loaded.plotting.madmax is None:
             raise ConfigurationException(
@@ -101,6 +109,14 @@ def get_validated_configs(config_text: str, config_path: str, preset_target_defi
                 "madMAx plotter accepts only one of plotting: pool_pk: and pool_contract_address: but both are specified",
             )
 
+        executable_name = os.path.basename(loaded.plotting.madmax.executable)
+        if executable_name != "chia_plot":
+            # TODO: fix all the `TODO: use the configured executable` so this is not
+            #       needed.
+            raise ConfigurationException(
+                "plotting: madmax: executable: must refer to an executable named chia_plot"
+            )
+
     if loaded.archiving is not None:
         preset_target_objects = yaml.safe_load(preset_target_definitions_text)
         preset_target_schema = desert.schema(PresetTargetDefinitions)
@@ -312,6 +328,7 @@ class Scheduling:
 
 @attr.frozen
 class ChiaPlotterOptions:
+    executable: str = "chia"
     n_threads: int = 2
     n_buckets: int = 128
     k: Optional[int] = 32
@@ -321,6 +338,7 @@ class ChiaPlotterOptions:
 
 @attr.frozen
 class MadmaxPlotterOptions:
+    executable: str = "chia_plot"
     n_threads: int = 4
     n_buckets: int = 256
 
@@ -369,9 +387,15 @@ class PlotmanConfig:
     @contextlib.contextmanager
     def setup(self) -> Generator[None, None, None]:
         if self.plotting.type == 'chia':
+            if self.plotting.chia is None:
+                message = (
+                    "internal plotman error, please report the full traceback and your"
+                    + " full configuration file"
+                )
+                raise Exception(message)
             if self.plotting.pool_contract_address is not None:
                 completed_process = subprocess.run(
-                    args=['chia', 'version'],
+                    args=[self.plotting.chia.executable, 'version'],
                     capture_output=True,
                     check=True,
                     encoding='utf-8',
@@ -384,9 +408,16 @@ def setup(self) -> Generator[None, None, None]:
                         f' plots but found: {version}'
                     )
         elif self.plotting.type == 'madmax':
+            if self.plotting.madmax is None:
+                message = (
+                    "internal plotman error, please report the full traceback and your"
+                    + " full configuration file"
+                )
+                raise Exception(message)
+
             if self.plotting.pool_contract_address is not None:
                 completed_process = subprocess.run(
-                    args=['chia_plot', '--help'],
+                    args=[self.plotting.madmax.executable, '--help'],
                     capture_output=True,
                     check=True,
                     encoding='utf-8',

src/plotman/job.py

@@ -35,11 +35,13 @@ def is_plotting_cmdline(cmdline: typing.List[str]) -> bool:
         cmdline = cmdline[1:]
         return (
             len(cmdline) >= 3
+            # TODO: use the configured executable
             and 'chia' in cmdline[0]
             and 'plots' == cmdline[1]
             and 'create' == cmdline[2]
         )
     elif cmdline and 'chia_plot' == os.path.basename(cmdline[0].lower()):  # Madmax plotter
+        # TODO: use the configured executable
         return True
     return False
 
@@ -57,6 +59,7 @@ def parse_chia_plots_create_command_line(
     if 'python' in command_line[0].lower():  # Stock Chia plotter
         command_line = command_line[1:]
         assert len(command_line) >= 3
+        # TODO: use the configured executable
         assert 'chia' in command_line[0]
         assert 'plots' == command_line[1]
         assert 'create' == command_line[2]
@@ -66,6 +69,7 @@ def parse_chia_plots_create_command_line(
         #       copied.
         command = chia.commands.latest_command()
     elif 'chia_plot' in command_line[0].lower():  # Madmax plotter
+        # TODO: use the configured executable
         command_line = command_line[1:]
         all_command_arguments = command_line[2:]
         command = madmax._cli_c8121b9
@@ -268,6 +272,7 @@ def __init__(
         #     'nobitfield': False,
         #     'exclude_final_dir': False,
         # }
+        # TODO: use the configured executable
         if proc.name().startswith("chia_plot"): # MADMAX
             self.k = 32
             self.r = self.args['threads']  # type: ignore[assignment]

src/plotman/manager.py

@@ -144,7 +144,8 @@ def key(key: str) -> job.Phase:
                     raise Exception(
                         "madmax plotter selected but not configured, report this as a plotman bug",
                     )
-                plot_args = ['chia_plot',
+                plot_args = [
+                    plotting_cfg.madmax.executable,
                     '-n', str(1),
                     '-r', str(plotting_cfg.madmax.n_threads),
                     '-u', str(plotting_cfg.madmax.n_buckets),
@@ -158,7 +159,7 @@ def key(key: str) -> job.Phase:
                     raise Exception(
                         "chia plotter selected but not configured, report this as a plotman bug",
                     )
-                plot_args = ['chia', 'plots', 'create',
+                plot_args = [plotting_cfg.chia.executable, 'plots', 'create',
                     '-k', str(plotting_cfg.chia.k),
                     '-r', str(plotting_cfg.chia.n_threads),
                     '-u', str(plotting_cfg.chia.n_buckets),