From 58d3c0c0dcd30ed9f22c45ca9cb3872ec305e209 Mon Sep 17 00:00:00 2001
From: fujammy <467918@qq.com>
Date: Wed, 25 Dec 2024 01:44:44 +0800
Subject: [PATCH] Enhance image resolution adjuster to support SDXL optimal
 aspect ratios with improved error handling. Update README files to reflect
 new features and use cases for the image resolution adjuster utility.

---
 README.md                                     |  15 ++++++
 README_CN.md                                  |  15 ++++++
 .../image_resolution_adjuster.cpython-311.pyc | Bin 11085 -> 10942 bytes
 image_resolution_adjuster.py                  |  48 ++++++++++++++----
 4 files changed, 69 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 42c6374..6318cea 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,21 @@ Features:
 - Supports trimming leading and trailing spaces
 - Flexible output format options
 
+### Image Resolution Adjuster
+A utility node for adjusting image resolutions according to SDXL optimal aspect ratios.
+
+Features:
+- Supports all SDXL optimal resolutions (1:1, 9:7, 7:9, 3:2, 2:3, etc.)
+- Adjustable scale factor for resolution scaling
+- Configurable maximum and minimum resolution constraints
+- Multiple extend modes (contain, cover, fill, etc.)
+- Maintains aspect ratio while resizing
+
+Use Cases:
+- Preparing images for SDXL generation
+- Batch resizing images to specific aspect ratios
+- Standardizing image dimensions for consistent processing
+
 ## 🎨 Usage Examples
 
 ### Dynamic Image Inputs Node
diff --git a/README_CN.md b/README_CN.md
index 908adb0..1f4736b 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -51,6 +51,21 @@ git clone https://github.com/jammyfu/ComfyUI_PaintingCoderUtils.git
 - 支持移除首尾空格
 - 灵活的输出格式选项
 
+### 图像分辨率调整器 (Image Resolution Adjuster)
+一个用于按照 SDXL 最佳宽高比调整图像分辨率的实用节点。
+
+特点：
+- 支持所有 SDXL 最佳分辨率（1:1、9:7、7:9、3:2、2:3 等）
+- 可调节的缩放系数
+- 可配置的最大和最小分辨率限制
+- 多种延展模式（包含、覆盖、填充等）
+- 调整时保持宽高比
+
+使用场景：
+- 为 SDXL 生成准备图像
+- 批量调整图像至特定宽高比
+- 标准化图像尺寸以保持处理一致性
+
 ## 🎨 使用示例
 
 ### 动态图片输入节点
diff --git a/__pycache__/image_resolution_adjuster.cpython-311.pyc b/__pycache__/image_resolution_adjuster.cpython-311.pyc
index c39bc69a156d0bd3a9b1c7ec4810607888af8245..a6d15357657948c96bbdb30531df8935226144c6 100644
GIT binary patch
delta 1457
zcmb`HO>7%Q6o6;EKVGlB8z8uj9pgCvY)w<_BrRDrZGq+hDF~6altM^N*NIIN+nrsf
zku_F=_)%N6sL~u7sj29xRmCO92W~x-BSJVR6474Z!hxQQ#E)by%(L4NDBKv$eDBSh
zH#2YEKJC{h?jF}~YnqC9lYV}0ZfMWv`n6E(um_=Q$ikM#5-ib@EZOo}isiG^HD5($
zxWiBbVb}wWxgD`~rQ*v!;Rr1Y(9)Pc+=~^qHyp$&>kjuXd;eOcD)ryumwd)Yt5pIt
zKs{$gnAtMdg_cfC$M?X63+kbPvY$(#CI4}T=14nyRjQTw{1)c-@WIBz-pAFydHAWu
zlHuU;&Kn+$Os6^(&o&R{k?B-w={&NXFA}NVj7)0D|0S{~bx0IdsBc!BLWa)1iF~oY
zAtcRYLl`r;w%;6U2*YNoA*9S<n2t1r5xyWMQ|4$x95s_E7sm-?nSIq6j!CX$7w2;h
zIlwI>!r=-F=_QU_-e_aKXoi)eFN$s8e=nL)=ea`pu+OvKqp4T4@OOdOw}IHIy%Ff$
z4D{Z7elswzGEtY2qSYRY*SyfTdQ$77n>}M2O4kMT>g3hQAN7t}cx=6&gZB;H+|<pQ
zVpe~6O2cd|<Qs<@{<GXX6j40up`JxVRQ~;&v+d$TQ|ymed{E$Kq0FCI5h;G4NmRU!
zEI*a5qZ<OxUZ6b1Ug%1`_Dp;soy$9X<nnXzsUs(k#%(8^x6;IlleCj7*yME{5SaoT
z0~`mO0K5S>33wB5isKGj>mC|tV3R=Y8L}&#&sk2^m9v@LT-I^@wzV`r(>j=4?i!M0
z?iOcvyZWXVVLKo8ha4-YuAoqKD;RmCcWwnc>+Nd0Tt^%$ll2Jl=@%APmRA!sZ$Ix_
zZIRW9oBLJ|ZMG$9O5#@;?Fv_a>AH>ENS+^E_Qaod@lpdDY^%G}`3^UcX%1JkolMac
zUV8Od4k-xzgju%dxtCAFdK&O9;0(axFgyezcI9-jn8{oGsn{kNu=q*FF3gvB?(#M%
zg8w<d47=YmfxoOi+Z)8u3RvEM2tyzrfZlShru#Gxev1_b79wwh8S0LV01g70)%r2}
zZD8-w<}Sz=`3P_t@Gr5tTA}0=OU_JgAw8F|$qe}Q0r~-RfGj&V7?N8NuulfN@g=rC
zIE3$4zaN~&_#zuOMmjHX$2*9Og8wjJ=^^g1%f{?3m>QVCkARDPAT)A?DZ5if^9_)&
t)}A%cw$EuO2NnueX+Cq1e9F%3zSxt%hjAV4;3*u!d+KN#DW)e5{RwrmPeuR$

delta 1547
zcmb7^OKclO7=U-YYsdC_?TwvHoH*~eu{TOn*-6@F)rKIELwZ0&ZHge2Vr93<QolO8
z4rLjWwi3d?2@O&rHAvyo1R<fI9LfoCM@VtBQpyU{a^Qe^2|{p)gkUDlvxozuop1j6
z=YPzM|M53d-(L-`3WA>@ZT0D!vmf?<6<lme##x40WK^KKR959wx9U;rRIln&{mZ_x
zN97SS&%pN)gH!RQj=%%JFkg^fYpT$EATs5;nhpN3Nfd%d`W1iy*C48)ldd#ek9bm7
z_L}a)cntE=@c2%+DdKxZPr_3@=g-Fx{<En);w$^}VYBYYS*^#3Xb;Xuqr&l!eq4x3
zlL6CrWQlkbc;F(ZBE8ni0uqqxCP!z6hsbPAhKkAWn~(vykYJHHVv&IFHb?4%CpO8W
zAifoqLdUZQ_H+@F|9G5#=MSL};%@GxBKbqeU6V=v<NM}NXfMATh5lduP=KBp`H=qx
zcbSpH_-XUQ1&d87DT^IZ&ROg^WyE3!m9)jCl|eckve+TAz@^g4u*D54sq`*LI-nEM
zJNuQE!!D2=aNBB}$j@i8y4smBirS3X2{Wc%P&#Fg<2H&}-6Vqv^&)H`F7N_@!{#!#
z2{=73i&%_lepSzDc|$Mc4Q#~5@yCG%{9UZouM=ZLy74pqEtX#J@|EmnT?_f1h^^aV
z_m<ebGFTN8wwPE0w%Av3Ka#q(rNow$SYxYFzb*BzP1@3#ZE1K*8eX5NN{THh+tS#U
zH1=(zDvjIHc*Xyd6kTdrd49RADkW?wK@^S6OMNSo%crZ2NxLyw;Vb-(hpBHnPvZ09
zW<z|Fr{AOAv+E_h_hL2BQ@OOnFY$kPm`K}Z+r@Q_fPB^Ps2v{N42*6RTLmyhON%@^
z=Jyu}78&#KLD4fJ@Ju<nh|Xn^t1hz$>`NSC?~_N1xckhfEcp>#Rto#uQ_Z_Tfwbgg
zx8r_GSIs%cGpFgZb0&V=KETlx9PWsRZxLagbYq0z4)co?-M}5I0Lb{G_JN?~>P*6`
zWCczU;EAqM>{U8@g}~tqQ!6^`#EVyS#!Hk}@DE+*FTF<BuTi{Cah>7~0@(#=F2|E8
z7PY)e3IP}}Lp40qj6$|V>LYK!EYZLm#WbGo9tU4<eAX?2)_JP24j{Ae9V*w1H@12N
z7r2a{oXWMlOx3hP;1I<q1+6alE}rc@qwjgq;(=v~|Jth~6iQ~XWM0>EnOV(%)6_Ul
zaf(8v&?tHcoPaTt$!coNcz;j$@7^wO4|gR7z~haV64wB@i@!_`#qJS@&lxyOod+q5
z13bikC2us+sSF_f|02U#ItcJR{I;By_fAExu;%j#l@8<VdN1S(YALIY!bNP$A9Sa|
V7}#NsaSph_=^f?}LA=oS+&`kZUs3=7

diff --git a/image_resolution_adjuster.py b/image_resolution_adjuster.py
index 056132b..3414681 100644
--- a/image_resolution_adjuster.py
+++ b/image_resolution_adjuster.py
@@ -124,15 +124,27 @@ def pad_image(image, target_width, target_height, position='center'):
 def calculate_resolution(aspect_ratio, scale_factor, max_width, max_height, min_width, min_height):
     """Calculate the target resolution based on aspect ratio and scale factor."""
     
-    # 从目标分辨率中提取实际的宽高比和尺寸
-    if "(" in aspect_ratio:
-        # 如果输入格式是 "9:7 (1152x896)" 这样的格式
-        dimensions = aspect_ratio.split("(")[1].strip(")").split("x")
-        base_width = int(dimensions[0])
-        base_height = int(dimensions[1])
+    # SDXL 最佳分辨率对照表
+    base_resolutions = {
+        "1:1": (1024, 1024),
+        "9:7": (1152, 896),
+        "7:9": (896, 1152),
+        "3:2": (1216, 832),
+        "2:3": (832, 1216),
+        "7:4": (1344, 768),
+        "4:7": (768, 1344),
+        "12:5": (1536, 640),
+        "5:12": (640, 1536),
+    }
+    
+    # 从输入中提取比例部分
+    ratio = aspect_ratio.split(" ")[0]
+    
+    # 查找对应的基础分辨率
+    if ratio in base_resolutions:
+        base_width, base_height = base_resolutions[ratio]
     else:
-        # 如果找不到对应的预设值，返回错误
-        raise ValueError(f"Unable to parse resolution from: {aspect_ratio}")
+        raise ValueError(f"Invalid aspect ratio: {ratio}")
 
     # 计算初始目标尺寸
     target_width = int(base_width * scale_factor)
@@ -155,7 +167,25 @@ def calculate_resolution(aspect_ratio, scale_factor, max_width, max_height, min_
     return target_width, target_height, base_width, base_height
 
 def get_aspect_ratio_string(width, height):
-    """Get the aspect ratio string from width and height"""
+    """Get the aspect ratio string from width and height, maintaining SDXL standard ratios"""
+    # SDXL 标准比例映射
+    sdxl_ratios = {
+        (1024, 1024): "1:1",
+        (1152, 896): "9:7",
+        (896, 1152): "7:9",
+        (1216, 832): "3:2",
+        (832, 1216): "2:3",
+        (1344, 768): "7:4",
+        (768, 1344): "4:7",
+        (1536, 640): "12:5",
+        (640, 1536): "5:12"
+    }
+    
+    # 如果是标准 SDXL 分辨率，直接返回对应的比例
+    if (width, height) in sdxl_ratios:
+        return sdxl_ratios[(width, height)]
+    
+    # 如果不是标准分辨率，则使用最大公约数计算
     common_divisor = gcd(width, height)
     aspect_width = width // common_divisor
     aspect_height = height // common_divisor