up

app.py

@@ -310,55 +310,53 @@ pipe.fuse_lora()
 # --- UI Constants and Helpers ---
 MAX_SEED = np.iinfo(np.int32).max
 
-def get_image_size_for_position(position_data, image_index, num_images):
+def get_image_size_for_position(position_data, image_index, num_images, max_resolution=1024):
     """Determines optimal image size based on its position in the layout.
 
     Args:
         position_data: Layout position data [x, y, width, height] in relative units
         image_index: Index of the current image (0-based)
         num_images: Total number of images in the layout
+        max_resolution: Maximum resolution for any dimension (default 1024)
 
     Returns:
-        tuple: (width, height) optimized for the position's aspect ratio, max 1024 in any dimension
+        tuple: (width, height) optimized for the position's aspect ratio
     """
     if not position_data:
-        return 1024, 1024  # Default square
+        return max_resolution, max_resolution  # Default square
 
     x_rel, y_rel, w_rel, h_rel = position_data
     aspect_ratio = w_rel / h_rel if h_rel > 0 else 1.0
 
-    # Max dimension is 1024
-    max_dim = 1024
-
-    # Calculate dimensions maintaining aspect ratio with max of 1024
+    # Calculate dimensions maintaining aspect ratio
     if aspect_ratio >= 1:  # Wider than tall
-        width = max_dim
-        height = int(max_dim / aspect_ratio)
-        # Ensure height is at least 256 for quality
-        if height < 256:
-            height = 256
-            width = int(256 * aspect_ratio)
+        width = max_resolution
+        height = int(max_resolution / aspect_ratio)
+        # Ensure height is at least 384 for quality
+        if height < 384:
+            height = 384
+            width = int(384 * aspect_ratio)
     else:  # Taller than wide
-        height = max_dim
-        width = int(max_dim * aspect_ratio)
-        # Ensure width is at least 256 for quality
-        if width < 256:
-            width = 256
-            height = int(256 / aspect_ratio)
+        height = max_resolution
+        width = int(max_resolution * aspect_ratio)
+        # Ensure width is at least 384 for quality
+        if width < 384:
+            width = 384
+            height = int(384 / aspect_ratio)
 
     # Round to nearest 64 for better compatibility
     width = (width // 64) * 64
     height = (height // 64) * 64
 
-    # Ensure we don't exceed max_dim after rounding
-    if width > max_dim:
-        width = max_dim
-    if height > max_dim:
-        height = max_dim
+    # Ensure we don't exceed max_resolution after rounding
+    if width > max_resolution:
+        width = max_resolution
+    if height > max_resolution:
+        height = max_resolution
 
-    # Minimum size check
-    width = max(width, 256)
-    height = max(height, 256)
+    # Minimum size check (increased from 256 to 384 for better quality)
+    width = max(width, 384)
+    height = max(height, 384)
 
     return width, height
 
@@ -666,6 +664,7 @@ def infer_page(
     custom_style_text="",
     num_images=1,
     layout="default",
+    max_resolution=1024,
     session_state=None,
     progress=gr.Progress(track_tqdm=True),
 ):
@@ -696,8 +695,8 @@ def infer_page(
     if random.random() < 0.1:  # 10% chance to cleanup on each request
         session_manager.cleanup_old_sessions()
 
-    # Check page limit
-    if session_manager.metadata["total_pages"] >= 128:
+    # Check page limit (reduced to 24 for performance)
+    if session_manager.metadata["total_pages"] >= 24:
         return session_state, None, None, f"Page limit reached"
 
     generated_images = []
@@ -733,6 +732,7 @@ def infer_page(
             dialogue=scene_dialogue,  # Pass dialogue separately
             style_preset=style_preset,
             custom_style_text=custom_style_text,
+            max_resolution=max_resolution,
         )
 
         generated_images.append(image)
@@ -753,7 +753,7 @@ def infer_page(
 
     # Next button label
     next_page_num = page_num + 1
-    button_label = f"Generate page {next_page_num}" if next_page_num <= 128 else "Page limit reached"
+    button_label = f"Generate page {next_page_num}" if next_page_num <= 24 else "Page limit reached"
 
     return session_state, pdf_path, pdf_path, button_label
 
@@ -770,6 +770,7 @@ def infer_single_auto(
     dialogue="",  # New parameter for dialogue
     style_preset="no_style",
     custom_style_text="",
+    max_resolution=1024,  # New parameter for max resolution
 ):
     """
     Generates an image with automatically determined aspect ratio based on layout position.
@@ -777,8 +778,8 @@ def infer_single_auto(
     if randomize_seed:
         seed = random.randint(0, MAX_SEED)
 
-    # Automatically determine image size based on position
-    width, height = get_image_size_for_position(position_data, image_index, num_images)
+    # Automatically determine image size based on position with custom max resolution
+    width, height = get_image_size_for_position(position_data, image_index, num_images, max_resolution)
 
     # Set up the generator for reproducibility
     generator = torch.Generator(device="cuda").manual_seed(seed)
@@ -923,11 +924,20 @@ with gr.Blocks(css=css) as demo:
                         value=8,
                     )
 
+                    max_resolution = gr.Slider(
+                        label="Max Resolution",
+                        minimum=768,
+                        maximum=1280,
+                        step=128,
+                        value=1024,
+                        info="Maximum dimension for generated images (higher = better quality but slower)"
+                    )
+
                 # Download link
                 pdf_output = gr.File(label="Download PDF", show_label=True, elem_id="pdf-download")
 
                 gr.Markdown("""**Note:** Your images and PDF are saved for up to 24 hours.
-                You can continue adding pages (up to 128) by clicking the generate button.""")
+                You can continue adding pages (up to 24) by clicking the generate button.""")
 
                 # Examples section in the left column
                 with gr.Accordion("Examples", open=True):
@@ -985,6 +995,7 @@ with gr.Blocks(css=css) as demo:
             custom_style_text,
             num_images_slider,
             layout_dropdown,
+            max_resolution,
             session_state,
         ],
         outputs=[session_state, pdf_output, pdf_preview, run_button],