jsex / yaml parser

Summary

• More descriptions everywhere.
• Fixed bug in get_deep: properties may be used multiple times
• Cleanup in yaml parser: list data types, property names
• Better mocks in jsex tests
• New yaml parser test for property inheritance

Focus

Mostly: Compatibility with previous use cases.

Test Environment

Run unit tests.

Check List for the Author

Please, prepare your MR for a review. Be sure to write a summary and a focus and create gitlab comments for the reviewer. They should guide the reviewer through the changes, explain your changes and also point out open questions. For further good practices have a look at our review guidelines

• All automated tests pass
• Reference related issues caosdb/customers/dimr/management#114
• Up-to-date CHANGELOG.md (or not necessary)
• Up-to-date JSON schema (or not necessary)
• Appropriate user and developer documentation (or not necessary)
  • How do I use the software? Assume "stupid" users.
  • How do I develop or debug the software? Assume novice developers.
• Annotations in code (Gitlab comments)
  • Intent of new code
  • Problems with old code
  • Why this implementation?

Check List for the Reviewer

• I understand the intent of this MR
• All automated tests pass
• Up-to-date CHANGELOG.md (or not necessary)
• Appropriate user and developer documentation (or not necessary)
• The test environment setup works and the intended behavior is reproducible in the test environment
• In-code documentation and comments are up-to-date.
• Check: Are there specifications? Are they satisfied?

For further good practices have a look at our review guidelines.

src/caosadvancedtools/models/data_model.py

@@ -31,7 +31,7 @@ from typing import List
 
 import linkahead as db
 import linkahead.common.models as models
-from linkahead.apiutils import compare_entities, describe_diff
+from linkahead.apiutils import compare_entities, describe_diff, merge_entities
 
 
 CAOSDB_INTERNAL_PROPERTIES = [
@@ -264,7 +264,7 @@ class DataModel(dict):
 
         return list(all_ents.values())
 
-    def get_deep(self, name: str, visited_props: set = None, visited_parents: set = None):
+    def get_deep(self, name: str, visited_props: dict = None, visited_parents: set = None):
         """Attempt to resolve references for the given ``name``.
 
         The returned entity has all the properties it inherits from its ancestry and all properties
@@ -279,7 +279,7 @@ class DataModel(dict):
         if not entity:
             return entity
         if not visited_props:
-            visited_props = set()
+            visited_props = {}
         if not visited_parents:
             visited_parents = set()
 
@@ -309,8 +309,14 @@ class DataModel(dict):
 
         for prop in list(entity.get_properties()):  # Make a change-resistant list copy.
             if prop.name in visited_props:
+                if visited_props[prop.name]:
+                    deep_prop = visited_props[prop.name]
+                    merge_entities(prop, deep_prop)
+                    prop.datatype = deep_prop.datatype
+                    prop.value = deep_prop.value
+                    prop.unit = deep_prop.unit
                 continue
-            visited_props.add(prop.name)
+            visited_props[prop.name] = None
             if prop.name in self:
                 deep_prop = self.get_deep(prop.name, visited_props=visited_props,
                                           visited_parents=visited_parents)
@@ -322,6 +328,7 @@ class DataModel(dict):
                         linked_prop.datatype = deep_prop
                 if deep_prop.description:
                     linked_prop.description = deep_prop.description
+                visited_props[prop.name] = deep_prop
             else:
                 print(f"Referenced property \"{prop.name}\" not found in data model.")