Update app.py

app.py

@@ -8,68 +8,92 @@ import requests
 import json
 import time
 
-# Hugging Face Secrets'dan environment variables'ları al
-TRYON_URL = os.getenv('TRYON_URL', 'default_url/')
-TOKEN = os.getenv('TOKEN', 'default_token')
-COOKIE = os.getenv('COOKIE', 'default_cookie')
-REFERER = os.getenv('REFERER', 'default_referer')
+# Environment variables
+TRYON_URL = os.getenv('TRYON_URL')
+TOKEN = os.getenv('TOKEN')
+COOKIE = os.getenv('COOKIE')
+REFERER = os.getenv('REFERER')
+
+# Environment variables kontrolü
+if not all([TRYON_URL, TOKEN, COOKIE, REFERER]):
+    print("Warning: Some environment variables are missing!")
+    print(f"TRYON_URL: {'Set' if TRYON_URL else 'Missing'}")
+    print(f"TOKEN: {'Set' if TOKEN else 'Missing'}")
+    print(f"COOKIE: {'Set' if COOKIE else 'Missing'}")
+    print(f"REFERER: {'Set' if REFERER else 'Missing'}")
+
+MAX_SEED = 999999
 
 def tryon(person_img, garment_img, seed, randomize_seed):
+    if not all([TRYON_URL, TOKEN, COOKIE, REFERER]):
+        raise gr.Error("Server configuration is missing. Please contact administrator.")
+        
     post_start_time = time.time()
     if person_img is None or garment_img is None:
         gr.Warning("Empty image")
         return None, None, "Empty image"
+        
     if randomize_seed:
         seed = random.randint(0, MAX_SEED)
-    
-    # Resim kodlama
-    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')
+        
+    try:
+        # Resim kodlama
+        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 ve headers
-    url = f"http://{TRYON_URL}Submit"
-    headers = {
-        'Content-Type': 'application/json',
-        'token': TOKEN,
-        'Cookie': COOKIE,
-        'referer': REFERER
-    }
-    
-    data = {
-        "clothImage": encoded_garment_img,
-        "humanImage": encoded_person_img,
-        "seed": seed
-    }
+        # URL oluşturma
+        if not TRYON_URL.startswith(('http://', 'https://')):
+            base_url = f"https://{TRYON_URL}"
+        else:
+            base_url = TRYON_URL
+            
+        url = f"{base_url.rstrip('/')}/Submit"
+        
+        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)
+        print("post 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)
+                print(uuid)
+        
     except Exception as err:
         print(f"Post Exception 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}")
 
-    get_start_time =time.time()
+    get_start_time = time.time()
     time.sleep(9)
     Max_Retry = 12
     result_img = None
     info = ""
     err_log = ""
+    
     for i in range(Max_Retry):
         try:
-            url = "http://" + os.environ['tryon_url'] + "Query?taskId=" + uuid
-            response = requests.get(url, headers=headers, timeout=20)
-            # print("get response code", response.status_code)
+            query_url = f"{base_url.rstrip('/')}/Query?taskId={uuid}"
+            response = requests.get(query_url, headers=headers, timeout=20)
+            print("get response code", response.status_code)
+            
             if response.status_code == 200:
                 result = response.json()['result']
                 status = result['status']
@@ -85,19 +109,21 @@ def tryon(person_img, garment_img, seed, randomize_seed):
                     info = "Error"
                     break
             else:
-                # print(response.text)
-                err_log = "URL error, pleace contact the admin"
-                info = "URL error, pleace contact the admin"
+                err_log = "URL error, please contact the admin"
+                info = "URL error, please contact the admin"
                 break
+                
         except requests.exceptions.ReadTimeout:
             err_log = "Http Timeout"
             info = "Http Timeout, please try again later"
         except Exception as err:
             err_log = f"Get Exception Error: {err}"
         time.sleep(1)
+        
     get_end_time = time.time()
     print(f"get time used: {get_end_time-get_start_time}")
     print(f"all time used: {get_end_time-get_start_time+post_end_time-post_start_time}")
+    
     if info == "":
         err_log = f"No image after {Max_Retry} retries"
         info = "Too many users, please try again later"
@@ -113,17 +139,24 @@ def start_tryon(person_img, garment_img, seed, randomize_seed):
         return None, None, "Empty image"
     if randomize_seed:
         seed = random.randint(0, MAX_SEED)
+        
     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']
-    token = os.environ['token']
-    cookie = os.environ['Cookie']
-    referer = os.environ['referer']
+    if not TRYON_URL.startswith(('http://', 'https://')):
+        base_url = f"https://{TRYON_URL}"
+    else:
+        base_url = TRYON_URL
 
-    headers = {'Content-Type': 'application/json', 'token': token, 'Cookie': cookie, 'referer': referer}
+    headers = {
+        'Content-Type': 'application/json',
+        'token': TOKEN,
+        'Cookie': COOKIE,
+        'referer': REFERER
+    }
+    
     data = {
         "clothImage": encoded_garment_img,
         "humanImage": encoded_person_img,
@@ -133,7 +166,7 @@ def start_tryon(person_img, garment_img, seed, randomize_seed):
     result_img = None
     try:
         session = requests.Session()
-        response = session.post(url, headers=headers, data=json.dumps(data), timeout=60)
+        response = session.post(base_url, headers=headers, data=json.dumps(data), timeout=60)
         print("response code", response.status_code)
         if response.status_code == 200:
             result = response.json()['result']
@@ -145,24 +178,22 @@ def start_tryon(person_img, garment_img, seed, randomize_seed):
                 result_img = cv2.cvtColor(result_img, cv2.COLOR_RGB2BGR)
                 info = "Success"
             else:
-                info = "Try again latter"
+                info = "Try again later"
         else:
             print(response.text)
-            info = "URL error, pleace contact the admin"
+            info = "URL error, please 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"
+        print(f"Error: {err}")
+        info = "Error, please contact the admin"
     end_time = time.time()
     print(f"time used: {end_time-start_time}")
 
     return result_img, seed, info
 
-MAX_SEED = 999999
-
 example_path = os.path.join(os.path.dirname(__file__), 'assets')
 
 garm_list = os.listdir(os.path.join(example_path,"cloth"))
@@ -198,9 +229,6 @@ def load_description(fp):
         content = f.read()
     return content
 
-def change_imgs(image1, image2):
-    return image1, image2
-
 with gr.Blocks(css=css) as Tryon:
     gr.HTML(load_description("assets/title.md"))
     with gr.Row():
@@ -224,14 +252,13 @@ with gr.Blocks(css=css) as Tryon:
             gr.HTML("""
             <div style="display: flex; justify-content: center; align-items: center; text-align: center; font-size: 20px;">
                 <div>
-                Step 3. Press “Run” to get try-on results
+                Step 3. Press "Run" to get try-on results
                 </div>
             </div>
             """)
     with gr.Row():
         with gr.Column(elem_id = "col-left"):
             imgs = gr.Image(label="Person image", sources='upload', type="numpy")
-            # category = gr.Dropdown(label="Garment category", choices=['upper_body', 'lower_body', 'dresses'],  value="upper_body")
             example = gr.Examples(
                 inputs=imgs,
                 examples_per_page=12,
@@ -258,12 +285,15 @@ with gr.Blocks(css=css) as Tryon:
             with gr.Row():
                 seed_used = gr.Number(label="Seed used")
                 result_info = gr.Text(label="Response")
-            # try_button = gr.Button(value="Run", elem_id="button")
             test_button = gr.Button(value="Run", elem_id="button")
 
-
-    # try_button.click(fn=start_tryon, inputs=[imgs, garm_img, seed, randomize_seed], outputs=[image_out, seed_used, result_info], api_name='tryon',concurrency_limit=10)
-    test_button.click(fn=tryon, inputs=[imgs, garm_img, seed, randomize_seed], outputs=[image_out, seed_used, result_info], api_name=False, concurrency_limit=45)
+    test_button.click(
+        fn=tryon,
+        inputs=[imgs, garm_img, seed, randomize_seed],
+        outputs=[image_out, seed_used, result_info],
+        api_name=False,
+        concurrency_limit=45
+    )
 
     with gr.Column(elem_id = "col-showcase"):
         gr.HTML("""
@@ -285,9 +315,9 @@ with gr.Blocks(css=css) as Tryon:
             label=None
         )
 
+# Uygulamayı başlat
 Tryon.queue(api_open=False).launch(
-    server_name="0.0.0.0",  # Tüm IP'lerden erişime izin ver
-    share=True,             # Public URL oluştur
-    show_api=False,         # API docs'u gizle
-    debug=True             # Debug modunu aç
-)
+    server_name="0.0.0.0",
+    show_api=False,
+    debug=True
+)