Update app.py

app.py

@@ -2,63 +2,85 @@ import gradio as gr
 import json
 import logging
 import tempfile
-import core  # Import our new core module
+import core  # Import our core module
 
 # --- Configure Logging ---
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
 logger = logging.getLogger(__name__)
 
 # ==============================================================================
-#  UI HELPER FUNCTIONS
+#  CONFIGURATION & DATA HANDLING
 # ==============================================================================
 
-def update_service_dropdown(json_config_string: str):
-    """Parses the JSON config and updates the dropdown choices."""
-    if not json_config_string.strip():
-        return gr.Dropdown(choices=[], value=None, label="Decoder Service (Paste JSON config)"), "Status: Waiting for JSON configuration."
+ENDPOINTS = []
+ENDPOINT_NAMES = []
+DEFAULT_CONFIG_FILE = "endpoints.json"
 
+def load_config_from_string(json_string: str) -> str:
+    """Parses a JSON string, updates global config, and returns a status message."""
+    global ENDPOINTS, ENDPOINT_NAMES
     try:
-        endpoints = json.loads(json_config_string)
-        if not isinstance(endpoints, list):
-            raise TypeError("JSON root must be a list of objects.")
-
-        service_names = []
-        for service in endpoints:
-            # Validate that each service has the required keys
+        data = json.loads(json_string)
+        if not isinstance(data, list):
+            raise TypeError("JSON root must be a list of service objects.")
+        
+        # Validate and extract data
+        temp_endpoints = []
+        temp_names = []
+        for service in data:
             if not all(k in service for k in ("name", "link", "public_key")):
                 raise ValueError("Each service object must contain 'name', 'link', and 'public_key' keys.")
-            service_names.append(service["name"])
+            temp_endpoints.append(service)
+            temp_names.append(service["name"])
+
+        ENDPOINTS = temp_endpoints
+        ENDPOINT_NAMES = temp_names
         
-        # If valid, update the dropdown with the new choices
-        if not service_names:
-            return gr.Dropdown(choices=[], value=None, label="Decoder Service (No services found)"), "Status: JSON parsed, but no services were found."
-            
-        logger.info(f"Updated dropdown with services: {service_names}")
-        return gr.Dropdown(choices=service_names, value=service_names[0], label="Select Decoder Service"), f"Status: Loaded {len(service_names)} services. '{service_names[0]}' selected."
-    except (json.JSONDecodeError, TypeError, ValueError) as e:
-        logger.error(f"JSON parsing error: {e}")
-        return gr.Dropdown(choices=[], value=None, label="Decoder Service (Invalid JSON)"), f"Status: Error parsing JSON - {e}"
-
-def generate_image(json_config_string: str, selected_service_name: str, secret_data_str: str):
+        status_msg = f"✅ Success! Loaded {len(ENDPOINT_NAMES)} services from custom JSON."
+        logger.info(status_msg)
+        return status_msg
+    except Exception as e:
+        status_msg = f"❌ Error loading custom JSON: {e}"
+        logger.error(status_msg)
+        # On error, we don't change the existing valid configuration
+        return status_msg
+
+# --- Load initial configuration from the file at startup ---
+try:
+    with open(DEFAULT_CONFIG_FILE, "r") as f:
+        initial_config = f.read()
+        INITIAL_STATUS = load_config_from_string(initial_config)
+except FileNotFoundError:
+    logger.warning(f"{DEFAULT_CONFIG_FILE} not found. App will start with an empty configuration.")
+    initial_config = "[]"
+    INITIAL_STATUS = f"Status: {DEFAULT_CONFIG_FILE} not found. Please provide a configuration."
+except Exception as e:
+    logger.error(f"Error loading initial config file: {e}")
+    initial_config = "[]"
+    INITIAL_STATUS = f"Status: Error loading {DEFAULT_CONFIG_FILE}: {e}"
+
+# ==============================================================================
+#  MAIN APPLICATION LOGIC
+# ==============================================================================
+
+def generate_image(selected_service_name: str, secret_data_str: str):
     """
     The main function called by the 'Create' button.
     It finds the selected service's public key and calls the core encryption logic.
     """
-    if not all([json_config_string, selected_service_name, secret_data_str]):
-        raise gr.Error("Configuration, a selected service, and secret data are all required.")
+    if not all([selected_service_name, secret_data_str]):
+        raise gr.Error("A selected service and secret data are both required.")
 
     try:
-        endpoints = json.loads(json_config_string)
-        
-        # Find the public key for the selected service
+        # Find the public key for the selected service from the loaded global config
         public_key = None
-        for service in endpoints:
+        for service in ENDPOINTS:
             if service.get("name") == selected_service_name:
                 public_key = service.get("public_key")
                 break
         
         if not public_key:
-            raise gr.Error(f"Could not find the service '{selected_service_name}' in the provided JSON.")
+            raise gr.Error(f"Could not find the service '{selected_service_name}'. Please check the configuration.")
 
         # Call the core function to do the heavy lifting
         encrypted_image = core.create_encrypted_image(secret_data_str, public_key)
@@ -71,74 +93,76 @@ def generate_image(json_config_string: str, selected_service_name: str, secret_d
 
     except Exception as e:
         logger.error(f"Image creation failed: {e}", exc_info=True)
-        # Return empty outputs on failure
         return None, None, f"❌ Error: {e}"
 
 # ==============================================================================
 #  GRADIO INTERFACE
 # ==============================================================================
 
-# Example JSON for the user to copy
-EXAMPLE_JSON = """
-[
-  {
-    "name": "My Python Decoder API",
-    "link": "https://huggingface.co/spaces/YOUR_USERNAME/KeyLock-API-Python",
-    "public_key": "-----BEGIN PUBLIC KEY-----\\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy2sWjB1iQ3vK03U7e/9E\\nO6J1K/s0tBq4Pz8F3r9/i8s7t9R1p8Z4Y6h4f4O7w9p9Z0c8t7m4J1e9g7K9m6f3\\nR1k3y7v1w0l7z6s5v2l8l4t9v8z7y6t5k2x1c9v7z3k1y9w8r5t3s1v9a8d7g6f5\\ne4d3c2b1a9f8e7d6c5b4a3f2e1d0c9b8a7f6e5d4c3b2a1f0e9d8c7b6a5f4e3d2\\nc1b0a9f8e7d6c5b4a3f2e1d0c9b8a7f6e5d4c3b2a1f0e9d8c7b6a5f4e3d2c1b0\\na9f8e7d6c5b4a3f2e1d0c9b8a7f6e5d4c3b2a1f0e9d8c7b6a5f4e3d2c1b0a9f8\\ne7d6\\n-----END PUBLIC KEY-----"
-  }
-]
-"""
-
 with gr.Blocks(theme=gr.themes.Soft(), title="KeyLock Image Creator") as demo:
     gr.Markdown("# 🏭 KeyLock Image Creator")
-    gr.Markdown("Create secure, encrypted images by providing a JSON configuration of decoder endpoints and your secret data.")
-
-    with gr.Row():
-        with gr.Column(scale=2):
-            gr.Markdown("### 1. Configure Decoder Services")
+    gr.Markdown("Create secure, encrypted PNG images for various decoder services.")
+
+    # This invisible textbox holds the current state of the dropdown choices
+    # This allows us to update the dropdown on the main tab from the config tab
+    dropdown_state = gr.State(ENDPOINT_NAMES)
+
+    with gr.Tabs():
+        with gr.TabItem("Create Image", id=0):
+            with gr.Row():
+                with gr.Column(scale=2):
+                    gr.Markdown("### 1. Select Decoder Service")
+                    service_dropdown = gr.Dropdown(
+                        label="Target Service",
+                        choices=ENDPOINT_NAMES,
+                        value=ENDPOINT_NAMES[0] if ENDPOINT_NAMES else None,
+                        interactive=True
+                    )
+                    gr.Markdown("### 2. Enter Your Secret Data")
+                    secret_data = gr.Textbox(
+                        lines=7,
+                        label="Secret Data (Key-Value Pairs)",
+                        placeholder="USERNAME: [email protected]\nAPI_KEY: sk-12345..."
+                    )
+                with gr.Column(scale=1):
+                    gr.Markdown("### 3. Generate")
+                    create_button = gr.Button("Create Encrypted Image", variant="primary")
+                    status_output = gr.Textbox(label="Status", interactive=False)
+                    image_output = gr.Image(label="Generated Image", type="pil")
+                    download_output = gr.File(label="Download Image")
+
+        with gr.TabItem("Manage Configuration", id=1):
+            gr.Markdown("## Decoder Service Configuration")
+            gr.Markdown("You can override the default `endpoints.json` by pasting a new JSON configuration below.")
             json_config = gr.Textbox(
-                lines=10,
+                lines=15,
                 label="JSON Configuration",
-                placeholder="Paste your JSON list of services here...",
-                info="Each service must have a 'name', 'link', and 'public_key'."
-            )
-            gr.Markdown("### 2. Enter Your Secret Data")
-            secret_data = gr.Textbox(
-                lines=5,
-                label="Secret Data (Key-Value Pairs)",
-                placeholder="USERNAME: [email protected]\nAPI_KEY: sk-12345..."
-            )
-            
-        with gr.Column(scale=1):
-            gr.Markdown("### 3. Select Service and Create")
-            service_dropdown = gr.Dropdown(
-                label="Decoder Service (Paste JSON config)",
-                choices=[],
-                interactive=True
+                value=initial_config,
+                info="Each service must be an object in a list with 'name', 'link', and 'public_key'."
             )
-            create_button = gr.Button("Create Encrypted Image", variant="primary")
-            
-            status_output = gr.Textbox(label="Status", interactive=False)
-            image_output = gr.Image(label="Generated Image", type="pil")
-            download_output = gr.File(label="Download Image")
+            update_config_button = gr.Button("Apply New Configuration")
+            config_status_output = gr.Textbox(label="Configuration Status", value=INITIAL_STATUS, interactive=False)
 
     # --- Interactivity ---
-    # When the JSON config textbox changes, update the dropdown menu
-    json_config.change(
-        fn=update_service_dropdown,
+    # When the "Apply" button on the config tab is clicked...
+    update_config_button.click(
+        fn=load_config_from_string,
         inputs=[json_config],
-        outputs=[service_dropdown, status_output]
+        outputs=[config_status_output]
+    ).then(
+        # ...then, update the dropdown on the main tab with the new choices.
+        # We use a lambda to get the latest global state.
+        lambda: gr.Dropdown(choices=ENDPOINT_NAMES, value=ENDPOINT_NAMES[0] if ENDPOINT_NAMES else None),
+        inputs=[],
+        outputs=[service_dropdown]
     )
 
-    # When the create button is clicked, run the main generation function
+    # When the "Create" button on the main tab is clicked...
     create_button.click(
         fn=generate_image,
-        inputs=[json_config, service_dropdown, secret_data],
+        inputs=[service_dropdown, secret_data],
         outputs=[image_output, download_output, status_output]
     )
-    
-    with gr.Accordion("Example JSON Configuration", open=False):
-        gr.Code(value=EXAMPLE_JSON, language="json")
 
 if __name__ == "__main__":
     demo.launch()