using jinja2 instead of two files

Author: Peyman-N

pipeline/src/module_template.py.txt

@@ -16,7 +16,7 @@ class {{ class_name }}({{ base_class }}):
     """
     type_ = "{{ openminds_type }}"
     context = {
-        "@vocab": "https://openminds.om-i.org/props/"
+        "@vocab": "{{ context_vocab }}"
     }
     schema_version = "{{ schema_version }}"
 

pipeline/src/module_template_old.py.txt

@@ -38,7 +38,7 @@ def test_issue_0003():
     )
     # on export, a single item should be wrapped in a list, where the property expects an array
     expected = {
-        "@context": {"@vocab": "https://openminds.om-i.org/vocab/"},
+        "@context": {"@vocab": "https://openminds.om-i.org/props/"},
         "@type": "https://openminds.om-i.org/types/FileArchive",
         "IRI": "http://example.com/archive.zip",
         "format": {
@@ -90,7 +90,7 @@ def test_issue0007():
 
     actual = person.to_jsonld(include_empty_properties=False, embed_linked_nodes=False, with_context=True)
     expected = {
-        "@context": {"@vocab": "https://openminds.om-i.org/vocab/"},
+        "@context": {"@vocab": "https://openminds.om-i.org/props/"},
         "@id": "_:001",
         "@type": "https://openminds.om-i.org/types/Person",
         "familyName": "Professor",
@@ -120,7 +120,7 @@ def test_issue0007():
         saved_data = json.load(fp)
     os.remove("issue0007.jsonld")
     expected_saved_data = {
-        "@context": {"@vocab": "https://openminds.om-i.org/vocab/"},
+        "@context": {"@vocab": "https://openminds.om-i.org/props/"},
         "@graph": [
             {
                 "@id": "_:001",
@@ -171,7 +171,7 @@ def test_issue0008():
     )
     actual = person.to_jsonld(include_empty_properties=False, embed_linked_nodes=False, with_context=True)
     expected = {
-        "@context": {"@vocab": "https://openminds.om-i.org/vocab/"},
+        "@context": {"@vocab": "https://openminds.om-i.org/props/"},
         "@id": "_:002",
         "@type": "https://openminds.om-i.org/types/Person",
         "affiliation": [

pipeline/tests/test_regressions.py

@@ -64,10 +64,12 @@ def __init__(self, schema_file_path: str, root_path: str, instances: Optional[di
             schema_file_path[len(root_path) + 1 :].replace(".schema.omi.json", "").split("/")
         )
         self.version = _relative_path_without_extension[0]
+        self.template_name = "src/module_template.py.txt"
         if self.version in ["v3.0" , "v2.0" , "v1.0"]:
-            self.template_name = "src/module_template_old.py.txt"
+            self.context_vocab = "https://openminds.ebrains.eu/vocab/"
         else:
-            self.template_name = "src/module_template.py.txt"
+            self.context_vocab = "https://openminds.om-i.org/props/"
+
         self.relative_path_without_extension = [
             generate_python_name(part) for part in _relative_path_without_extension[1:]
         ]
@@ -86,7 +88,7 @@ def _version_module(self):
     def _target_file_without_extension(self) -> str:
         return os.path.join(self._version_module, "/".join(self.relative_path_without_extension))
 
-    def translate(self, embedded=None, class_module_dict=None):
+    def translate(self, embedded=None, class_to_module_map=None):
         def get_type(property):
             type_map = {
                 "string": "str",
@@ -104,8 +106,8 @@ def get_type(property):
                 types = []
                 for item in property["_linkedTypes"]:
                     openminds_module_from_type, class_name = item.split("/")[-2:]
-                    if isinstance(class_module_dict,dict) and (class_name in class_module_dict):
-                        openminds_module = generate_python_name(class_module_dict[class_name])
+                    if isinstance(class_to_module_map,dict) and (class_name in class_to_module_map):
+                        openminds_module = generate_python_name(class_to_module_map[class_name])
                     else:
                         openminds_module = generate_python_name(openminds_module_from_type)
                     types.append(f"openminds.{self._version_module}.{openminds_module}.{class_name}")
@@ -116,8 +118,8 @@ def get_type(property):
                 types = []
                 for item in property["_embeddedTypes"]:
                     openminds_module_from_type, class_name = item.split("/")[-2:]
-                    if isinstance(class_module_dict,dict) and (class_name in class_module_dict):
-                        openminds_module = generate_python_name(class_module_dict[class_name])
+                    if isinstance(class_to_module_map,dict) and (class_name in class_to_module_map):
+                        openminds_module = generate_python_name(class_to_module_map[class_name])
                     else:
                         openminds_module = generate_python_name(openminds_module_from_type)
                     types.append(f"openminds.{self._version_module}.{openminds_module}.{class_name}")
@@ -210,6 +212,7 @@ def filter_instance(instance):
             "class_name": class_name,
             "openminds_type": openminds_type,
             "schema_version": self.version,
+            "context_vocab": self.context_vocab,
             "properties": properties,
             "additional_methods": "",
             "instances": instances
@@ -242,11 +245,11 @@ def filter_instance(instance):
             if extra_imports:
                 self.context["preamble"] = "\n".join(sorted(extra_imports))
 
-    def build(self, embedded=None, class_module_dict=None):
+    def build(self, embedded=None, class_to_module_map=None):
         target_file_path = os.path.join("target", "openminds", f"{self._target_file_without_extension()}.py")
         os.makedirs(os.path.dirname(target_file_path), exist_ok=True)
 
-        self.translate(embedded=embedded, class_module_dict=class_module_dict)
+        self.translate(embedded=embedded, class_to_module_map=class_to_module_map)
 
         with open(target_file_path, "w") as target_file:
             contents = self.env.get_template(self.template_name).render(self.context)