init

app.py

@@ -20,7 +20,7 @@ description = r"""
 mk_guide = ""
 
 
-def onClick(cloth_image, pose_image, size):
+def onClick(cloth_image, pose_image, high_resolution):
     if pose_image is None:
         yield None, "no pose image found !", ""
         return None, "no pose image found !", ""
@@ -30,95 +30,55 @@ def onClick(cloth_image, pose_image, size):
 
     pose_id = os.path.basename(pose_image).split(".")[0]
     cloth_id = int(os.path.basename(cloth_image).split(".")[0])
-    if len(pose_id)>0:
-        res = get_result_example(cloth_id, pose_id)
-        # print(res)
-        if os.path.exists(res):
-            yield res, "Done! Use the pre-run results directly, the cloth size does not take effect ", mk_guide
-            return res, "Done! Use the pre-run results directly, the cloth size does not take effect ", mk_guide
             
     try:
         client_ip = '8.8.8.8'
         yield None, "begin to upload ", ""
 
         timeId = int(  str(time.time()).replace(".", "")  )+random.randint(1000, 9999)
-        isUpload = upload_pose_img(ApiUrl, OpenId, ApiKey, client_ip, timeId, pose_image)
+        upload_url = upload_pose_img(ApiUrl, OpenId, ApiKey, client_ip, timeId, pose_image)
+        # exit(0)
         yield None, "begin to public task ", ""
+        # return None, "begin to public task ", ""
         
-        if isUpload==0:
+        if len(upload_url)==0:
             yield None, "fail to upload", ""
             return None, "fail to upload", ""
-        elif isUpload==-1:
-            yield None, "There is a running task already, please wait and check the history tab. Please remember to give us a star on github, thx~", ""
-            return None, "There is a running task already, please wait and check the history tab. Please remember to give us a star on github, thx~", ""
-        
-        elif isUpload==-2:
-            yield None, "can not creat task, you have exhausted free trial quota", ""
-            return None, "can not creat task, you have exhausted free trial quota", ""
 
-        taskId = publicClothSwap(ApiUrl, OpenId, ApiKey, client_ip, cloth_id, timeId, size)
-        if taskId==0:
+        if high_resolution:
+            public_res = publicClothSwap(upload_url, cloth_id, is_hr=1)
+        else:
+            public_res = publicClothSwap(upload_url, cloth_id, is_hr=0)
+        if public_res is None:
             yield None, "fail to public you task", ""
             return None, "fail to public you task", ""
 
-        max_try = 100
-        wait_s = 1.5
+        yield public_res['mid_result'], f"task is processing, task id: {public_res['id']}, {public_res['msg']}", ""
+
+        max_try = 120
+        wait_s = 1
         for i in range(max_try):
             time.sleep(wait_s)
-            state = getInfRes(ApiUrl, OpenId, ApiKey, client_ip, timeId)
-            if state=='stateIs-1':
-                yield None, "task failed, it may be that no human was detected, or there may be illegal content, etc. ", ""
-                return None, "task failed, it may be that no human was detected, or there may be illegal content, etc. ", ""
-            elif state=='stateIs0':
-                yield None, "task not public success", ""
-                return None, "task not public success", ""
-            elif len(state)>20:
-                yield state, "task finished", ""
-                return state, "task finished", ""
-            elif (not state.startswith('stateIs')):
-                yield None, f"task is on processing, query {i}", ""
-                pass
+            state = getInfRes(public_res['id'])
+            timestamp = int(time.time() * 1000)
+            if state is None:
+                yield public_res['mid_result'] + f"?t={timestamp}", "task query failed,", ""
+            elif state['status']=='PROCESSING':
+                yield public_res['mid_result'] + f"?t={timestamp}", f"task is processing, query {i}", ""
+            elif state['status']=='SUCCEED':
+                yield state['output1'] + f"?t={timestamp}", f"task finished, {state['msg']}", ""
+                return state['output1'] + f"?t={timestamp}", f"task finished, {state['msg']}", ""
+            elif state['status']=='FAILED':
+                yield state['mid_result'] + f"?t={timestamp}", f"task failed, {state['msg']}", ""
+                return state['mid_result'] + f"?t={timestamp}", f"task failed, {state['msg']}", ""
             else:
-                return None, state, ""
-        return None, "task has been created successfully, you can refresh the page 5~15 mins latter, and check the following history tab", ""
+                yield public_res['mid_result'] + f"?t={timestamp}", f"task is on processing, query {i}", ""
+        return None, "no machine...", ""
     except Exception as e:
         print(e)
         raise e
         return None, "fail to create task", ""
 
-def onLoad(request: gr.Request):
-    client_ip = '8.8.8.8'
-    his_datas = [None for _ in range(10)]
-    info = ''
-    try:
-        infs = getAllInfs(ApiUrl, OpenId, ApiKey, client_ip)
-        print(client_ip, 'history infs: ', len(infs))
-        cnt = 0
-        finish_n, fail_n, queue_n = 0, 0, 0
-        for i, inf in enumerate(infs):
-            if inf['state']==2:
-                if cnt>4: continue
-                pose, res = inf['pose'], inf['res']
-                his_datas[cnt*2] = f"<img src=\"{pose}\" >"
-                his_datas[cnt*2+1] = f"<img src=\"{res}\" >"
-                finish_n += 1
-                cnt += 1
-            elif inf['state'] in [-1, -2, 0]:
-                fail_n += 1
-            elif inf['state'] in [1]:
-                queue_n += 1
-        info = f"{client_ip}, you have {finish_n} successed tasks, {queue_n} running tasks, {fail_n} failed tasks."
-        if fail_n>0:
-            info = info+" Please upload a half/full-body human image, not just a clothing image!!!"
-        if queue_n>0:
-            info = info+" Wait for 20s and refresh this page, successed results will display in the history tab at the bottom"
-            
-    except Exception as e:
-        print(e)
-    his_datas = his_datas + [info]
-    return his_datas
-
-
 with gr.Blocks() as demo:
     gr.Markdown(title)
     gr.Markdown(description)
@@ -142,7 +102,9 @@ with gr.Blocks() as demo:
             
         with gr.Column():
             with gr.Column():
-                size_slider = gr.Slider(-3, 3, value=1, interactive=True, label="clothes size")
+                # size_slider = gr.Slider(-3, 3, value=1, interactive=True, label="clothes size")
+                high_resolution = gr.Checkbox(value=False, label="high resolution", interactive=True)
+                
                 run_button = gr.Button(value="Run")
                 info_text = gr.Textbox(value="", interactive=False, 
                     label='runtime information')                
@@ -150,48 +112,48 @@ with gr.Blocks() as demo:
                 MK01 = gr.Markdown()
 
                 
-    with gr.Tab('history'):
+    # with gr.Tab('history'):
 
-        with gr.Row():  # 用 Row 包裹按钮
-            with gr.Column(scale=0.5):  # Button 占用 Row 的一半
-                refresh_button = gr.Button("Refresh History", size="small")
-        MK02 = gr.Markdown(value="")  # 示例 Markdown 内容
+    #     with gr.Row():  # 用 Row 包裹按钮
+    #         with gr.Column(scale=0.5):  # Button 占用 Row 的一半
+    #             refresh_button = gr.Button("Refresh History", size="small")
+    #     MK02 = gr.Markdown(value="")  # 示例 Markdown 内容
 
-        # with gr.Row():
-        #     MK02 = gr.Markdown()
+    #     # with gr.Row():
+    #     #     MK02 = gr.Markdown()
 
-        with gr.Row():
-            his_pose_image1 = gr.HTML()
-            his_res_image1 = gr.HTML()
+    #     with gr.Row():
+    #         his_pose_image1 = gr.HTML()
+    #         his_res_image1 = gr.HTML()
 
-        with gr.Row():
-            his_pose_image2 = gr.HTML()
-            his_res_image2 = gr.HTML()
+    #     with gr.Row():
+    #         his_pose_image2 = gr.HTML()
+    #         his_res_image2 = gr.HTML()
 
-        with gr.Row():
-            his_pose_image3 = gr.HTML()
-            his_res_image3 = gr.HTML()            
+    #     with gr.Row():
+    #         his_pose_image3 = gr.HTML()
+    #         his_res_image3 = gr.HTML()            
 
-        with gr.Row():
-            his_pose_image4 = gr.HTML()
-            his_res_image4 = gr.HTML()            
+    #     with gr.Row():
+    #         his_pose_image4 = gr.HTML()
+    #         his_res_image4 = gr.HTML()            
 
-        with gr.Row():
-            his_pose_image5 = gr.HTML()
-            his_res_image5 = gr.HTML()            
+    #     with gr.Row():
+    #         his_pose_image5 = gr.HTML()
+    #         his_res_image5 = gr.HTML()            
 
-    run_button.click(fn=onClick, inputs=[cloth_image, pose_image, size_slider], 
+    run_button.click(fn=onClick, inputs=[cloth_image, pose_image, high_resolution], 
                      outputs=[res_image, info_text, MK01])
 
-    refresh_button.click(fn=onLoad, inputs=[], outputs=[his_pose_image1, his_res_image1,
-        his_pose_image2, his_res_image2, his_pose_image3, his_res_image3,
-        his_pose_image4, his_res_image4, his_pose_image5, his_res_image5,
-        MK02])
+    # refresh_button.click(fn=onLoad, inputs=[], outputs=[his_pose_image1, his_res_image1,
+    #     his_pose_image2, his_res_image2, his_pose_image3, his_res_image3,
+    #     his_pose_image4, his_res_image4, his_pose_image5, his_res_image5,
+    #     MK02])
 
-    demo.load(onLoad, inputs=[], outputs=[his_pose_image1, his_res_image1,
-        his_pose_image2, his_res_image2, his_pose_image3, his_res_image3,
-        his_pose_image4, his_res_image4, his_pose_image5, his_res_image5,
-        MK02])
+    # demo.load(onLoad, inputs=[], outputs=[his_pose_image1, his_res_image1,
+    #     his_pose_image2, his_res_image2, his_pose_image3, his_res_image3,
+    #     his_pose_image4, his_res_image4, his_pose_image5, his_res_image5,
+    #     MK02])
 
 if __name__ == "__main__":
 

util_bak.py

@@ -0,0 +1,156 @@
+
+import os
+import sys
+import cv2
+import json
+import random
+import time
+import requests
+import func_timeout
+import numpy as np
+import gradio as gr
+
+
+ApiUrl = "https://selfitcamera.site/public"
+OpenId = 'ovB-x639B8QwdfF7kQYS9QKdK6u8'
+ApiKey = 'be0b28ba433b6245ce10b7c341f'
+OssUrl = "https://selfit-deploy-1256039085.cos.accelerate.myqcloud.com/"
+Regions = "IndiaKorea"
+
+
+proj_dir = os.path.dirname(os.path.abspath(__file__))
+data_dir = os.path.join(proj_dir, 'Datas')
+# data_dir = "Datas"
+tmpFolder = "tmp"
+os.makedirs(tmpFolder, exist_ok=True)
+
+
+def get_cloth_examples(hr=0):
+    cloth_dir = os.path.join(data_dir, 'ClothImgs')
+    examples = []
+    files = sorted(os.listdir(cloth_dir))
+    hr_clothes = [507, 508]
+    for f in files:
+        if '.jpg' not in f and '.png' not in f:
+            continue
+
+        cloth_id = f.split(".")[0]
+        if int(cloth_id) in hr_clothes and hr==0:
+            continue
+        if int(cloth_id) not in hr_clothes and hr==1:
+            continue
+
+        cloth_path = os.path.join(cloth_dir, f)
+        examples.append(cloth_path)
+    examples = examples[::-1]
+    return examples
+
+def get_pose_examples():
+    pose_dir = os.path.join(data_dir, 'PoseImgs')
+    examples = []
+    for f in os.listdir(pose_dir):
+        if '.jpg' not in f and '.png' not in f:
+            continue
+        pose_id = f.split(".")[0]
+        pose_path = os.path.join(pose_dir, f)
+        examples.append(pose_path)
+    return examples
+
+def get_result_example(cloth_id, pose_id):
+    result_dir = os.path.join(data_dir, 'ResultImgs')
+    res_path = os.path.join(result_dir, f"{cloth_id}_{pose_id}.jpg")
+    return res_path
+
+def get_tips():
+    path1 = OssUrl+'ClothData/Publics/PoseGuide/tip1.jpg'
+    path2 = OssUrl+'ClothData/Publics/PoseGuide/tip2.jpg'
+    return path1, path2
+    
+def getAllInfs(apiUrl, openId, apiKey, clientIp):
+    params = {'openId':openId, 'apiKey':apiKey, 'ipId':clientIp}
+    session = requests.session()
+    ret = requests.get(f"{apiUrl}/api/all_infs", params=params)
+    res = []
+    if ret.status_code==200:
+        if 'data' in ret.json():
+            records = ret.json()['data']['records']
+            for record in records:
+                res.append({'pose':OssUrl+record['body_url']+"?thumbnail/768x768>", 
+                    'res':OssUrl+record['showUrl']+"?thumbnail/768x768>",
+                    'state':int(record['state'])})
+                # res.append({'pose':OssUrl+record['body_url'], 
+                #     'res':OssUrl+record['showUrl']})
+    return res
+
+
+def upload_pose_img(apiUrl, openId, apiKey, clientIp, timeId, img):
+    fileName = clientIp.replace(".", "")+str(timeId)+".jpg"
+    local_path = os.path.join(tmpFolder, fileName)
+    img = cv2.imread(img)
+    cv2.imwrite(os.path.join(tmpFolder, fileName), img)
+    params = {'openId':openId, 'apiKey':apiKey, 'ipId':clientIp, 
+        'timeId':str(timeId), 'fileName':fileName}
+    session = requests.session()
+    ret = requests.get(f"{apiUrl}/api/inf_upload", params=params)
+    res = 0
+    if ret.status_code==200:
+        if 'data' in ret.json():
+            upload_url = ret.json()['data']
+            if 'running' in upload_url:
+                res = -1 # 存在正在进行的任务
+            elif 'no_coin' in upload_url:
+                res = -2 # 该ip已经用完了quota
+            else:
+                with open(local_path, 'rb') as file:
+                    response = requests.put(upload_url, data=file)
+                    if response.status_code == 200:
+                        res = 1
+    if os.path.exists(local_path):
+        os.remove(local_path)
+    return res
+
+
+def publicClothSwap(apiUrl, openId, apiKey, clientIp, clothId, timeId, size):
+    params = {'openId':openId, 'apiKey':apiKey, 'ipId':clientIp, 
+        'timeId':timeId, 'clothId':int(clothId), 'bmi':size}
+    session = requests.session()
+    ret = requests.get(f"{apiUrl}/api/cloth_swap", params=params)
+    if ret.status_code==200:
+        if 'data' not in ret.json():
+            print(ret.json())
+            return 0
+        taskId = ret.json()['data']
+        return taskId
+    else:
+        return 0
+
+def getInfRes(apiUrl, openId, apiKey, clientIp, timeId):
+    params = {'openId':openId, 'apiKey':apiKey, 'ipId':clientIp, 'timeId':timeId}
+    session = requests.session()
+    ret = requests.get(f"{apiUrl}/api/getInfRes", params=params)
+    if ret.status_code==200:
+        if 'data' not in ret.json():
+            print(ret.json())
+            return 0
+        return ret.json()['data']
+    else:
+        return 0
+
+@func_timeout.func_set_timeout(10)
+def check_region(ip):
+    session = requests.session()
+    ret = requests.get(f"https://webapi-pc.meitu.com/common/ip_location?ip={ip}")
+    for k in ret.json()['data']:
+        nat = ret.json()['data'][k]['nation']
+        if nat in Regions:
+            print(nat, 'invalid')
+            return False
+        else:
+            print(nat, 'valid')
+    return True
+def check_region_warp(ip):
+    try:
+        return check_region(ip)
+    except Exception as e:
+        print(e)
+        return True

utils.py

@@ -16,6 +16,7 @@ OpenId = 'ovB-x639B8QwdfF7kQYS9QKdK6u8'
 ApiKey = 'be0b28ba433b6245ce10b7c341f'
 OssUrl = "https://selfit-deploy-1256039085.cos.accelerate.myqcloud.com/"
 Regions = "IndiaKorea"
+TOKEN = os.environ['TOKEN']
 
 
 proj_dir = os.path.dirname(os.path.abspath(__file__))
@@ -88,53 +89,87 @@ def upload_pose_img(apiUrl, openId, apiKey, clientIp, timeId, img):
     local_path = os.path.join(tmpFolder, fileName)
     img = cv2.imread(img)
     cv2.imwrite(os.path.join(tmpFolder, fileName), img)
-    params = {'openId':openId, 'apiKey':apiKey, 'ipId':clientIp, 
-        'timeId':str(timeId), 'fileName':fileName}
+
+    json_data = {
+        "token": "c0e69e5d129b11efa10c525400b75156",  # 使用 apiKey 作为 token
+        "input1": fileName,
+        "input2": "",
+        "protocol": "",
+        "cloud": "ali"
+    }
+    
     session = requests.session()
-    ret = requests.get(f"{apiUrl}/api/inf_upload", params=params)
-    res = 0
+    ret = requests.post(
+        f"https://selfitapi.uk/upload",
+        headers={'Content-Type': 'application/json'},
+        json=json_data
+    )
+    
+    res = ""
     if ret.status_code==200:
-        if 'data' in ret.json():
-            upload_url = ret.json()['data']
-            if 'running' in upload_url:
-                res = -1 # 存在正在进行的任务
-            elif 'no_coin' in upload_url:
-                res = -2 # 该ip已经用完了quota
-            else:
-                with open(local_path, 'rb') as file:
-                    response = requests.put(upload_url, data=file)
-                    if response.status_code == 200:
-                        res = 1
+        if 'upload1' in ret.json():
+            upload_url = ret.json()['upload1']
+            headers = {'Content-Type': 'image/jpeg'}
+            response = session.put(upload_url, data=open(local_path, 'rb').read(), headers=headers)
+            print(response.status_code)
+            if response.status_code == 200:
+                res = upload_url
     if os.path.exists(local_path):
         os.remove(local_path)
     return res
 
 
-def publicClothSwap(apiUrl, openId, apiKey, clientIp, clothId, timeId, size):
-    params = {'openId':openId, 'apiKey':apiKey, 'ipId':clientIp, 
-        'timeId':timeId, 'clothId':int(clothId), 'bmi':size}
-    session = requests.session()
-    ret = requests.get(f"{apiUrl}/api/cloth_swap", params=params)
-    if ret.status_code==200:
-        if 'data' not in ret.json():
-            print(ret.json())
-            return 0
-        taskId = ret.json()['data']
-        return taskId
+def publicClothSwap(image, clothId, is_hr=0):
+    json_data = {
+        "image": image,
+        "task_type": "11", 
+        "param1": str(clothId),
+        "param2": "",
+        "param3": "",
+        "param4": str(is_hr),
+        "delete_if_complete": "0"
+    }
+    
+    headers = {
+        'Authorization': f'Bearer {TOKEN}',
+        'Content-Type': 'application/json'
+    }
+    
+    ret = requests.post(
+        'https://selfitapi.uk/public_advton',
+        headers=headers,
+        json=json_data
+    )
+    
+    if ret.status_code == 200:
+        response = ret.json()
+        if 'mid_result' in response and 'id' in response:
+            return {'mid_result': response['mid_result'], 'id': response['id'], "msg": response['msg']}
+        print(response)
+        return None
     else:
-        return 0
-
-def getInfRes(apiUrl, openId, apiKey, clientIp, timeId):
-    params = {'openId':openId, 'apiKey':apiKey, 'ipId':clientIp, 'timeId':timeId}
-    session = requests.session()
-    ret = requests.get(f"{apiUrl}/api/getInfRes", params=params)
-    if ret.status_code==200:
-        if 'data' not in ret.json():
-            print(ret.json())
-            return 0
-        return ret.json()['data']
+        return None
+
+def getInfRes(taskId):
+    headers = {
+        'Content-Type': 'application/json'
+    }
+    json_data = {
+        'id': taskId
+    }
+    ret = requests.post(
+        'https://selfitapi.uk/status_advton',
+        headers=headers,
+        json=json_data
+    )
+    if ret.status_code == 200:
+        response = ret.json()
+        if 'status' in response:
+            return response
+        print(response)
+        return None
     else:
-        return 0
+        return None
 
 @func_timeout.func_set_timeout(10)
 def check_region(ip):