proper commit

app.py

@@ -10,6 +10,8 @@ import requests
 import json
 import time
 
+
+
 # Add a new function for text-to-image generation
 def generate_garment_image(prompt):
     # This is a placeholder function. You'll need to implement actual text-to-image generation here.
@@ -20,32 +22,32 @@ def generate_garment_image(prompt):
     return placeholder_image
 
 def tryon(person_img, garment_prompt, seed, randomize_seed):
-    try:
-        post_start_time = time.time()
-        if person_img is None or garment_prompt == "":
-            return None, seed, "Empty image or prompt"
-        if randomize_seed:
-            seed = random.randint(0, MAX_SEED)
+    post_start_time = time.time()
+    if person_img is None or garment_prompt == "":
+        return None, None, "Empty image or prompt"
+    if randomize_seed:
+        seed = random.randint(0, MAX_SEED)
+
+
     # Generate garment image from prompt
-        # Generate garment image from prompt
-        garment_img = generate_garment_image(garment_prompt)
-        
-        encoded_person_img = cv2.imencode('.jpg', cv2.cvtColor(person_img, cv2.COLOR_RGB2BGR))[1].tobytes()
-        encoded_person_img = base64.b64encode(encoded_person_img).decode('utf-8')
-        encoded_garment_img = cv2.imencode('.jpg', cv2.cvtColor(garment_img, cv2.COLOR_RGB2BGR))[1].tobytes()
-        encoded_garment_img = base64.b64encode(encoded_garment_img).decode('utf-8')
+    garment_img = generate_garment_image(garment_prompt)
+    
+    encoded_person_img = cv2.imencode('.jpg', cv2.cvtColor(person_img, cv2.COLOR_RGB2BGR))[1].tobytes()
+    encoded_person_img = base64.b64encode(encoded_person_img).decode('utf-8')
+    encoded_garment_img = cv2.imencode('.jpg', cv2.cvtColor(garment_img, cv2.COLOR_RGB2BGR))[1].tobytes()
+    encoded_garment_img = base64.b64encode(encoded_garment_img).decode('utf-8')
 
-        url = "http://" + os.environ['tryon_url'] + "Submit"
-        token = os.environ['token']
-        cookie = os.environ['Cookie']
-        referer = os.environ['referer']
-        headers = {'Content-Type': 'application/json', 'token': token, 'Cookie': cookie, 'referer': referer}
-        data = {
-            "clothImage": encoded_garment_img,
-            "humanImage": encoded_person_img,
-            "seed": seed
-        }
-        
+    url = "http://" + os.environ['tryon_url'] + "Submit"
+    token = os.environ['token']
+    cookie = os.environ['Cookie']
+    referer = os.environ['referer']
+    headers = {'Content-Type': 'application/json', 'token': token, 'Cookie': cookie, 'referer': referer}
+    data = {
+        "clothImage": encoded_garment_img,
+        "humanImage": encoded_person_img,
+        "seed": seed
+    }
+    try:
         response = requests.post(url, headers=headers, data=json.dumps(data), timeout=50)
         print("post response code", response.status_code)
         if response.status_code == 200:
@@ -54,49 +56,47 @@ def tryon(person_img, garment_prompt, seed, randomize_seed):
             if status == "success":
                 uuid = result['result']
                 print(uuid)
-        else:
-            return None, seed, f"Error: HTTP {response.status_code}"
+    except Exception as err:
+        print(f"Error: {err}")
+        raise gr.Error("Too many users, please try again later")
+    post_end_time = time.time()
+    print(f"post time used: {post_end_time-post_start_time}")
 
-        post_end_time = time.time()
-        print(f"post time used: {post_end_time-post_start_time}")
+    get_start_time =time.time()
+    time.sleep(9)
+    Max_Retry = 10
+    result_img = None
+    for i in range(Max_Retry):
+        try:
+            url = "http://" + os.environ['tryon_url'] + "Query?taskId=" + uuid
+            response = requests.get(url, headers=headers, timeout=15)
+            print("get response code", response.status_code)
+            if response.status_code == 200:
+                result = response.json()['result']
+                status = result['status']
+                if status == "success":
+                    result = base64.b64decode(result['result'])
+                    result_np = np.frombuffer(result, np.uint8)
+                    result_img = cv2.imdecode(result_np, cv2.IMREAD_UNCHANGED)
+                    result_img = cv2.cvtColor(result_img, cv2.COLOR_RGB2BGR)
+                    info = "Success"
+                    break
+                elif status == "error":
+                    raise gr.Error("Too many users, please try again later")
+            else:
+                print(response.text)
+                info = "URL error, pleace contact the admin"
+        except requests.exceptions.ReadTimeout:
+            print("timeout")
+            info = "Too many users, please try again later"
+        except Exception as err:
+            print(f"Error: {err}")
+        time.sleep(1)
+    get_end_time = time.time()
+    print(f"get time used: {get_end_time-get_start_time}")
 
-        get_start_time = time.time()
-        time.sleep(9)
-        Max_Retry = 10
-        result_img = None
-        for i in range(Max_Retry):
-            try:
-                url = "http://" + os.environ['tryon_url'] + "Query?taskId=" + uuid
-                response = requests.get(url, headers=headers, timeout=15)
-                print("get response code", response.status_code)
-                if response.status_code == 200:
-                    result = response.json()['result']
-                    status = result['status']
-                    if status == "success":
-                        result = base64.b64decode(result['result'])
-                        result_np = np.frombuffer(result, np.uint8)
-                        result_img = cv2.imdecode(result_np, cv2.IMREAD_UNCHANGED)
-                        result_img = cv2.cvtColor(result_img, cv2.COLOR_RGB2BGR)
-                        info = "Success"
-                        break
-                    elif status == "error":
-                        return None, seed, "Too many users, please try again later"
-                else:
-                    print(response.text)
-                    info = "URL error, please contact the admin"
-            except requests.exceptions.ReadTimeout:
-                print("timeout")
-                info = "Too many users, please try again later"
-            except Exception as err:
-                print(f"Error: {err}")
-            time.sleep(1)
-        get_end_time = time.time()
-        print(f"get time used: {get_end_time-get_start_time}")
+    return result_img, seed, info
 
-        return result_img, seed, info
-    except Exception as e:
-        print(f"An error occurred: {str(e)}")
-        return None, seed, f"An error occurred: {str(e)}"
 
 def start_tryon(person_img, garment_prompt, seed, randomize_seed):
     start_time = time.time()
@@ -106,78 +106,60 @@ def start_tryon(person_img, garment_prompt, seed, randomize_seed):
         seed = random.randint(0, MAX_SEED)
     
     # Generate garment image from prompt
-        # Generate garment image from prompt
-        garment_img = generate_garment_image(garment_prompt)
-        
-        encoded_person_img = cv2.imencode('.jpg', cv2.cvtColor(person_img, cv2.COLOR_RGB2BGR))[1].tobytes()
-        encoded_person_img = base64.b64encode(encoded_person_img).decode('utf-8')
-        encoded_garment_img = cv2.imencode('.jpg', cv2.cvtColor(garment_img, cv2.COLOR_RGB2BGR))[1].tobytes()
-        encoded_garment_img = base64.b64encode(encoded_garment_img).decode('utf-8')
+    garment_img = generate_garment_image(garment_prompt)
+    
+    encoded_person_img = cv2.imencode('.jpg', cv2.cvtColor(person_img, cv2.COLOR_RGB2BGR))[1].tobytes()
+    encoded_person_img = base64.b64encode(encoded_person_img).decode('utf-8')
+    encoded_garment_img = cv2.imencode('.jpg', cv2.cvtColor(garment_img, cv2.COLOR_RGB2BGR))[1].tobytes()
+    encoded_garment_img = base64.b64encode(encoded_garment_img).decode('utf-8')
 
-        url = "http://" + os.environ['tryon_url'] + "Submit"
-        token = os.environ['token']
-        cookie = os.environ['Cookie']
-        referer = os.environ['referer']
-        headers = {'Content-Type': 'application/json', 'token': token, 'Cookie': cookie, 'referer': referer}
-        data = {
-            "clothImage": encoded_garment_img,
-            "humanImage": encoded_person_img,
-            "seed": seed
-        }
-        
-        response = requests.post(url, headers=headers, data=json.dumps(data), timeout=50)
-        print("post response code", response.status_code)
+    url = "http://" + os.environ['tryon_url']
+    token = os.environ['token']
+    cookie = os.environ['Cookie']
+    referer = os.environ['referer']
+
+    headers = {'Content-Type': 'application/json', 'token': token, 'Cookie': cookie, 'referer': referer}
+    data = {
+        "clothImage": encoded_garment_img,
+        "humanImage": encoded_person_img,
+        "seed": seed
+    }
+
+    result_img = None
+    try:
+        session = requests.Session()
+        response = session.post(url, headers=headers, data=json.dumps(data), timeout=60)
+        print("response code", response.status_code)
         if response.status_code == 200:
             result = response.json()['result']
             status = result['status']
             if status == "success":
-                uuid = result['result']
-                print(uuid)
+                result = base64.b64decode(result['result'])
+                result_np = np.frombuffer(result, np.uint8)
+                result_img = cv2.imdecode(result_np, cv2.IMREAD_UNCHANGED)
+                result_img = cv2.cvtColor(result_img, cv2.COLOR_RGB2BGR)
+                info = "Success"
+            else:
+                info = "Try again latter"
         else:
-            return None, seed, f"Error: HTTP {response.status_code}"
+            print(response.text)
+            info = "URL error, pleace contact the admin"
+    except requests.exceptions.ReadTimeout:
+        print("timeout")
+        info = "Too many users, please try again later"
+        raise gr.Error("Too many users, please try again later")
+    except Exception as err:
+        print(f"其他错误: {err}")
+        info = "Error, pleace contact the admin"
+    end_time = time.time()
+    print(f"time used: {end_time-start_time}")
 
-        post_end_time = time.time()
-        print(f"post time used: {post_end_time-post_start_time}")
+    return result_img, seed, info
+
+MAX_SEED = 999999
 
-        get_start_time = time.time()
-        time.sleep(9)
-        Max_Retry = 10
-        result_img = None
-        for i in range(Max_Retry):
-            try:
-                url = "http://" + os.environ['tryon_url'] + "Query?taskId=" + uuid
-                response = requests.get(url, headers=headers, timeout=15)
-                print("get response code", response.status_code)
-                if response.status_code == 200:
-                    result = response.json()['result']
-                    status = result['status']
-                    if status == "success":
-                        result = base64.b64decode(result['result'])
-                        result_np = np.frombuffer(result, np.uint8)
-                        result_img = cv2.imdecode(result_np, cv2.IMREAD_UNCHANGED)
-                        result_img = cv2.cvtColor(result_img, cv2.COLOR_RGB2BGR)
-                        info = "Success"
-                        break
-                    elif status == "error":
-                        return None, seed, "Too many users, please try again later"
-                else:
-                    print(response.text)
-                    info = "URL error, please contact the admin"
-            except requests.exceptions.ReadTimeout:
-                print("timeout")
-                info = "Too many users, please try again later"
-            except Exception as err:
-                print(f"Error: {err}")
-            time.sleep(1)
-        get_end_time = time.time()
-        print(f"get time used: {get_end_time-get_start_time}")
 
-        return result_img, seed, info
-    except Exception as e:
-        print(f"An error occurred: {str(e)}")
-        return None, seed, f"An error occurred: {str(e)}"
 
-MAX_SEED = 999999
 
 example_path = os.path.join(os.path.dirname(__file__), 'assets')