init

tmp/12700117287042505075724.jpg → Datas/UserRecord_1/Ips/127.0.0.1.pkl

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e3e4f3218373561c3063988aa1bdd53ac34652c5fc21c15df69d260cfcc774ec
-size 60553
+oid sha256:16b78f6ccd9445ae37a2e9f1db8b60633acb8dae7e1e8fa97fa86268e80f4668
+size 306

Datas/UserRecord_2/Ips/127.0.0.1.pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a320c492b81763b540da6e823b2c8eaa2c3151d6a77bf9b107b647b8fc81aa29
+size 7442

Datas/UserRecord_3/Ips/127.0.0.1.pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d548af32b28aacce0ff6f28b98e6a4528553818c281cef7752a4bf843ddbf2a6
+size 569

Datas/UserRecord_6/Ips/127.0.0.1.pkl

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:94d8b6463d24175ce07c7e3c63920c1028089b49010e33edd8c2ffaef17f0bac
+size 830

app.py

@@ -16,15 +16,29 @@ css = """
 
 
 def onClick(temp_image, user_image, caption_text, token_text, request: gr.Request):
-    print("======> temp_image ", type(temp_image), temp_image)
+
+    user_mask = None
+    if taskType=='2':
+        user_mask = user_image['layers'][0]
+        user_image = user_image['background']
+        user_mask = (user_mask.sum(2)>0).astype(np.uint8)*255
+        user_image = np.array(Image.fromarray(user_image).convert('RGB'))
+        if user_image.sum()==0:
+            yield None, "please upload a photo!!!"
+            return None, "please upload a photo!!!"
+        if user_mask.sum()==0:
+            yield None, "please draw a area!!!"
+            return None, "please draw a area!!!" 
+
+    print("======> temp_image ", type(temp_image))
     print("======> user_image ", type(user_image))
     print("======> caption_text ", type(caption_text))
     if temp_image is None: 
         yield None, "please choose a template background!!!"
         return None, "please choose a template background!!!"
     if user_image is None: 
-        yield None, "please upload a product photo!!!"
-        return None, "please upload a product photo!!!"
+        yield None, "please upload a photo!!!"
+        return None, "please upload a photo!!!"
 
     try:
         client_ip = request.client.host
@@ -40,21 +54,21 @@ def onClick(temp_image, user_image, caption_text, token_text, request: gr.Reques
             return None, info
 
         # 上传用户照片
-        upload_url = upload_user_img(client_ip, user_image)
+        upload_url, uploadm_url = upload_user_img_mask(client_ip, user_image, user_mask)
         if len(upload_url)==0:
             yield None, "fail to upload"
             return None, "fail to upload"
 
+        # return 
         # 发布任务
-        taskId = publicSelfitTask(upload_url, temp_image, caption_text)
+        taskId = publicSelfitTask(upload_url, uploadm_url, temp_image, caption_text)
         if not taskId:
             yield None, "fail to public task..."
             return None, "fail to public task..."
-
-        # taskId = "95a19e33-1ff5-446e-ac37-d3a8dd59eba8-e1"
+            
         max_try = 30
         wait_s = 3
-        time.sleep(5)
+        # time.sleep(2)
         for i in range(max_try):
             time.sleep(wait_s)
             taskStatus = getTaskRes(taskId)
@@ -103,7 +117,13 @@ with gr.Blocks(css=css) as demo:
                     examples=temp_examples, visible=TempVisible)
         with gr.Column():
             with gr.Column():
-                user_image = gr.Image(value=None, type="numpy", label=UserLabel)
+                if taskType=='2':
+                    brush = gr.Brush(colors=['#FF0000'], color_mode='fixed')
+                    user_image = gr.ImageEditor(value=None, type="numpy", 
+                        eraser=False, brush=brush ,layers=False, sources=['upload',],
+                        transforms=[], label=UserLabel)
+                else:
+                    user_image = gr.Image(value=None, type="numpy", label=UserLabel)
                 caption_text = gr.Textbox(value="", interactive=True, label=CaptionLabel, visible=CapVisible)
         with gr.Column():
             with gr.Column():

config.py

@@ -11,6 +11,7 @@ import requests
 import func_timeout
 import numpy as np
 import gradio as gr
+from PIL import Image
 from collections import OrderedDict
 
 
@@ -129,6 +130,28 @@ elif taskType=="1":
     CaptionLabel = "English caption text (optional)"
     CapVisible = False
    
+elif taskType=="2":
+    # 是否显示token输入框
+    is_show_token = True
+    # 标题
+    title = r"""
+    <h1 align="center">Selfit AI App: Object Remove</h1>
+    """
+    # 标题下的描述
+    description = r"""
+    Go to <a href='https://heybeauty.ai/extension' target='_blank'><b>HeyBeauty</b></a> for Faster and Free AI App! 🤗 .<br>
+
+    1. Please wait for a while after submitting the task, you will get the result within 30 seconds.
+    2. After exhausted all trial attempts, you can <a href='https://heybeauty.ai/keys' target='_blank'><b>find your api key here</b></a> .<br>
+    3. Share app with your friends and enjoy! 😊.<br>
+    """
+    # 组件信息
+    TempLabel = "guide"
+    TempVisible = True
+    UserLabel = "upload and paint photo"
+    CaptionLabel = "English caption text (optional)"
+    CapVisible = False
+
 else:
     # 是否显示token输入框
     is_show_token = False

utils.py

@@ -86,7 +86,7 @@ class UserRecorder(object):
             if token_valid:
                 return True, ""
             else:
-                return False, "token is invalid"
+                return False, "api key is invalid"
         else:
             _, total_n, _ = self.get_record(ip=ip, token=token)
             if total_n>=LimitTask:
@@ -110,7 +110,6 @@ class UserRecorder(object):
         success_n, fail_n, process_n = 0, 0, 0
         shows = [None]*6
         show_i = 0
-        print(record_data)
         for key in reversed(record_data):
             status = record_data[key]['status']
             if status in ['FAILED', 'CANCELLED', 'TIMED_OUT', ]:
@@ -189,6 +188,10 @@ def get_showcase_examples(taskType):
         examples=[
             ["task1/temps/caption.jpg", "task1/srcs/src01.jpg", "task1/showcases/src01_seg.png"],
         ]
+    elif taskType=="2":
+        examples=[
+            ["task2/temps/caption.jpg", "task2/srcs/street.webp", "task2/showcases/out1.jpg"],
+        ]
 
     for i in range(len(examples)):
         for j in range(len(examples[i])):
@@ -201,12 +204,16 @@ def get_result_example(cloth_id, pose_id):
     res_path = os.path.join(result_dir, f"{cloth_id}_{pose_id}.jpg")
     return res_path
 
-def upload_user_img(clientIp, img):
+def upload_user_img_mask(clientIp, img, mask=None):
     timeId = int(  str(time.time()).replace(".", "")  )+random.randint(1000, 9999)
     fileName = clientIp.replace(".", "")+str(timeId)+".jpg"
     local_path = os.path.join(tmpFolder, fileName)
-    cv2.imwrite(os.path.join(tmpFolder, fileName), img[:,:,::-1])
-    params = {'token':uploadToken, 'input1':fileName, 'input2':''}
+    filemName = clientIp.replace(".", "")+str(timeId)+"_m.jpg"
+    localm_path = os.path.join(tmpFolder, filemName)
+    cv2.imwrite(local_path, img[:,:,::-1].astype(np.uint8))
+    if mask is not None:
+        cv2.imwrite(localm_path, mask)
+    params = {'token':uploadToken, 'input1':fileName, 'input2':filemName}
     session = requests.session()
     ret = requests.post(f"{apiUrl}/upload", data=json.dumps(params))
     res = ""
@@ -216,6 +223,7 @@ def upload_user_img(clientIp, img):
     ctype = head_dict[ftype]
     headers = {"Content-Type": ctype}
 
+    uploadm_url = ''
     if ret.status_code==200:
         if 'upload1' in ret.json():
             upload_url = ret.json()['upload1']
@@ -225,19 +233,28 @@ def upload_user_img(clientIp, img):
                     res = upload_url
                 else:
                     print(response)
+            if mask is not None:
+                uploadm_url = ret.json()['upload2']
+                with open(localm_path, 'rb') as file:
+                    response = requests.put(uploadm_url, data=file, headers=headers)
+                    if response.status_code == 200:
+                        pass
+                    else:
+                        uploadm_url = ''
+                        print(response)              
     else:
         print(ret.json(), ret.status_code, 'call upload failed')
-    if os.path.exists(local_path):
-        os.remove(local_path)
-    return res
+    if os.path.exists(local_path): os.remove(local_path)
+    if os.path.exists(localm_path): os.remove(localm_path)
+    return res, uploadm_url
 
 
-def publicSelfitTask(image, temp_image, caption_text):
+def publicSelfitTask(image, mask, temp_image, caption_text):
     if taskType in ['5']: # 无模板
         temp_name = ''
     else:
         temp_name = os.path.basename(temp_image).split('.')[0]
-    params = {'openId':openId, 'apiKey':apiKey, 'image':image, 'mask':"",
+    params = {'openId':openId, 'apiKey':apiKey, 'image':image, 'mask':mask,
         "image_type":"2", "task_type":taskType, 'param1':temp_name, 
         'param2':str(caption_text), 'param3':"1", 'param4':"", 'param5':""}
     session = requests.session()