Update app.py

app.py

@@ -5,6 +5,7 @@ import base64
 import io
 import json
 import logging
+import requests  # Use requests to fetch the remote JSON file
 from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric import rsa
 
@@ -18,6 +19,10 @@ logger = logging.getLogger(__name__)
 CREATOR_SPACE_ID = "broadfield-dev/KeyLock-Auth-Creator"
 SERVER_SPACE_ID = "broadfield-dev/KeyLock-Auth-Server"
 
+# URL to the raw JSON file containing the list of public keys and services.
+# This makes the Creator's configuration publicly readable.
+CREATOR_ENDPOINTS_JSON_URL = "https://huggingface.co/spaces/broadfield-dev/KeyLock-Auth-Creator/raw/main/endpoints.json"
+
 # Construct URLs for linking in documentation
 BASE_HF_URL = "https://huggingface.co/spaces/"
 CREATOR_URL = f"{BASE_HF_URL}{CREATOR_SPACE_ID}"
@@ -30,23 +35,23 @@ SERVER_APP_PY_URL = f"{SERVER_URL}/blob/main/app.py"
 # ==============================================================================
 
 def get_creator_endpoints():
-    """Calls the Creator space to get its list of supported endpoints."""
-    status = f"Fetching endpoint list from {CREATOR_SPACE_ID}..."
-    yield gr.Dropdown(choices=[], value=None, label="⏳ Fetching..."), status
+    """Fetches the list of supported endpoints by making an HTTP request to the Creator's JSON file."""
+    status = f"Fetching endpoint list from {CREATOR_ENDPOINTS_JSON_URL}..."
+    yield gr.Dropdown(choices=[], value=None, label="⏳ Fetching..."), status, [] # Initial state
     try:
-        client = Client(src=CREATOR_SPACE_ID)
-        json_string = client.predict(api_name="/get_endpoints")
+        response = requests.get(CREATOR_ENDPOINTS_JSON_URL, timeout=10)
+        response.raise_for_status()  # Raise an exception for bad status codes
         
-        endpoints = json.loads(json_string)
+        endpoints = response.json()
         endpoint_names = [e['name'] for e in endpoints]
         
         status = f"✅ Success! Found {len(endpoint_names)} endpoints."
         # Return the full list to the state, and the updated dropdown
-        yield gr.Dropdown(choices=endpoint_names, value=endpoint_names[0] if endpoint_names else None, label="Target Service"), status
+        yield gr.Dropdown(choices=endpoint_names, value=endpoint_names[0] if endpoint_names else None, label="Target Service"), status, endpoints
     except Exception as e:
-        logger.error(f"Failed to get endpoints from creator: {e}", exc_info=True)
-        status = f"❌ Error: Could not fetch endpoints from Creator space. Check if it's running. Details: {e}"
-        yield gr.Dropdown(choices=[], value=None, label="Error fetching services"), status
+        logger.error(f"Failed to get endpoints from creator's JSON file: {e}", exc_info=True)
+        status = f"❌ Error: Could not fetch configuration. Check the URL and if the 'endpoints.json' file is public. Details: {e}"
+        yield gr.Dropdown(choices=[], value=None, label="Error fetching services"), status, []
 
 def create_image_via_api(service_name: str, secret_data: str, available_endpoints: list):
     """Calls the Creator Space API to generate an encrypted image for a selected service."""
@@ -56,7 +61,6 @@ def create_image_via_api(service_name: str, secret_data: str, available_endpoint
     status = f"Looking up public key for '{service_name}'..."
     yield None, None, status
 
-    # Find the public key from the list we fetched earlier
     public_key = next((e['public_key'] for e in available_endpoints if e['name'] == service_name), None)
     if not public_key:
         raise gr.Error(f"Could not find public key for '{service_name}' in the fetched configuration.")
@@ -120,7 +124,7 @@ theme = gr.themes.Base(
     neutral_hue=gr.themes.colors.slate,
     font=(gr.themes.GoogleFont("Inter"), "system-ui", "sans-serif"),
 ).set(
-    body_background_fill="#F1F5F9", # Light grey
+    body_background_fill="#F1F5F9",
     panel_background_fill="white",
     block_background_fill="white",
     block_border_width="1px",
@@ -130,7 +134,6 @@ theme = gr.themes.Base(
 )
 
 with gr.Blocks(theme=theme, title="KeyLock Operations Dashboard") as demo:
-    # This State component will hold the list of dicts fetched from the Creator
     endpoints_state = gr.State([])
 
     gr.Markdown("# 🔑 KeyLock Operations Dashboard")
@@ -153,7 +156,7 @@ with gr.Blocks(theme=theme, title="KeyLock Operations Dashboard") as demo:
                 with gr.Column(scale=2):
                     with gr.Row():
                         creator_service_dropdown = gr.Dropdown(label="Target Service", interactive=True, info="Select the API server you want to encrypt data for.")
-                        refresh_button = gr.Button("Refresh List", icon="🔄", scale=0)
+                        refresh_button = gr.Button("Refresh List", icon="🔄", scale=0, size="sm")
                     creator_secret_input = gr.Textbox(lines=8, label="Secret Data to Encrypt", placeholder="API_KEY: sk-123...\nUSER: demo-user")
                     creator_button = gr.Button("Create Auth Image via API", variant="primary", icon="✨")
                 with gr.Column(scale=1):
@@ -173,49 +176,24 @@ with gr.Blocks(theme=theme, title="KeyLock Operations Dashboard") as demo:
         
         with gr.TabItem("ℹ️ Service Information", id=3):
             gr.Markdown("## Ecosystem Architecture")
-            gr.Markdown(
-                """
-                This dashboard coordinates separate Hugging Face Spaces to demonstrate a secure, decoupled workflow. Each service has a specific role.
-                """
-            )
+            gr.Markdown("This dashboard coordinates separate Hugging Face Spaces to demonstrate a secure, decoupled workflow. Each service has a specific role.")
             with gr.Row():
                 with gr.Column():
-                    gr.Markdown(f"""
-                    ### 🏭 Auth Creator Service
-                    - **Space:** [{CREATOR_SPACE_ID}]({CREATOR_URL})
-                    - **Role:** Provides a UI and an API to encrypt data into PNG images for various targets. It reads a public configuration file (`endpoints.json`) to know which public keys it can use.
-                    - **Source Code:** [app.py]({CREATOR_APP_PY_URL})
-                    """)
+                    gr.Markdown(f"### 🏭 Auth Creator Service\n- **Space:** [{CREATOR_SPACE_ID}]({CREATOR_URL})\n- **Role:** Provides an API to encrypt data for various targets defined in its `endpoints.json` file.\n- **Source Code:** [app.py]({CREATOR_APP_PY_URL})")
                 with gr.Column():
-                    gr.Markdown(f"""
-                    ### 📡 Decoder Server
-                    - **Space:** [{SERVER_SPACE_ID}]({SERVER_URL})
-                    - **Role:** The trusted authority. It holds a **secret private key** and provides a secure API to decrypt images. This is the only component that can read the secret data.
-                    - **Source Code:** [app.py]({SERVER_APP_PY_URL})
-                    """)
+                    gr.Markdown(f"### 📡 Decoder Server\n- **Space:** [{SERVER_SPACE_ID}]({SERVER_URL})\n- **Role:** The trusted authority. It holds a secret private key and provides a secure API to decrypt images.\n- **Source Code:** [app.py]({SERVER_APP_PY_URL})")
 
     # --- Wire up the component logic ---
     gen_keys_button.click(fn=generate_rsa_keys, inputs=None, outputs=[output_private_key, output_public_key])
     
-    # Logic for fetching and populating the dropdown
-    load_event = demo.load(
-        fn=get_creator_endpoints,
-        inputs=None,
-        outputs=[creator_service_dropdown, creator_status]
-    ).then(
-        lambda data: data, # Pass the full data to the state
-        js="(data) => data.choices",
-        outputs=[endpoints_state]
-    )
-    refresh_button.click(
-        fn=get_creator_endpoints,
-        inputs=None,
-        outputs=[creator_service_dropdown, creator_status]
-    ).then(
-        lambda data: data,
-        js="(data) => data.choices",
-        outputs=[endpoints_state]
-    )
+    # Event handler for loading the page or refreshing the endpoint list
+    def refresh_endpoints():
+        # This is a generator function, so we need to iterate to get the last value.
+        *_, last_yield = get_creator_endpoints()
+        return last_yield
+
+    refresh_button.click(fn=refresh_endpoints, outputs=[creator_service_dropdown, creator_status, endpoints_state])
+    demo.load(fn=refresh_endpoints, outputs=[creator_service_dropdown, creator_status, endpoints_state])
 
     # Logic for the Creator and Client tabs
     creator_button.click(fn=create_image_via_api, inputs=[creator_service_dropdown, creator_secret_input, endpoints_state], outputs=[creator_image_output, gr.File(visible=False), creator_status])