Update app.py

app.py

@@ -10,7 +10,7 @@ import math
 from datetime import datetime
 
 # ==========================================
-# 1. JSON & HELPER LOGIC (Kept same)
+# 1. JSON & HELPER LOGIC
 # ==========================================
 def get_sorted_nodes(G):
     return sorted(list(G.nodes()), key=lambda l: (l[0], l[1]))
@@ -430,10 +430,9 @@ IMG_WIDTH_PX = 800
 IMG_HEIGHT_PX = 800
 
 def plot_graph_to_image(graph, width, height, title="Network"):
-    # Create figure with exact pixel control (no margins)
     dpi = 100
     fig = plt.figure(figsize=(IMG_WIDTH_PX/dpi, IMG_HEIGHT_PX/dpi), dpi=dpi)
-    ax = fig.add_axes([0, 0, 1, 1]) # 0% to 100% of figure, no borders
+    ax = fig.add_axes([0, 0, 1, 1]) 
     
     pos = {node: (node[0], node[1]) for node in graph.nodes()}
     nx.draw_networkx_edges(graph, pos, ax=ax, width=2, alpha=0.6, edge_color="#333")
@@ -443,18 +442,12 @@ def plot_graph_to_image(graph, width, height, title="Network"):
     labels = {node: str(i+1) for i, node in enumerate(sorted_nodes)}
     nx.draw_networkx_labels(graph, pos, labels, ax=ax, font_size=8, font_color="white", font_weight="bold")
     
-    # Exact Limits Mapping: 
-    # Grid goes 0..Width. We want Click (0,0) to be Top-Left.
-    # We map 0..Width to X, 0..Height to Y.
-    # To center nodes, we set limits -0.5 to Width+0.5
     ax.set_xlim(-0.5, width + 0.5)
-    ax.set_ylim(height + 0.5, -0.5) # Inverted Y
+    ax.set_ylim(height + 0.5, -0.5)
     
-    # Draw faint grid
     ax.grid(True, linestyle=':', alpha=0.3)
     ax.set_axis_on()
     
-    # Save to temp file
     timestamp = datetime.now().strftime("%Y%m%d_%H%M%S_%f")
     fname = f"temp_plot_{timestamp}.png"
     plt.savefig(fname)
@@ -464,50 +457,32 @@ def plot_graph_to_image(graph, width, height, title="Network"):
 def handle_plot_click(evt: gr.SelectData, state_data):
     if not state_data or "graph" not in state_data: return None, "Generate first.", state_data
     
-    # 1. Get click coordinates (pixels)
     click_x, click_y = evt.index 
     width = state_data["width"]
     height = state_data["height"]
     
-    # 2. Map Pixels -> Grid
-    # Logic: Total pixels = 800. Range = Width + 1.
-    # NormX = ClickX / 800. 
-    # DataX = NormX * (Width + 1) - 0.5
-    # GridX = round(DataX)
-    
     range_x = width + 1.0
     range_y = height + 1.0
-    
     norm_x = click_x / IMG_WIDTH_PX
     norm_y = click_y / IMG_HEIGHT_PX
-    
-    # Since limits are -0.5 to W+0.5, total span is W+1
     data_x = norm_x * range_x - 0.5
     data_y = norm_y * range_y - 0.5
-    
     grid_x = int(round(data_x))
     grid_y = int(round(data_y))
     
-    # 3. Perform Action (Smart Toggle)
     gen = NetworkGenerator(width, height)
     gen.graph = state_data["graph"]
     
-    # Check bounds
     if 0 <= grid_x <= width and 0 <= grid_y <= height:
         if gen.graph.has_node((grid_x, grid_y)):
-            # Delete
             success, msg = gen.manual_delete_node(grid_x, grid_y)
             action = "Deleted"
         else:
-            # Add
             success, msg = gen.manual_add_node(grid_x, grid_y)
             action = "Added"
     else:
-        success = False
-        msg = "Clicked outside grid."
-        action = "Ignored"
+        success, msg, action = False, "Clicked outside.", "Ignored"
 
-    # 4. Refresh
     if success:
         state_data["graph"] = gen.graph
         img_path = plot_graph_to_image(gen.graph, width, height)
@@ -516,10 +491,9 @@ def handle_plot_click(evt: gr.SelectData, state_data):
     else:
         return gr.update(), f"Error: {msg}", state_data
 
-# ... (Previous helper functions get_preset_dims, update_ui_for_variant, etc. remain same) ...
 def get_preset_dims(preset_mode, topology):
     if preset_mode == "Custom": return gr.update(interactive=True), gr.update(interactive=True)
-    dims = (6, 11) if topology=="linear" and preset_mode=="Medium" else (8,8) # Simplified for brevity
+    dims = (6, 11) if topology=="linear" and preset_mode=="Medium" else (8,8)
     if preset_mode == "Small": dims = (4, 4)
     if preset_mode == "Large": dims = (16, 16) if topology!="linear" else (10, 26)
     return gr.update(value=dims[0], interactive=False), gr.update(value=dims[1], interactive=False)
@@ -540,16 +514,14 @@ def generate_and_store(topology, width, height, variant, void_frac, t_nodes, t_e
         if variant == "Fixed": t_nodes, t_edges = 0, 0
         gen = NetworkGenerator(width, height, var_code, topology, void_frac, t_nodes, t_edges)
         graph = gen.generate()
-        
         img_path = plot_graph_to_image(graph, width, height)
         metrics = f"**Nodes:** {len(graph.nodes())} | **Edges:** {len(graph.edges())} | **Density:** {nx.density(graph):.2f}"
         state_data = { "graph": graph, "width": width, "height": height, "topology": topology }
-        return img_path, metrics, state_data, gr.update(interactive=True), gr.update(interactive=True)
+        return img_path, metrics, state_data, gr.update(interactive=True), gr.update(interactive=True), gr.update(interactive=True)
     except Exception as e:
-        return None, f"Error: {e}", None, gr.update(interactive=False), gr.update(interactive=False)
+        return None, f"Error: {e}", None, gr.update(interactive=False), gr.update(interactive=False), gr.update(interactive=False)
 
 def run_batch_generation(count, topology, width, height, variant, void_frac, t_nodes, t_edges):
-    # (Same batch logic as before)
     timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
     dir_name = f"batch_{timestamp}"
     os.makedirs(dir_name, exist_ok=True)
@@ -568,6 +540,15 @@ def run_batch_generation(count, topology, width, height, variant, void_frac, t_n
     except Exception as e:
         return None
 
+def save_single_json_action(state_data):
+    if not state_data or "graph" not in state_data: return None
+    timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+    json_content = generate_full_json_dict(state_data["graph"], loop=1)
+    fname = f"single_network_{timestamp}.json"
+    with open(fname, 'w') as f:
+        json.dump(json_content, f, indent=4)
+    return fname
+
 # ==========================================
 # GRADIO UI
 # ==========================================
@@ -584,14 +565,20 @@ with gr.Blocks(title="Interactive Network Generator") as demo:
                 with gr.Row():
                     width = gr.Number(8, label="Width", interactive=False)
                     height = gr.Number(8, label="Height", interactive=False)
-                variant = gr.Dropdown(["Fixed", "Custom"], value="Fixed", label="Variant")
+                
+                with gr.Group():
+                    variant = gr.Dropdown(["Fixed", "Custom"], value="Fixed", label="Variant")
+                    with gr.Row():
+                        t_nodes = gr.Number(0, label="Target Nodes", interactive=False)
+                        t_edges = gr.Number(0, label="Target Edges", interactive=False)
+                
                 void_frac = gr.Slider(0.0, 0.9, 0.35, label="Void Fraction", interactive=False)
-                gr.Markdown("### Custom Overrides")
-                with gr.Row():
-                    t_nodes = gr.Number(0, label="Nodes", interactive=False)
-                    t_edges = gr.Number(0, label="Edges", interactive=False)
+                
                 gen_btn = gr.Button("Generate", variant="primary")
-            
+                with gr.Row():
+                    save_json_btn = gr.Button("Download JSON", interactive=False)
+                    json_file = gr.File(label="Saved JSON", visible=False)
+
             with gr.Tab("Batch"):
                 batch_count = gr.Slider(1, 50, 5, step=1, label="Count")
                 batch_btn = gr.Button("Generate Batch ZIP")
@@ -599,8 +586,6 @@ with gr.Blocks(title="Interactive Network Generator") as demo:
 
         with gr.Column(scale=2):
             metrics = gr.Markdown("Ready.")
-            # Important: interactive=False prevents user from uploading their own image, 
-            # but select events still fire.
             plot_img = gr.Image(label="Interactive Graph", interactive=False, height=800, width=800)
 
     # EVENTS
@@ -615,11 +600,14 @@ with gr.Blocks(title="Interactive Network Generator") as demo:
     topology.change(update_ui_for_variant, inputs_var, [void_frac, t_nodes, t_edges])
 
     gen_args = [topology, width, height, variant, void_frac, t_nodes, t_edges]
-    gen_btn.click(generate_and_store, gen_args, [plot_img, metrics, state])
+    gen_btn.click(generate_and_store, gen_args, [plot_img, metrics, state, save_json_btn, json_file])
 
-    # CLICK EVENT
     plot_img.select(handle_plot_click, [state], [plot_img, metrics, state])
 
+    save_json_btn.click(save_single_json_action, [state], [json_file]).then(
+        lambda: gr.update(visible=True), None, [json_file]
+    )
+
     batch_args = [batch_count, topology, width, height, variant, void_frac, t_nodes, t_edges]
     batch_btn.click(run_batch_generation, batch_args, [file_out])