3.11

jsons/cote_replacements.json

@@ -1,4 +1,3 @@
-
 {
   "honorifics": {
     "ちゃん": "chan",
@@ -72,6 +71,7 @@
   "single_names": {
     "Akiyama": ["秋山"],
     "Anzai": ["安在"],
+    "Hoashi": ["帆足"],
     "Ijūin": ["伊集院"],
     "Iki": ["井木"],
     "Ishida": ["石田"],
@@ -87,6 +87,7 @@
     "Mika": ["美香"],
     "Minamikawa": ["南川"],
     "Namekawa": ["滑川"],
+    "Niiura": ["新浦"],
     "Ōba": ["大場"],
     "Obokata": ["小保方"],
     "Onizuka": ["鬼塚"],
@@ -96,17 +97,20 @@
     "Sonezaki": ["曽根崎"],
     "Sōya": ["宗谷"],
     "Sugio": ["杉尾"],
+    "Tanihara": ["谷原"],
     "Tatebayashi":["舘林"],
     "Tomose":["トモセ"],
     "Toyohashi": ["豊橋"],
+    "Yamawaki": ["山脇"],
     "Yano": ["矢野"],
     "king": ["Wan-sama"]
-    },
+  },
 
   "full_names": {
     "Amasawa Ichika": ["天沢","一夏"],
     "Amikura Mako": ["網倉","麻子"],
     "Andō Sayo" : ["安藤","紗代"],
+    "Asagaya Mai": ["阿佐ヶ谷","舞"],
     "Asahina Nazuna": ["朝比奈","なずな"],
     "Asama Hisashi": ["浅間","久"],
     "Ayanokōji Atsuomi": ["綾小路","篤臣"],
@@ -115,12 +119,15 @@
     "Chabashira Sae": ["茶柱","佐枝"],
     "Eikura Mami": ["榮倉","まみ"],
     "Enoshima Midoriko":["榎嶋","翠子"],
+    "Fujisaki Rinna": ["藤崎","稟菜"],
     "Fukuchi Hinano": ["福地陽","菜乃"],
+    "Fukuyama Shinobu": ["福山","しのぶ"],
     "Hamaguchi Tetsuya": ["浜口","哲也"],
     "Hagiwara Chihaya": ["萩原","千颯"],
     "Hasebe Haruka": ["長谷部","波瑠加"],
     "Hashimoto Masayoshi": ["橋本","正義"],
     "Hatsukawa Maho": ["初川","舞峰"],
+    "Hatate Kaoru": ["旗手","薫"],
     "Himeno Yuki":["姫野","ユキ"],
     "Hirata Yōsuke": ["平田","洋介"],
     "Hondō Ryōtarō": ["本堂","遼太郎"],
@@ -132,11 +139,15 @@
     "Iguchi Yuri": ["井口","由里"],
     "Ike Kanji": ["池","寛治"],
     "Inogashira Kokoro": ["井の頭","心"],
+    "Inoue Toa": ["井上","都亞"],
     "Ishigami Kyō" : ["石上" , "京"],
+    "Ishida Yūsuke": ["石田","優介"],
     "Ishizaki Daichi": ["石崎","大地"],
     "Isomaru Yōkō": ["磯丸","容幸"],
+    "Isoyama Nagisa": ["磯山","渚沙"],
     "Kamogawa Toshizō": ["鴨川","俊三"],
     "Kamuro Masumi": ["神室","真澄"],
+    "Kaneda Satoru": ["金田","悟"],
     "Kanzaki Ryūji": ["神崎","隆二"],
     "Karuizawa Kei": ["軽井沢","恵"],
     "Katsuragi Kōhei": ["葛城","康平"],
@@ -147,52 +158,77 @@
     "Kitō Hayato": ["鬼頭","隼"],
     "Kobashi Yume": ["小橋","夢"],
     "Komiya Kyōgo": ["小宮","叶吾"],
-    "Kondō Reo": ["近藤","玲音"],
+    "Kondō Reon": ["近藤","玲音"],
     "Kōenji Rokusuke": ["高円寺","六助"],
     "Kōji Machida": ["浩二","町田"],
     "Kusuda Yukitsu": ["楠田","ゆきつ"],
+    "Machida Kōji": ["町田","浩二"],
+    "Makita Susumu": ["牧田","進"],
     "Manabe Shiho": ["真鍋","志保"],
     "Mashima Tomonari": ["真嶋","智也"],
     "Matsushita Chiaki": ["松下","千秋"],
+    "Minami Hakuo": ["南伯夫"],
     "Miyake Akito": ["三宅","明人"],
     "Miyamoto Sōshi":["宮本","蒼士"],
-    "Mori Nene": ["森","寧々"],
+    "Morishige Takurō": ["森重","卓郎"],
     "Morishita Ai": ["森下","藍"],
+    "Morofuji Rika": ["諸藤","リカ"],
+    "Moriyama Susumu": ["森山","進"],
+    "Mori Nene": ["森","寧々"],
+    "Motodoi Chikako": ["元土肥","千佳子"],
     "Nagumo Miyabi": ["南雲","雅"],
+    "Nakaizumi Shōhei": ["中泉","昌平"],
+    "Nakanishi Jirō": ["中西","次郎"],
     "Nanase Tsubasa": ["七瀬","翼"],
     "Naoe Jinnosuke": ["直江","仁之助"],
     "Nishimura Ryūko": ["西村","龍子"],
     "Nishino Takeko" : ["西野","武子"],
+    "Nomura Yūji": ["野村","雄二"],
     "Norihito Watanabe": ["渡辺","紀仁"],
+    "Oda Takumi": ["小田","拓海"],
+    "Okabe Fuyu": ["岡部","ふゆ"],
     "Okitani Kyōsuke": ["沖谷","京介"],
     "Onodera Kayano": ["小野寺","かや乃"],
+    "Rokkaku Momoe": ["六角","百恵"],
     "Ryūen Kakeru": ["龍園","翔"],
     "Sakagami Kazuma": ["坂上","数馬"],
     "Sakayanagi Arisu": ["坂柳","有栖"],
     "Sakayanagi Narimori": ["坂柳","成守"],
     "Sakura Airi": ["佐倉","愛里"],
     "Satō Maya": ["佐藤","麻耶"],
+    "Satonaka Satoru": ["里中","聡"],
     "Sanada Kousei": ["真田","康生"],
     "Sawada Yasumi": ["沢田","恭美"],
     "Shiba Katsunori": ["司馬","克典"],
     "Shibata Sō" : ["柴田","颯"],
+    "Shimizu Naoki": ["清水","直樹"],
     "Shiina Hiyori": ["椎名","ひより"],
     "Shinohara Satsuki": ["篠原","さつき"], 
     "Shintoku Tarō": ["新徳","太郎"],
     "Shiranami Chihiro": ["白波","千尋"],
+    "Shimazaki Ikkei": ["島崎","いっけい"],
+    "Sonoda Masashi": ["園田","正志"],
     "Sotomura Hideo": ["外村","秀雄"],
     "Suchi Moeka": ["須知","萌香"],
     "Sudō Ken": ["須藤","健"],
+    "Sugio Hiroshi": ["杉尾","大"],
+    "Suminokura Mami": ["角倉","真美"],
+    "Suzuki Hidetoshi": ["鈴木","英俊"],
+    "Suzuhira Miu": ["鈴平","美羽"],
     "Suzukake Tanji": ["鈴懸","鍛治"],
     "Tachibana Akane": ["橘","茜"],
     "Tachibana Kento": ["立花","賢人"],
     "Takahashi Osamu":["高橋","修"],
+    "Takarajima Miko": ["宝島","みこ"],
+    "Tanihara Mao": ["谷原","真緒"],
+    "Tamiya Emi": ["田宮","江美"],
     "Tokitō Hiroya": ["時任","裕也"],
-    "Tatewaki Aoi": ["帯刀","碧"],
     "Totsuka Yahiko": ["戸塚","弥彦"],
-    "Tōdō Rin": ["藤堂","凛"],
     "Tsubaki Sakurako": ["椿","桜子"],
+    "Tsukaji Shihori": ["塚地","しほり"],
+    "Tsukasaki Taiga": ["司城","大河"],
     "Tsukishiro Tokinari": ["月城","常成"],
+    "Takanashi Kō": ["小鳥遊","コウ"],
     "Utomiya Riku": ["宇都宮","陸"],
     "Wan Mei-Yui": ["王","美雨"],
     "Yabu Nanami" : ["藪","菜々美"],
@@ -200,16 +236,21 @@
     "Yamada Albert": ["山田","アルベルト"],
     "Yamamura Miki": ["山村","美紀"],
     "Yamanaka Ikuko": ["山中","郁子"],
-    "Yamashita Saki" : ["鈴代","紗弓"],
     "Yamashita Naohisa" :[ "山下","直久"],
+    "Yamashita Saki" : ["山下","沙希"],
     "Yamauchi Haruki": ["山内","春樹"],
     "Yanagi Yasuhisa": ["柳","安久"],
-    "Yukimura Teruhiko": ["幸村","輝彦"]
+    "Yanagibashi Motofumi": ["柳橋","元史"],
+    "Yano Koharu": ["矢野","小春"],
+    "Yajima Mariko": ["矢島","麻里子"],
+    "Yoshida Kenta": ["吉田","健太"],
+    "Yoshimoto Kōsetsu": ["吉本","功節"],
+    "Yonezu Haruto": ["米津","春斗"],
+    "Yūbe Yoshika": ["夕部","よしか"]
   },
 
   "enhanced_check_whitelist": {
     "Hoshinomiya Chie": ["星之宮","知恵"],
     "Kijima": ["鬼島"]
   }
-  
 }

lib/gui/save_to_zip.js

@@ -0,0 +1,33 @@
+(...texts) =>
+{
+        console.log("Starting save_to_zip function");
+    
+        const sectionNames = [
+            "Indexed Text", "Indexing Results", "Indexing Debug Log",
+            "Preprocessed Text", "Preprocessing Results", "Preprocessing Debug Log",
+            "Translated Text", "JE Check Text", "Translator Debug Log",
+            "Overall Debug Log", "Error Log"
+        ];
+    
+        texts.forEach((text, index) =>
+        {
+            console.log(`Processing section: ${sectionNames[index]}`);
+            const fileName = `${sectionNames[index].replace(/ /g, '_').toLowerCase()}.txt`;
+            const blob = new Blob([text], { type: 'text/plain' });
+            const url = URL.createObjectURL(blob);
+            console.log("URL created:", url);
+    
+            const a = document.createElement('a');
+            a.href = url;
+            a.download = fileName;
+            console.log("Download link created for", fileName);
+    
+            a.click();
+            console.log("Download initiated for", fileName);
+    
+            URL.revokeObjectURL(url);
+            console.log("URL revoked for", fileName);
+        });
+    
+        console.log("save_to_zip function completed");
+}

modules/common/file_ensurer.py

@@ -74,8 +74,9 @@ class FileEnsurer():
     ## favicon
     favicon_path = os.path.join(gui_lib, "Kudasai_Logo.png")
 
-    ## js save to file
+    ## js
     js_save_to_file_path = os.path.join(gui_lib, "save_to_file.js")
+    js_save_to_zip_path = os.path.join(gui_lib, "save_to_zip.js")
 
     ## translation settings description
     translation_settings_description_path = os.path.join(common_lib, "translation_settings_description.txt")

modules/common/toolkit.py

@@ -15,7 +15,7 @@ class Toolkit():
 
     """
 
-    CURRENT_VERSION = "v3.4.10"
+    CURRENT_VERSION = "v3.4.11"
 
 ##-------------------start-of-clear_console()---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 

modules/common/translator.py

@@ -217,7 +217,7 @@ class Translator:
         else:
             method = Translator.TRANSLATION_METHOD
 
-        Translator.TRANSLATION_METHOD, api_key_path = translation_methods.get(method, ("deepl", FileEnsurer.deepl_api_key_path)) #type: ignore
+        Translator.TRANSLATION_METHOD, api_key_path = translation_methods.get(method, ("deepl", FileEnsurer.deepl_api_key_path)) # type: ignore
         
         if(Translator.pre_provided_api_key != ""):
             if(Translator.TRANSLATION_METHOD == "google translate"):

requirements.txt

@@ -1,5 +1,5 @@
 backoff==2.2.1
-gradio==4.20.0
+gradio==4.44.0
 kairyou==1.6.5
-easytl==0.4.6
+easytl==0.4.10
 ja_core_news_lg @ https://github.com/explosion/spacy-models/releases/download/ja_core_news_lg-3.7.0/ja_core_news_lg-3.7.0-py3-none-any.whl#sha256=f08eecb4d40523045c9478ce59a67564fd71edd215f32c076fa91dc1f05cc7fd

webgui.py

@@ -2,6 +2,7 @@
 import typing
 import base64
 import asyncio
+import time
 import os
 import json
 
@@ -42,6 +43,9 @@ class KudasaiGUI:
     with open(FileEnsurer.js_save_to_file_path, 'r', encoding='utf-8') as f:
         js_save_to_file = f.read()
 
+    with open(FileEnsurer.js_save_to_zip_path, 'r', encoding='utf-8') as f:
+        js_save_to_zip = f.read()
+
     ## used for whether the debug log tab for Translator should be actively refreshing based of Logger.current_batch
     is_translation_ongoing = False
 
@@ -89,6 +93,9 @@ class KudasaiGUI:
         "deepl_formality": lines[81-1].strip(),
     }
 
+    last_text_change = 0
+    debounce_delay = 2 ## 2 seconds
+
 ##-------------------start-of-build_gui()---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
     def build_gui(self) -> None:
@@ -99,8 +106,7 @@ class KudasaiGUI:
 
         """
 
-        with gr.Blocks(title="Kudasai", delete_cache=(300, 300)) as self.gui:
-
+        with gr.Blocks(title="Kudasai", delete_cache=(300, 300), analytics_enabled=False) as self.gui:
 ##-------------------start-of-Utility-Functions---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 ##-------------------start-of-fetch_log_content()---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -772,6 +778,11 @@ class KudasaiGUI:
                     with gr.Row():
                         self.logging_clear_logs_button = gr.Button('Clear Logs', variant='stop')
 
+                with gr.Tab("Output"):
+
+                    with gr.Row():
+                        self.download_all_outputs_button = gr.Button('Download All Outputs', elem_id="download-all-outputs-button")
+                        
 ##-------------------start-of-Listener-Functions---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
             def webgui_update_check() -> None:
@@ -2076,7 +2087,42 @@ class KudasaiGUI:
                 outputs=[],
 
                 ## javascript code that allows us to save textbox contents to a file
-                js=(self.js_save_to_file).replace("downloaded_text.txt", "error_log.txt")
+                js=(self.js_save_to_zip).replace("downloaded_text.txt", "error_log.txt")
+            )
+
+##-------------------start-of-download_all_outputs_click()---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+            self.download_all_outputs_button.click(
+                lambda indexed_text, indexing_results, indexing_debug, 
+                       preprocessed_text, preprocessing_results, preprocessing_debug,
+                       translated_text, je_check_text, translator_debug,
+                       logging_debug, logging_error: 
+                f"Indexed Text:\n{indexed_text}\n\n"
+                f"Indexing Results:\n{indexing_results}\n\n"
+                f"Indexing Debug Log:\n{indexing_debug}\n\n"
+                f"Preprocessed Text:\n{preprocessed_text}\n\n"
+                f"Preprocessing Results:\n{preprocessing_results}\n\n"
+                f"Preprocessing Debug Log:\n{preprocessing_debug}\n\n"
+                f"Translated Text:\n{translated_text}\n\n"
+                f"JE Check Text:\n{je_check_text}\n\n"
+                f"Translator Debug Log:\n{translator_debug}\n\n"
+                f"Overall Debug Log:\n{logging_debug}\n\n"
+                f"Error Log:\n{logging_error}",
+                inputs=[
+                    self.indexing_output_field,
+                    self.indexing_results_output_field,
+                    self.debug_log_output_field_indexing_tab,
+                    self.preprocessing_output_field,
+                    self.preprocessing_results_output_field,
+                    self.debug_log_output_field_preprocess_tab,
+                    self.translator_translated_text_output_field,
+                    self.translator_je_check_text_output_field,
+                    self.translator_debug_log_output_field,
+                    self.logging_tab_debug_log_output_field,
+                    self.logging_tab_error_log_output_field
+                ],
+                outputs=[],
+                js=(self.js_save_to_zip)
             )
 
 ##-------------------start-of-send_to_x_click()---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -2088,6 +2134,58 @@ class KudasaiGUI:
             self.send_to_translator_button.click(fn=send_to_translator_button,
                                         inputs=[self.preprocessing_output_field],
                                         outputs=[self.input_text_translator])
+            
+##-------------------start-of-toggle_inputs()---------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+            def toggle_knowledge_base_inputs(file_input, dir_input):
+                return gr.update(interactive=not bool(file_input)), gr.update(interactive=not bool(dir_input))
+
+            self.input_knowledge_base_file.change(
+                toggle_knowledge_base_inputs,
+                inputs=[self.input_knowledge_base_file, self.input_knowledge_base_directory],
+                outputs=[self.input_knowledge_base_directory, self.input_knowledge_base_file]
+            )
+
+            self.input_knowledge_base_directory.change(
+                toggle_knowledge_base_inputs,
+                inputs=[self.input_knowledge_base_file, self.input_knowledge_base_directory],
+                outputs=[self.input_knowledge_base_directory, self.input_knowledge_base_file]
+            )
+
+            def toggle_text_inputs(file_input, text_input):
+                current_time = time.time()
+                if current_time - KudasaiGUI.last_text_change < KudasaiGUI.debounce_delay:
+                    # If it's a text change and we're within the debounce period, don't update
+                    return gr.update(), gr.update()
+                self.last_text_change = current_time
+                return gr.update(placeholder=""), gr.update(interactive=not bool(file_input)), gr.update(interactive=not bool(text_input))
+
+
+            ## For preprocessor
+            self.input_txt_file_preprocessing.change(
+                toggle_text_inputs,
+                inputs=[self.input_txt_file_preprocessing, self.input_text_kairyou],
+                outputs=[self.input_text_kairyou, self.input_txt_file_preprocessing]
+            )
+
+            self.input_text_kairyou.change(
+                toggle_text_inputs,
+                inputs=[self.input_txt_file_preprocessing, self.input_text_kairyou],
+                outputs=[self.input_text_kairyou, self.input_txt_file_preprocessing]
+            )
+
+            ## For translator
+            self.input_txt_file_translator.change(
+                toggle_text_inputs,
+                inputs=[self.input_txt_file_translator, self.input_text_translator],
+                outputs=[self.input_text_translator, self.input_txt_file_translator]
+            )
+
+            self.input_text_translator.change(
+                toggle_text_inputs,
+                inputs=[self.input_txt_file_translator, self.input_text_translator],
+                outputs=[self.input_text_translator, self.input_txt_file_translator]
+            )
 
 ##-------------------start-of-launch()---------------------------------------------------------------------------------------------------------------------------------------------------------------------------