f3

utils.py

@@ -157,14 +157,7 @@ def generate_novelai_image(
         payload['parameters']['extra_noise_seed'] = seed
         payload["parameters"]['noise'] = i2i_noise
     if chr_image != None:
-        scale = chr_image.size[0]/chr_image.size[1]
-        if scale < 0.8165:
-            chr_image = chr_image.resize((1024, 1536))
-        elif scale < 1.2247:
-            chr_image = chr_image.resize((1427, 1427))
-        else:
-            chr_image = chr_image.resize((1536, 1024))
-        payload['parameters']['director_reference_images'] = [image2base64(chr_image)]
+        payload['parameters']['director_reference_images'] = [image2base64(resize_and_pad_image(chr_image))]
         payload['parameters']['director_reference_descriptions'] = [{'caption': {'base_caption': 'character&style' if style_aware else 'character', 'char_captions': []}, 'legacy_uc': False}]
         payload['parameters']['director_reference_secondary_strength_values'] = [1 - fidelity]
         payload['parameters']['director_reference_strength_values'] = [1]
@@ -208,6 +201,65 @@ def base642image(b64):
     img = Image.open(read_buffer)
     return img
 
+def resize_and_pad_image(chr_image):
+    """
+    根据图像宽高比选择最接近的尺寸，等比缩放并用黑边填充
+    
+    Args:
+        chr_image: PIL Image对象
+    
+    Returns:
+        处理后的PIL Image对象
+    """
+    # 定义三种目标尺寸
+    target_sizes = [
+        (1024, 1536),  # 竖版
+        (1472, 1472),  # 正方形
+        (1536, 1024)   # 横版
+    ]
+    
+    # 获取原图尺寸
+    original_width, original_height = chr_image.size
+    original_ratio = original_width / original_height
+    
+    # 计算每个目标尺寸的宽高比，并找出最接近的
+    min_diff = float('inf')
+    best_size = None
+    
+    for size in target_sizes:
+        target_ratio = size[0] / size[1]
+        diff = abs(original_ratio - target_ratio)
+        if diff < min_diff:
+            min_diff = diff
+            best_size = size
+    
+    # 目标尺寸
+    target_width, target_height = best_size
+    
+    # 计算缩放比例（保持宽高比）
+    scale_x = target_width / original_width
+    scale_y = target_height / original_height
+    scale = min(scale_x, scale_y)  # 选择较小的缩放比例以确保图像完全显示
+    
+    # 计算缩放后的尺寸
+    new_width = int(original_width * scale)
+    new_height = int(original_height * scale)
+    
+    # 缩放图像
+    resized_image = chr_image.resize((new_width, new_height), Image.Resampling.LANCZOS)
+    
+    # 创建目标尺寸的黑色背景
+    padded_image = Image.new('RGBA', (target_width, target_height), color='black')
+    
+    # 计算居中位置
+    x_offset = (target_width - new_width) // 2
+    y_offset = (target_height - new_height) // 2
+    
+    # 将缩放后的图像粘贴到黑色背景上
+    padded_image.paste(resized_image, (x_offset, y_offset))
+    
+    return padded_image
+
 def augment_image(image, width, height, req_type, selection, factor=1, defry=0, prompt=''):
     if selection == "scale":
         width = int(width * factor)