updated app

.gradio/certificate.pem

@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4
+WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu
+ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY
+MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc
+h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+
+0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U
+A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW
+T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH
+B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC
+B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv
+KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn
+OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn
+jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw
+qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI
+rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq
+hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
+ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ
+3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK
+NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5
+ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur
+TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC
+jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc
+oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq
+4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA
+mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d
+emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=
+-----END CERTIFICATE-----

requirements.txt

@@ -8,15 +8,15 @@ torchaudio==2.5.1
 
 
 # HUGGINGFACE DIFFUSION ECOSYSTEM
-diffusers==0.29.2
-transformers==4.39.3    
-huggingface_hub==0.29.1 
+diffusers==0.35.2
+transformers==4.57.3    
+huggingface_hub==0.36.0
 accelerate==0.28.0
-safetensors==0.4.2
+safetensors==0.7.0
 
 
 # UI FRAMEWORK
-gradio==3.50.2
+gradio==6.0.2
 
 
 # IMAGE PROCESSING & UTILITIES

src/sdgen/config/__init__.py

@@ -1,7 +1,7 @@
 """Configuration exports for the sdgen package.
 
 This module re-exports commonly used configuration paths and settings
-so they can be imported directly from `src.sdgen.config`.
+so they can be imported directly from `sdgen.config`.
 """
 
 from __future__ import annotations

src/sdgen/config/paths.py

@@ -1,4 +1,4 @@
-"""Path configuration for src.sdgen.
+"""Path configuration for sdgen.
 
 All filesystem paths are resolved relative to the project root.
 The project root is detected by walking upward until a marker

src/sdgen/config/settings.py

@@ -1,4 +1,4 @@
-"""Application runtime settings for src.sdgen.
+"""Application runtime settings for sdgen.
 
 AppSettings reads configuration values from environment variables at
 process start and exposes them as strongly typed attributes.

src/sdgen/main.py

@@ -9,11 +9,11 @@ from __future__ import annotations
 import torch
 from dotenv import load_dotenv
 
-from src.sdgen.config import AppSettings
-from src.sdgen.sd.img2img import prepare_img2img_pipeline
-from src.sdgen.sd.pipeline import load_pipeline, warmup_pipeline
-from src.sdgen.ui import build_ui
-from src.sdgen.utils.logger import get_logger
+from sdgen.config import AppSettings
+from sdgen.sd.img2img import prepare_img2img_pipeline
+from sdgen.sd.pipeline import load_pipeline, warmup_pipeline
+from sdgen.ui import build_ui
+from sdgen.utils.logger import get_logger
 
 logger = get_logger(__name__)
 load_dotenv()
@@ -57,7 +57,7 @@ def main() -> None:
         ),
     }
     if device == "cuda" and settings.warmup:
-        warmup_pipeline(pipes["SD1.5"])
+        warmup_pipeline(pipes["Turbo"])
 
     img2img_pipes = {
         "SD1.5": prepare_img2img_pipeline(pipes["SD1.5"]),
@@ -65,10 +65,7 @@ def main() -> None:
     }
 
     demo = build_ui(pipes, img2img_pipes)
-    demo.queue(
-        concurrency_count=1,
-        max_size=8,
-    ).launch(
+    demo.launch(
         server_name=settings.server_host,
         server_port=settings.server_port,
         share=settings.share,

src/sdgen/sd/generator.py

@@ -8,9 +8,9 @@ from typing import Tuple
 import torch
 from PIL import Image
 
-from src.sdgen.sd.models import GenerationMetadata, Txt2ImgConfig
-from src.sdgen.utils.common import validate_resolution
-from src.sdgen.utils.logger import get_logger
+from sdgen.sd.models import GenerationMetadata, Txt2ImgConfig
+from sdgen.utils.common import validate_resolution
+from sdgen.utils.logger import get_logger
 
 logger = get_logger(__name__)
 

src/sdgen/sd/img2img.py

@@ -8,9 +8,9 @@ import torch
 from diffusers import StableDiffusionImg2ImgPipeline
 from PIL import Image
 
-from src.sdgen.sd.models import GenerationMetadata, Img2ImgConfig
-from src.sdgen.utils.common import validate_resolution
-from src.sdgen.utils.logger import get_logger
+from sdgen.sd.models import GenerationMetadata, Img2ImgConfig
+from sdgen.utils.common import validate_resolution
+from sdgen.utils.logger import get_logger
 
 logger = get_logger(__name__)
 

src/sdgen/sd/models.py

@@ -63,44 +63,43 @@ class Img2ImgConfig:
 
 @dataclass
 class GenerationMetadata:
-    """Output metadata for a generated image.
+    """Generic metadata for any generation mode.
 
-    Attributes:
-        mode: Generation mode ("txt2img", "img2img", "upscale", ...).
-        prompt: Prompt text.
-        negative_prompt: Negative prompt text.
-        steps: Number of diffusion steps.
-        guidance_scale: CFG scale.
-        width: Output width.
-        height: Output height.
-        seed: Resolved random seed.
-        strength: Img2Img strength; None for Txt2Img.
-        elapsed_seconds: Wall-clock runtime.
-        timestamp: UTC timestamp.
-        id: Unique entry ID.
-        thumbnail: Local thumbnail path.
-        full_image: Local full-size image path.
+    Fields are optional depending on mode:
+    - Txt2Img: prompt, negative, steps, guidance
+    - Img2Img: prompt, negative, strength, steps, guidance
+    - Upscale: scale, original size, final size
     """
 
-    mode: str
-    prompt: str
-    negative_prompt: str = ""
-    steps: int = 30
-    guidance_scale: float = 7.5
-    width: int = 512
-    height: int = 512
-    seed: Optional[int] = None
-    strength: Optional[float] = None
+    mode: str  # "txt2img", "img2img", "upscale"
+
+    # Shared
     elapsed_seconds: float = 0.0
     timestamp: str = field(default_factory=lambda: datetime.utcnow().isoformat())
     id: Optional[str] = None
     thumbnail: Optional[str] = None
     full_image: Optional[str] = None
 
+    # Txt2Img / Img2Img
+    prompt: Optional[str] = None
+    negative_prompt: Optional[str] = None
+    steps: Optional[int] = None
+    guidance_scale: Optional[float] = None
+    seed: Optional[int] = None
+
+    # Img2Img only
+    strength: Optional[float] = None
+
+    # Upscale only
+    scale: Optional[float] = None
+    original_width: Optional[int] = None
+    original_height: Optional[int] = None
+    width: Optional[int] = None
+    height: Optional[int] = None
+
     def to_dict(self) -> Dict[str, Any]:
-        """Return a dict representation excluding None values."""
-        data = asdict(self)
-        return {key: value for key, value in data.items() if value is not None}
+        """Drop None values for clean JSON."""
+        return {k: v for k, v in asdict(self).items() if v is not None}
 
 
 @dataclass

src/sdgen/sd/pipeline.py

@@ -12,7 +12,7 @@ from diffusers import (
     StableDiffusionPipeline,
 )
 
-from src.sdgen.utils.logger import get_logger
+from sdgen.utils.logger import get_logger
 
 logger = get_logger(__name__)
 

src/sdgen/ui/__init__.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
 
-from src.sdgen.ui.layout import build_ui
+from sdgen.ui.layout import build_ui
 
 __all__ = ["build_ui"]

src/sdgen/ui/layout.py

@@ -2,24 +2,24 @@
 
 from __future__ import annotations
 
-from typing import Any, Dict, Tuple
+from typing import Any, Tuple
 
 import gradio as gr
 
-from src.sdgen.sd.generator import generate_image
-from src.sdgen.sd.img2img import generate_img2img
-from src.sdgen.sd.models import Img2ImgConfig, Txt2ImgConfig
-from src.sdgen.ui.tabs import (
+from sdgen.sd.generator import generate_image
+from sdgen.sd.img2img import generate_img2img
+from sdgen.sd.models import Img2ImgConfig, Txt2ImgConfig
+from sdgen.ui.tabs import (
     build_history_tab,
     build_img2img_tab,
     build_presets_tab,
     build_txt2img_tab,
     build_upscaler_tab,
 )
-from src.sdgen.upscaler.upscaler import Upscaler
-from src.sdgen.utils.common import pretty_json, to_pil
-from src.sdgen.utils.history import save_history_entry
-from src.sdgen.utils.logger import get_logger
+from sdgen.upscaler.upscaler import Upscaler
+from sdgen.utils.common import pretty_json, to_pil
+from sdgen.utils.history import save_history_entry
+from sdgen.utils.logger import get_logger
 
 logger = get_logger(__name__)
 
@@ -142,21 +142,14 @@ def _upscale_handler(
         raise gr.Error("Scale must be numeric (2 or 4).") from exc
 
     upscaler = Upscaler(scale=scale_int, prefer="ncnn")
-    out_image = upscaler.upscale(pil_image)
-
-    meta: Dict[str, Any] = {
-        "mode": "upscale",
-        "scale": scale_int,
-        "width": out_image.width,
-        "height": out_image.height,
-    }
+    out_image, meta = upscaler.upscale(pil_image)
 
     try:
         save_history_entry(meta, out_image)
     except Exception as exc:  # noqa: BLE001
         logger.exception("Failed to save history entry: %s", exc)
 
-    return out_image, pretty_json(meta)
+    return out_image, pretty_json(meta.to_dict())
 
 
 def make_img2img_handler(model_choice, pipes):

src/sdgen/ui/tabs/history_tab.py

@@ -7,13 +7,13 @@ from typing import Any, Dict, List, Optional, Tuple
 import gradio as gr
 from PIL import Image
 
-from src.sdgen.utils.common import short_prompt
-from src.sdgen.utils.history import (
+from sdgen.utils.common import short_prompt
+from sdgen.utils.history import (
     delete_history_entry,
     list_history,
     load_entry,
 )
-from src.sdgen.utils.logger import get_logger
+from sdgen.utils.logger import get_logger
 
 logger = get_logger(__name__)
 

src/sdgen/ui/tabs/img2img_tab.py

@@ -37,7 +37,6 @@ def build_img2img_tab(handler: Callable[..., Tuple[Any, dict]]) -> Img2ImgContro
                 input_image = gr.Image(
                     label="Input Image",
                     type="numpy",
-                    tool="editor",
                 )
 
                 prompt = gr.Textbox(

src/sdgen/ui/tabs/presets_tab.py

@@ -6,9 +6,9 @@ from typing import Any, Tuple
 
 import gradio as gr
 
-from src.sdgen.presets.styles import get_preset, list_presets
-from src.sdgen.ui.tabs.img2img_tab import Img2ImgControls
-from src.sdgen.ui.tabs.txt2img_tab import Txt2ImgControls
+from sdgen.presets.styles import get_preset, list_presets
+from sdgen.ui.tabs.img2img_tab import Img2ImgControls
+from sdgen.ui.tabs.txt2img_tab import Txt2ImgControls
 
 
 def apply_preset(preset_name: Any) -> Tuple[Any, ...]:

src/sdgen/upscaler/realesrgan.py

@@ -12,7 +12,7 @@ from typing import Final
 from PIL import Image
 from realesrgan_ncnn_py import Realesrgan
 
-from src.sdgen.utils.logger import get_logger
+from sdgen.utils.logger import get_logger
 
 logger = get_logger(__name__)
 

src/sdgen/upscaler/upscaler.py

@@ -10,12 +10,14 @@ Planned:
 
 from __future__ import annotations
 
+import time
 from typing import Optional
 
 from PIL import Image
 
-from src.sdgen.upscaler.realesrgan import NCNNUpscaler
-from src.sdgen.utils.logger import get_logger
+from sdgen.sd.models import GenerationMetadata
+from sdgen.upscaler.realesrgan import NCNNUpscaler
+from sdgen.utils.logger import get_logger
 
 logger = get_logger(__name__)
 
@@ -78,7 +80,7 @@ class Upscaler:
             logger.warning("NCNN RealESRGAN init failed: %s", err)
             self.engine = None
 
-    def upscale(self, image: Image.Image) -> Image.Image:
+    def upscale(self, image: Image.Image) -> tuple[Image.Image, GenerationMetadata]:
         """Upscale the given image.
 
         Args:
@@ -91,5 +93,23 @@ class Upscaler:
             RuntimeError: If the engine is not initialized.
         """
         if self.engine is None:
-            raise RuntimeError("Upscaler is not initialized.")
-        return self.engine.upscale(image)
+            raise RuntimeError("Upscaler not initialized.")
+
+        orig_w, orig_h = image.width, image.height
+        start = time.perf_counter()
+
+        out = self.engine.upscale(image)
+
+        elapsed = time.perf_counter() - start
+
+        meta = GenerationMetadata(
+            mode="upscale",
+            scale=float(self.scale),
+            original_width=orig_w,
+            original_height=orig_h,
+            width=out.width,
+            height=out.height,
+            elapsed_seconds=elapsed,
+        )
+
+        return out, meta

src/sdgen/utils/history.py

@@ -18,14 +18,14 @@ from typing import Any, Dict, List, Optional, Tuple
 
 from PIL import Image
 
-from src.sdgen.config import (
+from sdgen.config import (
     HISTORY_ENTRIES_DIR,
     HISTORY_FULL_DIR,
     HISTORY_ROOT,
     HISTORY_THUMBS_DIR,
 )
-from src.sdgen.sd.models import GenerationMetadata, HistorySummary
-from src.sdgen.utils.logger import get_logger
+from sdgen.sd.models import GenerationMetadata, HistorySummary
+from sdgen.utils.logger import get_logger
 
 logger = get_logger(__name__)
 

src/sdgen/utils/logger.py

@@ -10,7 +10,7 @@ import logging
 from logging import Handler, Logger
 from logging.handlers import RotatingFileHandler
 
-from src.sdgen.config import LOGS_ROOT
+from sdgen.config import LOGS_ROOT
 
 # Ensure logs directory exists
 LOGS_ROOT.mkdir(parents=True, exist_ok=True)