Support optional references

Author: alessiostalla

pylasu/model/model.py

@@ -158,7 +158,7 @@ def compute_feature_from_annotation(cl, name, decl_type):
         elif type(decl_type) is str:
             decl_type = try_to_resolve_string_type(decl_type, name, cl)
         if not isinstance(decl_type, type):
-            raise Exception(f"Unsupported feature {name} of type {decl_type}")
+            raise Exception(f"Unsupported feature {name} of type {decl_type} in {cl}")
     feature.type = decl_type
     feature.is_containment = provides_nodes(decl_type) and not feature.is_reference
     return feature
@@ -169,7 +169,7 @@ def try_to_resolve_string_type(decl_type, name, cl):
         ns = getattr(sys.modules.get(cl.__module__, None), '__dict__', globals())
         decl_type = ns[decl_type]
     except KeyError:
-        raise Exception(f"Unsupported feature {name} of unknown type {decl_type}")
+        raise Exception(f"Unsupported feature {name} of unknown type {decl_type} in {cl}")
     return decl_type
 
 
@@ -195,6 +195,7 @@ def try_to_resolve_type(decl_type, feature):
                 feature.multiplicity = Multiplicity.OPTIONAL
         else:
             raise Exception(f"Unsupported feature {feature.name} of union type {decl_type}")
+        decl_type = try_to_resolve_type(decl_type, feature)
     return decl_type
 
 

tests/model/test_model.py

@@ -20,6 +20,7 @@ class SomeNode(Node, Named):
     optional: Optional[Node] = None
     multiple_opt: List[Optional[Node]] = dataclasses.field(default_factory=list)
     internal: Node = internal_field(default=None)
+    optional_ref: Optional[ReferenceByName["SomeNode"]] = None
 
     def __post_init__(self):
         self.bar = 5
@@ -208,7 +209,7 @@ def frob_node(_: Node):
             pass
 
         pds = [pd for pd in sorted(SomeNode.node_properties, key=lambda x: x.name)]
-        self.assertEqual(8, len(pds), f"{pds} should be 7")
+        self.assertEqual(9, len(pds), f"{pds} should be 9")
         self.assertEqual("bar", pds[0].name)
         self.assertFalse(pds[0].is_containment)
         self.assertEqual("containment", pds[1].name)
@@ -226,8 +227,11 @@ def frob_node(_: Node):
         self.assertEqual("optional", pds[6].name)
         self.assertTrue(pds[6].is_containment)
         self.assertEqual(Multiplicity.OPTIONAL, pds[6].multiplicity)
-        self.assertEqual("reference", pds[7].name)
+        self.assertEqual("optional_ref", pds[7].name)
         self.assertTrue(pds[7].is_reference)
+        self.assertEqual(Multiplicity.OPTIONAL, pds[7].multiplicity)
+        self.assertEqual("reference", pds[8].name)
+        self.assertTrue(pds[8].is_reference)
 
         self.assertRaises(Exception, lambda: [x for x in InvalidNode.node_properties])
 
@@ -237,7 +241,7 @@ def frob_node_2(_: Node):
             pass
 
         pds = [pd for pd in sorted(ExtendedNode.node_properties, key=lambda x: x.name)]
-        self.assertEqual(15, len(pds), f"{pds}")
+        self.assertEqual(16, len(pds), f"{pds}")
         self.assertEqual("bar", pds[0].name)
         self.assertFalse(pds[0].is_containment)
         self.assertEqual("cont_fwd", pds[1].name)