From 84307b95aa4e49e72e29aaeff9e3c4c84c849ab3 Mon Sep 17 00:00:00 2001
From: yolain <yolain@163.com>
Date: Tue, 2 Apr 2024 13:22:54 +0800
Subject: [PATCH] fix:lora not use different checkpoint model when
 optional_lora_stack in xyplot #113

---
 py/image.py       | 2 ++
 py/libs/xyplot.py | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/py/image.py b/py/image.py
index 955f04b..12c1a13 100644
--- a/py/image.py
+++ b/py/image.py
@@ -327,6 +327,8 @@ class imageRatio:
       height_ratio = height // ratio
       result = (width_ratio, height_ratio, width_ratio, height_ratio)
     else:
+      width_ratio = 0
+      height_ratio = 0
       result = (0, 0, 0.0, 0.0)
     text = f"Image Ratio is {str(width_ratio)}:{str(height_ratio)}"
 
diff --git a/py/libs/xyplot.py b/py/libs/xyplot.py
index 5eb9eb0..a6a5309 100644
--- a/py/libs/xyplot.py
+++ b/py/libs/xyplot.py
@@ -308,6 +308,7 @@ class easyXYPlot():
                 ckpt_name, clip_skip, vae_name = xy_values.split(",")
                 ckpt_name = ckpt_name.replace('*', ',')
                 vae_name = vae_name.replace('*', ',')
+                print(ckpt_name)
                 model, clip, vae, clip_vision = self.easyCache.load_checkpoint(ckpt_name)
                 if vae_name != 'None':
                     vae = self.easyCache.load_vae(vae_name)
@@ -316,6 +317,8 @@ class easyXYPlot():
                 optional_lora_stack = plot_image_vars['lora_stack']
                 if optional_lora_stack is not None and optional_lora_stack != []:
                     for lora in optional_lora_stack:
+                        lora['model'] = model
+                        lora['clip'] = clip
                         model, clip = self.easyCache.load_lora(lora)
 
                 # 处理clip