finish todo in run.py refine task.py

Former-commit-id: 2dc2a4f9cfea11c7457cb8a6e4a64487ec64fd0c

entries/run.py

@@ -18,7 +18,7 @@ def parse_args():
     parser.add_argument("--srt_file", help="srt file input path here", default=None, type=str, required=False)
     parser.add_argument("--continue", help="task_id that need to continue", default=None, type=str, required=False) # need implement
     parser.add_argument("--launch_cfg", help="launch config path", default='./configs/local_launch.yaml', type=str, required=False)
-    # task config
+    parser.add_argument("--task_cfg", help="task config path", default='./config/task_config.yaml', type=str, required=False)
     args = parser.parse_args()
 
     return args
@@ -27,7 +27,7 @@ if __name__ == "__main__":
     # read args and configs
     args = parse_args()
     launch_cfg = load(open(args.launch_cfg), Loader=Loader)
-    # TODO: task config
+    task_cfg = load(open(args.task_cfg), Loader=Loader)
 
     # initialize dir
     local_dir = Path(launch_cfg['local_dump'])
@@ -49,12 +49,12 @@ if __name__ == "__main__":
             "{}/{}_{}.log".format(task_dir, f"task_{task_id}", datetime.now().strftime("%m%d%Y_%H%M%S")),
             'w', encoding='utf-8')])
 
-    # TODO: write task info into log
+
     
     # Task create
     if args.link is not None:
         try:
-            task = Task.fromYoutubeLink(args.link, task_id, launch_cfg)
+            task = Task.fromYoutubeLink(args.link, task_id, task_dir, task_cfg)
         except:
             shutil.rmtree(task_dir)
             raise RuntimeError("failed to create task from youtube link")

src/task.py

@@ -64,30 +64,30 @@ class Task:
         with self.__status_lock:
             self.__status = new_status
 
-    def __init__(self, task_id, task_local_dir, task_config):
+    def __init__(self, task_id, task_local_dir, task_cfg):
         self.__status_lock = threading.Lock()
         self.__status = TaskStatus.CREATED
         openai.api_key = getenv("OPENAI_API_KEY")
-        self.launch_info = task_config # do not use, just for fallback
+        self.launch_info = task_cfg # do not use, just for fallback
         self.task_local_dir = task_local_dir
-        self.model = task_config["model"]
+        self.model = task_cfg["model"]
         self.gpu_status = 0
-        self.output_type = task_config["output_type"]
-        self.target_lang = task_config["target_lang"]
-        self.source_lang = task_config["source_lang"]
-        self.field = task_config["field"]
+        self.output_type = task_cfg["output_type"]
+        self.target_lang = task_cfg["target_lang"]
+        self.source_lang = task_cfg["source_lang"]
+        self.field = task_cfg["field"]
         self.task_id = task_id
         self.progress = NotImplemented
         self.SRT_Script = None
         self.result = None
+        logging.info(f"{self.source_lang} -> {self.target_lang} task in {self.field}\n Model: \t{self.model}\n subtitle_type: \t{self.output_type['subtitle']}\n video_ouput: \t{self.output_type['video']}\n bilingal_ouput: \t{self.output_type['bilingal']}")
 
 
     @staticmethod
-    def fromYoutubeLink(youtube_url, task_id, launch_info, task_config):
+    def fromYoutubeLink(youtube_url, task_id, task_dir, task_cfg):
         # convert to audio
         logging.info("Task Creation method: Youtube Link")
-        local_dump = Path(launch_info['local_dump'])  # should get from launch config
-        return YoutubeTask(task_id, local_dump.joinpath(f"task_{task_id}"), task_config, youtube_url)
+        return YoutubeTask(task_id, task_dir, task_cfg, youtube_url)
 
     @staticmethod
     def fromAudioFile():
@@ -107,7 +107,8 @@ class Task:
         time.sleep(5)
         pass
 
-    # Module 2: SRT preprocess: perform preprocess steps   
+    # Module 2: SRT preprocess: perform preprocess steps
+    # TODO: multi-lang and multi-field support according to task_cfg   
     def preprocess(self):
         self.status = TaskStatus.PRE_PROCESSING
         logging.info("--------------------Start Preprocessing SRT class--------------------")
@@ -154,8 +155,8 @@ class Task:
         self.result = self.output_render()
 
 class YoutubeTask(Task):
-    def __init__(self, task_id, task_local_dir, task_config, youtube_url):
-        super().__init__(task_id, task_local_dir, task_config)
+    def __init__(self, task_id, task_local_dir, task_cfg, youtube_url):
+        super().__init__(task_id, task_local_dir, task_cfg)
         self.youtube_url = youtube_url
 
     def run(self):