Fix example workspace zoom initialization

app.py

@@ -52,6 +52,8 @@ model = AutoModel.from_pretrained(MODEL_NAME, _attn_implementation=_attn_impl, t
 BASE_SIZE = 1024
 IMAGE_SIZE = 768
 CROP_MODE = True
+WORKSPACE_EDITOR_HEIGHT = 640
+WORKSPACE_EDITOR_WIDTH_EST = 980
 WORKSPACE_DEFAULT_SCALE = 89
 GROUNDING_PATTERN = re.compile(r'<\|ref\|>(.*?)<\|/ref\|><\|det\|>(.*?)<\|/det\|>', re.DOTALL)
 INFER_DEBUG_FILTERS = ['PATCHES', '====', 'BASE:', 'directly resize', 'NO PATCHES', 'torch.Size', '%|']
@@ -1354,21 +1356,45 @@ def _scale_workspace_image(img, workspace_scale):
         scale = max(60, min(220, int(workspace_scale)))
     except Exception:
         scale = WORKSPACE_DEFAULT_SCALE
-    if scale == 100:
+    # Target a predictable initial in-canvas zoom by fitting image into
+    # a virtual viewport derived from editor size and requested scale.
+    target_ratio = max(0.6, min(2.2, scale / 100.0))
+    max_w = max(1, int(round(WORKSPACE_EDITOR_WIDTH_EST / target_ratio)))
+    max_h = max(1, int(round(WORKSPACE_EDITOR_HEIGHT / target_ratio)))
+    fit_ratio = min(max_w / max(1, img.width), max_h / max(1, img.height), 1.0)
+    if fit_ratio >= 0.999:
         return img
-    ratio = scale / 100.0
-    new_w = max(1, int(round(img.width * ratio)))
-    new_h = max(1, int(round(img.height * ratio)))
+    new_w = max(1, int(round(img.width * fit_ratio)))
+    new_h = max(1, int(round(img.height * fit_ratio)))
     resample = Image.Resampling.BILINEAR if hasattr(Image, "Resampling") else Image.BILINEAR
     return img.resize((new_w, new_h), resample)
 
-def load_image_with_size(file_path, page_num=1, workspace_scale=WORKSPACE_DEFAULT_SCALE):
-    img = load_image(file_path, page_num)
+def _prepare_workspace_image(img, workspace_scale=WORKSPACE_DEFAULT_SCALE):
     if img is None:
         return None, None, None
     display_img = _scale_workspace_image(img, workspace_scale)
     return display_img, (int(display_img.width), int(display_img.height)), display_img
 
+def load_image_with_size(file_path, page_num=1, workspace_scale=WORKSPACE_DEFAULT_SCALE):
+    img = load_image(file_path, page_num)
+    return _prepare_workspace_image(img, workspace_scale)
+
+def load_example_into_workspace(example_value):
+    if example_value is None:
+        return None, None, None
+    if isinstance(example_value, Image.Image):
+        img = example_value
+    else:
+        maybe_rgba = _to_rgba_image(example_value)
+        if maybe_rgba is None:
+            return None, None, None
+        img = maybe_rgba.convert("RGB")
+    return _prepare_workspace_image(img, WORKSPACE_DEFAULT_SCALE)
+
+def load_example_into_workspace_and_reset(example_value):
+    display_img, base_size, base_img = load_example_into_workspace(example_value)
+    return display_img, base_size, base_img, [], [], "No saved regions.", None
+
 def sync_workspace_state(editor_value, current_base_image):
     background = _extract_editor_background(editor_value)
     if isinstance(background, Image.Image):
@@ -1451,7 +1477,7 @@ with gr.Blocks(**blocks_kwargs) as demo:
                             label="Image Workspace",
                             show_label=False,
                             type="pil",
-                            height=640,
+                            height=WORKSPACE_EDITOR_HEIGHT,
                             **editor_kwargs,
                         )
                     except TypeError:
@@ -1459,21 +1485,21 @@ with gr.Blocks(**blocks_kwargs) as demo:
                             region_editor = gr.ImageEditor(
                                 label="Image Workspace",
                                 show_label=False,
-                                height=640,
+                                height=WORKSPACE_EDITOR_HEIGHT,
                                 **editor_kwargs,
                             )
                         except TypeError:
                             region_editor = gr.ImageEditor(
                                 label="Image Workspace",
                                 show_label=False,
-                                height=640,
+                                height=WORKSPACE_EDITOR_HEIGHT,
                             )
                 else:
                     region_editor = gr.Paint(
                         label="Image Workspace",
                         show_label=False,
                         type="pil",
-                        height=640,
+                        height=WORKSPACE_EDITOR_HEIGHT,
                         **editor_kwargs,
                     )
             else:
@@ -1529,10 +1555,19 @@ with gr.Blocks(**blocks_kwargs) as demo:
                 "examples/2022-0922 Section 15 Notes.png",
             ]
             if HAS_REGION_WORKSPACE and region_editor is not None:
+                image_examples_input = gr.Image(
+                    label="Example Loader",
+                    type="pil",
+                    visible=False,
+                    show_label=False,
+                )
                 gr.Examples(
                     label="Image Examples (click thumbnail to load into workspace)",
                     examples=image_examples,
-                    inputs=[region_editor],
+                    inputs=[image_examples_input],
+                    outputs=[region_editor, workspace_base_size, workspace_base_image, selected_regions_state, selected_regions_gallery, selection_status, drawn_mask_state],
+                    fn=load_example_into_workspace_and_reset,
+                    run_on_click=True,
                     cache_examples=False,
                 )
             else:
@@ -1560,7 +1595,7 @@ with gr.Blocks(**blocks_kwargs) as demo:
         2. Choose **Input Scope**:
            - `Entire Page` for the full page.
            - `Selected Region` for a specific area.
-        2a. Workspace opens at **89% scale** by default to keep small math readable while avoiding extra zoom adjustments.
+        2a. Workspace targets about **89% initial zoom** by default to keep small math readable while avoiding extra zoom adjustments.
         3. For `Selected Region`, use the **Image Workspace**:
            - Recommended: freehand selection (draw/highlight target); app uses an automatic bounding box around your marks.
            - Optional rectangle selection: use the **Crop** tool.