ensure uploading of file works

Author: bisgaard-itis

services/api-server/src/simcore_service_api_server/api/routes/files.py

@@ -375,18 +375,32 @@ async def delete_file(
 async def abort_multipart_upload(
     request: Request,
     file_id: UUID,
-    client_file: Annotated[ClientFile, Body(..., embed=True)],
+    client_file: Annotated[ClientFileInProgramJob | ClientFile, Body(..., embed=True)],
     storage_client: Annotated[StorageApi, Depends(get_api_client(StorageApi))],
     user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
+    webserver_api: Annotated[AuthSession, Depends(get_webserver_session)],
 ):
+    assert file_id  # nosec
     assert request  # nosec
     assert user_id  # nosec
-    file = DomainFile(
-        id=file_id,
-        filename=client_file.filename,
-        checksum=client_file.sha256_checksum,
-        e_tag=None,
-    )
+
+    if isinstance(client_file, ClientFile):
+        file = client_file.to_domain_model()
+    elif isinstance(client_file, ClientFileInProgramJob):
+        project = await webserver_api.get_project(project_id=client_file.job_id)
+        if len(project.workbench) > 1:
+            raise HTTPException(
+                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                detail=f"Job_id {project.uuid} is not a valid program job.",
+            )
+        node_id = next(iter(project.workbench.keys()))
+        file = client_file.to_domain_model(
+            project_id=project.uuid, node_id=NodeID(node_id)
+        )
+    else:
+        err_msg = f"Invalid client_file type passed: {type(client_file)=}"
+        raise TypeError(err_msg)
+
     abort_link: URL = await storage_client.create_abort_upload_link(
         file=file, query={"user_id": str(user_id)}
     )
@@ -404,20 +418,32 @@ async def abort_multipart_upload(
 async def complete_multipart_upload(
     request: Request,
     file_id: UUID,
-    client_file: Annotated[ClientFile, Body(...)],
+    client_file: Annotated[ClientFileInProgramJob | ClientFile, Body(...)],
     uploaded_parts: Annotated[FileUploadCompletionBody, Body(...)],
     storage_client: Annotated[StorageApi, Depends(get_api_client(StorageApi))],
     user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
+    webserver_api: Annotated[AuthSession, Depends(get_webserver_session)],
 ):
+    assert file_id  # nosec
     assert request  # nosec
     assert user_id  # nosec
 
-    file = DomainFile(
-        id=file_id,
-        filename=client_file.filename,
-        checksum=client_file.sha256_checksum,
-        e_tag=None,
-    )
+    if isinstance(client_file, ClientFile):
+        file = client_file.to_domain_model()
+    elif isinstance(client_file, ClientFileInProgramJob):
+        project = await webserver_api.get_project(project_id=client_file.job_id)
+        if len(project.workbench) > 1:
+            raise HTTPException(
+                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                detail=f"Job_id {project.uuid} is not a valid program job.",
+            )
+        node_id = next(iter(project.workbench.keys()))
+        file = client_file.to_domain_model(
+            project_id=project.uuid, node_id=NodeID(node_id)
+        )
+    else:
+        err_msg = f"Invalid client_file type passed: {type(client_file)=}"
+        raise TypeError(err_msg)
     complete_link: URL = await storage_client.create_complete_upload_link(
         file=file, query={"user_id": str(user_id)}
     )

services/api-server/src/simcore_service_api_server/services_http/storage.py

@@ -35,9 +35,7 @@
 
 AccessRight = Literal["read", "write"]
 
-_FILE_ID_PATTERN = re.compile(
-    r"^api\/(?P<file_id>[\w-]+)\/(?P<filename>.+)|(?P<project_id>[\w-]+)\/(?P<node_id>[\w-]+)\/workspace/.*$"
-)
+_FILE_ID_PATTERN = re.compile(r"^api\/(?P<file_id>[\w-]+)\/(?P<filename>.+)$")
 
 
 def to_file_api_model(stored_file_meta: StorageFileMetaData) -> File:
@@ -47,12 +45,11 @@ def to_file_api_model(stored_file_meta: StorageFileMetaData) -> File:
         msg = f"Invalid file_id {stored_file_meta.file_id} in file metadata"
         raise ValueError(msg)
 
-    file_id, filename = match.groups()
-
     return File(
-        id=file_id,  # type: ignore
-        filename=filename,
-        content_type=guess_type(filename)[0] or "application/octet-stream",
+        id=stored_file_meta.file_id,  # type: ignore
+        filename=stored_file_meta.file_name,
+        content_type=guess_type(stored_file_meta.file_name)[0]
+        or "application/octet-stream",
         e_tag=stored_file_meta.entity_tag,
         checksum=stored_file_meta.sha256_checksum,
     )
@@ -110,7 +107,7 @@ async def search_owned_files(
                 {
                     "kind": "owned",
                     "user_id": f"{user_id}",
-                    "startswith": None if file_id is None else f"api/{file_id}",
+                    "startswith": "api/" if file_id is None else f"api/{file_id}",
                     "sha256_checksum": sha256_checksum,
                     "limit": limit,
                     "offset": offset,