Merge keygen, encrypt and send inputs button

app.py

@@ -159,6 +159,8 @@ def encrypt(user_id, input_image, filter_name):
         representation.
 
     """
+    user_id = keygen
+
     if user_id == "":
         raise gr.Error("Please generate the private key first.")
 
@@ -181,6 +183,8 @@ def encrypt(user_id, input_image, filter_name):
     # Create a truncated version of the encrypted image for display
     encrypted_image_short = shorten_bytes_object(encrypted_image)
 
+    send_input()
+
     return (input_image, encrypted_image_short)
 
 
@@ -336,50 +340,8 @@ with demo:
     )
 
     gr.Markdown("## Client side")
-    gr.Markdown("### Step 1: Keygen. ")
-    gr.Markdown("#### Notes")
-    gr.Markdown(
-        """
-        - The private key is used to encrypt and decrypt the data and will never be shared.
-        - No public key is required for these filter operators.
-        """
-    )
-
-    with gr.Row():
-        with gr.Column():
-            gr.Markdown("### Client ")
-            keygen_button_1 = gr.Button("Generate the private key.")
-
-            # TODO : change the button name (add check emoji) instead maybe
-            with gr.Row():
-                keygen_checkbox_1 = gr.Checkbox(label="Private key generated:", interactive=False)
-
-
-            client_id = gr.Textbox(label="", max_lines=2, interactive=False, visible=False)
-
-        with gr.Column():
-            gr.Markdown("### Bank ")
-            keygen_button_2 = gr.Button("Generate the private key.")
-
-            # TODO : change the button name (add check emoji) instead maybe
-            with gr.Row():
-                keygen_checkbox_2 = gr.Checkbox(label="Private key generated:", interactive=False)
-
-            bank_id = gr.Textbox(label="", max_lines=2, interactive=False, visible=False)
-
-        with gr.Column():
-            gr.Markdown("### Third Party ")
-            keygen_button_3 = gr.Button("Generate the private key.")
-
-            # TODO : change the button name (add check emoji) instead maybe
-            with gr.Row():
-                keygen_checkbox_3 = gr.Checkbox(label="Private key generated:", interactive=False)
-
-            party_id = gr.Textbox(label="", max_lines=2, interactive=False, visible=False)
-
-
-    gr.Markdown("### Step 2: Infos. ")
 
+    gr.Markdown("### Step 1: Infos. ")
     with gr.Row():
         with gr.Column():
             gr.Markdown("### Client ")
@@ -397,50 +359,37 @@ with demo:
             # TODO : change infos
             radio_1 = gr.Radio(["park", "zoo", "road"], label="Location", info="Where did they go?")
         
-    gr.Markdown("### Step 4: Encrypt the inputs using FHE.")
+
+    gr.Markdown("### Step 2: Keygen, encrypt  using FHE and send the inputs to the server.")
     with gr.Row():
         with gr.Column():
             gr.Markdown("### Client ")
-            encrypt_button_1 = gr.Button("Encrypt the inputs using FHE.")
+            encrypt_button_1 = gr.Button("Encrypt the inputs and send to server.")
             encrypted_input_1 = gr.Textbox(
                 label="Encrypted input representation:", max_lines=2, interactive=False
             )
 
+            client_id = gr.Textbox(label="", max_lines=2, interactive=False, visible=False)
+
 
         with gr.Column():
             gr.Markdown("### Bank ")
-            encrypt_button_2 = gr.Button("Encrypt the inputs using FHE.")
+            encrypt_button_2 = gr.Button("Encrypt the inputs and send to server.")
             encrypted_input_2 = gr.Textbox(
                 label="Encrypted input representation:", max_lines=2, interactive=False
             )
 
+            bank_id = gr.Textbox(label="", max_lines=2, interactive=False, visible=False)
+
+
         with gr.Column():
             gr.Markdown("### Third Party ")
-            encrypt_button_3 = gr.Button("Encrypt the inputs using FHE.")
+            encrypt_button_3 = gr.Button("Encrypt the inputs and send to server.")
             encrypted_input_3 = gr.Textbox(
                 label="Encrypted input representation:", max_lines=2, interactive=False
             )
 
-    gr.Markdown("### Step 5: Send the encrypted inputs to the server.")
-    with gr.Row():
-        with gr.Column():
-            gr.Markdown("### Client ")
-            send_input_button_1 = gr.Button("Send the encrypted inputs to the server.")
-            # TODO : change the button name (add check emoji) instead maybe
-            send_input_checkbox_1 = gr.Checkbox(label="Encrypted inputs sent.", interactive=False)
-
-
-        with gr.Column():
-            gr.Markdown("### Bank ")
-            send_input_button_2 = gr.Button("Send the encrypted inputs to the server.")
-            # TODO : change the button name (add check emoji) instead maybe
-            send_input_checkbox_2 = gr.Checkbox(label="Encrypted inputs sent.", interactive=False)
-
-        with gr.Column():
-            gr.Markdown("### Third Party ")
-            send_input_button_3 = gr.Button("Send the encrypted inputs to the server.")
-            # TODO : change the button name (add check emoji) instead maybe
-            send_input_checkbox_3 = gr.Checkbox(label="Encrypted inputs sent.", interactive=False)
+            party_id = gr.Textbox(label="", max_lines=2, interactive=False, visible=False)
 
     gr.Markdown("## Server side")
     gr.Markdown(
@@ -469,6 +418,10 @@ with demo:
     )
     get_output_button = gr.Button("Receive the encrypted output from the server.")
 
+    encrypted_output_representation = gr.Textbox(
+        label="Credit card approval decision: ", max_lines=1, interactive=False
+    )
+
     gr.Markdown("### Step 8: Decrypt the output.")
     decrypt_button = gr.Button("Decrypt the output")