Update app.py

app.py

@@ -12,7 +12,7 @@ logger = logging.getLogger(__name__)
 #  CONFIGURATION & DATA HANDLING
 # ==============================================================================
 
-DEFAULT_CONFIG_FILE = "https://huggingface.co/spaces/Space-Share/bucket/raw/main/endpoints.json"
+DEFAULT_CONFIG_FILE = "endpoints.json"
 
 def load_config_from_file(filepath: str) -> list:
     """Loads and validates the JSON configuration from a file."""
@@ -31,7 +31,6 @@ def load_config_from_file(filepath: str) -> list:
         return []
     except Exception as e:
         logger.error(f"Error loading config file {filepath}: {e}")
-        # Return an empty list on error to prevent crashing the app
         return []
 
 def save_config_to_file(filepath: str, config_data: list) -> str:
@@ -47,8 +46,6 @@ def save_config_to_file(filepath: str, config_data: list) -> str:
         logger.error(status_msg)
         return status_msg
 
-# --- Load initial configuration from the file at startup ---
-# The 'config_state' will hold our list of dictionaries
 initial_config = load_config_from_file(DEFAULT_CONFIG_FILE)
 
 # ==============================================================================
@@ -62,21 +59,17 @@ def add_new_service(current_config: list, name: str, link: str, public_key: str)
     
     new_service = {"name": name, "link": link, "public_key": public_key}
     
-    # Check for duplicate names
     if any(service['name'] == name for service in current_config):
         raise gr.Error(f"A service with the name '{name}' already exists. Please use a unique name.")
         
     updated_config = current_config + [new_service]
-    
-    # Update dropdown choices
     updated_choices = [service['name'] for service in updated_config]
     
-    # Clear the input forms and provide success feedback
     status_update = f"✅ '{name}' added. You can now use it in the 'Create Image' tab. Click 'Save to File' to make it permanent."
     return updated_config, gr.Dropdown(choices=updated_choices), status_update, "", "", ""
 
 def generate_image(selected_service_name: str, secret_data_str: str, current_config: list):
-    """The main image creation function, now takes the config state as an input."""
+    """The main image creation function for the UI."""
     if not all([selected_service_name, secret_data_str]):
         raise gr.Error("A selected service and secret data are both required.")
 
@@ -85,6 +78,7 @@ def generate_image(selected_service_name: str, secret_data_str: str, current_con
         if not public_key:
             raise gr.Error(f"Could not find the service '{selected_service_name}'. Please check the configuration.")
 
+        # This call is correct and should not cause an error
         encrypted_image = core.create_encrypted_image(secret_data_str, public_key)
         
         with tempfile.NamedTemporaryFile(suffix=".png", delete=False) as tmp_file:
@@ -99,18 +93,17 @@ def generate_image(selected_service_name: str, secret_data_str: str, current_con
 def get_endpoints_json() -> str:
     """Reads and returns the content of endpoints.json as a string."""
     try:
-        with open("endpoints.json", "r") as f:
+        with open(DEFAULT_CONFIG_FILE, "r") as f:
             return f.read()
     except Exception as e:
-        logger.error(f"Could not read endpoints.json: {e}")
-        raise gr.Error("Server could not read its endpoints.json configuration file.")
+        logger.error(f"Could not read {DEFAULT_CONFIG_FILE}: {e}")
+        raise gr.Error(f"Server could not read its {DEFAULT_CONFIG_FILE} configuration file.")
+
 # ==============================================================================
 #  GRADIO INTERFACE
 # ==============================================================================
 
 with gr.Blocks(theme=gr.themes.Soft(), title="KeyLock Image Creator") as demo:
-    # This gr.State object holds the current configuration (list of dicts)
-    # It's initialized with the data loaded from endpoints.json
     config_state = gr.State(initial_config)
     
     gr.Markdown("# 🏭 KeyLock Image Creator")
@@ -118,6 +111,7 @@ with gr.Blocks(theme=gr.themes.Soft(), title="KeyLock Image Creator") as demo:
 
     with gr.Tabs() as tabs:
         with gr.TabItem("Create Image", id=0):
+            # ... (Your existing UI code is fine, no changes needed here) ...
             with gr.Row():
                 with gr.Column(scale=2):
                     gr.Markdown("### 1. Select Decoder Service")
@@ -141,62 +135,65 @@ with gr.Blocks(theme=gr.themes.Soft(), title="KeyLock Image Creator") as demo:
                     download_output = gr.File(label="Download Image")
 
         with gr.TabItem("Manage Configuration", id=1):
+            # ... (Your existing config management code is fine, no changes needed here) ...
             gr.Markdown("## Decoder Service Configuration")
             gr.Markdown("View the current configuration, add new services, and save your changes.")
-            
             with gr.Row():
                 with gr.Column(scale=2):
                     gr.Markdown("### Current Configuration")
-                    config_display = gr.JSON(value=initial_config, label="Loaded from endpoints.json")
-                
+                    config_display = gr.JSON(value=initial_config, label=f"Loaded from {DEFAULT_CONFIG_FILE}")
                 with gr.Column(scale=1):
                     gr.Markdown("### Add a New Service")
                     new_service_name = gr.Textbox(label="Service Name", placeholder="e.g., My Production API")
                     new_service_link = gr.Textbox(label="Service Link", placeholder="https://huggingface.co/...")
                     new_service_key = gr.Textbox(label="Public Key (PEM Format)", lines=5, placeholder="-----BEGIN PUBLIC KEY-----...")
                     add_service_button = gr.Button("Add Service to Current Session")
-                    
             gr.Markdown("---")
             save_config_button = gr.Button("Save Current Configuration to File", variant="secondary")
             config_status_output = gr.Textbox(label="Configuration Status", interactive=False)
-    with gr.Row(visible=False):
-        # Original API for creating images
-        api_secret_input = gr.Textbox()
-        api_pubkey_input = gr.Textbox()
-        api_image_output = gr.Image(type="pil")
-        gr.Interface(
-            fn=create_carrier_image,
-            inputs=[api_secret_input, api_pubkey_input],
-            outputs=api_image_output,
-            api_name="create_image"
-        )
-        
-        # NEW API to get the endpoint list
-        api_get_endpoints_output = gr.Textbox()
-        gr.Interface(
-            fn=get_endpoints_json,
-            inputs=[],
-            outputs=api_get_endpoints_output,
-            api_name="get_endpoints" # This creates /run/get_endpoints
-        )
+            
+        # FIX: Define API endpoints clearly instead of using a hidden row
+        with gr.TabItem("API", id=2):
+            gr.Markdown("## API Endpoints")
+            gr.Markdown("Use these endpoints for programmatic access.")
+            
+            # API for creating an image
+            gr.Interface(
+                # By passing core.create_encrypted_image directly, we ensure it runs in the correct scope
+                fn=core.create_encrypted_image,
+                inputs=[
+                    gr.Textbox(label="Secret Data", info="Key-value pairs, one per line."),
+                    gr.Textbox(label="Public Key PEM", info="The full PEM-formatted public key.")
+                ],
+                outputs=gr.Image(type="pil", label="Encrypted Image"),
+                title="Image Creation API",
+                description="Creates an encrypted image from secret data and a public key. Use via the `/api/create_image/` route.",
+                api_name="create_image" 
+            )
+
+            # API to get the endpoint list
+            gr.Interface(
+                fn=get_endpoints_json,
+                inputs=[],
+                outputs=gr.Textbox(label="Endpoint Configuration"),
+                title="Get Endpoints API",
+                description=f"Retrieves the contents of `{DEFAULT_CONFIG_FILE}`. Use via the `/api/get_endpoints/` route.",
+                api_name="get_endpoints"
+            )
 
     # --- Interactivity ---
     
-    # Main image creation logic
     create_button.click(
         fn=generate_image,
         inputs=[service_dropdown, secret_data, config_state],
         outputs=[image_output, download_output, status_output]
     )
 
-    # Logic for the "Manage Configuration" tab
     add_service_button.click(
         fn=add_new_service,
         inputs=[config_state, new_service_name, new_service_link, new_service_key],
-        # Outputs: update the state, the dropdown, the status, and clear the form fields
         outputs=[config_state, service_dropdown, config_status_output, new_service_name, new_service_link, new_service_key]
     ).then(
-        # After updating the state, also update the JSON display to reflect the change
         lambda state: state,
         inputs=[config_state],
         outputs=[config_display]
@@ -208,8 +205,6 @@ with gr.Blocks(theme=gr.themes.Soft(), title="KeyLock Image Creator") as demo:
         outputs=[config_status_output]
     )
 
-    # When the configuration state changes (e.g., after adding a service),
-    # update the JSON display on the config tab. This keeps the UI in sync.
     config_state.change(
         fn=lambda state: state,
         inputs=[config_state],