Skip to content

Commit 77cf4f7

Browse files
authored
Merge pull request #396 from VariantEffect/estelle/debugUploadFilesUnicodeDecodeError
Debug UnicodeDecodeError problem and add a related test.
2 parents acc7b7a + b8b2b06 commit 77cf4f7

18 files changed

+29
-141
lines changed

src/mavedb/routers/score_sets.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -648,10 +648,15 @@ async def upload_score_set_variant_data(
648648
assert_permission(user_data, item, Action.UPDATE)
649649
assert_permission(user_data, item, Action.SET_SCORES)
650650

651-
scores_df = csv_data_to_df(scores_file.file)
652-
counts_df = None
653-
if counts_file and counts_file.filename:
654-
counts_df = csv_data_to_df(counts_file.file)
651+
try:
652+
scores_df = csv_data_to_df(scores_file.file)
653+
counts_df = None
654+
if counts_file and counts_file.filename:
655+
counts_df = csv_data_to_df(counts_file.file)
656+
# Handle non-utf8 file problem.
657+
except UnicodeDecodeError as e:
658+
raise HTTPException(status_code=400, detail=f"Error decoding file: {e}. Ensure the file has correct values.")
659+
655660

656661
if scores_file:
657662
# Although this is also updated within the variant creation job, update it here

tests/routers/counts.csv

Lines changed: 0 additions & 12 deletions
This file was deleted.

tests/routers/counts_with_different_variants.csv

Lines changed: 0 additions & 12 deletions
This file was deleted.

tests/routers/counts_with_hgvs_nt_and_pro.csv

Lines changed: 0 additions & 3 deletions
This file was deleted.

tests/routers/counts_with_score.csv

Lines changed: 0 additions & 12 deletions
This file was deleted.
203 KB
Binary file not shown.

tests/routers/scores.csv

Lines changed: 0 additions & 12 deletions
This file was deleted.

tests/routers/scores_hgvs_nt_not_match_pro.csv

Lines changed: 0 additions & 3 deletions
This file was deleted.

tests/routers/scores_hgvs_pro_has_same_values.csv

Lines changed: 0 additions & 12 deletions
This file was deleted.

tests/routers/scores_with_duplicate_columns.csv

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)