Make user_local_exports a non-optional dict

Author: tcompa

fractal_server/runner/config/_slurm.py

@@ -126,4 +126,4 @@ class JobRunnerConfigSLURM(BaseModel):
     default_slurm_config: _SlurmConfigSet
     gpu_slurm_config: _SlurmConfigSet | None = None
     batching_config: _BatchingConfigSet
-    user_local_exports: DictStrStr | None = None
+    user_local_exports: DictStrStr = Field(default_factory=dict)

fractal_server/runner/executors/slurm_common/get_slurm_config.py

@@ -77,7 +77,7 @@ def _get_slurm_config_internal(
     else:
         needs_gpu = False
     logger.debug(f"[get_slurm_config] {needs_gpu=}")
-    if needs_gpu:
+    if needs_gpu and shared_config.gpu_slurm_config is not None:
         for key, value in shared_config.gpu_slurm_config.model_dump(
             exclude_unset=True, exclude={"mem"}
         ).items():

fractal_server/runner/executors/slurm_common/slurm_config.py

@@ -86,7 +86,7 @@ class SlurmConfig(BaseModel):
     extra_lines: list[str] = Field(default_factory=list)
 
     # Variables that will be `export`ed in the SLURM submission script
-    user_local_exports: dict[str, str] | None = None
+    user_local_exports: dict[str, str] = Field(default=dict)
 
     # Metaparameters needed to combine multiple tasks in each SLURM job
     tasks_per_job: int | None = None
@@ -189,14 +189,13 @@ def to_sbatch_preamble(
         for line in self._sorted_extra_lines():
             lines.append(line)
 
-        if self.user_local_exports:
-            if remote_export_dir is None:
-                raise ValueError(
-                    f"remote_export_dir=None but {self.user_local_exports=}"
-                )
-            for key, value in self.user_local_exports.items():
-                tmp_value = str(Path(remote_export_dir) / value)
-                lines.append(f"export {key}={tmp_value}")
+        if self.user_local_exports != {} and remote_export_dir is None:
+            raise ValueError(
+                f"{remote_export_dir=} but {self.user_local_exports=}"
+            )
+        for key, value in self.user_local_exports.items():
+            tmp_value = str(Path(remote_export_dir) / value)
+            lines.append(f"export {key}={tmp_value}")
 
         """
         FIXME export SRUN_CPUS_PER_TASK

tests/v2/test_08_backends/test_slurm_config.py

@@ -138,6 +138,7 @@ def test_get_slurm_config_internal_gpu_options():
             "max_num_jobs": 10,
         },
     )
+    assert shared_slurm_config.user_local_exports == {}
     assert shared_slurm_config.default_slurm_config.extra_lines == []
 
     # In absence of `needs_gpu`, parameters in `gpu_slurm_config` are not used