Update app.py

app.py

@@ -98,6 +98,37 @@ def repeat_to_one_fb(x):
 
 repeat_to_one = repeat_to_one_fb
 
+def process_row(x, names):
+    assert type(names) == type([])
+    x = x.strip()
+    if not x:
+        return x
+    first_char = x[0]
+    if first_char in map(lambda y: y[0], names):
+        return x
+    if first_char in ["：", ":"]:
+        return x[1:]
+    if first_char in "".join(names):
+        req = {}
+        for name in names:
+            merged = name
+            find_it = False
+            for ele in jieba.lcut(x):
+                if merged.endswith(ele) and not find_it:
+                    continue
+                else:
+                    find_it = True
+                merged += ele
+            if find_it:
+                req[name] = merged
+        #print(req)
+        return sorted(req.items(), key = lambda t2: len(t2[1][len(t2[0]):]))[0][1]
+    return x
+
+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"):
@@ -735,7 +766,10 @@ def get_single_prompt(
         )
     #a = a.replace("?", "").replace("？", "")
     a = a.replace("？", "?")
-    return "\n".join([b, a])
+    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,
@@ -819,7 +853,10 @@ def get_two_prompt(
         )
     #a = a.replace("?", "").replace("？", "")
     a = a.replace("？", "?")
-    return "\n".join([b, a])
+    req = "\n".join([b, a])
+    req = process_info(req)
+    return req
+    #return "\n".join([b, a])
 
 import chatglm_cpp
 from pathlib import Path
@@ -983,6 +1020,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(
@@ -991,6 +1029,14 @@ def run_two(
     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):
+    if hasattr(single_name_1, "value"):
+        single_name_1_ = single_name_1.value
+    else:
+        single_name_1_ = single_name_1
+    if hasattr(single_name_2, "value"):
+        single_name_2_ = single_name_2.value
+    else:
+        single_name_2_ = single_name_2
     two_prompt = partial(get_two_prompt, two_task = "哪些信息")(
         single_name_1, select_gender_1, select_country_1, single_identity_1, single_disposition_1,
         single_introduction_1,
@@ -1006,11 +1052,24 @@ def run_two(
         ):
             pass
         #yield ele
+        ele = process_row(ele, [single_name_1_, single_name_2_]).strip()
         req.append(ele)
     #print(req)
     req = sorted(set(filter(lambda x: x.strip(), req)), key = lambda y: -1 * len(y))
-    req = "\n\n".join(map(lambda t2: "结果{}:\n{}".format(t2[0], t2[1]), enumerate(req)))
+    req = "\n\n".join(map(lambda t2: "结果{}:\n{}".format(t2[0], t2[1].strip()), enumerate(req)))
     req = process_text(req)
+    req = process_info(req)
+    l = req.split("\n\n")
+    def process_head(y):
+        ll = y.split("\n")
+        if len(ll) >= 2:
+            if len(ll[1].strip()) == 1:
+                return "\n".join([ll[0]] + ll[2:]).strip()
+            else:
+                return y.strip()
+        else:
+            return y.strip()
+    req = "\n\n".join(map(process_head, l))
     return req
 
 all_single_task = ["介绍", "故事", "信", "聊天", "时候", "关于", "了解"]
@@ -1131,7 +1190,7 @@ with gr.Blocks() as demo:
             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)
@@ -1141,7 +1200,7 @@ with gr.Blocks() as demo:
             """<h2 align="center"> <font size="+0"> 例子（这里面涉及推荐选择的需要从左面或上面的角色图片集里面点按选取） </font> </h2>""",
             elem_id="title",
     )
-    
+ 
     with gr.Row():
         gr.Examples(
             [
@@ -1154,11 +1213,11 @@ with gr.Blocks() as demo:
     with gr.Row():
         gr.Examples(
             [
-            ["这里推荐从左面选择：行秋" ,"故事", "一天行秋在绝云间练剑。"],
             ["这里推荐从左面选择：柯莱" ,"信", "鸟语花香"],
             ["这里推荐从左面选择：魈" ,"聊天", "美味��杏仁豆腐"],
             ["这里推荐从左面选择：凝光" ,"时候", "品尝璃月香茗"],
             ["这里推荐从左面选择：可莉" ,"关于", "如何制造蹦蹦炸弹"],
+            ["这里推荐从左面选择：行秋" ,"故事", "一天行秋在绝云间练剑。"],
             ["这里推荐从左面选择：北斗" ,"了解", ""],
             ],
             inputs = [single_name ,select_task, Text],