Update app.py

app.py

@@ -26,7 +26,7 @@ def save_settings_to_ini(settings, filename='character_settings.ini'):
         'gender': settings['gender'],
         'situation': '\n'.join(settings['situation']),
         'orders': '\n'.join(settings['orders']),
-        'dirty_talk_list': '\n'.join(settings['dirty_talk_list']),
+        'talk_list': '\n'.join(settings['talk_list']),
         'example_quotes': '\n'.join(settings['example_quotes'])
     }
     with open(filename, 'w', encoding='utf-8') as configfile:
@@ -49,7 +49,7 @@ def load_settings_from_ini(filename='character_settings.ini'):
             'gender': config['Settings']['gender'],
             'situation': config['Settings']['situation'].split('\n'),
             'orders': config['Settings']['orders'].split('\n'),
-            'dirty_talk_list': config['Settings']['dirty_talk_list'].split('\n'),
+            'talk_list': config['Settings']['talk_list'].split('\n'),
             'example_quotes': config['Settings']['example_quotes'].split('\n')
         }
         return settings
@@ -121,12 +121,12 @@ class CharacterMaker:
         self.history.append({"user": input_str, "assistant": res_text})
         return res_text
     
-    def make_prompt(self, name: str, gender: str, situation: list, orders: list, dirty_talk_list: list, example_quotes: list, input_str: str):
+    def make_prompt(self, name: str, gender: str, situation: list, orders: list, talk_list: list, example_quotes: list, input_str: str):
         with open('test_prompt.jinja2', 'r', encoding='utf-8') as f:
             prompt = f.readlines()
         fix_example_quotes = [quote+"<END>" for quote in example_quotes]
         prompt = "".join(prompt)
-        prompt = Template(prompt).render(name=name, gender=gender, situation=situation, orders=orders, dirty_talk_list=dirty_talk_list, example_quotes=fix_example_quotes, histories=self.history, input_str=input_str)
+        prompt = Template(prompt).render(name=name, gender=gender, situation=situation, orders=orders, talk_list=talk_list, example_quotes=fix_example_quotes, histories=self.history, input_str=input_str)
         return prompt
 
     def _generate_aki(self, input_str: str):
@@ -135,7 +135,7 @@ class CharacterMaker:
             self.settings["gender"],
             self.settings["situation"],
             self.settings["orders"],
-            self.settings["dirty_talk_list"],
+            self.settings["talk_list"],
             self.settings["example_quotes"],
             input_str
         )
@@ -153,13 +153,13 @@ class CharacterMaker:
 character_maker = CharacterMaker()
 
 # 設定を更新する関数
-def update_settings(name, gender, situation, orders, dirty_talk_list, example_quotes):
+def update_settings(name, gender, situation, orders, talk_list, example_quotes):
     new_settings = {
         "name": name,
         "gender": gender,
         "situation": [s.strip() for s in situation.split('\n') if s.strip()],
         "orders": [o.strip() for o in orders.split('\n') if o.strip()],
-        "dirty_talk_list": [d.strip() for d in dirty_talk_list.split('\n') if d.strip()],
+        "talk_list": [d.strip() for d in talk_list.split('\n') if d.strip()],
         "example_quotes": [e.strip() for e in example_quotes.split('\n') if e.strip()]
     }
     character_maker.update_settings(new_settings)
@@ -221,7 +221,7 @@ with gr.Blocks(css=custom_css) as iface:
         gender_input = gr.Textbox(label="性別", value=character_maker.settings["gender"])
         situation_input = gr.Textbox(label="状況設定", value="\n".join(character_maker.settings["situation"]), lines=5)
         orders_input = gr.Textbox(label="指示", value="\n".join(character_maker.settings["orders"]), lines=5)
-        dirty_talk_input = gr.Textbox(label="淫語リスト", value="\n".join(character_maker.settings["dirty_talk_list"]), lines=5)
+        talk_input = gr.Textbox(label="語彙リスト", value="\n".join(character_maker.settings["talk_list"]), lines=5)
         example_quotes_input = gr.Textbox(label="例文", value="\n".join(character_maker.settings["example_quotes"]), lines=5)
         
         update_button = gr.Button("設定を更新")
@@ -229,7 +229,7 @@ with gr.Blocks(css=custom_css) as iface:
 
         update_button.click(
             update_settings,
-            inputs=[name_input, gender_input, situation_input, orders_input, dirty_talk_input, example_quotes_input],
+            inputs=[name_input, gender_input, situation_input, orders_input, talk_input, example_quotes_input],
             outputs=[update_output]
         )