Update app.py

app.py

@@ -42,10 +42,10 @@ class ZGMApiClient:
             response.raise_for_status()
             return response.json()
         except requests.exceptions.ConnectTimeout:
-            return {"error": f"Cannot connect to {self.base_url}. Check URL or network.", "status_code": 0}
+            return {"error": f"Cannot connect to {self.base_url}. Please check URL or network.", "status_code": 0}
         except requests.exceptions.HTTPError as e:
             if response.status_code == 401:
-                return {"error": "Unauthorized. Check API Token.", "status_code": 401}
+                return {"error": "Unauthorized. Please check API Token.", "status_code": 401}
             elif response.status_code == 500:
                 return {"error": "Server error from ZGM API.", "status_code": 500}
             return {"error": f"HTTP Error: {str(e)}", "status_code": response.status_code}
@@ -71,11 +71,11 @@ def validate_key_from_api(access_key: str) -> tuple[bool, str]:
         response.raise_for_status()
         data = response.json()
         if data["valid"]:
-            return True, f"{data['remaining']} key(s) remaining."
+            return True, f"Remaining {data['remaining']} keys."
         else:
-            return False, "Invalid key. Please enter a valid key."
+            return False, "Invalid key!"
     except requests.exceptions.RequestException as e:
-        return False, f"Error while checking key from API: {str(e)}"
+        return False, f"Error checking key from API: {str(e)}"
 
 def remove_key_from_api(access_key: str) -> tuple[bool, str]:
     try:
@@ -83,28 +83,27 @@ def remove_key_from_api(access_key: str) -> tuple[bool, str]:
         response.raise_for_status()
         data = response.json()
         if data["success"]:
-            return True, f"{data['remaining']} key(s) remaining."
+            return True, f"Remaining {data['remaining']} keys."
         else:
-            return False, "Could not remove key."
+            return False, "Cannot remove key."
     except requests.exceptions.RequestException as e:
-        return False, f"Error while removing key from API: {str(e)}"
+        return False, f"Error removing key from API: {str(e)}"
 
 def validate_and_remove_key(access_key: str, result: Dict) -> tuple[bool, str]:
     is_valid, message = validate_key_from_api(access_key)
     if not is_valid:
         return False, message
-
     if result.get("code") == 200 and result.get("data") and "orderId" in result["data"] and "email" in result["data"]:
         success, remove_message = remove_key_from_api(access_key)
         if not success:
-            return True, f"OTP rental succeeded but {remove_message}"
-        remaining_keys = int(remove_message.split(" key")[0].split()[-1])
-        remaining_message = f"{remaining_keys} key(s) remaining."
+            return True, f"OTP rented successfully but {remove_message}"
+        remaining_keys = int(remove_message.split("Remaining ")[1].split(" key")[0])
+        remaining_message = f"Remaining {remaining_keys} keys."
         if remaining_keys < 100:
-            remaining_message += " Low key count! Please generate more."
+            remaining_message += " Low key count! Please create more keys."
         return True, remaining_message
     else:
-        return True, f"Error: {result.get('message', 'Could not rent Gmail.')}\nKey not removed."
+        return True, f"Error: {result.get('message', 'Unable to rent Gmail.')}\nKey not deleted."
 
 def execute_with_loading(func, *args, **kwargs):
     result = [None]
@@ -117,14 +116,8 @@ def execute_with_loading(func, *args, **kwargs):
     api_thread = threading.Thread(target=target)
     api_thread.start()
 
-    chars = "|/-\\"
-    i = 0
     while is_loading[0]:
-        print(f"\rLoading {chars[i % len(chars)]}", end="")
-        i += 1
         time.sleep(0.1)
-    print("\r", end="")
-
     api_thread.join()
     return result[0]
 
@@ -132,10 +125,13 @@ def format_rent_otp_result(data: Dict) -> pd.DataFrame:
     if not data or "data" not in data:
         return pd.DataFrame([["No data to display."]], columns=["Message"])
     order_info = data["data"]
-    df = pd.DataFrame([{ "Order ID": order_info.get("orderId", "N/A"), "Email": order_info.get("email", "N/A") }])
+    df = pd.DataFrame([{
+        "Order ID": order_info.get("orderId", "N/A"),
+        "Email": order_info.get("email", "N/A")
+    }])
     return df
 
-def format_get_otp_result(data: Dict, selected_service: str) -> pd.DataFrame:
+def format_get_otp_result(data: Dict) -> pd.DataFrame:
     if not data or "data" not in data:
         return pd.DataFrame([["No data to display."]], columns=["Message"])
     otp_data = data["data"]
@@ -143,10 +139,8 @@ def format_get_otp_result(data: Dict, selected_service: str) -> pd.DataFrame:
         otp_data = [otp_data]
     if not isinstance(otp_data, list):
         return pd.DataFrame([["Invalid data."]], columns=["Message"])
-
     df = pd.DataFrame([
         {
-            "Service": selected_service,
             "Email": item.get("email", "N/A"),
             "OTP Code": item.get("otpCode", "N/A"),
             "Content": item.get("otpContent", "N/A")
@@ -161,15 +155,13 @@ def clear_all_logs():
 def gradio_interface(access_key, action, service, order_id, rent_otp_log, get_otp_log):
     message = ""
     new_order_id = order_id
-
     if rent_otp_log is None:
         rent_otp_log = pd.DataFrame([["No data yet"]], columns=["Message"])
     if get_otp_log is None:
         get_otp_log = pd.DataFrame([["No data yet"]], columns=["Message"])
-
     if action == "Rent OTP":
         if not access_key:
-            rent_otp_log = pd.DataFrame([["Please enter key to proceed!"]], columns=["Message"])
+            rent_otp_log = pd.DataFrame([["Please enter a key to rent OTP!"]], columns=["Message"])
             return rent_otp_log, get_otp_log, message, order_id
         if not service:
             rent_otp_log = pd.DataFrame([["Please select a service!"]], columns=["Message"])
@@ -191,40 +183,82 @@ def gradio_interface(access_key, action, service, order_id, rent_otp_log, get_ot
             return rent_otp_log, get_otp_log, "", order_id
         result = execute_with_loading(client.get_otp, order_id)
         if result.get("code") == 200 and "data" in result:
-            get_otp_log = format_get_otp_result(result, service)
+            get_otp_log = format_get_otp_result(result)
         else:
             get_otp_log = pd.DataFrame([[json.dumps(result, indent=2, ensure_ascii=False)]], columns=["Message"])
         return rent_otp_log, get_otp_log, "", order_id
     else:
         return rent_otp_log, get_otp_log, "Invalid action!", order_id
 
-SERVICES = ["ICLOUD", "ZSK", "FACEBOOK", "TELEGRAM", "OTHERS", "GGPLAY", "INSTAGRAM", "FMCPAY", "AMAZON"]
+SERVICES = [
+    "ICLOUD", "ZSK", "FACEBOOK", "TELEGRAM", "OTHERS",
+    "GGPLAY", "INSTAGRAM", "FMCPAY", "AMAZON"
+]
+
+notification_message = ""
+
+def update_notification(msg_input, password):
+    global notification_message
+    if password == "2312":
+        notification_message = msg_input
+    return notification_message
 
 with gr.Blocks() as demo:
-    gr.Markdown("## ZGM API Client - Enter Access Key to Rent OTP (Key is required only for Rent OTP, one-time use only)")
+    gr.Markdown("## ZGM API Client - Enter Key to Rent OTP")
 
     with gr.Row():
-        access_key = gr.Textbox(label="Enter Access Key (Only for Rent OTP)", placeholder="Enter 32-character key...")
+        access_key = gr.Textbox(label="Access Key (Required for Rent OTP)", placeholder="Enter 32-char key...")
         action = gr.Dropdown(label="Select Action", choices=["Rent OTP", "Get OTP"], value="Rent OTP")
 
     with gr.Row():
-        service = gr.Dropdown(label="Service (for Rent OTP)", choices=SERVICES)
-        order_id = gr.Textbox(label="Order ID (for Get OTP)", placeholder="Enter Order ID")
+        service = gr.Dropdown(label="Service (For Rent OTP)", choices=SERVICES)
+        order_id = gr.Textbox(label="Order ID (For Get OTP)", placeholder="Enter Order ID")
 
     rent_otp_log = gr.State(value=pd.DataFrame([["No data yet"]], columns=["Message"]))
     get_otp_log = gr.State(value=pd.DataFrame([["No data yet"]], columns=["Message"]))
 
-    with gr.Row():
-        rent_otp_output = gr.Dataframe(label="Rent OTP Log", headers=["Order ID", "Email"], datatype=["str", "str"], interactive=False)
-        get_otp_output = gr.Dataframe(label="Get OTP Log", headers=["Service", "Email", "OTP Code", "Content"], datatype=["str", "str", "str", "str"], interactive=False)
+    rent_otp_output = gr.Dataframe(
+        label="Rent OTP Log",
+        headers=["Order ID", "Email"],
+        datatype=["str", "str"],
+        interactive=False
+    )
+
+    get_otp_output = gr.Dataframe(
+        label="Get OTP Log",
+        headers=["Email", "OTP Code", "Content"],
+        datatype=["str", "str", "str"],
+        interactive=False
+    )
 
     message_output = gr.Textbox(label="Message", interactive=False)
 
     with gr.Row():
-        submit_btn = gr.Button("Execute", variant="primary")
-        clear_btn = gr.Button("Clear Logs", variant="secondary")
+        submit_btn = gr.Button("Submit", variant="primary")
+        clear_btn = gr.Button("Clear Log", variant="secondary")
+
+    submit_btn.click(
+        fn=gradio_interface,
+        inputs=[access_key, action, service, order_id, rent_otp_log, get_otp_log],
+        outputs=[rent_otp_output, get_otp_output, message_output, order_id]
+    )
+
+    clear_btn.click(
+        fn=clear_all_logs,
+        inputs=None,
+        outputs=[rent_otp_output, get_otp_output, message_output]
+    )
+
+    gr.Markdown("## System Notification")
+    with gr.Row():
+        notification_input = gr.Textbox(label="Update Notification", lines=3)
+        password_input = gr.Textbox(label="Password", type="password")
+    with gr.Row():
+        update_btn = gr.Button("Update Notification")
+        current_notification = gr.Textbox(label="Current Notification", interactive=False)
+    update_btn.click(update_notification, inputs=[notification_input, password_input], outputs=current_notification)
 
-    submit_btn.click(fn=gradio_interface, inputs=[access_key, action, service, order_id, rent_otp_log, get_otp_log], outputs=[rent_otp_output, get_otp_output, message_output, order_id])
-    clear_btn.click(fn=clear_all_logs, inputs=None, outputs=[rent_otp_output, get_otp_output, message_output])
+    gr.Markdown("## Get OTP Log")
+    demo.append(get_otp_output)
 
 demo.launch()