🐛Correctly handle file type of on-demand clusters (#5101)

Author: sanderegg

services/director-v2/src/simcore_service_director_v2/modules/dask_clients_pool.py

@@ -80,7 +80,7 @@ async def _concurently_safe_acquire_client() -> DaskClient:
                         tasks_file_link_type = (
                             self.settings.COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_FILE_LINK_TYPE
                         )
-                    if cluster.type is ClusterTypeInModel.ON_DEMAND:
+                    if cluster.type == ClusterTypeInModel.ON_DEMAND.value:
                         tasks_file_link_type = (
                             self.settings.COMPUTATIONAL_BACKEND_ON_DEMAND_CLUSTERS_FILE_LINK_TYPE
                         )

services/storage/src/simcore_service_storage/exceptions.py

@@ -44,7 +44,7 @@ class S3AccessError(StorageRuntimeError):
 
 class S3BucketInvalidError(S3AccessError):
     code = "s3_bucket.invalid_error"
-    msg_template: str = "The {bucket} is invalid"
+    msg_template: str = "The bucket '{bucket}' is invalid"
 
 
 class S3KeyNotFoundError(S3AccessError):

services/storage/src/simcore_service_storage/handlers_files.py

@@ -193,10 +193,9 @@ async def upload_file(request: web.Request) -> web.Response:
     if query_params.file_size is None and not query_params.is_directory:
         # return v1 response
         assert len(links.urls) == 1  # nosec
-        return web.json_response(
-            {"data": {"link": jsonable_encoder(links.urls[0], by_alias=True)}},
-            dumps=json_dumps,
-        )
+        response = {"data": {"link": jsonable_encoder(links.urls[0], by_alias=True)}}
+        log.debug("Returning v1 response: %s", response)
+        return web.json_response(response, dumps=json_dumps)
 
     # v2 response
     abort_url = request.url.join(
@@ -226,7 +225,7 @@ async def upload_file(request: web.Request) -> web.Response:
             ),
         ),
     )
-
+    log.debug("returning v2 response: %s", response)
     return jsonable_encoder(response, by_alias=True)
 
 

services/storage/src/simcore_service_storage/simcore_s3_dsm.py

@@ -805,12 +805,13 @@ async def _clean_expired_uploads(self):
             list_of_expired_uploads = await db_file_meta_data.list_fmds(
                 conn, expired_after=now
             )
+
+        if not list_of_expired_uploads:
+            return
         _logger.debug(
             "found following pending uploads: [%s]",
             [fmd.file_id for fmd in list_of_expired_uploads],
         )
-        if not list_of_expired_uploads:
-            return
 
         # try first to upload these from S3 (conservative)
         updated_fmds = await logged_gather(