Add conditional block IfThenElse

Author: illusional

wdlgen/common.py

@@ -4,6 +4,16 @@
 from .util import WdlBase
 
 
+class IfThenElse(WdlBase):
+    def __init__(self, condition, value_if_true, value_if_false):
+        self.condition = condition
+        self.value_if_true = value_if_true
+        self.value_if_false = value_if_false
+
+    def get_string(self):
+        return f"if {self.condition} then {self.value_if_true} else {self.value_if_false}"
+
+
 class Input(WdlBase):
     def __init__(self, data_type: WdlType, name: str, expression: str = None, requires_quotes=True):
         self.type = data_type
@@ -31,14 +41,16 @@ def get_string_from_type(self, wdtype):
 
         if isinstance(expression, bool):
             expression = "true" if expression else "false"
+        elif hasattr(expression, 'get_string'):
+            expression = expression.get_string()
 
         if requires_quotes:
             expression = f'"{expression}"'
 
         return self.format.format(
             type=wdtype,
             name=self.name,
-            def_w_equals=((" = " + expression) if expression is not None else "")
+            def_w_equals=((" = " + str(expression)) if expression is not None else "")
         )
 
 

wdlgen/task.py

@@ -29,7 +29,13 @@ def __init__(self, **kwargs):
             self.kwargs = kwargs
 
         def get_string(self):
-            return ['{k}: {v}'.format(k=k, v=v) for k,v in self.kwargs.items()]
+            l = []
+            for k, v in self.kwargs.items():
+                val = v
+                if hasattr(v, 'get_string'):
+                    val = v.get_string()
+                l.append('{k}: {v}'.format(k=k, v=val))
+            return l
 
         def add_docker(self, docker):
             self.kwargs["docker"] = f'"{docker}"'
@@ -46,7 +52,6 @@ def add_gcp_disk(self, disk_size_gb):
         def add_gcp_boot_disk(self, disk_size_gb: int):
             self.kwargs["bootDiskSizeGb"] = int(disk_size_gb)
 
-
     class Command(WdlBase):
         """
         Past the regular attributes, I've built the command generation here, because that's where