From f0927404fef32b018c9394d1ed5f6f74a052b318 Mon Sep 17 00:00:00 2001 From: yihong0618 Date: Sun, 22 Dec 2024 19:00:40 +0800 Subject: [PATCH] fix: lint Signed-off-by: yihong0618 --- book_maker/cli.py | 2 +- book_maker/loader/md_loader.py | 14 +++++++------- book_maker/translator/gemini_translator.py | 12 +++++++++--- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/book_maker/cli.py b/book_maker/cli.py index 5c71492..ce0d58f 100644 --- a/book_maker/cli.py +++ b/book_maker/cli.py @@ -35,7 +35,7 @@ def parse_prompt_arg(prompt_arg): else: raise FileNotFoundError(f"{prompt_arg} not found") - #if prompt is None or any(c not in prompt["user"] for c in ["{text}", "{language}"]): + # if prompt is None or any(c not in prompt["user"] for c in ["{text}", "{language}"]): if prompt is None or any(c not in prompt["user"] for c in ["{text}"]): raise ValueError("prompt must contain `{text}`") diff --git a/book_maker/loader/md_loader.py b/book_maker/loader/md_loader.py index 88b1bde..c8cc498 100644 --- a/book_maker/loader/md_loader.py +++ b/book_maker/loader/md_loader.py @@ -60,21 +60,21 @@ class MarkdownBookLoader(BaseBookLoader): for line in self.origin_book: # 如果是空行且当前段落不为空,保存当前段落 if not line.strip() and current_paragraph: - self.md_paragraphs.append('\n'.join(current_paragraph)) + self.md_paragraphs.append("\n".join(current_paragraph)) current_paragraph = [] # 如果是标题行,单独作为一个段落 - elif line.strip().startswith('#'): + elif line.strip().startswith("#"): if current_paragraph: - self.md_paragraphs.append('\n'.join(current_paragraph)) + self.md_paragraphs.append("\n".join(current_paragraph)) current_paragraph = [] self.md_paragraphs.append(line) # 其他情况,添加到当前段落 else: current_paragraph.append(line) - + # 处理最后一个段落 if current_paragraph: - self.md_paragraphs.append('\n'.join(current_paragraph)) + self.md_paragraphs.append("\n".join(current_paragraph)) @staticmethod def _is_special_text(text): @@ -93,7 +93,7 @@ class MarkdownBookLoader(BaseBookLoader): for i in range(0, len(self.md_paragraphs), self.batch_size) ] for paragraphs in sliced_list: - batch_text = '\n\n'.join(paragraphs) + batch_text = "\n\n".join(paragraphs) if self._is_special_text(batch_text): continue if not self.resume or index >= p_to_save_len: @@ -112,7 +112,7 @@ class MarkdownBookLoader(BaseBookLoader): except Exception as e: print(f"翻译过程中出错: {e}") raise Exception("翻译过程中出现错误") from e - + self.p_to_save.append(temp) if not self.single_translate: self.bilingual_result.append(batch_text) diff --git a/book_maker/translator/gemini_translator.py b/book_maker/translator/gemini_translator.py index 139daa9..23d24d0 100644 --- a/book_maker/translator/gemini_translator.py +++ b/book_maker/translator/gemini_translator.py @@ -121,12 +121,18 @@ class Gemini(Base): ) t_text = self.convo.last.text.strip() # 检查是否包含特定标签,如果有则只返回标签内的内容 - tag_pattern = r'(.*?)' + tag_pattern = ( + r"(.*?)" + ) tag_match = re.search(tag_pattern, t_text, re.DOTALL) if tag_match: - print("[bold green]" + re.sub("\n{3,}", "\n\n", t_text) + "[/bold green]") + print( + "[bold green]" + + re.sub("\n{3,}", "\n\n", t_text) + + "[/bold green]" + ) t_text = tag_match.group(1).strip() - #print("[bold green]" + re.sub("\n{3,}", "\n\n", t_text) + "[/bold green]") + # print("[bold green]" + re.sub("\n{3,}", "\n\n", t_text) + "[/bold green]") break except StopCandidateException as e: print(