Refine GRES regex validation for SLURM jobs

Updated GRES regex to include optional postfix for units.

Author: maarten-k

snakemake_executor_plugin_slurm/utils.py

@@ -251,12 +251,9 @@ def set_gres_string(job: JobExecutorInterface) -> str:
     based on the resources requested in the job.
     """
     # generic resources (GRES) arguments can be of type
-    # "string:int" or "string:string:int"
-    gres_re = re.compile(r"^[a-zA-Z0-9_]+(:[a-zA-Z0-9_\.]+)?:\d+$")
+    # "string:int" or "string:string:int" with optional postfix 'T' or 'G' or 'M'
+    gres_re = re.compile(r"^[a-zA-Z0-9_]+(:[a-zA-Z0-9_\.]+)?:\d+[TGM]?$")
 
-    # generic resources (GRES) arguments can be of type
-    # "string:int[TGM]" when a tmpspace is specified.
-    gres_tmpspace_re = re.compile(r"^tmpspace:\d+[TGM]?$")
     # gpu model arguments can be of type "string"
     # The model string may contain a dot for variants, see
     # https://github.com/snakemake/snakemake-executor-plugin-slurm/issues/387
@@ -286,24 +283,21 @@ def set_gres_string(job: JobExecutorInterface) -> str:
     if job.resources.get("gres"):
         # Validate GRES format (e.g., "gpu:1", "gpu:tesla:2")
         gres = job.resources.gres
-        if not gres_re.match(gres):
-            if not gres_tmpspace_re.match(gres):
-                if not string_check.match(gres):
-                    raise WorkflowError(
-                        "GRES format should not be a nested string (start "
-                        "and end with ticks or quotation marks). "
-                        "Expected format: "
-                        "'<name>:<number>' or '<name>:<type>:<number>' or "
-                        "'tmpspace:<number>[TGM]' "
-                        "(e.g., 'gpu:1' or 'gpu:tesla:2') or tmpspace:10G "
-                    )
-                else:
-                    raise WorkflowError(
-                        f"Invalid GRES format: {gres}. Expected format: "
-                        "'<name>:<number>' or '<name>:<type>:<number>' "
-                        "or 'tmpspace:<number>[TGM]' "
-                        "(e.g., 'gpu:1' or 'gpu:tesla:2') or tmpspace:10G "
-                    )
+        if not gres_re.match(gres
+            if not string_check.match(gres):
+                raise WorkflowError(
+                    "GRES format should not be a nested string (start "
+                    "and end with ticks or quotation marks). "
+                    "Expected format: "
+                    "'<name>:<number>' or '<name>:<type>:<number>' with an optional 'T' 'M' or 'G' postfix "
+                    "(e.g., 'gpu:1' or 'gpu:tesla:2') "
+                )
+            else:
+                raise WorkflowError(
+                    f"Invalid GRES format: {gres}. Expected format: "
+                    "'<name>:<number>' or '<name>:<type>:<number>' with an optional 'T' 'M' or 'G' postfix"
+                    "(e.g., 'gpu:1' or 'gpu:tesla:2') "
+                )
         return f" --gres={job.resources.gres}"
 
     if gpu_model and gpu_string: