auto-add the key folder

Author: sanderegg

packages/simcore-sdk/src/simcore_sdk/node_ports_v2/port.py

@@ -320,14 +320,19 @@ async def _set(
 
                 _check_if_symlink_is_valid(converted_value)
 
+                # NOTE: the file will be saved in S3 as PROJECT_ID/NODE_ID/(set_kwargs.file_base_path)/PORT_KEY/file.ext
+                base_path = Path(self.key)
+                if set_kwargs and set_kwargs.file_base_path:
+                    base_path = set_kwargs.file_base_path / self.key
+
                 new_value = await port_utils.push_file_to_store(
                     file=converted_value,
                     user_id=self._node_ports.user_id,
                     project_id=self._node_ports.project_id,
                     node_id=self._node_ports.node_uuid,
                     r_clone_settings=self._node_ports.r_clone_settings,
                     io_log_redirect_cb=self._node_ports.io_log_redirect_cb,
-                    file_base_path=set_kwargs.file_base_path if set_kwargs else None,
+                    file_base_path=base_path,
                 )
             else:
                 new_value = converted_value

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/modules/nodeports.py

@@ -117,7 +117,9 @@ async def upload_outputs(
                     ports_values[port.key] = (
                         files_and_folders_list[0],
                         SetKWargs(
-                            file_base_path=(src_folder.relative_to(outputs_path.parent))
+                            file_base_path=(
+                                src_folder.parent.relative_to(outputs_path.parent)
+                            )
                         ),
                     )
                     continue
@@ -142,7 +144,9 @@ async def upload_outputs(
                 ports_values[port.key] = (
                     tmp_file,
                     SetKWargs(
-                        file_base_path=(src_folder.relative_to(outputs_path.parent))
+                        file_base_path=(
+                            src_folder.parent.relative_to(outputs_path.parent)
+                        )
                     ),
                 )
             else: