test for dynamic module import without as parameter

JZentgraf · JZentgraf · commit b91a02a83673 · 2025-03-13T09:00:06.000+01:00
diff --git a/snakemake/workflow.py b/snakemake/workflow.py
@@ -2278,19 +2278,20 @@ def userule(
         def decorate(maybe_ruleinfo):
             if from_module is not None:
                 try:
-                    module = self.modules[from_module]
                     modifier = name_modifier
+                    module = self.modules[from_module]
                 except KeyError:
                     from inspect import currentframe
 
                     if from_module in currentframe().f_back.f_globals:
                         module = self.modules[
                             currentframe().f_back.f_globals[from_module]
                         ]
-                        if name_modifier.endswith("*"):
-                            modifier = f"{currentframe().f_back.f_globals[name_modifier[:-1]]}*"
-                        else:
-                            modifier = currentframe().f_back.f_globals[name_modifier]
+                        if name_modifier is not None:
+                            if name_modifier.endswith("*"):
+                                modifier = f"{currentframe().f_back.f_globals[name_modifier[:-1]]}*"
+                            else:
+                                modifier = currentframe().f_back.f_globals[name_modifier]
                     else:
                         raise WorkflowError(
                             "Module {} has not been registered with 'module' statement before using it in 'use rule' statement.".format(
diff --git a/tests/test_modules_dynamic_no_as/Snakefile b/tests/test_modules_dynamic_no_as/Snakefile
@@ -0,0 +1,25 @@
+shell.executable("bash")
+
+
+configfile: "config/config.yaml"
+
+for module_name in ["module1", "module2"]:
+    module:
+        name: module_name
+        snakefile:
+            f"{module_name}/Snakefile"
+        config:
+            config
+        replace_prefix:
+            {"results/": "results/testmodule/"}
+
+    use rule * from module_name
+
+rule all:
+    input:
+        multiext(expand("results/testmodule/c1/{name}.", name="test")[0], "tsv", "txt"),
+        multiext(expand("results/testmodule/c2/{name}.", name="test")[0], "tsv", "txt"),
+
+
+assert module1.some_func() == 15
+assert module2.some_func() == 25
diff --git a/tests/test_modules_dynamic_no_as/config/config.yaml b/tests/test_modules_dynamic_no_as/config/config.yaml
@@ -0,0 +1 @@
+test: 1
diff --git a/tests/test_modules_dynamic_no_as/expected-results/results/testmodule/b1/test.out b/tests/test_modules_dynamic_no_as/expected-results/results/testmodule/b1/test.out
@@ -0,0 +1 @@
+1
diff --git a/tests/test_modules_dynamic_no_as/expected-results/results/testmodule/b2/test.out b/tests/test_modules_dynamic_no_as/expected-results/results/testmodule/b2/test.out
@@ -0,0 +1 @@
+1
diff --git a/tests/test_modules_dynamic_no_as/module1/Snakefile b/tests/test_modules_dynamic_no_as/module1/Snakefile
@@ -0,0 +1,40 @@
+configfile: "config.yaml"  # does not exist, but this statement should be ignored on module import
+
+
+def some_func():
+    return 15
+
+
+rule module1_a:
+    output:
+        temp("results/a1/{name}.out"),
+    shell:
+        "echo {config[test]} > {output}"
+
+
+rule module1_b:
+    input:
+        expand(rules.module1_a.output, name="test"),
+    output:
+        "results/b1/{name}.out",
+    shell:
+        "cat {input} > {output}"
+
+
+rule module1_c_tsv:
+    input:
+        expand(rules.module1_b.output, name="test"),
+    output:
+        "results/c1/{name}.tsv",
+    shell:
+        "cat {input} > {output}"
+
+
+use rule module1_c_tsv as module1_c_txt with:
+    output:
+        "results/c1/{name}.txt",
+
+
+rule module1_all:
+    input:
+        expand(rules.module1_c_tsv.output, name="test"),
diff --git a/tests/test_modules_dynamic_no_as/module2/Snakefile b/tests/test_modules_dynamic_no_as/module2/Snakefile
@@ -0,0 +1,40 @@
+configfile: "config.yaml"  # does not exist, but this statement should be ignored on module import
+
+
+def some_func():
+    return 25
+
+
+rule module2_a:
+    output:
+        temp("results/a2/{name}.out"),
+    shell:
+        "echo {config[test]} > {output}"
+
+
+rule module2_b:
+    input:
+        expand(rules.module2_a.output, name="test"),
+    output:
+        "results/b2/{name}.out",
+    shell:
+        "cat {input} > {output}"
+
+
+rule module2_c_tsv:
+    input:
+        expand(rules.module2_b.output, name="test"),
+    output:
+        "results/c2/{name}.tsv",
+    shell:
+        "cat {input} > {output}"
+
+
+use rule module2_c_tsv as module2_c_txt with:
+    output:
+        "results/c2/{name}.txt",
+
+
+rule module2_all:
+    input:
+        expand(rules.module2_c_tsv.output, name="test"),
diff --git a/tests/tests.py b/tests/tests.py
@@ -1464,6 +1464,10 @@ def test_modules_dynamic():
     run(dpath("test_modules_dynamic"), targets=["all"])
 
 
+def test_modules_dynamic_no_as():
+    run(dpath("test_modules_dynamic_no_as"), targets=["all"])
+
+
 def test_module_nested():
     run(dpath("test_module_nested"))
 
