exception of xlsx generation fails

h2020charisma · Mar 10, 2024 · d590cd8 · d590cd8
1 parent 5a8b30c
commit d590cd8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/rcapi/api/templates.py b/src/rcapi/api/templates.py
@@ -225,12 +225,15 @@ async def get_template(request : Request, response : Response,
             _response.headers.update(custom_headers)
             return _response
         elif format=="xlsx":         
-            file_path =  template_service.get_template_xlsx(uuid,json_blueprint)
-            # Return the file using FileResponse
-            _response =  FileResponse(file_path, media_type=format_supported[format]["mime"], 
+            try:
+                file_path =  template_service.get_template_xlsx(uuid,json_blueprint)
+                # Return the file using FileResponse
+                _response =  FileResponse(file_path, media_type=format_supported[format]["mime"], 
                                     headers={"Content-Disposition": f'attachment; filename="{uuid}.{format}"'})
-            _response.headers.update(custom_headers)
-            return _response
+                _response.headers.update(custom_headers)
+                return _response
+            except Exception as err:
+                raise HTTPException(status_code=400, detail="The blueprint may not be complete. {}".format(err))
     else:
             raise HTTPException(status_code=400, detail="Format not supported")
 

diff --git a/src/rcapi/services/template_service.py b/src/rcapi/services/template_service.py
@@ -59,10 +59,13 @@ def get_template_json(uuid):
 
 
 def get_template_xlsx(uuid,json_blueprint):
-    file_path_xlsx = os.path.join(TEMPLATE_DIR, f"{uuid}.xlsx")   
-    df_info,df_result,df_raw =bp.get_template_frame(json_blueprint)
-    bp.iom_format_2excel(file_path_xlsx,df_info,df_result,df_raw)
-    return file_path_xlsx  
+    try:
+        file_path_xlsx = os.path.join(TEMPLATE_DIR, f"{uuid}.xlsx")   
+        df_info,df_result,df_raw =bp.get_template_frame(json_blueprint)
+        bp.iom_format_2excel(file_path_xlsx,df_info,df_result,df_raw)
+        return file_path_xlsx  
+    except Exception as err:
+        raise err
 
 def get_nmparser_config(uuid,json_blueprint,force=True):
     file_path = os.path.join(TEMPLATE_DIR, f"{uuid}.json.nmparser")