options reorg

app.py

@@ -135,7 +135,6 @@ def _overlay_bubbles_html(
         bbox = bubble.get("bbox_px", [0, 0, 120, 60])
         x, y, box_w, box_h = bbox
         line = dialogue[index] if index < len(dialogue) else {}
-        # char_id = html.escape(line.get("character_id", "narrator"))
         text = html.escape(line.get("text", ""))
         left = max(0.0, min(100.0, (x / width) * 100))
         top = max(0.0, min(100.0, (y / height) * 100))
@@ -145,7 +144,6 @@ def _overlay_bubbles_html(
             "<div class='overlay-bubble' "
             f"style='left:{left:.2f}%;top:{top:.2f}%;"
             f"width:{bubble_w:.2f}%;height:{bubble_h:.2f}%;'>"
-            # f"<div class='overlay-speaker'>{char_id}</div>"
             f"<div class='overlay-line'>{text}</div>"
             "</div>"
         )
@@ -243,7 +241,6 @@ def generate_strip(
     style_id: str,
     use_live_feed: bool,
     panel_count: int,
-    enable_model_generation: bool,
     use_serverless_api: bool,
     negative_prompt: str,
     seed: int,
@@ -258,7 +255,6 @@ def generate_strip(
     payload = backends.fetch_article(
         language,
         use_live_feed=use_live_feed,
-        model_generation=enable_model_generation,
         )
     document = session.build_base_session(language, style_id, payload)
     document.setdefault("ui", {})["debug_mode"] = debug_mode
@@ -272,7 +268,6 @@ def generate_strip(
         comics.generate_story_pipeline(
             document,
             panel_count=panel_count,
-            enable_model_generation=enable_model_generation,
             text_model_repo_id=DEFAULT_TEXT_MODEL_ID,
             image_options={
                 "model_repo_id": image_model_id,
@@ -317,7 +312,6 @@ def generate_strip_ui(
     style_id: str,
     use_live_feed: bool,
     panel_count: int,
-    enable_model_generation: bool,
     use_serverless_api: bool,
     negative_prompt: str,
     seed: int,
@@ -344,7 +338,6 @@ def generate_strip_ui(
         style_id,
         use_live_feed,
         panel_count,
-        enable_model_generation,
         use_serverless_api,
         negative_prompt,
         seed,
@@ -446,11 +439,7 @@ with gr.Blocks() as demo:
                 value=False,
             )
 
-        with gr.Accordion("Model Generation (Optional)", open=False):
-            enable_model_generation_input = gr.Checkbox(
-                label="Enable model generation (text + images)",
-                value=False,
-            )
+        with gr.Accordion("Advanced Options", open=False):
             use_serverless_api_input = gr.Checkbox(
                 label="Use HF serverless API for text + image generation",
                 value=False,
@@ -538,7 +527,6 @@ with gr.Blocks() as demo:
             style_input,
             live_feed_input,
             panel_count,
-            enable_model_generation_input,
             use_serverless_api_input,
             negative_prompt_input,
             seed_input,

comic_gen/backends.py

@@ -99,7 +99,6 @@ def fallback_image_src(panel: dict[str, Any]) -> str:
 def fetch_article(
     language: str,
     use_live_feed: bool = False,
-    model_generation: bool = False,
 ) -> dict[str, str]:
     normalized = language.lower()
     if use_live_feed:
@@ -121,33 +120,32 @@ def fetch_article(
     else:
         payload = load_json_article(language)
 
-        if model_generation:
-            try:
-                parsed = {
-                    "publisher": payload.get("source").get(
-                        "publisher"
-                    ),
-                    "source_link": payload.get("source").get("link"),
-                    "published_at": payload.get("source").get(
-                        "published_at"
-                    ),
-                    "title": payload.get("article").get("title"),
-                    "fulltext": payload.get("article").get("fulltext"),
-                }
-                if parsed and parsed.get("source_link") and parsed.get(
-                    "fulltext"
-                ):
-                    return parsed
-            except (OSError, json.JSONDecodeError):
-                logger.warning(
-                    f"Error reading example file for '{language}',"
-                    f" falling back to deterministic article."
-                )
-            except Exception as e:
-                logger.warning(
-                    f"Unexpected error loading example file for '{language}':"
-                    f" {e}. Falling back to deterministic article."
-                )
+        try:
+            parsed = {
+                "publisher": payload.get("source").get(
+                    "publisher"
+                ),
+                "source_link": payload.get("source").get("link"),
+                "published_at": payload.get("source").get(
+                    "published_at"
+                ),
+                "title": payload.get("article").get("title"),
+                "fulltext": payload.get("article").get("fulltext"),
+            }
+            if parsed and parsed.get("source_link") and parsed.get(
+                "fulltext"
+            ):
+                return parsed
+        except (OSError, json.JSONDecodeError):
+            logger.warning(
+                f"Error reading example file for '{language}',"
+                f" falling back to deterministic article."
+            )
+        except Exception as e:
+            logger.warning(
+                f"Unexpected error loading example file for '{language}':"
+                f" {e}. Falling back to deterministic article."
+            )
         return payload
 
     return load_json_article(language)

comic_gen/comics.py

@@ -25,7 +25,7 @@ def _default_image_options() -> dict[str, Any]:
     return {
         "enable_live_images": False,
         "use_serverless_image_api": False,
-        "model_repo_id": "stabilityai/sdxl-turbo",
+        "model_repo_id": "black-forest-labs/FLUX.1-schnell",
         "negative_prompt": "",
         "seed": 0,
         "randomize_seed": True,
@@ -52,8 +52,8 @@ def _normalize_model_repo_id(value: Any) -> str:
             value = value[0]
         else:
             value = value[0] if value else ""
-    model_repo_id = str(value or "stabilityai/sdxl-turbo").strip()
-    return model_repo_id or "stabilityai/sdxl-turbo"
+    model_repo_id = str(value or "black-forest-labs/FLUX.1-schnell").strip()
+    return model_repo_id or "black-forest-labs/FLUX.1-schnell"
 
 
 def _normalized_image_options(
@@ -79,7 +79,7 @@ def _normalized_image_options(
     )
     options["randomize_seed"] = bool(options.get("randomize_seed", True))
     options["model_repo_id"] = _normalize_model_repo_id(
-        options.get("model_repo_id", "stabilityai/sdxl-turbo")
+        options.get("model_repo_id", "black-forest-labs/FLUX.1-schnell")
     )
     options["negative_prompt"] = str(options.get("negative_prompt", ""))
     return options
@@ -88,15 +88,9 @@ def _normalized_image_options(
 def generate_story_pipeline(
     document: dict[str, Any],
     panel_count: int,
-    enable_model_generation: bool,
     text_model_repo_id: str,
     image_options: dict[str, Any] | None = None,
 ) -> None:
-    if not enable_model_generation:
-        logger.info("Running deterministic pipeline")
-        deterministic_pipeline(document)
-        return
-
     options = _normalized_image_options(image_options)
     options["enable_live_images"] = True
     logger.info("Running unified model pipeline (text + image)")

comic_gen/image_backend.py

@@ -101,8 +101,8 @@ def _normalize_model_repo_id(value: Any) -> str:
     """Return a model repo id string that Diffusers can validate."""
     if isinstance(value, (list, tuple)):
         value = value[0] if value else ""
-    model_repo_id = str(value or "stabilityai/sdxl-turbo").strip()
-    return model_repo_id or "stabilityai/sdxl-turbo"
+    model_repo_id = str(value or "black-forest-labs/FLUX.1-schnell").strip()
+    return model_repo_id or "black-forest-labs/FLUX.1-schnell"
 
 
 def _is_serverless_image_enabled(options: dict[str, Any]) -> bool:
@@ -265,6 +265,7 @@ def _generate_panel_image(
         height=height,
         guidance_scale=guidance_scale,
         num_inference_steps=num_inference_steps,
+        max_sequence_length=256,
     ).images[0]
 
     out_path = _build_output_path(session_id, panel_id)

comic_gen/text_backend.py

@@ -14,7 +14,6 @@ from .text_utils import (
     ComicResponse,
 )
 from .errors import (
-    ModelPipelineError,
     TextGenerationError,
     UnifiedGenerationError,
 )

test/test_image_backend.py

@@ -62,7 +62,7 @@ def _options(enable_live_images: bool = True) -> dict:
     return {
         "enable_live_images": enable_live_images,
         "use_serverless_image_api": True,
-        "model_repo_id": "stabilityai/sdxl-turbo",
+        "model_repo_id": "black-forest-labs/FLUX.1-schnell",
         "negative_prompt": "",
         "seed": 11,
         "randomize_seed": False,
@@ -117,7 +117,7 @@ def test_generate_panel_image_uses_serverless_without_local_fallback(
         negative_prompt="",
         session_id="session-1",
         panel_id="panel_1",
-        model_repo_id=("stabilityai/sdxl-turbo",),
+        model_repo_id=("black-forest-labs/FLUX.1-schnell",),
         seed=5,
         randomize_seed=False,
         width=256,
@@ -130,7 +130,7 @@ def test_generate_panel_image_uses_serverless_without_local_fallback(
     assert out_path.endswith("panel_1.png")
     assert used_seed == 5
     assert image_source == "serverless"
-    assert captured["model_repo_id"] == "stabilityai/sdxl-turbo"
+    assert captured["model_repo_id"] == "black-forest-labs/FLUX.1-schnell"
 
 
 def test_generate_image_panels_passes_stored_image_prompt(monkeypatch):