made report and changes editable

ocr/api/openai_requests.py

@@ -60,6 +60,9 @@ async def generate_consult_note(text: str, changes: str, type_: str):
         "assessment": ocr_prompts.consult.generate_assessment,
         "plan": ocr_prompts.consult.generate_plan,
     }
+    user_content = f'Medical information:\n```\n{text}\n```'
+    if changes:
+        user_content += f'\nChanges:\n```\n{changes}\n```'
     messages = [
         {
             "role": "system",
@@ -67,7 +70,7 @@ async def generate_consult_note(text: str, changes: str, type_: str):
         },
         {
             "role": "user",
-            "content": f"Medical information:\n```\n{text}\n```\n{changes}"
+            "content": user_content
         }
     ]
     return messages

ocr/api/report/db_requests.py

@@ -1,5 +1,6 @@
 from fastapi import HTTPException
 
+from ocr.api.message.schemas import CreateMessageRequest
 from ocr.api.report.dto import ReportModelShort
 from ocr.api.report.model import ReportModel
 from ocr.core.config import settings
@@ -30,3 +31,29 @@ async def save_report_obj(report: str, changes: str | None, original_text: str,
 async def get_last_report_obj() -> ReportModel | None:
     report = await settings.DB_CLIENT.reports.find().sort("_id", -1).to_list(length=1)
     return ReportModel.from_mongo(report[0]) if report else None
+
+
+async def change_report_report_obj(report_id: str, data: CreateMessageRequest) -> ReportModel:
+    report = await settings.DB_CLIENT.reports.find_one({"id": report_id})
+    if not report:
+        raise HTTPException(status_code=404, detail="Report not found")
+    report = ReportModel.from_mongo(report)
+    report.report = data.text
+    await settings.DB_CLIENT.reports.update_one(
+        {"id": report.id},
+        {"$set": report.to_mongo()},
+    )
+    return report
+
+
+async def change_changes_report_obj(report_id: str, data: CreateMessageRequest) -> ReportModel:
+    report = await settings.DB_CLIENT.reports.find_one({"id": report_id})
+    if not report:
+        raise HTTPException(status_code=404, detail="Report not found")
+    report = ReportModel.from_mongo(report)
+    report.changes = data.text
+    await settings.DB_CLIENT.reports.update_one(
+        {"id": report.id},
+        {"$set": report.to_mongo()},
+    )
+    return report

ocr/api/report/views.py

@@ -2,17 +2,18 @@ import asyncio
 
 from fastapi import UploadFile, File
 
+from ocr.api.message.schemas import CreateMessageRequest
 from ocr.api.openai_requests import generate_report, generate_changes
 from ocr.api.report import report_router
 from ocr.api.report.db_requests import (get_all_reports_obj,
                                         delete_all_reports,
                                         get_report_obj_by_id,
                                         save_report_obj,
-                                        get_last_report_obj)
+                                        get_last_report_obj, change_report_report_obj, change_changes_report_obj)
 from ocr.api.report.dto import Paging
 from ocr.api.report.model import ReportModel
 from ocr.api.report.schemas import AllReportResponse
-from ocr.api.utils import divide_images, prepare_request_content, clean_response, extract_text_from_images
+from ocr.api.utils import divide_images, clean_response, extract_text_from_images
 from ocr.core.wrappers import OcrResponseWrapper
 
 
@@ -38,6 +39,24 @@ async def get_report(reportId: str) -> OcrResponseWrapper[ReportModel]:
     return OcrResponseWrapper(data=report)
 
 
+@report_router.patch('/{reportId}/report')
+async def change_report_report(
+        reportId: str,
+        data: CreateMessageRequest
+) -> OcrResponseWrapper[ReportModel]:
+    report = await change_report_report_obj(reportId, data)
+    return OcrResponseWrapper(data=report)
+
+
+@report_router.post('/{reportId}/changes')
+async def change_report_changes(
+        reportId: str,
+        data: CreateMessageRequest
+) -> OcrResponseWrapper[ReportModel]:
+    report = await change_changes_report_obj(reportId, data)
+    return OcrResponseWrapper(data=report)
+
+
 @report_router.post('')
 async def create_report(
         file: UploadFile = File(...),