update

serve/utils.py

@@ -143,6 +143,11 @@ def get_conv_log_filename():
     name = os.path.join(LOGDIR, f"{t.year}-{t.month:02d}-{t.day:02d}-conv.json")
     return name
 
+def get_nsfw_conv_log_filename():
+    t = datetime.datetime.now()
+    name = os.path.join(LOGDIR, f"nsfw/{t.year}-{t.month:02d}-{t.day:02d}-conv.json")
+    return name
+
 def save_image_file_on_log_server(image_file:str):
 
     image_file = Path(image_file).absolute().relative_to(os.getcwd())

serve/vote_utils.py

@@ -518,7 +518,7 @@ def generate_ig(gen_func, state, text, model_name, request: gr.Request):
     state.output = generated_image
     state.model_name = model_name
     if generated_image == '':
-        with open(get_conv_log_filename(), "a") as fout:
+        with open(get_nsfw_conv_log_filename(), "a") as fout:
             data = {
                 "type": "chat",
                 "model": model_name,
@@ -528,7 +528,7 @@ def generate_ig(gen_func, state, text, model_name, request: gr.Request):
                 "ip": get_ip(request),
             }
             fout.write(json.dumps(data) + "\n")
-            append_json_item_on_log_server(data, get_conv_log_filename())
+            append_json_item_on_log_server(data, get_nsfw_conv_log_filename())
         raise gr.Warning("Input prompt is blocked by the NSFW filter, please input safe content and try again!")
     
     yield state, generated_image
@@ -616,7 +616,7 @@ def generate_igm(gen_func, state0, state1, text, model_name0, model_name1, reque
     state0.model_name = model_name0
     state1.model_name = model_name1
     if generated_image0 == '' and generated_image1 == '':
-        with open(get_conv_log_filename(), "a") as fout:
+        with open(get_nsfw_conv_log_filename(), "a") as fout:
             data = {
                 "type": "chat",
                 "model": model_name0,
@@ -626,7 +626,7 @@ def generate_igm(gen_func, state0, state1, text, model_name0, model_name1, reque
                 "ip": get_ip(request),
             }
             fout.write(json.dumps(data) + "\n")
-            append_json_item_on_log_server(data, get_conv_log_filename())
+            append_json_item_on_log_server(data, get_nsfw_conv_log_filename())
             data = {
                 "type": "chat",
                 "model": model_name1,
@@ -636,7 +636,7 @@ def generate_igm(gen_func, state0, state1, text, model_name0, model_name1, reque
                 "ip": get_ip(request),
             }
             fout.write(json.dumps(data) + "\n")
-            append_json_item_on_log_server(data, get_conv_log_filename())
+            append_json_item_on_log_server(data, get_nsfw_conv_log_filename())
         raise gr.Warning("Input prompt is blocked by the NSFW filter, please input safe content and try again!")
     
     yield state0, state1, generated_image0, generated_image1
@@ -755,7 +755,7 @@ def generate_igm_annoy(gen_func, state0, state1, text, model_name0, model_name1,
     state0.model_name = model_name0
     state1.model_name = model_name1
     if generated_image0 == '' and generated_image1 == '':
-        with open(get_conv_log_filename(), "a") as fout:
+        with open(get_nsfw_conv_log_filename(), "a") as fout:
             data = {
                 "type": "chat",
                 "model": model_name0,
@@ -765,7 +765,7 @@ def generate_igm_annoy(gen_func, state0, state1, text, model_name0, model_name1,
                 "ip": get_ip(request),
             }
             fout.write(json.dumps(data) + "\n")
-            append_json_item_on_log_server(data, get_conv_log_filename())
+            append_json_item_on_log_server(data, get_nsfw_conv_log_filename())
             data = {
                 "type": "chat",
                 "model": model_name1,
@@ -775,7 +775,7 @@ def generate_igm_annoy(gen_func, state0, state1, text, model_name0, model_name1,
                 "ip": get_ip(request),
             }
             fout.write(json.dumps(data) + "\n")
-            append_json_item_on_log_server(data, get_conv_log_filename())
+            append_json_item_on_log_server(data, get_nsfw_conv_log_filename())
         raise gr.Warning("Input prompt is blocked by the NSFW filter, please input safe content and try again!")
 
     
@@ -899,7 +899,7 @@ def generate_ie(gen_func, state, source_text, target_text, instruct_text, source
     state.model_name = model_name
 
     if generated_image == '':
-        with open(get_conv_log_filename(), "a") as fout:
+        with open(get_nsfw_conv_log_filename(), "a") as fout:
             data = {
                 "type": "chat",
                 "model": model_name,
@@ -909,7 +909,7 @@ def generate_ie(gen_func, state, source_text, target_text, instruct_text, source
                 "ip": get_ip(request),
             }
             fout.write(json.dumps(data) + "\n")
-            append_json_item_on_log_server(data, get_conv_log_filename())
+            append_json_item_on_log_server(data, get_nsfw_conv_log_filename())
         raise gr.Warning("Input prompt is blocked by the NSFW filter, please input safe content and try again!")
     
     yield state, generated_image
@@ -1021,7 +1021,7 @@ def generate_iem(gen_func, state0, state1, source_text, target_text, instruct_te
     state1.model_name = model_name1
 
     if generated_image0 == '' and generated_image1 == '':
-        with open(get_conv_log_filename(), "a") as fout:
+        with open(get_nsfw_conv_log_filename(), "a") as fout:
             data = {
                 "type": "chat",
                 "model": model_name0,
@@ -1031,7 +1031,7 @@ def generate_iem(gen_func, state0, state1, source_text, target_text, instruct_te
                 "ip": get_ip(request),
             }
             fout.write(json.dumps(data) + "\n")
-            append_json_item_on_log_server(data, get_conv_log_filename())
+            append_json_item_on_log_server(data, get_nsfw_conv_log_filename())
             data = {
                 "type": "chat",
                 "model": model_name1,
@@ -1041,7 +1041,7 @@ def generate_iem(gen_func, state0, state1, source_text, target_text, instruct_te
                 "ip": get_ip(request),
             }
             fout.write(json.dumps(data) + "\n")
-            append_json_item_on_log_server(data, get_conv_log_filename())
+            append_json_item_on_log_server(data, get_nsfw_conv_log_filename())
         raise gr.Warning("Input prompt is blocked by the NSFW filter, please input safe content and try again!")
 
     
@@ -1186,7 +1186,7 @@ def generate_iem_annoy(gen_func, state0, state1, source_text, target_text, instr
     state1.output = generated_image1
     state1.model_name = model_name1
     if generated_image0 == '' and generated_image1 == '':
-        with open(get_conv_log_filename(), "a") as fout:
+        with open(get_nsfw_conv_log_filename(), "a") as fout:
             data = {
                 "type": "chat",
                 "model": model_name0,
@@ -1196,7 +1196,7 @@ def generate_iem_annoy(gen_func, state0, state1, source_text, target_text, instr
                 "ip": get_ip(request),
             }
             fout.write(json.dumps(data) + "\n")
-            append_json_item_on_log_server(data, get_conv_log_filename())
+            append_json_item_on_log_server(data, get_nsfw_conv_log_filename())
             data = {
                 "type": "chat",
                 "model": model_name1,
@@ -1206,7 +1206,7 @@ def generate_iem_annoy(gen_func, state0, state1, source_text, target_text, instr
                 "ip": get_ip(request),
             }
             fout.write(json.dumps(data) + "\n")
-            append_json_item_on_log_server(data, get_conv_log_filename())
+            append_json_item_on_log_server(data, get_nsfw_conv_log_filename())
         raise gr.Warning("Input prompt is blocked by the NSFW filter, please input safe content and try again!")
 
     
@@ -1332,7 +1332,7 @@ def generate_vg(gen_func, state, text, model_name, request: gr.Request):
     state.output = generated_video
     state.model_name = model_name
     if generated_video == '':
-        with open(get_conv_log_filename(), "a") as fout:
+        with open(get_nsfw_conv_log_filename(), "a") as fout:
             data = {
                 "type": "chat",
                 "model": model_name,
@@ -1342,7 +1342,7 @@ def generate_vg(gen_func, state, text, model_name, request: gr.Request):
                 "ip": get_ip(request),
             }
             fout.write(json.dumps(data) + "\n")
-            append_json_item_on_log_server(data, get_conv_log_filename())
+            append_json_item_on_log_server(data, get_nsfw_conv_log_filename())
         raise gr.Warning("Input prompt is blocked by the NSFW filter, please input safe content and try again!")
 
 
@@ -1443,7 +1443,7 @@ def generate_vgm(gen_func, state0, state1, text, model_name0, model_name1, reque
     state0.model_name = model_name0
     state1.model_name = model_name1
     if generated_video0 == '' and generated_video1 == '':
-        with open(get_conv_log_filename(), "a") as fout:
+        with open(get_nsfw_conv_log_filename(), "a") as fout:
             data = {
                 "type": "chat",
                 "model": model_name0,
@@ -1453,7 +1453,7 @@ def generate_vgm(gen_func, state0, state1, text, model_name0, model_name1, reque
                 "ip": get_ip(request),
             }
             fout.write(json.dumps(data) + "\n")
-            append_json_item_on_log_server(data, get_conv_log_filename())
+            append_json_item_on_log_server(data, get_nsfw_conv_log_filename())
             data = {
                 "type": "chat",
                 "model": model_name1,
@@ -1463,7 +1463,7 @@ def generate_vgm(gen_func, state0, state1, text, model_name0, model_name1, reque
                 "ip": get_ip(request),
             }
             fout.write(json.dumps(data) + "\n")
-            append_json_item_on_log_server(data, get_conv_log_filename())
+            append_json_item_on_log_server(data, get_nsfw_conv_log_filename())
         raise gr.Warning("Input prompt is blocked by the NSFW filter, please input safe content and try again!")
 
     # yield state0, state1, generated_video0, generated_video1
@@ -1604,7 +1604,7 @@ def generate_vgm_annoy(gen_func, state0, state1, text, model_name0, model_name1,
     state0.model_name = model_name0
     state1.model_name = model_name1
     if generated_video0 == '' and generated_video1 == '':
-        with open(get_conv_log_filename(), "a") as fout:
+        with open(get_nsfw_conv_log_filename(), "a") as fout:
             data = {
                 "type": "chat",
                 "model": model_name0,
@@ -1614,7 +1614,7 @@ def generate_vgm_annoy(gen_func, state0, state1, text, model_name0, model_name1,
                 "ip": get_ip(request),
             }
             fout.write(json.dumps(data) + "\n")
-            append_json_item_on_log_server(data, get_conv_log_filename())
+            append_json_item_on_log_server(data, get_nsfw_conv_log_filename())
             data = {
                 "type": "chat",
                 "model": model_name1,
@@ -1624,7 +1624,7 @@ def generate_vgm_annoy(gen_func, state0, state1, text, model_name0, model_name1,
                 "ip": get_ip(request),
             }
             fout.write(json.dumps(data) + "\n")
-            append_json_item_on_log_server(data, get_conv_log_filename())
+            append_json_item_on_log_server(data, get_nsfw_conv_log_filename())
         raise gr.Warning("Input prompt is blocked by the NSFW filter, please input safe content and try again!")