Add support for importing other files from package and assembly confi…

…guration files (#46)
openvmp · Jan 7, 2024 · f6e140c · f6e140c
1 parent 55b7d0e
commit f6e140c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -15,6 +15,8 @@
     "bierner.markdown-checkbox",
     "bierner.markdown-yaml-preamble",
     "bierner.markdown-footnotes",
-    "bierner.markdown-mermaid"
+    "bierner.markdown-mermaid",
+    // Jinja2
+    "samuelcolvin.jinjahtml",
   ]
 }
diff --git a/src/partcad/assembly_factory_assy.py b/src/partcad/assembly_factory_assy.py
@@ -8,7 +8,7 @@
 #
 
 import build123d as b3d
-from jinja2 import Template
+from jinja2 import Environment, FileSystemLoader
 import logging
 import os
 import yaml
@@ -32,7 +32,9 @@ def instantiate(self, assembly):
             fp.close()
 
             # Resolve Jinja templates
-            template = Template(config)
+            template = Environment(
+                loader=FileSystemLoader(os.path.dirname(self.path) + os.path.sep)
+            ).from_string(config)
             config = template.render(
                 name=self.assembly_config["name"],
             )

diff --git a/src/partcad/project_config.py b/src/partcad/project_config.py
@@ -6,7 +6,7 @@
 #
 # Licensed under Apache License, Version 2.0.
 
-from jinja2 import Template
+from jinja2 import Environment, FileSystemLoader
 import json
 import logging
 import os
@@ -40,7 +40,9 @@ def __init__(self, import_config_name, config_path=DEFAULT_CONFIG_FILENAME):
         fp.close()
 
         # Resolve Jinja templates
-        template = Template(config)
+        template = Environment(
+            loader=FileSystemLoader(self.config_dir + os.path.sep)
+        ).from_string(config)
         config = template.render(
             package_name=import_config_name,
         )