Specify loader for jinja template (external Jinja template support)

src/dynamicprompts/generators/jinjagenerator.py

@@ -69,7 +69,11 @@ def _build_jinja_template(self, template: str):
             PromptExtension,
         )
 
-        env = jinja2.Environment(extensions=[PromptExtension])
+        env_kwargs = dict(extensions=[PromptExtension])
+        # If wildcard root is specified, set it as jinja template root, also
+        if self._wildcard_manager.path:
+           env_kwargs.update(loader=jinja2.FileSystemLoader(self._wildcard_manager.path))
+        env = jinja2.Environment(**env_kwargs)
         prompt_blocks: list[str] = []
         env.globals.update(
             {

tests/generators/test_jinja.py

@@ -280,3 +280,23 @@ def test_ignore_whitespace(self, generator: JinjaGenerator):
         prompts = generator.generate(template)
         for p in prompts:
             assert "\n" not in p
+
+    def test_jinja_template_from_file(self, generator: JinjaGenerator):
+        template = """
+        {%- import 'jinja/lib.jinja' as lib -%}
+        {{ lib.echo('test') -}}
+        """
+        assert generator.generate(template) == ["test"]
+
+        with patch("random.choice") as mock_choice:
+            mock_choice.side_effect = ["red", "blue", "red"]
+            template = """
+            {%- import 'jinja/lib.jinja' as lib with context -%}
+            {{ lib.mychoice() -}}
+            """
+
+            assert generator.generate(template, 3) == [
+                "This is a red rose",
+                "This is a blue rose",
+                "This is a red rose",
+            ]

tests/test_data/wildcards/jinja/lib.jinja

@@ -0,0 +1,6 @@
+{% macro echo(arg) -%}
+{{ arg }}
+{%- endmacro %}
+{% macro mychoice() -%}
+This is a {{ choice('red', 'blue') }} rose
+{%- endmacro %}