Update app.py

app.py

@@ -4,33 +4,31 @@ import base64
 import json
 from PIL import Image
 import io
+import logging
 
-# ==============================================================================
-#  CONFIGURATION
-# ==============================================================================
-
-# This is the full URL to the MCP (base64) endpoint of your SERVER Space.
-# Replace this with the URL of your deployed Python API server.
-DECODER_API_ENDPOINT = "https://https://broadfield-dev-keylock-auth.hf.space/run/mcp_decode"
-# Example: "https://broadfield-dev-keylock-api-python.hf.space/run/mcp_decode"
-
-# Link to the server space for user reference
-SERVER_SPACE_URL = "https://huggingface.co/spaces/broadfield-dev/keylock-auth"
-# Example: "https://huggingface.co/spaces/broadfield-dev/KeyLock-API-Python"
-
+# --- Configure Logging ---
+logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+logger = logging.getLogger(__name__)
 
 # ==============================================================================
 #  API CALL LOGIC
 # ==============================================================================
 
-def call_decoder_api(image: Image.Image) -> dict:
+def call_decoder_api(server_base_url: str, image: Image.Image) -> dict:
     """
-    Takes a PIL image, converts it to base64, sends it to the decoder API,
+    Takes a PIL image, converts it to base64, sends it to the specified server API,
     and returns the decrypted JSON data.
     """
+    # --- Input Validation ---
+    if not server_base_url or "hf.space" not in server_base_url:
+        raise gr.Error("Please provide a valid Hugging Face Space URL for the server API.")
     if image is None:
         raise gr.Error("Please upload an encrypted image.")
 
+    # The specific endpoint for our Gradio API
+    api_endpoint = f"{server_base_url.strip('/')}/run/mcp_decode"
+    logger.info(f"Attempting to call API at: {api_endpoint}")
+
     try:
         # 1. Convert the PIL Image to a base64 string
         buffer = io.BytesIO()
@@ -39,7 +37,7 @@ def call_decoder_api(image: Image.Image) -> dict:
         image_base64 = base64.b64encode(image_bytes).decode('utf-8')
 
         # 2. Prepare the JSON payload for the Gradio API
-        # Gradio's /run/predict endpoint expects this specific structure
+        # Gradio's /run/predict endpoint expects this specific structure: {"data": [input1, input2, ...]}
         payload = {
             "data": [
                 image_base64
@@ -48,28 +46,28 @@ def call_decoder_api(image: Image.Image) -> dict:
 
         # 3. Make the POST request to the server API
         headers = {"Content-Type": "application/json"}
-        response = requests.post(DECODER_API_ENDPOINT, headers=headers, json=payload)
+        response = requests.post(api_endpoint, headers=headers, json=payload, timeout=30)
         
-        # Raise an error for bad status codes (4xx or 5xx)
-        response.raise_for_status()
-
         # 4. Process the response
-        response_json = response.json()
-        
-        # Gradio API wraps results in a "data" list. The actual result is the first element.
-        if "data" in response_json and len(response_json["data"]) > 0:
-            return response_json["data"][0]
-        elif "error" in response_json:
-            # Handle application-level errors returned by the server
-            raise gr.Error(f"API Error: {response_json['error']}")
+        if response.status_code == 200:
+            response_json = response.json()
+            if "data" in response_json and len(response_json["data"]) > 0:
+                # Gradio API wraps results in a "data" list. The actual result is the first element.
+                return response_json["data"][0]
+            elif "error" in response_json:
+                raise gr.Error(f"API returned an error: {response_json['error']}")
+            else:
+                raise gr.Error(f"API returned an unexpected response format: {response_json}")
         else:
-            raise gr.Error(f"API returned an unexpected response format: {response_json}")
+            # Handle non-200 responses with more detail
+            error_text = response.text
+            raise gr.Error(f"API Error (Status {response.status_code}): {error_text}")
 
     except requests.exceptions.RequestException as e:
         logger.error(f"Network error calling API: {e}")
-        raise gr.Error(f"Could not connect to the decoder API. Please check the URL and server status. Error: {e}")
+        raise gr.Error(f"Could not connect to the API. Check the URL and server status. Error: {e}")
     except Exception as e:
-        logger.error(f"An unexpected error occurred: {e}")
+        logger.error(f"An unexpected error occurred: {e}", exc_info=True)
         raise gr.Error(f"An unexpected error occurred: {e}")
 
 # ==============================================================================
@@ -77,33 +75,37 @@ def call_decoder_api(image: Image.Image) -> dict:
 # ==============================================================================
 
 with gr.Blocks(theme=gr.themes.Soft(), title="KeyLock API Client") as demo:
-    gr.Markdown(f"""
-    # 🔑 KeyLock API Client
-    This is a user interface for the [Secure Decoder API]({SERVER_SPACE_URL}). 
-    
-    Upload an image that was encrypted with the service's public key, and this client will send it to the API for decryption.
-    """)
+    gr.Markdown("# 🔑 KeyLock API Client")
+    gr.Markdown(
+        "This is a user interface for the **Secure Decoder API**. It sends an encrypted image "
+        "to the server for decryption."
+    )
 
     with gr.Row():
         with gr.Column(scale=1):
+            gr.Markdown("### 1. Configure Server URL")
+            server_url_input = gr.Textbox(
+                label="Decoder API Server URL",
+                placeholder="Enter the direct URL of your Python server space...",
+                info="Example: https://your-name-keylock-api-python.hf.space"
+            )
+
+            gr.Markdown("### 2. Upload Encrypted Image")
             image_input = gr.Image(
                 type="pil",
                 label="Upload Encrypted PNG Image",
                 sources=["upload", "clipboard"]
             )
             submit_button = gr.Button("Decrypt via API", variant="primary")
-            
-            gr.Markdown("---")
-            gr.Markdown(f"This client sends requests to the following API endpoint: `{DECODER_API_ENDPOINT}`")
 
         with gr.Column(scale=2):
-            gr.Markdown("## Decrypted Data")
+            gr.Markdown("### 3. Decrypted Data")
             json_output = gr.JSON(label="Result from Server")
 
     # Connect the UI components to the API call function
     submit_button.click(
         fn=call_decoder_api,
-        inputs=[image_input],
+        inputs=[server_url_input, image_input],
         outputs=[json_output]
     )