remove storage name

Author: feilin-flexcompute

flow360/component/project_utils.py

@@ -494,44 +494,37 @@ def upload_imported_surfaces_to_draft(params, draft, parent_case):
         method="imported-surfaces",
     )
 
-    basename_to_surface_metadata: dict[str, list[dict[str, str]]] = {}
+    basename_to_surface_mesh_ids: dict[str, list[str]] = {}
     for entry, resp in zip(deduplicated_surface_file_paths_to_import, response):
         surface_mesh_id = resp.get("surfaceMeshId")
-        remote_file_name = resp.get("storageFileName") or resp.get("filename")
         _upload_surface_mesh_resource(
             surface_mesh_id=surface_mesh_id,
-            remote_file_name=remote_file_name,
             local_file_path=entry["path"],
         )
-        metadata = {
-            "surfaceMeshId": surface_mesh_id,
-            "storageFileName": remote_file_name,
-            "filename": entry["basename"],
-        }
-        basename_to_surface_metadata.setdefault(entry["basename"], []).append(metadata)
+        basename_to_surface_mesh_ids.setdefault(entry["basename"], []).append(surface_mesh_id)
 
-    _normalize_imported_surface_entities(params, basename_to_surface_metadata)
+    _normalize_imported_surface_entities(params, basename_to_surface_mesh_ids)
 
 
-def _upload_surface_mesh_resource(surface_mesh_id: str, remote_file_name: str, local_file_path: str):
-    if not surface_mesh_id or not remote_file_name:
+def _upload_surface_mesh_resource(surface_mesh_id: str, local_file_path: str):
+    if not surface_mesh_id:
         raise Flow360ConfigurationError("Surface mesh metadata missing for imported surface upload.")
     surface_mesh = SurfaceMeshV2(surface_mesh_id)
+    remote_file_name = surface_mesh.info.file_name
     surface_mesh._webapi._upload_file(remote_file_name=remote_file_name, file_name=local_file_path)
     surface_mesh._webapi._complete_upload()
 
 
 def _normalize_imported_surface_entities(
-    params: SimulationParams, basename_to_surface_metadata: dict[str, list[dict[str, str]]] | None = None
+    params: SimulationParams, basename_to_surface_mesh_ids: dict[str, list[str]] | None = None
 ):
     if params is None or params.outputs is None:
         return
 
     basename_to_iter = {}
-    if basename_to_surface_metadata:
+    if basename_to_surface_mesh_ids:
         basename_to_iter = {
-            basename: iter(metadata_list)
-            for basename, metadata_list in basename_to_surface_metadata.items()
+            basename: iter(mesh_ids) for basename, mesh_ids in basename_to_surface_mesh_ids.items()
         }
 
     for output in params.outputs:
@@ -542,11 +535,4 @@ def _normalize_imported_surface_entities(
                     surface.file_name = file_basename
                     iterator = basename_to_iter.get(file_basename)
                     if iterator is not None:
-                        metadata = next(iterator, None)
-                        if metadata is not None:
-                            surface.surface_mesh_id = metadata.get(
-                                "surfaceMeshId", surface.surface_mesh_id
-                            )
-                            surface.storage_file_name = metadata.get(
-                                "storageFileName", surface.storage_file_name
-                            )
+                        surface.surface_mesh_id = next(iterator, surface.surface_mesh_id)

flow360/component/simulation/primitives.py

@@ -649,7 +649,6 @@ class ImportedSurface(EntityBase):
     )
     file_name: str
     surface_mesh_id: Optional[str] = None
-    storage_file_name: Optional[str] = None
 
 
 class GhostSurface(_SurfaceEntityBase):