1, Add language settings for llm outputs

2, Optimize llm prompts
3, Add timeout handling for material downloads

app/services/llm.py

@@ -72,10 +72,10 @@ def _generate_response(prompt: str) -> str:
         if response:
             content = response.choices[0].message.content
 
-    return content
+    return content.replace("\n", "")
 
 
-def generate_script(video_subject: str, language: str = "zh-CN", paragraph_number: int = 1) -> str:
+def generate_script(video_subject: str, language: str = "", paragraph_number: int = 1) -> str:
     prompt = f"""
 # Role: Video Script Generator
 
@@ -92,13 +92,12 @@ Generate a script for a video, depending on the subject of the video.
 7. you must not mention the prompt, or anything about the script itself. also, never talk about the amount of paragraphs or lines. just write the script.
 8. respond in the same language as the video subject.
 
-## Output Example:
-What is the meaning of life. This question has puzzled philosophers.
-
 # Initialization:
 - video subject: {video_subject}
 - number of paragraphs: {paragraph_number}
 """.strip()
+    if language:
+        prompt += f"\n- language: {language}"
 
     final_script = ""
     logger.info(f"subject: {video_subject}")

app/services/material.py

@@ -71,7 +71,7 @@ def search_videos(search_term: str,
                     break
         return video_items
     except Exception as e:
-        logger.error(f"search videos failed: {e}")
+        logger.error(f"search videos failed: {str(e)}")
 
     return []
 
@@ -81,7 +81,7 @@ def save_video(video_url: str, save_dir: str) -> str:
     video_path = f"{save_dir}/{video_id}.mp4"
     proxies = config.pexels.get("proxies", None)
     with open(video_path, "wb") as f:
-        f.write(requests.get(video_url, proxies=proxies, verify=False).content)
+        f.write(requests.get(video_url, proxies=proxies, verify=False, timeout=(10, 180)).content)
 
     return video_path
 
@@ -129,6 +129,6 @@ def download_videos(task_id: str,
                 logger.info(f"total duration of downloaded videos: {total_duration} seconds, skip downloading more")
                 break
         except Exception as e:
-            logger.error(f"failed to download video: {item}, {e}")
+            logger.error(f"failed to download video: {utils.to_json(item)} => {str(e)}")
     logger.success(f"downloaded {len(video_paths)} videos")
     return video_paths

app/services/task.py

@@ -48,7 +48,7 @@ def start(task_id, params: VideoParams):
     logger.info("\n\n## generating video script")
     video_script = params.video_script.strip()
     if not video_script:
-        video_script = llm.generate_script(video_subject=video_subject, language=language,
+        video_script = llm.generate_script(video_subject=video_subject, language=params.video_language,
                                            paragraph_number=paragraph_number)
     else:
         logger.debug(f"video script: \n{video_script}")

app/services/voice.py

@@ -26,7 +26,7 @@ def tts(text: str, voice_name: str, voice_file: str) -> [SubMaker, None]:
         logger.info(f"completed, output file: {voice_file}")
         return sub_maker
     except Exception as e:
-        logger.error(f"failed, error: {e}")
+        logger.error(f"failed, error: {str(e)}")
         return None
 
 
@@ -61,29 +61,34 @@ def create_subtitle(sub_maker: submaker.SubMaker, text: str, subtitle_file: str)
     script_lines_without_space = [line.replace(" ", "") for line in script_lines]
 
     sub_line = ""
-    for _, (offset, sub) in enumerate(zip(sub_maker.offset, sub_maker.subs)):
-        _start_time, end_time = offset
-        if start_time < 0:
-            start_time = _start_time
 
-        sub = unescape(sub)
-        sub_line += sub
-        if sub_line == script_lines[sub_index] or sub_line == script_lines_without_space[sub_index]:
-            sub_text = script_lines[sub_index]
-            sub_index += 1
-            line = formatter(
-                idx=sub_index,
-                start_time=start_time,
-                end_time=end_time,
-                sub_text=sub_text,
-            )
-            # logger.debug(line.strip())
-            sub_items.append(line)
-            start_time = -1.0
-            sub_line = ""
+    try:
+        for _, (offset, sub) in enumerate(zip(sub_maker.offset, sub_maker.subs)):
+            _start_time, end_time = offset
+            if start_time < 0:
+                start_time = _start_time
 
-    with open(subtitle_file, "w", encoding="utf-8") as file:
-        file.write("\n".join(sub_items) + "\n")
+            sub = unescape(sub)
+            sub_line += sub
+            if sub_line == script_lines[sub_index] or sub_line == script_lines_without_space[sub_index]:
+                sub_text = script_lines[sub_index]
+                sub_index += 1
+                line = formatter(
+                    idx=sub_index,
+                    start_time=start_time,
+                    end_time=end_time,
+                    sub_text=sub_text,
+                )
+                # logger.debug(line.strip())
+                sub_items.append(line)
+                start_time = -1.0
+                sub_line = ""
+
+        with open(subtitle_file, "w", encoding="utf-8") as file:
+            file.write("\n".join(sub_items) + "\n")
+
+    except Exception as e:
+        logger.error(f"failed, error: {str(e)}")
 
 
 def get_audio_duration(sub_maker: submaker.SubMaker):