Added function to show results of processing modules. Fix for display…

… of processing logs.
mercure-imaging · Jul 24, 2024 · 25b8241 · 25b8241
1 parent 843a299
commit 25b8241
Show file tree

Hide file tree

Showing 6 changed files with 95 additions and 7 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.3.1-beta.6
+0.3.1-beta.7
diff --git a/bookkeeping/query.py b/bookkeeping/query.py
@@ -137,7 +137,7 @@ async def get_dicom_files(request) -> JSONResponse:
 @router.get("/task_process_logs")
 @requires("authenticated")
 async def get_task_process_logs(request) -> JSONResponse:
-    """Endpoint for getting all events related to one series."""
+    """Endpoint for getting all processing logs related to one series."""
     task_id = request.query_params.get("task_id", "")
 
     subtask_query = (
@@ -149,7 +149,7 @@ async def get_task_process_logs(request) -> JSONResponse:
     subtasks = await database.fetch_all(subtask_query)
     subtask_ids = [row[0] for row in subtasks]
 
-    query = processor_logs_table.select(processor_logs_table.c.task_id.in_(subtask_ids))
+    query = processor_logs_table.select(processor_logs_table.c.task_id.in_(subtask_ids)).order_by(processor_logs_table.c.id)
     results = [dict(r) for r in await database.fetch_all(query)]
     for result in results:
         if result["logs"] == None:
@@ -160,6 +160,17 @@ async def get_task_process_logs(request) -> JSONResponse:
     return CustomJSONResponse(results)
 
 
+@router.get("/task_process_results")
+@requires("authenticated")
+async def get_task_process_results(request) -> JSONResponse:
+    """Endpoint for getting all processing results from a task."""
+    task_id = request.query_params.get("task_id", "")
+
+    query = processor_outputs_table.select().where(processor_outputs_table.c.task_id == task_id).order_by(processor_outputs_table.c.id)
+    results = [dict(r) for r in await database.fetch_all(query)]
+    return CustomJSONResponse(results)
+
+
 @router.get("/find_task")
 @requires("authenticated")
 async def find_task(request) -> JSONResponse:

diff --git a/common/monitor.py b/common/monitor.py
@@ -258,5 +258,9 @@ async def task_process_logs(task_id="") -> Any:
     return await get("query/task_process_logs", {"task_id": task_id})
 
 
+async def task_process_results(task_id="") -> Any:
+    return await get("query/task_process_results", {"task_id": task_id})
+
+
 async def get_task_info(task_id="") -> Any:
     return await get("query/get_task_info", {"task_id": task_id})
diff --git a/webinterface/api.py b/webinterface/api.py
@@ -87,6 +87,16 @@ async def task_process_logs(request):
         return JSONResponse({"error": e.status_code}, status_code=e.status_code)
 
 
+@router.get("/task-process-results")
+@requires(["authenticated"])
+async def task_process_results(request):
+    task_id = request.query_params.get("task_id", "")
+    try:
+        return JSONResponse(await monitor.task_process_results(task_id))
+    except monitor.MonitorHTTPError as e:
+        return JSONResponse({"error": e.status_code}, status_code=e.status_code)
+
+
 @router.get("/get-task-info")
 @requires(["authenticated"])
 async def get_task_info(request):

diff --git a/webinterface/statics/css/custom.css b/webinterface/statics/css/custom.css
@@ -381,14 +381,14 @@ table.dataTable tbody tr.selected th, table.dataTable tbody tr.selected td {
   height: 14px;
 }
 
-.process-logs-output {
+.process-logs-output, .process-results-output {
   font-family: monospace;
   background-color: #0a0a0a;
   color: #fff;
   padding: 8px;
 }
 
-.process-logs-output::selection {
+.process-logs-output::selection, .process-results-output::selection {
   background-color: rgb(50, 115, 220);
   color: #fff;
 }

diff --git a/webinterface/templates/queue.html b/webinterface/templates/queue.html
@@ -315,6 +315,20 @@ <h5 class="title is-5 configtitle" style="margin-top: 60px;"><i
         </div>
     </div> 
 
+    <div class="modal" id="process_results">
+        <div class="modal-background"></div>
+        <div class="modal-card process-results" style="width: 60%;">
+            <header class="modal-card-head">
+                <p class="modal-card-title">Processing Results</p>
+            </header>
+            <section class="modal-card-body process-results" style="background-color: #0a0a0a; border-left: 3px solid #FFF; border-right: 3px solid #FFF;">
+                <pre id="process_results_display" class="process-results process-results-output"></pre>
+            </section>
+            <footer class="modal-card-foot buttons is-centered">
+                <button class="button" type="button" id="closeprocessresults" onclick="closeProcessResults()">Close</button>
+            </footer>
+        </div>
+    </div>     
 </main>
 
 <script>
@@ -812,9 +826,10 @@ <h5 class="title is-5 configtitle" style="margin-top: 60px;"><i
                     autoClose: true,
                     text: '<i class="fas fa-filter"></i>',
                     className: 'queueArchiveFilter',
+                    titleAttr: 'Job filter',
                     buttons: [
                         {
-                            text: 'Show only STUDY tasks',
+                            text: 'Show only STUDY jobs',
                             className: 'queueArchiveFilterButton',
                             action: function (e, dt, node, config, cb) {
                                 // Toggles class when pressed
@@ -848,7 +863,15 @@ <h5 class="title is-5 configtitle" style="margin-top: 60px;"><i
                         var jid = $('#jobs_archive').DataTable().rows( { selected: true } ).data()[0].slice(-1)[0];
                         showLogs(jid);
                     }
-                }
+                },
+                {
+                    text: '<i class="fas fa-chart-bar"></i>',
+                    titleAttr: 'Processing results',
+                    action: function ( e, dt, node, config ) {
+                        var jid = $('#jobs_archive').DataTable().rows( { selected: true } ).data()[0].slice(-1)[0];
+                        showResults(jid);
+                    }
+                }                
             ],
             dom: 'Bfrtip',
             "scrollY": "740px",
@@ -865,6 +888,7 @@ <h5 class="title is-5 configtitle" style="margin-top: 60px;"><i
             $('#jobs_archive').DataTable().button(1).enable( selectedRows > 0 );
             $('#jobs_archive').DataTable().button(2).enable( selectedRows > 0 );
             $('#jobs_archive').DataTable().button(3).enable( selectedRows > 0 );
+            $('#jobs_archive').DataTable().button(4).enable( selectedRows > 0 );
         } );
         $("#job_archive_search").on('keyup', function (event) {
             if (event.keyCode === 13) {
@@ -945,6 +969,7 @@ <h5 class="title is-5 configtitle" style="margin-top: 60px;"><i
                     $('#jobs_archive').DataTable().button(1).enable(false);
                     $('#jobs_archive').DataTable().button(2).enable(false);
                     $('#jobs_archive').DataTable().button(3).enable(false);
+                    $('#jobs_archive').DataTable().button(4).enable(false);
                     jobtable.draw();
                 },
                 complete: function (data) {
@@ -989,6 +1014,39 @@ <h5 class="title is-5 configtitle" style="margin-top: 60px;"><i
         });
     }
 
+    function showResults(jobId)
+    {
+        if (jobId === "") {
+            return;
+        }
+        $("#process_results").addClass("is-loading");   
+
+        $.ajax({
+            type: 'GET',
+            url: '/api/task-process-results',
+            data: {'task_id': jobId},
+            dataType: 'json',
+            error: function () {
+                // $('#erroralert').show();
+            },
+            success: function (data) {
+                if (data && data.length > 0) {
+                    var resultsText = "";
+                    for (var i = 0; i < data.length; i++) {
+                        resultsText += "### Module " + data[i].module + "\n\n";
+                        resultsText += data[i].logs;
+                        resultsText += "\n\n";
+                    }
+                    $("#process_results_display").text(resultsText);
+                } else {
+                    $("#process_results_display").text("No processing results exist for the selected task.")
+                }
+                $("#process_results").addClass("is-active");
+            },
+            timeout: 5000
+        });
+    }
+
     function showAuditTrail(jobId)
     {
         if (jobId === "") {
@@ -1027,6 +1085,11 @@ <h5 class="title is-5 configtitle" style="margin-top: 60px;"><i
         $("#process_logs").removeClass("is-active");
     }
 
+    function closeProcessResults()
+    {
+        $("#process_results").removeClass("is-active");
+    }
+
     function showJobInformation(jobId,category)
     {
         if ((jobId === "") || (category === "")) {