Update asymmetric-tiling-sd-webui-2.0/scripts/asymmetric_tiling_UNIFIED.py

asymmetric-tiling-sd-webui-2.0/scripts/asymmetric_tiling_UNIFIED.py

@@ -12,6 +12,14 @@ import numpy as np
 from collections import OrderedDict
 
 from PIL import Image
+from improved_tiling_functions import (
+    compute_advanced_blend_padding,
+    apply_multires_blend,
+    validate_blend_params,
+    validate_multires_params,
+    BlendStrategy,
+    MultiResStrategy
+)
 # ========================================================================
 # КОНСТАНТЫ И КОНФИГУРАЦИЯ
 # ========================================================================
@@ -1632,44 +1640,6 @@ def compute_hex_padding_x(input_tensor, pad_l, pad_r):
 
     return torch.cat([left_pad, input_tensor, right_pad], dim=3)
 
-def compute_blend_overlay(padded, pad_h, pad_w, blend_strength=0.1):
-    """
-    Мягкое смешивание краев поверх уже примененного паддинга.
-    Работает с любым базовым режимом.
-    NOTE: This applies blend as an overlay on already-padded tensor.
-    For creating padding from scratch with blend, use compute_blend_padding().
-    """
-    b, c, H, W = padded.shape
-
-    h = max(H - 2 * pad_h, 0)
-    w = max(W - 2 * pad_w, 0)
-
-    if h <= 0 or w <= 0:
-        return padded
-
-    blend_w = min(int(w * blend_strength), w)
-    blend_h = min(int(h * blend_strength), h)
-
-    if blend_h > 0 and pad_h > 0:
-        top_mask = torch.linspace(0.0, 1.0, steps=blend_h, device=padded.device, dtype=padded.dtype)
-        top_mask = top_mask.view(1, 1, blend_h, 1).expand(b, c, blend_h, W)
-        padded[:, :, pad_h:pad_h + blend_h, :] *= top_mask
-
-        bottom_mask = torch.linspace(1.0, 0.0, steps=blend_h, device=padded.device, dtype=padded.dtype)
-        bottom_mask = bottom_mask.view(1, 1, blend_h, 1).expand(b, c, blend_h, W)
-        padded[:, :, pad_h + h - blend_h:pad_h + h, :] *= bottom_mask
-
-    if blend_w > 0 and pad_w > 0:
-        left_mask = torch.linspace(0.0, 1.0, steps=blend_w, device=padded.device, dtype=padded.dtype)
-        left_mask = left_mask.view(1, 1, 1, blend_w).expand(b, c, H, blend_w)
-        padded[:, :, :, pad_w:pad_w + blend_w] *= left_mask
-
-        right_mask = torch.linspace(1.0, 0.0, steps=blend_w, device=padded.device, dtype=padded.dtype)
-        right_mask = right_mask.view(1, 1, 1, blend_w).expand(b, c, H, blend_w)
-        padded[:, :, :, pad_w + w - blend_w:pad_w + w] *= right_mask
-
-    return padded
-
 # ========================================================================
 # ГЛАВНАЯ ФУНКЦИЯ ПАДДИНГА
 # ========================================================================
@@ -1784,15 +1754,26 @@ def custom_padding_forward(input_tensor, weight, bias, stride, padding, dilation
                 )
 # Multi-resolution blend (keeps original behavior but in output space)
             if params.get('multires_enabled', False):
-                denom = max(int(params['end_step']) - int(params['start_step']), 1)
-                step_ratio = (current_step - int(params['start_step'])) / denom
-                step_ratio = max(0.0, min(float(step_ratio), 1.0))
-                if step_ratio < 0.3:
-                    x_default = F.pad(input_tensor, (req_pad_w, req_pad_w, req_pad_h, req_pad_h),
-                                      mode='constant', value=0)
-                    out_default = F.conv2d(x_default, weight, bias, stride, 0, dilation, groups)
-                    alpha = step_ratio / 0.3  # 0..1
-                    out_cube = out_cube * alpha + out_default * (1.0 - alpha)
+                multires_params = validate_multires_params(params)
+                
+                # Создаем простой padding (для сравнения)
+                x_simple = F.pad(input_tensor, (req_pad_w, req_pad_w, req_pad_h, req_pad_h),
+                               mode='replicate')
+                
+                # Применяем смешивание ПЕРЕД конволюцией
+                # (для input-space blending)
+                x = apply_multires_blend(
+                    tensor_simple=x_simple,
+                    tensor_advanced=x,  # x уже содержит продвинутый padding
+                    current_step=current_step,
+                    start_step=params['start_step'],
+                    end_step=params['end_step'],
+                    strategy=multires_params['strategy'],
+                    transition_start=multires_params['transition_start'],
+                    transition_end=multires_params['transition_end'],
+                    sharpness=multires_params['sharpness'],
+                    enabled=True
+                )
 
             return out_cube
 # Панорама
@@ -1846,15 +1827,26 @@ def custom_padding_forward(input_tensor, weight, bias, stride, padding, dilation
 
                 # Multi-resolution blend (output-space) — same policy as cubemap
                 if params.get('multires_enabled', False):
-                    denom = max(int(params['end_step']) - int(params['start_step']), 1)
-                    step_ratio = (current_step - int(params['start_step'])) / denom
-                    step_ratio = max(0.0, min(float(step_ratio), 1.0))
-                    if step_ratio < 0.3:
-                        x_default = F.pad(input_tensor, (req_pad_w, req_pad_w, req_pad_h, req_pad_h),
-                                          mode='constant', value=0)
-                        out_default = F.conv2d(x_default, weight, bias, stride, 0, dilation, groups)
-                        alpha = step_ratio / 0.3  # 0..1
-                        out_pano = out_pano * alpha + out_default * (1.0 - alpha)
+                    multires_params = validate_multires_params(params)
+                    
+                    # Простая версия (output space)
+                    x_default = F.pad(input_tensor, (req_pad_w, req_pad_w, req_pad_h, req_pad_h),
+                                      mode='replicate')
+                    out_default = F.conv2d(x_default, weight, bias, stride, 0, dilation, groups)
+                    
+                    # Применяем улучшенное смешивание
+                    out_pano = apply_multires_blend(
+                        tensor_simple=out_default,
+                        tensor_advanced=out_pano,
+                        current_step=current_step,
+                        start_step=params['start_step'],
+                        end_step=params['end_step'],
+                        strategy=multires_params['strategy'],
+                        transition_start=multires_params['transition_start'],
+                        transition_end=multires_params['transition_end'],
+                        sharpness=multires_params['sharpness'],
+                        enabled=True
+                    )
 
                 return out_pano
 
@@ -1928,19 +1920,52 @@ def custom_padding_forward(input_tensor, weight, bias, stride, padding, dilation
 
         # Дополнительный мягкий бленд поверх выбранного режима
         if params.get('blend_enabled', False) and (req_pad_h > 0 or req_pad_w > 0):
-            blend_str = params.get('blend_strength', 0.1)
-            x = compute_blend_overlay(x, req_pad_h, req_pad_w, blend_str)
+            blend_params = validate_blend_params(params)
+            
+            # Определяем простой режим
+            mode_simple = 'replicate'  # или 'constant'
+            
+            # x уже содержит результат продвинутого padding
+            # Нам нужно смешать его с простым режимом
+            
+            # Метод 1: Применяем blend прямо на x (если x уже западдингован)
+            # В этом случае нужно создать simple версию
+            x_simple = F.pad(input_tensor, (req_pad_w, req_pad_w, req_pad_h, req_pad_h), 
+                           mode=mode_simple)
+            
+            # Смешиваем
+            x = compute_advanced_blend_padding(
+                input_tensor,
+                pad_h=req_pad_h,
+                pad_w=req_pad_w,
+                mode_simple=mode_simple,
+                mode_advanced=x,  # Передаем уже готовый тензор
+                blend_strength=blend_params['strength'],
+                blend_width=blend_params['width'],
+                falloff_curve=blend_params['falloff'],
+                edge_sharpness=blend_params['sharpness']
+            )
 
         # Мультиразрешение
         if params.get('multires_enabled', False):
-            denom = max(int(params['end_step']) - int(params['start_step']), 1)
-            step_ratio = (current_step - int(params['start_step'])) / denom
-            step_ratio = max(0.0, min(float(step_ratio), 1.0))
-            if step_ratio < 0.3:
-                x_default = F.pad(input_tensor, (req_pad_w, req_pad_w, req_pad_h, req_pad_h),
-                                  mode='constant', value=0)
-                alpha = step_ratio * 3
-                x = x * alpha + x_default * (1 - alpha)
+                    multires_params = validate_multires_params(params)
+                    
+                    x_default = F.pad(input_tensor, (req_pad_w, req_pad_w, req_pad_h, req_pad_h),
+                                      mode='replicate')
+                    out_default = F.conv2d(x_default, weight, bias, stride, 0, dilation, groups)
+                    
+                    out_pano = apply_multires_blend(
+                        tensor_simple=out_default,
+                        tensor_advanced=out_pano,
+                        current_step=current_step,
+                        start_step=params['start_step'],
+                        end_step=params['end_step'],
+                        strategy=multires_params['strategy'],
+                        transition_start=multires_params['transition_start'],
+                        transition_end=multires_params['transition_end'],
+                        sharpness=multires_params['sharpness'],
+                        enabled=True
+                    )
 
         return F.conv2d(x, weight, bias, stride, 0, dilation, groups)
 
@@ -2109,9 +2134,89 @@ class AdvancedTilingScriptV3(scripts.Script):
                         )
 
                     with gr.Row():
-                        multires = gr.Checkbox(label="Multi-Resolution Mode", value=False)
-                        use_blend = gr.Checkbox(label="Soft Blend Edges", value=False)
-                        blend_strength = gr.Slider(0.0, 0.5, step=0.05, label="Blend Strength", value=0.1)
+                        multires = gr.Checkbox(
+                            label="Multi-Resolution Mode", 
+                            value=False,
+                            info="Gradually transition from simple to advanced tiling"
+                        )
+                        use_blend = gr.Checkbox(
+                            label="Advanced Blend Mode", 
+                            value=False,
+                            info="Smart blending between padding modes (NEW!)"
+                        )
+                        blend_strength = gr.Slider(
+                            0.0, 1.0, step=0.05, 
+                            label="Blend Strength (0=simple, 1=advanced)", 
+                            value=0.5,
+                            info="Controls proximity/zoom effect"
+                        )
+
+                    # ═══ NEW: ADVANCED BLEND SETTINGS ═══
+                    with gr.Accordion("🎨 Advanced Blend Settings", open=False):
+                        gr.Markdown("""
+                        **Blend Mode улучшен!** Теперь это настоящий слайдер приближения/отдаления:
+                        - `0.0` = далеко (простой padding)
+                        - `0.5` = средняя дистанция (смешивание)
+                        - `1.0` = близко (полный advanced tiling)
+                        """)
+                        
+                        with gr.Row():
+                            blend_falloff = gr.Dropdown(
+                                label="Falloff Curve",
+                                choices=["linear", "smoothstep", "cosine", "perceptual"],
+                                value="smoothstep",
+                                info="Shape of the transition gradient"
+                            )
+                            blend_sharpness = gr.Slider(
+                                0.1, 5.0, step=0.1,
+                                label="Edge Sharpness",
+                                value=1.0,
+                                info="<1 = softer, >1 = sharper transitions"
+                            )
+                        
+                        blend_width = gr.Slider(
+                            0, 128, step=8,
+                            label="Blend Width (pixels, 0=auto)",
+                            value=0,
+                            info="Width of transition zone"
+                        )
+
+                    # ═══ NEW: ADVANCED MULTI-RESOLUTION SETTINGS ═══
+                    with gr.Accordion("🔬 Advanced Multi-Resolution Settings", open=False):
+                        gr.Markdown("""
+                        **Multi-Resolution улучшен!** Гибкие стратегии и параметры:
+                        - **Cosine**: плавная (рекомендуется)
+                        - **Exponential**: быстрый старт
+                        - **Sigmoid**: S-кривая
+                        """)
+                        
+                        multires_strategy = gr.Dropdown(
+                            label="Interpolation Strategy",
+                            choices=["linear", "cosine", "exponential", "sigmoid", "early_boost", "late_smooth"],
+                            value="cosine",
+                            info="How to blend simple → advanced"
+                        )
+                        
+                        with gr.Row():
+                            multires_start = gr.Slider(
+                                0.0, 1.0, step=0.05,
+                                label="Transition Start",
+                                value=0.0,
+                                info="When to begin transition (0.0 = from start)"
+                            )
+                            multires_end = gr.Slider(
+                                0.0, 1.0, step=0.05,
+                                label="Transition End",
+                                value=0.3,
+                                info="When to finish transition (0.3 = at 30%)"
+                            )
+                        
+                        multires_sharpness = gr.Slider(
+                            0.1, 5.0, step=0.1,
+                            label="Transition Sharpness",
+                            value=1.0,
+                            info="Speed of transition (<1 = slower, >1 = faster)"
+                        )
 
                     # NEW ENHANCED MODES Parameters
                     with gr.Accordion("✨ NEW Enhanced Modes Parameters", open=False):
@@ -2771,7 +2876,7 @@ class AdvancedTilingScriptV3(scripts.Script):
                 enabled, mode_x, mode_y,
                 start_step, end_step,
                 step_mode, step_start_frac, step_end_frac,
-                multires,
+                multires, multires_strategy, multires_start, multires_end, multires_sharpness,
                 voronoi_cells, voronoi_seed,
                 perlin_strength, perlin_scale,
                 fractal_iterations, fractal_scale,
@@ -2786,7 +2891,7 @@ class AdvancedTilingScriptV3(scripts.Script):
                 panorama_grid_interp, panorama_grid_padding, panorama_cache_angle_quant,
                 use_cubemap, cubemap_engine, cubemap_resolution_mode, cubemap_pad_mode, cubemap_blend_width, cubemap_blend_strength,
                 cubemap_yaw, cubemap_pitch, cubemap_roll, cubemap_coord_mode, cubemap_twist_deg, cubemap_polar_scale, cubemap_polar_power, cubemap_swirl_deg, cubemap_swirl_power, cubemap_grid_interp, cubemap_grid_padding, cubemap_cache_angle_quant, cubemap_geoaa_samples, cubemap_geoaa_radius, cubemap_antipode_strength,
-                use_blend, blend_strength,
+                use_blend, blend_strength, blend_falloff, blend_sharpness, blend_width,
                 use_anisotropic, aniso_angle, aniso_angle2, aniso_angle_mix,
                 stereo_enabled, stereo_eye, stereo_engine, stereo_output, stereo_in_model, stereo_separation, stereo_convergence, stereo_depth_power, stereo_pole_power,
                 patch_vae, tiling_disable_hr, use_kohaku,
@@ -2971,6 +3076,10 @@ class AdvancedTilingScriptV3(scripts.Script):
             'start_step': start_step,
             'end_step': end_step,
             'multires_enabled': multires,
+            'multires_strategy': multires_strategy,  # NEW
+            'multires_start': multires_start,  # NEW
+            'multires_end': multires_end,  # NEW
+            'multires_sharpness': multires_sharpness,  # NEW
             # NEW ENHANCED MODES parameters
             'voronoi_cells': voronoi_cells,
             'voronoi_seed': voronoi_seed,
@@ -3002,6 +3111,9 @@ class AdvancedTilingScriptV3(scripts.Script):
             'panorama_cache_angle_quant': panorama_cache_angle_quant,
             'blend_enabled': use_blend,
             'blend_strength': blend_strength,
+            'blend_falloff': blend_falloff,  # NEW
+            'blend_sharpness': blend_sharpness,  # NEW
+            'blend_width': blend_width if blend_width > 0 else None,  # NEW
             'cubemap_engine': cubemap_engine,
             'cubemap_pad_mode': cubemap_pad_mode,
             'cubemap_blend_width': cubemap_blend_width,