dsl: support string type annotations containing '|'.

docs/examples/service_template.py

@@ -28,7 +28,7 @@ class MyApplication(tosca.nodes.SoftwareComponent):
     private_address: str = Attribute()
 
     host: Sequence[
-        tosca.relationships.HostedOn | tosca.nodes.Compute | tosca.capabilities.Compute
+        "tosca.relationships.HostedOn | tosca.nodes.Compute | tosca.capabilities.Compute"
     ] = ()
 
     db: "DatabaseConnection"

tosca-package/tosca/_tosca.py

@@ -436,6 +436,8 @@ def _get_type_name(_type):
 def get_optional_type(_type) -> Tuple[bool, Any]:
     # if not optional return false, type
     # else return true, type or type
+    if isinstance(_type, ForwardRef):
+        _type = _type.__forward_arg__
     if isinstance(_type, str):
         union = [t.strip() for t in _type.split("|")]
         try:
@@ -508,7 +510,9 @@ def pytype_to_tosca_type(_type, as_str=False) -> TypeInfo:
             _type = Any
         origin = get_origin(_type)
 
-    if _get_type_name(origin) in ["Union", "UnionType"]:
+    if isinstance(_type, ForwardRef):
+        types: tuple = tuple(ForwardRef(t.strip()) for t in _type.__forward_arg__.split("|"))
+    elif _get_type_name(origin) in ["Union", "UnionType"]:
         types = get_args(_type)
     else:
         types = (_type,)

tosca-package/tosca/yaml2python.py

@@ -649,16 +649,8 @@ def import_types(self, types: List[str]):
         return self.maybe_forward_refs(*(self.python_name_from_type(t) for t in types))
 
     def maybe_forward_refs(self, *types) -> Sequence[str]:
-        def may_quote(tn):
-            if self._builtin_prefix:
-                return repr(tn)
-            elif tn.startswith("unfurl.") or tn.startswith("tosca."):
-                return tn
-            else:
-                return repr(tn)
-
         if self.forward_refs:
-            return [may_quote(t) for t in types]
+            return [repr(t) for t in types]
         else:
             return types