signature change

app.py

@@ -8,6 +8,10 @@ from io import BytesIO
 from PIL import Image
 import uuid
 
+# from dotenv import load_dotenv
+
+# load_dotenv()
+
 example_path = os.path.join(os.path.dirname(__file__), 'assets')
 clothing_list = os.listdir(os.path.join(example_path, "clothing"))
 clothing_list_path = [os.path.join(example_path, "clothing", clothing) for clothing in clothing_list]
@@ -23,7 +27,7 @@ query_task_url = os.getenv('query_task_url')
 secret_key = os.getenv('secret_key')
 agent_version = os.getenv('agent_version')
 agent_name = os.getenv('agent_name')
-
+app_id = os.getenv('app_id')
 
 def parse_response(response):
     data = {}
@@ -67,12 +71,19 @@ def url_to_image(url, ip):
     return None
 
 
-def start_task(task_id, timestamp, signature, did, ip):
+def start_task(task_id, did, ip):
+    timestamp = str(int(time.time()))
+    signature = generate_signature(
+        key=secret_key,
+        did=did,
+        timestamp=timestamp
+    )
     headers = {
         'Did': did,
         'X-Timestamp': timestamp,
         'X-Signature': signature,
-        'X-Forwarded-For': ip
+        'X-Forwarded-For': ip,
+        'X-AppId': app_id,
     }
     data = {
         "agentVersion": agent_version,
@@ -85,12 +96,19 @@ def start_task(task_id, timestamp, signature, did, ip):
     return data, msg
 
 
-def create_task(image_url, timestamp, signature, did, ip):
+def create_task(image_url, did, ip):
+    timestamp = str(int(time.time()))
+    signature = generate_signature(
+        key=secret_key,
+        did=did,
+        timestamp=timestamp
+    )
     headers = {
         'Did': did,
         'X-Timestamp': timestamp,
         'X-Signature': signature,
-        'X-Forwarded-For': ip
+        'X-Forwarded-For': ip,
+        'X-AppId': app_id,
     }
     data = {
         "agentVersion": agent_version,
@@ -102,12 +120,19 @@ def create_task(image_url, timestamp, signature, did, ip):
     return data, msg
 
 
-def save_task(image_url, timestamp, signature, show_image, task_id, location_id, did, ip):
+def save_task(image_url, show_image, task_id, location_id, did, ip):
+    timestamp = str(int(time.time()))
+    signature = generate_signature(
+        key=secret_key,
+        did=did,
+        timestamp=timestamp
+    )
     headers = {
         'Did': did,
         'X-Timestamp': timestamp,
         'X-Signature': signature,
-        'X-Forwarded-For': ip
+        'X-Forwarded-For': ip,
+        'X-AppId': app_id,
     }
     data = {
         "agentVersion": agent_version,
@@ -122,12 +147,19 @@ def save_task(image_url, timestamp, signature, show_image, task_id, location_id,
     return data, msg
 
 
-def query_task(task_id, execution_id, timestamp, signature, did, ip):
+def query_task(task_id, execution_id, did, ip):
+    timestamp = str(int(time.time()))
+    signature = generate_signature(
+        key=secret_key,
+        did=did,
+        timestamp=timestamp
+    )
     headers = {
         'Did': did,
         'X-Timestamp': timestamp,
         'X-Signature': signature,
-        'X-Forwarded-For': ip
+        'X-Forwarded-For': ip,
+        'X-AppId': app_id,
     }
     data = {
         "agentVersion": agent_version,
@@ -140,7 +172,7 @@ def query_task(task_id, execution_id, timestamp, signature, did, ip):
     return data, msg
 
 
-def upload_image(image, signature, timestamp, upload_type, did, ip):
+def upload_image(image, upload_type, did, ip):
     if image is None:
         return None
     if upload_type == 'image':
@@ -149,6 +181,12 @@ def upload_image(image, signature, timestamp, upload_type, did, ip):
         upload_url = upload_background_image_url
     image_format = image.format if image.format else "PNG"
     mime_type = f"image/{image_format.lower()}"
+    timestamp = str(int(time.time()))
+    signature = generate_signature(
+        key=secret_key,
+        did=did,
+        timestamp=timestamp
+    )
     with BytesIO() as m_img:
         image.save(m_img, format=image_format)
         m_img.seek(0)
@@ -157,7 +195,8 @@ def upload_image(image, signature, timestamp, upload_type, did, ip):
             'Did': did,
             'X-Timestamp': timestamp,
             'X-Signature': signature,
-            'X-Forwarded-For': ip
+            'X-Forwarded-For': ip,
+            'X-AppId': app_id,
         }
         response = requests.post(base_url + upload_url, files=files, headers=headers)
         data, msg = parse_response(response)
@@ -182,16 +221,8 @@ def generate_image(main_image, background_image, did, request: gr.Request):
     if x_forwarded_for:
         client_ip = x_forwarded_for
 
-    timestamp = str(int(time.time()))
-    signature = generate_signature(
-        key=secret_key,
-        did=did,
-        timestamp=timestamp
-    )
     upload_image_data, upload_image_msg = upload_image(
         image=main_image,
-        signature=signature,
-        timestamp=timestamp,
         upload_type='image',
         did=did,
         ip=client_ip
@@ -204,8 +235,6 @@ def generate_image(main_image, background_image, did, request: gr.Request):
         return gr.Warning(m), did
     create_task_data, create_task_msg = create_task(
         image_url=image_url,
-        timestamp=timestamp,
-        signature=signature,
         did=did,
         ip=client_ip
     )
@@ -218,8 +247,6 @@ def generate_image(main_image, background_image, did, request: gr.Request):
         return gr.Warning(m), did
     upload_image_data, upload_image_msg = upload_image(
         image=background_image,
-        signature=signature,
-        timestamp=timestamp,
         upload_type='background_image',
         did=did,
         ip=client_ip
@@ -229,8 +256,6 @@ def generate_image(main_image, background_image, did, request: gr.Request):
 
     save_task_data, save_task_msg = save_task(
         image_url=image_url,
-        timestamp=timestamp,
-        signature=signature,
         show_image=show_image,
         task_id=task_id,
         location_id=upload_image_data,
@@ -245,8 +270,6 @@ def generate_image(main_image, background_image, did, request: gr.Request):
         return gr.Warning('Save task failed'), did
     start_task_data, start_task_msg = start_task(
         task_id=save_task_id,
-        timestamp=timestamp,
-        signature=signature,
         did=did,
         ip=client_ip
     )
@@ -262,8 +285,6 @@ def generate_image(main_image, background_image, did, request: gr.Request):
         query_task_data, query_task_msg = query_task(
             task_id=save_task_id,
             execution_id=execution_id,
-            timestamp=timestamp,
-            signature=signature,
             did=did,
             ip=client_ip
         )