From 81affef059eae0900820da03c4513343e388af86 Mon Sep 17 00:00:00 2001 From: robbizbal Date: Wed, 13 Nov 2024 19:41:06 +0100 Subject: [PATCH 1/2] Update UI cleanup outputs disable ner --- src/api/demask.py | 2 +- src/api/mask.py | 6 +++--- src/templates/html/mask.html | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/api/demask.py b/src/api/demask.py index c24e368..6496f84 100644 --- a/src/api/demask.py +++ b/src/api/demask.py @@ -13,4 +13,4 @@ class MaskRequest(BaseModel): @router.post("/demask", response_class=JSONResponse, include_in_schema=True) async def mask(request: MaskRequest): deanontext = revert_replacements(request.text, request.entities) - return {"deanonymized_text": deanontext} \ No newline at end of file + return {"deanonymized_text": deanontext.strip().replace('"', '')} \ No newline at end of file diff --git a/src/api/mask.py b/src/api/mask.py index 18239d8..c8f2a32 100644 --- a/src/api/mask.py +++ b/src/api/mask.py @@ -43,12 +43,12 @@ async def mask(request: MaskRequest): request.llmModel = OLLAMA_MODEL llm_entities = llm_find_entities(text=request.text, base_url=request.llmURL, model=request.llmModel) - return {"original_text": request.text, "entities": llm_entities['replace_dict'], "anonymized_text": llm_entities['text']} + return {"original_text": request.text.strip().replace('"', ''), "entities": llm_entities['replace_dict'], "anonymized_text": llm_entities['text'].strip().replace('"', '')} case BackendType.NER: spacy_entities = ano.find_entities(request.text) - return {"original_text": request.text, "entities": spacy_entities['replace_dict'], "anonymized_text": spacy_entities['text']} + return {"original_text": request.text.strip().replace('"', ''), "entities": spacy_entities['replace_dict'], "anonymized_text": spacy_entities['text'].strip().replace('"', '')} case BackendType.REG: regex_entities = reg_find_entities(request.text) - return {"original_text": request.text, "entities": regex_entities['replace_dict'], "anonymized_text": regex_entities['text']} + return {"original_text": request.text.strip().replace('"', ''), "entities": regex_entities['replace_dict'], "anonymized_text": regex_entities['text'].strip().replace('"', '')} case _: return {"original_text": "Invalid backend type"} \ No newline at end of file diff --git a/src/templates/html/mask.html b/src/templates/html/mask.html index 5faffa1..5a75e60 100644 --- a/src/templates/html/mask.html +++ b/src/templates/html/mask.html @@ -33,7 +33,7 @@

Input

From 35d6f4b1b974a42e3ac1d923e3be438813c770e9 Mon Sep 17 00:00:00 2001 From: robbizbal Date: Wed, 13 Nov 2024 19:44:23 +0100 Subject: [PATCH 2/2] Hotfix for iOS safari again --- src/static/scripts/mask_downloader.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/static/scripts/mask_downloader.js b/src/static/scripts/mask_downloader.js index f7d3ed2..fa8c351 100644 --- a/src/static/scripts/mask_downloader.js +++ b/src/static/scripts/mask_downloader.js @@ -16,8 +16,10 @@ document.getElementById('downloadBtn').addEventListener('click', function() { linkNT.href = URL.createObjectURL(blobNewText); linkNT.download = 'yoyo-anonymizedText.txt'; // Specify the file name - linkE.click(); - URL.revokeObjectURL(linkE.href); + setTimeout(function() { + linkE.click(); + URL.revokeObjectURL(linkE.href); + }, 50); setTimeout(function() { linkNT.click();