Update logo.

Loader.py

@@ -35,21 +35,6 @@ class Loader:
     def __new_line(self):
         print()
 
-    def __warning_unstable_branch(self):
-        self.__new_line()
-        self.__error("Attention! You are currently using an unstable \"main\" update branch intended for the development of Allor 2.")
-        self.__error("Please be aware that changes made in Allor 2 may disrupt your current workflow.")
-        self.__error("Nodes may be renamed, parameters within them may be altered or even removed.")
-        self.__new_line()
-        self.__error("If backward compatibility of your workflow is important to you, "
-                     "you can change the \"branch_name\" parameter to \"allor-1\" in your config.json.")
-        self.__error("Switch the \"confirm_unstable_agreement\" parameter in your config.json to \"true\", "
-                     "if you are prepared for potential changes and are willing to modify your current workflow from time to time.")
-        self.__error("This will result in this warning no longer appearing.")
-        self.__new_line()
-        self.__notification("We appreciate your support and understanding during this transition period.")
-        self.__notification("Thank you for using Allor 2.\n")
-
     def __create_config(self):
         with open(self.__CONFIG_PATH, "w", encoding="utf-8") as f:
             json.dump(self.__template(), f, ensure_ascii=False, indent=4)
@@ -184,8 +169,6 @@ class Loader:
             self.__create_timestamp()
 
     def check_updates(self):
-        # confirm_unstable_agreement = self.__config()["updates"]["confirm_unstable_agreement"]
-        confirm_unstable_agreement = True
         branch_name = self.__config()["updates"]["branch_name"]
         update_frequency = self.__config()["updates"]["update_frequency"].lower()
         valid_frequencies = ["always", "day", "week", "month", "never"]
@@ -206,9 +189,6 @@ class Loader:
 
             return
 
-        if not confirm_unstable_agreement and branch_name == "main" and update_frequency != "never":
-            self.__warning_unstable_branch()
-
         if it_is_time_for_update:
             if not (self.__GIT_PATH.exists() or self.__GIT_PATH.is_dir()):
                 self.__error("Root directory of Allor is not a git repository. Update canceled.")
@@ -303,7 +283,7 @@ class Loader:
 
             override_nodes_len += override(lambda item: not item[1].CATEGORY.startswith("_for_testing"))
 
-        self.__log(str(override_nodes_len) + " standard nodes was overridden.")
+        self.__log(str(override_nodes_len) + " nodes were overridden.")
 
     def get_modules(self):
         modules = dict()
@@ -365,7 +345,7 @@ class Loader:
 
         nodes_len = modules.__len__()
 
-        self.__log(str(modules_len) + " modules enabled.")
-        self.__log(str(nodes_len) + " nodes was loaded.")
+        self.__log(str(modules_len) + " modules were enabled.")
+        self.__log(str(nodes_len) + " nodes were loaded.")
 
         return modules

README.MD

@@ -1,4 +1,4 @@
-![logo](resources/logo.png)
+![logo](https://raw.githubusercontent.com/Nourepide/ComfyUI-Allor-Res/c4147e55cf8ec26ca79fe3df6e1af71aca58c19e/v.2/logo_v.2_git.png)
 
 <details>
   <summary>This image from start to end was done in ComfyUI. How?</summary>
@@ -9,7 +9,7 @@
 4. Load [RealESRNet_x4plus.pth](https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.1/RealESRNet_x4plus.pth) and put in to `models/upscale` folder.
 5. Load [AOM3A1B_orangemixs.safetensors](https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/Models/AbyssOrangeMix3/AOM3A1B_orangemixs.safetensors) and put in to `models/chekpoints` folder.
 6. Load [orangemix.vae.pt](https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/VAEs/orangemix.vae.pt) and put in to `models/vae` folder.
-7. Drag-and-drop this [image](resources/logo.png) to ComfyUI or load [JSON](resources/logo.json).
+7. Drag-and-drop this [image](resources/logo.png) to ComfyUI or load [JSON](https://raw.githubusercontent.com/Nourepide/ComfyUI-Allor-Res/c4147e55cf8ec26ca79fe3df6e1af71aca58c19e/v.2/logo_v.2.json).
 8. Press the `Queue Promt` button.
 
 </details>

modules/ImageComposite.py

@@ -269,16 +269,10 @@ class ImageCompositeRelative:
             container_width = img_a_width + img_b_width
             container_height = img_a_height + img_b_height
         elif container_size_type == "sum_width":
-            if img_a_height != img_b_height:
-                raise ValueError()
-
             container_width = img_a_width + img_b_width
-            container_height = img_a_height
+            container_height = max(img_a_height, img_b_height)
         elif container_size_type == "sum_height":
-            if img_b_width != img_b_width:
-                raise ValueError()
-
-            container_width = img_a_width
+            container_width = max(img_a_width, img_b_width)
             container_height = img_a_height + img_a_height
         else:
             raise ValueError()

resources/logo.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dafc8789058e0a6c1341785a72195c746278283a455525c69cbf13153807a914
-size 1919499