latch 2.39.0.dev20__tar.gz → 2.39.0.dev21__tar.gz

{latch-2.39.0.dev20/latch.egg-info → latch-2.39.0.dev21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: latch
-Version: 2.39.0.dev20
+Version: 2.39.0.dev21
 Summary: The Latch SDK
 Author-email: kenny@latch.bio
 Classifier: Programming Language :: Python :: 3.8

{latch-2.39.0.dev20 → latch-2.39.0.dev21/latch.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: latch
-Version: 2.39.0.dev20
+Version: 2.39.0.dev21
 Summary: The Latch SDK
 Author-email: kenny@latch.bio
 Classifier: Programming Language :: Python :: 3.8

{latch-2.39.0.dev20 → latch-2.39.0.dev21}/latch_cli/extras/nextflow/build.py

@@ -505,7 +505,7 @@ def generate_nf_entrypoint(
 
         from flytekit.extras.persistence import LatchPersistence
         from latch_cli.extras.nextflow.file_persistence import download_files, stage_for_output, upload_files
-        from latch_cli.extras.nextflow.channel import get_mapper_inputs, get_boolean_value
+        from latch_cli.extras.nextflow.channel import get_mapper_inputs, get_boolean_value, get_mapper_outputs
         from latch_cli.utils import check_exists_and_rename, get_parameter_json_value, urljoins
 
         from latch.resources.tasks import custom_task

{latch-2.39.0.dev20 → latch-2.39.0.dev21}/latch_cli/extras/nextflow/channel.py

@@ -1,9 +1,9 @@
 import json
-from typing import Dict, List, Optional, Type, TypeVar
+from typing import Dict, List, NamedTuple, Optional, Type, TypeVar
 
 from latch.types.metadata import _IsDataclass
 
-T = TypeVar("T", bound=_IsDataclass)
+DC = TypeVar("DC", bound=_IsDataclass)
 
 
 def get_boolean_value(channel_value: str) -> bool:
@@ -29,10 +29,10 @@ def get_boolean_value(channel_value: str) -> bool:
 
 
 def get_mapper_inputs(
-    cls: Type[T],
+    cls: Type[DC],
     wf_inputs: Dict[str, object],
     channel_inputs: Dict[str, str],
-) -> List[T]:
+) -> List[DC]:
     value_channels = {}
     queue_channels = {}
 
@@ -49,7 +49,7 @@ def get_mapper_inputs(
     if min_len == float("inf"):
         min_len = 1
 
-    res: List[T] = []
+    res: List[DC] = []
     for i in range(min_len):
         kwargs = {**wf_inputs, **value_channels}
 
@@ -59,3 +59,31 @@ def get_mapper_inputs(
         res.append(cls(**kwargs))
 
     return res
+
+
+NT = TypeVar("NT", bound=NamedTuple)
+
+
+def get_mapper_outputs(adapter_output_cls: Type[NT], mapper_outputs: List[DC]) -> NT:
+    kwargs: Dict[str, str] = {}
+
+    if len(mapper_outputs) == 1:
+        output = mapper_outputs[0]
+        for f in adapter_output_cls._fields:
+            kwargs[f] = getattr(output, f)
+
+        return adapter_output_cls(**kwargs)
+
+    channels: Dict[str, List] = {}
+    for f in adapter_output_cls._fields:
+        channels[f] = []
+
+    for output in mapper_outputs:
+        for f in adapter_output_cls._fields:
+            channel = getattr(output, f)
+            channels[f].extend(json.loads(channel))
+
+    for f in adapter_output_cls._fields:
+        kwargs[f] = json.dumps(channels[f])
+
+    return adapter_output_cls(**kwargs)

{latch-2.39.0.dev20 → latch-2.39.0.dev21}/latch_cli/extras/nextflow/tasks/adapters.py

@@ -216,9 +216,7 @@ class NextflowProcessPostAdapterTask(NextflowBaseTask):
 
         return reindent(
             rf"""
-            return Res{self.name}(
-            __return_str__
-            )
+            return get_mapper_outputs(Res{self.name}, default)
             """,
             1,
         ).replace("__return_str__", return_str)

{latch-2.39.0.dev20 → latch-2.39.0.dev21}/setup.py

@@ -13,7 +13,7 @@ if cur_ver < (3, 8) or cur_ver > (3, 11):
 
 setup(
     name="latch",
-    version="v2.39.0.dev20",
+    version="v2.39.0.dev21",
     author_email="kenny@latch.bio",
     description="The Latch SDK",
     packages=find_packages(),