Update app.py

app.py

@@ -101,6 +101,10 @@ def repeat_to_one_fb(x):
 
 repeat_to_one = repeat_to_one_fb
 
+def process_info(x, maintain_chars = ",.。，;:：；?？\n——"):
+    req = re.findall(u"[0-9\u4e00-\u9fa5{}]+".format(maintain_chars) ,x)
+    return "".join(req)
+
 from huggingface_hub import snapshot_download
 
 if not os.path.exists("genshin-impact-character"):
@@ -746,7 +750,11 @@ def get_single_prompt(
         character_setting_rewrite_dict = character_setting_rewrite_dict,
         Text = Text,
         )
-    return "\n".join([b, a])
+    #a = a.replace("？", "?")
+    req = "\n".join([b, a])
+    req = process_info(req)
+    return req
+    #return "\n".join([b, a])
 
 def get_two_prompt(
     single_name_1, select_gender_1, select_country_1, single_identity_1, single_disposition_1,
@@ -828,7 +836,11 @@ def get_two_prompt(
         character_setting_rewrite_dict_1 = character_setting_rewrite_dict_1,
         character_setting_rewrite_dict_2 = character_setting_rewrite_dict_2,
         )
-    return "\n".join([b, a])
+    #a = a.replace("？", "?")
+    req = "\n".join([b, a])
+    req = process_info(req)
+    return req
+    #return "\n".join([b, a])
 
 import re
 import pandas as pd
@@ -865,8 +877,8 @@ model_file_path = "genshin_impact_character_llamazh13b_ggml/llama2zh-13b-3900-q4
 from llama_cpp import Llama
 llama = Llama(model_file_path,
                   n_ctx = 4090,
-                  n_threads=2,            # The number of CPU threads to use, tailor to your system and the resulting performance
-                  #n_gpu_layers=-1
+                  n_threads=8,            # The number of CPU threads to use, tailor to your system and the resulting performance
+                  n_gpu_layers=-1
                   )
 print("load {}".format(model_file_path))
 
@@ -996,6 +1008,7 @@ def run_single(
 
     req = "\n\n".join(map(lambda t2: "结果{}:\n{}".format(t2[0], t2[1]), enumerate(req)))
     req = process_text(req)
+    #req = process_info(req)
     return req
 
 def run_two(
@@ -1030,6 +1043,7 @@ def run_two(
     req = req_
     req = "\n\n".join(map(lambda t2: "结果{}:\n{}".format(t2[0], t2[1]), enumerate(req)))
     req = process_text(req)
+    #req = process_info(req)
     return req
 
 all_single_task = ["介绍", "故事", "信", "聊天", "时候", "关于", "了解"]
@@ -1084,73 +1098,9 @@ with gr.Blocks() as demo:
         with gr.Row():
             single_prompt_run_button = gr.Button("得到任务结果")
             output = gr.Text(label = "任务生成结果", info = "可编辑", lines = 2, scale = 5.0)
-
-    with gr.Tab("两个角色看法指令"):
-        with gr.Row():
-            with gr.Column(0.5):
-                with gr.Column():
-                    select_name_1 = gr.Gallery(im_list, elem_id="gallery",
-                                            #scale = 0.1,
-                                            columns=[5], object_fit="contain",
-                                            #height=2048 + 1024,
-                                            height=512+128,
-                                            allow_preview = False,
-                                            label="选择角色",
-                                            info = "可选择。原神沉玉谷前的内建角色"
-                                            )
-                    single_name_1 = gr.Text(label = "角色姓名",
-                            info = "可编辑。角色姓名会重写选择角色，用这个选项可以新建角色",
-                            interactive = True)
-                with gr.Row():
-                    select_gender_1 = gr.Dropdown(label="性别",
-                            choices=all_genders,
-                            info = "可选择",
-                            value=all_genders[0], interactive = True)
-                    select_country_1 = gr.Dropdown(label="国籍",
-                            choices=all_countries,
-                            info = "可选择",
-                            value=all_countries[0], interactive = True)
-                    #with gr.Column():
-                single_identity_1 = gr.Text(label = "身份", info = "可编辑", interactive = True)
-                single_disposition_1 = gr.Text(label = "性格特征", info = "可编辑", interactive = True)
-                single_introduction_1 = gr.Text(label = "角色介绍", info = "可编辑",
-                interactive = True, lines = 36)
-
-            with gr.Column(0.5):
-                with gr.Column():
-                    select_name_2 = gr.Gallery(im_list, elem_id="gallery",
-                                                                #scale = 0.1,
-                                                                columns=[5], object_fit="contain",
-                                                                #height=2048 + 1024,
-                                                                height=512+128,
-                                                                allow_preview = False,
-                                                                label="选择角色",
-                                                                info = "可选择。原神沉玉谷前的内建角色"
-                                                                )
-                    single_name_2 = gr.Text(label = "角色姓名",
-                            info = "可编辑。角色姓名会重写选择角色，用这个选项可以新建角色",
-                            interactive = True)
-                with gr.Row():
-                    select_gender_2 = gr.Dropdown(label="性别",
-                            choices=all_genders,
-                            info = "可选择",
-                            value=all_genders[0], interactive = True)
-                    select_country_2 = gr.Dropdown(label="国籍",
-                            choices=all_countries,
-                            info = "可选择",
-                            value=all_countries[0], interactive = True)
-                    #with gr.Column():
-                single_identity_2 = gr.Text(label = "身份", info = "可编辑", interactive = True)
-                single_disposition_2 = gr.Text(label = "性格特征", info = "可编辑", interactive = True)
-                single_introduction_2 = gr.Text(label = "角色介绍", info = "可编辑",
-                interactive = True, lines = 36)
-
-        with gr.Row():
-            two_prompt_run_button = gr.Button("得到角色间看法")
-            two_output = gr.Text(label = "角色间看法结果", info = "可编辑", lines = 2, scale = 5.0)
-
+    
     with gr.Row():
-        gen_times = gr.Slider(1, 10, value=3, step=1.0, label="Generate Num", interactive=True)
+        gen_times = gr.Slider(1, 10, value=10, step=1.0, label="Generate Num", interactive=True)
         max_length = gr.Slider(0, 32768, value=512, step=1.0, label="Maximum length", interactive=True)
         top_p = gr.Slider(0, 1, value=0.8, step=0.01, label="Top P", interactive=True)
         temperature = gr.Slider(0.01, 1, value=0.6, step=0.01, label="Temperature", interactive=True)
@@ -1173,11 +1123,11 @@ with gr.Blocks() as demo:
     with gr.Row():
         gr.Examples(
             [
-            ["这里推荐从左面选择：行秋" ,"故事", "一天行秋到望舒客栈吃饭。"],
             ["这里推荐从左面选择：柯莱" ,"信", "鸟语花香"],
             ["这里推荐从左面选择：夜兰" ,"聊天", "夜来香"],
             ["这里推荐从左面选择：凝光" ,"时候", "品尝璃月香茗"],
             ["这里推荐从左面选择：可莉" ,"关于", "如何制造蹦蹦炸弹"],
+            ["这里推荐从左面选择：行秋" ,"故事", "一天行秋到望舒客栈吃饭。"],
             ["这里推荐从左面选择：北斗" ,"了解", ""],
             ],
             inputs = [single_name ,select_task, Text],
@@ -1209,43 +1159,7 @@ with gr.Blocks() as demo:
             ],
             label = "单个角色任务指令例子"
         )
-
-    with gr.Row():
-        gr.Examples(
-            [
-                ["这里推荐从上面选择：芙宁娜", "这里推荐从上面选择：那维莱特"]
-            ],
-            inputs = [single_name_1, single_name_2],
-            label = "两个角色看法指令例子"
-        )
-
-    with gr.Row():
-        gr.Examples(
-            [
-            ["这里推荐从上面选择：提纳里" ,"大慈树王",
-            "成年女性", "须弥", "须弥的统治者",
-            "爱民如子，带领雨林的人民战胜灾厄",
-                        '''
-                        草神之所以也被称之为“智慧之神”，正是因为她的意识连接着世界之树。在须弥人眼里，她是智慧的化身、仁慈与无所不能的象征，但她却在几百年前的灾难中消失了。
-            在漫长的历史当中，须弥历经浩劫，种种险情都被大慈树王一一化解。大慈树王创造出雨林，使得须弥人能获得安宁的生活。而须弥最初的教令院，便是由长久地去追随大慈树王的学者组成，他们各司其职，协助大慈树王管理须弥。最能理解大慈树王的力量和哲思的，只能是教令院了。
-                        '''
-            ],
-            ],
-            inputs = [single_name_1 ,single_name_2,
-            select_gender_2, select_country_2, single_identity_2,
-            single_disposition_2, single_introduction_2
-            ],
-            label = "两个角色看法指令例子"
-        )
-
-    select_name_1.select(
-        get_single_name, select_name_1, single_name_1
-    )
-
-    select_name_2.select(
-        get_single_name, select_name_2, single_name_2
-    )
-
+    
     select_name.select(change_single_name,
         inputs = select_name,
         outputs = [
@@ -1254,31 +1168,12 @@ with gr.Blocks() as demo:
                 ],
         )
 
-    select_name_1.select(
-        change_single_name, select_name_1,
-            [single_name_1, select_gender_1, select_country_1,
-            single_identity_1, single_disposition_1, single_introduction_1
-            ]
-    )
-
-    select_name_2.select(
-        change_single_name, select_name_2,
-            [single_name_2, select_gender_2, select_country_2,
-            single_identity_2, single_disposition_2, single_introduction_2
-            ]
-    )
-
     single_prompt_run_button.click(run_single, [
         single_name, select_gender, select_country, single_identity, single_disposition,
         select_task, Text, single_introduction,
     gen_times, max_length, top_p, temperature
     ], output)
-    two_prompt_run_button.click(run_two, [
-    single_name_1, select_gender_1, select_country_1, single_identity_1, single_disposition_1,
-    single_introduction_1,
-    single_name_2, select_gender_2, select_country_2, single_identity_2, single_disposition_2,
-    single_introduction_2,
-    gen_times, max_length, top_p, temperature], two_output)
+
 
 #demo.launch("0.0.0.0", show_api=False, share = True)
 demo.queue(max_size=4, concurrency_count=1).launch(debug=True, show_api=False, share = True)