Merge pull request #93 from Raphael-Gazzotti/fix-#91

Fix #91: Vocabulary labels are modified by the build pipeline

Author: lzehl

openMINDS_pipeline/resolver.py

@@ -60,6 +60,7 @@ def _save_categories(directory_structure, categories):
     categories_file = os.path.join(directory_structure.target_directory, "vocab", "categories.json")
     with open(categories_file, "w+") as categories_f:
         categories_f.write(json.dumps(categories, sort_keys=True, indent=2))
+        categories_f.write("\n")
 
 
 def _schemas_by_category(schemas: List[SchemaStructure]) -> Dict[str, List[str]]:

openMINDS_pipeline/vocab.py

@@ -291,6 +291,7 @@ def _load_properties(self):
     def _save_properties(self):
         with open(self._properties_file, "w+") as properties_file:
             properties_file.write(json.dumps(self._properties, sort_keys=True, indent=2))
+            properties_file.write("\n")
 
     def clean_properties(self):
         to_be_removed = []
@@ -340,9 +341,11 @@ def _extract_property(self, type: str, property: str, definition: dict):
             prop["namePlural"] = None
 
         # Automatically calculated values
-        unqualified_property = os.path.basename(property)
-        prop["label"] = _camel_case_to_human_readable(unqualified_property)
-        prop["name"] = unqualified_property
+        property_basename = os.path.basename(property)
+        if "label" not in prop:
+            prop["label"] = _camel_case_to_human_readable(property_basename)
+        if "name" not in prop:
+            prop["name"] = property_basename
 
         if "usedIn" not in prop:
             prop["usedIn"] = {}