diff --git a/pyproject.toml b/pyproject.toml index ba5604b..52a3ccb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "HospitalAssistantBackend" -version = "1.5.9" +version = "1.5.10" description = "Backend for Hospital Assistant" readme = "README.md" requires-python = ">=3.13,<3.14" @@ -37,7 +37,6 @@ dependencies = [ "typer-slim==0.16.1", "xsdata[cli]>=26.2", "xsdata-pydantic>=24.5", - "chardet>=7.4.3", ] [dependency-groups] diff --git a/src/apps/users/v1/router.py b/src/apps/users/v1/router.py index d206e9a..54c94ea 100644 --- a/src/apps/users/v1/router.py +++ b/src/apps/users/v1/router.py @@ -5,7 +5,6 @@ from logging import getLogger from secrets import token_urlsafe from typing import Annotated -import chardet from fastapi import APIRouter, Body, Depends, UploadFile, status from orjson import loads from xsdata.formats.dataclass.parsers.config import ParserConfig @@ -120,27 +119,37 @@ async def get_vaccs_report_download( """ if resultId is not None: file = await c.vitacore_api.getDiagResultFile(resultId) + + if file is None: + raise e.BadRequestException + + filename = f'vaccs_report_{resultId}' + file_extension = 'pdf' + content_type = 'application/pdf' + xml_data = base64.b64decode(file.content) + xml_data = xml_data.decode('utf-8').strip() + xml_model = parser.from_string(xml_data, ClinicalDocument) + file_string = xml_model.component.non_xmlbody.text.value.strip() + else: file = await c.vitacore_api.getVaccsReport(user.vita_id) - if file is None: - raise e.BadRequestException + if file is None: + raise e.BadRequestException - filename = f'vaccs_report_{resultId or user.vita_id}.pdf' - xml_data = base64.b64decode(file.content) - result = chardet.detect(xml_data) - xml_data = xml_data.decode(result['encoding'] or 'utf-8').strip() - xml_model = parser.from_string(xml_data, ClinicalDocument) - pdf_string = xml_model.component.non_xmlbody.text.value.strip() + filename = f'vaccs_report_{token_urlsafe(10)}' + file_extension = 'doc' + content_type = 'application/msword' + file_string = file.content temp_link_token = token_urlsafe(32) await cache.set( f'download:{temp_link_token}', dumps( { - 'filename': filename, - 'content_type': 'application/pdf', - 'data': pdf_string, + 'filename': f'{filename}.{file_extension}', + 'content_type': content_type, + 'data': file_string, } ), ex=600,