Merge branch 'master' into feature/more-e2e

odeimaiz · web-flow · commit e9e8c18bffe6 · 2021-01-20T11:12:58.000+01:00
diff --git a/services/sidecar/src/simcore_service_sidecar/executor.py b/services/sidecar/src/simcore_service_sidecar/executor.py
@@ -159,7 +159,7 @@ async def _process_task_input(self, port: node_ports_v2.Port, input_ports: Dict)
             )
             # check if the file is a zip, in that case extract all if the service does not expect a zip file
             if zipfile.is_zipfile(final_path) and (
-                str(port.type) != "data:application/zip"
+                str(port.property_type) != "data:application/zip"
             ):
                 with zipfile.ZipFile(final_path, "r") as zip_obj:
                     zip_obj.extractall(final_path.parents[0])

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ async def _process_task_input(self, port: node_ports_v2.Port, input_ports: Dict)`
`159`	`159`	`)`
`160`	`160`	`# check if the file is a zip, in that case extract all if the service does not expect a zip file`
`161`	`161`	`if zipfile.is_zipfile(final_path) and (`
`162`		`- str(port.type) != "data:application/zip"`
	`162`	`+ str(port.property_type) != "data:application/zip"`
`163`	`163`	`):`
`164`	`164`	`with zipfile.ZipFile(final_path, "r") as zip_obj:`
`165`	`165`	`zip_obj.extractall(final_path.parents[0])`