dsl: support string type annotations containing '|'.

onecommons · Oct 27, 2024 · d1853f7 · d1853f7
1 parent ccce6b0
commit d1853f7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/docs/examples/service_template.py b/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"

diff --git a/tosca-package/tosca/_tosca.py b/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 = (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,)