Revert "test without exec"

This reverts commit 7f467975c1508eb55afa74a02180964fb26ccd63.

app.py

@@ -13,10 +13,6 @@ import requests
 from requests.adapters import HTTPAdapter
 from requests.packages.urllib3.util.retry import Retry
 import logging
-import numpy as np
-import seaborn as sns
-import io
-import matplotlib.pyplot as plt
 
 from common import (
     CLIENT_TMP_PATH,
@@ -314,58 +310,36 @@ def get_output(user_id):
         else:
             raise gr.Error("Please wait for the FHE execution to be completed.")
 
-def decrypt_output(user_id, encrypted_output):
-    """Decrypt the output of the seizure detection."""
-    if user_id == "":
-        raise gr.Error("Please generate the private key first.")
+def decrypt_output(user_id):
+    """Decrypt the result.
 
-    if encrypted_output is None:
-        raise gr.Error("Please run the FHE computation first.")
-
-    # Retrieve the client API
-    client = get_client(user_id)
+    Args:
+        user_id (int): The current user's ID.
 
-    try:
-        # Deserialize and decrypt the output
-        decrypted_output = client.deserialize_decrypt_post_process(encrypted_output)
+    Returns:
+        bool: The decrypted output (True if seizure detected, False otherwise)
 
-        # Reshape the output to match the expected shape
-        decrypted_output = decrypted_output.reshape(1, 1, 32, 32, 3)
+    """
+    if user_id == "":
+        raise gr.Error("Please generate the private key first.")
 
-        # Convert the output to a probability
-        probability = sigmoid(decrypted_output[0, 0, 0, 0, 0])
+    # Get the encrypted output path
+    encrypted_output_path = get_client_file_path("encrypted_output", user_id)
 
-        # Create a heatmap
-        heatmap = create_heatmap(decrypted_output[0, 0, :, :, 0])
+    if not encrypted_output_path.is_file():
+        raise gr.Error("Please run the FHE execution first.")
 
-        return probability, heatmap
+    # Load the encrypted output as bytes
+    with encrypted_output_path.open("rb") as encrypted_output_file:
+        encrypted_output = encrypted_output_file.read()
 
-    except Exception as e:
-        logger.error(f"Error in decrypt_output: {str(e)}")
-        raise gr.Error(f"Decryption failed: {str(e)}")
+    # Retrieve the client API
+    client = get_client(user_id)
 
-def sigmoid(x):
-    return 1 / (1 + np.exp(-x))
+    # Deserialize, decrypt and post-process the encrypted output
+    decrypted_output = client.deserialize_decrypt_post_process(encrypted_output)
 
-def create_heatmap(data):
-    # Normalize the data
-    data_normalized = (data - np.min(data)) / (np.max(data) - np.min(data))
-    
-    # Create a heatmap
-    plt.figure(figsize=(6, 6))
-    sns.heatmap(data_normalized, cmap='YlOrRd', cbar=True)
-    plt.title('Activation Heatmap')
-    plt.axis('off')
-    
-    # Save the plot to a BytesIO object
-    buf = io.BytesIO()
-    plt.savefig(buf, format='png')
-    buf.seek(0)
-    
-    # Clear the current figure
-    plt.clf()
-    
-    return buf
+    return "Seizure detected" if decrypted_output else "No seizure detected"
 
 def resize_img(img, width=256, height=256):
     """Resize the image."""
@@ -456,15 +430,10 @@ with demo:
     decrypt_button = gr.Button("Decrypt the output")
 
     with gr.Row():
-        probability_output = gr.Number(label="Seizure Probability")
-        heatmap_output = gr.Image(label="Activation Heatmap")
-
-    # Update the decrypt button click event
-    decrypt_button.click(
-        decrypt_output,
-        inputs=[user_id, encrypted_output],
-        outputs=[probability_output, heatmap_output]
-    )
+        decrypted_output = gr.Textbox(
+            label="Seizure detection result:",
+            interactive=False
+        )
 
     # Button to generate the private key
     keygen_button.click(

server.py

@@ -100,18 +100,17 @@ def run_fhe(user_id: str = Form()):
 
         # Run the FHE execution
         start = time.time()
-        # try:
-        #     encrypted_output = FHE_SERVER.run(encrypted_image, evaluation_key)
-        # except MemoryError:
-        #     logger.error("FHE execution failed due to insufficient memory")
-        #     raise HTTPException(status_code=503, detail="Insufficient memory during FHE execution")
-        # except Exception as e:
-        #     logger.error(f"FHE execution failed: {str(e)}")
-        #     raise HTTPException(status_code=500, detail="FHE execution failed")
-        # finally:
-        #     # Force garbage collection after FHE execution
-        #     gc.collect()
-        encrypted_output = encrypted_image
+        try:
+            encrypted_output = FHE_SERVER.run(encrypted_image, evaluation_key)
+        except MemoryError:
+            logger.error("FHE execution failed due to insufficient memory")
+            raise HTTPException(status_code=503, detail="Insufficient memory during FHE execution")
+        except Exception as e:
+            logger.error(f"FHE execution failed: {str(e)}")
+            raise HTTPException(status_code=500, detail="FHE execution failed")
+        finally:
+            # Force garbage collection after FHE execution
+            gc.collect()
 
         fhe_execution_time = round(time.time() - start, 2)