From 26c76be50ef74b68f1636d9df761c96bc346e7a4 Mon Sep 17 00:00:00 2001
From: cyjseagull <yujiechen_hust@163.com>
Date: Wed, 4 Dec 2024 18:49:48 +0800
Subject: [PATCH] support fetch log and fetch job result seperately

---
 .../model_result/task_result_handler.py       | 24 +++++++++++--------
 .../network/http/model_controller.py          |  8 ++++---
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/python/ppc_model/model_result/task_result_handler.py b/python/ppc_model/model_result/task_result_handler.py
index d678bcde..70f99a6e 100644
--- a/python/ppc_model/model_result/task_result_handler.py
+++ b/python/ppc_model/model_result/task_result_handler.py
@@ -11,10 +11,13 @@
 
 
 class TaskResultRequest:
-    def __init__(self, job_id, task_type, only_fetch_log, user):
+    def __init__(self, job_id, task_type,
+                 fetch_log: bool,
+                 fetch_result: bool, user):
         self.job_id = job_id
         self.task_type = task_type
-        self.only_fetch_log = only_fetch_log
+        self.fetch_log = fetch_log
+        self.fetch_result = fetch_result
         self.user = user
 
 
@@ -346,7 +349,7 @@ def __init__(self, task_result_request: TaskResultRequest, components: Initializ
 
     def get_response(self):
         response = dict()
-        if not self.task_result_request.only_fetch_log:
+        if self.task_result_request.fetch_result is True:
             merged_result = dict()
             for result in self.result_list:
                 merged_result.update(result.to_dict())
@@ -356,13 +359,14 @@ def get_response(self):
                 response = {"jobPlanetResult":  merged_result,
                             "modelData": self.model_data}
         # record the log
-        log_size, log_path, log_content = self.components.log_retriever.retrieve_log(
-            self.task_result_request.job_id, self.task_result_request.user)
-        log_result = {}
-        log_result.update({"logSize": log_size})
-        log_result.update({"logPath": log_path})
-        log_result.update({"logContent": log_content})
-        response.update({"logDetail": log_result})
+        if self.task_result_request.fetch_log is True:
+            log_size, log_path, log_content = self.components.log_retriever.retrieve_log(
+                self.task_result_request.job_id, self.task_result_request.user)
+            log_result = {}
+            log_result.update({"logSize": log_size})
+            log_result.update({"logPath": log_path})
+            log_result.update({"logContent": log_content})
+            response.update({"logDetail": log_result})
         return utils.make_response(PpcErrorCode.SUCCESS.get_code(), PpcErrorCode.SUCCESS.get_msg(), response)
 
     def _get_evaluation_result(self):
diff --git a/python/ppc_model/network/http/model_controller.py b/python/ppc_model/network/http/model_controller.py
index 39e3301f..7a465965 100644
--- a/python/ppc_model/network/http/model_controller.py
+++ b/python/ppc_model/network/http/model_controller.py
@@ -105,12 +105,14 @@ def post(self, task_id):
                 f"get task result, task_id: {task_id}, args: {args}")
             user_name = args['user']
             task_type = args['jobType']
-            only_fetch_log = {'True': True, 'False': False}.get(
-                args['onlyFetchLog'])
+            fetch_log = {'True': True, 'False': False}.get(
+                args['fetchLog'])
+            fetch_job_result = {'True': True, 'False': False}.get(
+                args['fetchJobResult'])
             components.logger().info(
                 f"get_job_direct_result_response, job: {task_id}")
             task_result_request = TaskResultRequest(
-                task_id, task_type, only_fetch_log, user_name)
+                task_id, task_type, fetch_log, fetch_job_result, user_name)
             job_result_handler = TaskResultHandler(
                 task_result_request=task_result_request, components=components)
             response = job_result_handler.get_response()