Merge pull request #39 from baloise/main

Minor updates
baloise · Nov 13, 2024 · df75f46 · df75f46
2 parents 8e59143 + 35d6f4b
commit df75f46
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git 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}
+    return {"deanonymized_text": deanontext.strip().replace('"', '')}
diff --git 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"}
diff --git 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();

diff --git a/src/templates/html/mask.html b/src/templates/html/mask.html
@@ -33,7 +33,7 @@ <h3>Input</h3>
                             <select id="backendType" name="backendType" required>
                                 <option value="REG">REG</option>
                                 <option value="LLM">LLM</option>
-                                <option value="NER">NER</option>
+                                <!-- <option value="NER">NER</option> -->
                             </select>
                         </div>
                         <label class="flex-item checkbox-label" id="LLMcustomLabel"><input type="checkbox" id="LLMcustom" name="LLMcustom">use custom settings</label>