diff --git a/src/caosdb/apiutils.py b/src/caosdb/apiutils.py index e6bd80fb6807315a04eab8718b5b808b8fdf9b9a..d90ef0d55bb081d71d6dd04784cc013c77e9fd3e 100644 --- a/src/caosdb/apiutils.py +++ b/src/caosdb/apiutils.py @@ -356,8 +356,13 @@ def merge_entities(entity_a: Entity, entity_b: Entity): for key in diff_r2["properties"]: if key in diff_r1["properties"]: - if (diff_r1["properties"][key]["importance"] != - diff_r2["properties"][key]["importance"]): + if ("importance" in diff_r1["properties"][key] and + "importance" in diff_r2["properties"][key]): + if (diff_r1["properties"][key]["importance"] != + diff_r2["properties"][key]["importance"]): + raise NotImplementedError() + elif ("importance" in diff_r1["properties"][key] or + "importance" in diff_r2["properties"][key]): raise NotImplementedError() for attribute in ("datatype", "unit", "value"):