feat: layer diffuse

.pre-commit-config.yaml

@@ -19,4 +19,20 @@ repos:
     hooks:
     -   id: mypy
         exclude: ^examples/.*$ # FIXME
-        additional_dependencies: [pydantic, strenum, types-colorama, types-docutils, types-Pillow, types-psutil, types-Pygments, types-pywin32, types-PyYAML, types-regex, types-requests, types-setuptools, types-tabulate, types-tqdm, types-urllib3, horde_sdk==0.9.1]
+        additional_dependencies: [
+            pydantic,
+            strenum,
+            types-colorama,
+            types-docutils,
+            types-Pillow, types-psutil,
+            types-Pygments,
+            types-pywin32,
+            types-PyYAML,
+            types-regex,
+            types-requests,
+            types-setuptools,
+            types-tabulate,
+            types-tqdm,
+            types-urllib3,
+            horde_sdk==0.12.0,
+        ]

README.md

@@ -252,6 +252,22 @@ python run_controlnet.py
 The `images/` directory should have our test images.
 ```
 
+### Creating a local build of hordelib
+
+This is useful when testing new nodes  via the horde-reGen-worker etc
+
+```bash
+python build_helper.py
+python -m build --sdist --wheel --outdir dist/ .
+python build_helper.py --fix
+```
+
+On the venv where you want to install th new version
+
+```bash
+python -m pip install /path/to/hordelib/dist/horde_engine-*.whl
+```
+
 ### Updating the embedded version of ComfyUI
 
 - Change the value in `consts.py` to the desired ComfyUI version.

hordelib/consts.py

@@ -42,6 +42,7 @@ class MODEL_CATEGORY_NAMES(StrEnum):
     ti = auto()
     blip = auto()
     clip = auto()
+    miscellaneous = auto()
 
 
 # Default model managers to load
@@ -55,6 +56,7 @@ class MODEL_CATEGORY_NAMES(StrEnum):
     # MODEL_CATEGORY_NAMES.safety_checker: True,
     MODEL_CATEGORY_NAMES.lora: True,
     MODEL_CATEGORY_NAMES.ti: True,
+    MODEL_CATEGORY_NAMES.miscellaneous: True,
 }
 """The default model managers to load."""  # XXX Clarify
 
@@ -68,6 +70,7 @@ class MODEL_CATEGORY_NAMES(StrEnum):
     MODEL_CATEGORY_NAMES.safety_checker: MODEL_CATEGORY_NAMES.safety_checker,
     MODEL_CATEGORY_NAMES.lora: MODEL_CATEGORY_NAMES.lora,
     MODEL_CATEGORY_NAMES.ti: MODEL_CATEGORY_NAMES.ti,
+    MODEL_CATEGORY_NAMES.miscellaneous: MODEL_CATEGORY_NAMES.miscellaneous,
 }
 """The name of the json file (without the extension) of the corresponding model database."""
 
@@ -81,5 +84,6 @@ class MODEL_CATEGORY_NAMES(StrEnum):
     MODEL_CATEGORY_NAMES.safety_checker: MODEL_CATEGORY_NAMES.safety_checker,
     MODEL_CATEGORY_NAMES.lora: MODEL_CATEGORY_NAMES.lora,
     MODEL_CATEGORY_NAMES.ti: MODEL_CATEGORY_NAMES.ti,
+    MODEL_CATEGORY_NAMES.miscellaneous: MODEL_CATEGORY_NAMES.miscellaneous,
 }
 """The folder name on disk where the models are stored in AIWORKER_CACHE_HOME."""

hordelib/horde.py

@@ -174,6 +174,7 @@ class HordeLib:
         "extra_source_images": {"datatype": list, "default": []},  # Stable Cascade Remix
         "extra_texts": {"datatype": list, "default": []},  # QR Codes (for now)
         "workflow": {"datatype": str, "default": "auto_detect"},
+        "transparent": {"datatype": bool, "default": False},
     }
 
     EXTRA_IMAGES_SCHEMA = {
@@ -1029,6 +1030,24 @@ def _final_pipeline_adjustments(self, payload, pipeline_data) -> tuple[dict, lis
                     pipeline_params["controlnet_qr_model_loader.control_net_name"] = (
                         "control_v1p_sd15_qrcode_monster_v2.safetensors"
                     )
+        if payload.get("transparent") is True:
+            # A transparent gen is basically a fancy lora
+            pipeline_params["model_loader.will_load_loras"] = True
+            if SharedModelManager.manager.compvis:
+                model_details = SharedModelManager.manager.compvis.get_model_reference_info(payload["model_name"])
+                # SD2, Cascade and SD3 not supported
+                if model_details and model_details.get("baseline") in ["stable diffusion 1", "stable_diffusion_xl"]:
+                    self.generator.reconnect_input(pipeline_data, "sampler.model", "layer_diffuse_apply")
+                    self.generator.reconnect_input(pipeline_data, "layer_diffuse_apply.model", "model_loader")
+                    self.generator.reconnect_input(pipeline_data, "output_image.images", "layer_diffuse_decode_rgba")
+                    self.generator.reconnect_input(pipeline_data, "layer_diffuse_decode_rgba.images", "vae_decode")
+                    if model_details.get("baseline") == "stable diffusion 1":
+                        pipeline_params["layer_diffuse_apply.config"] = "SD15, Attention Injection, attn_sharing"
+                        pipeline_params["layer_diffuse_decode_rgba.sd_version"] = "SD15"
+                    else:
+                        pipeline_params["layer_diffuse_apply.config"] = "SDXL, Conv Injection"
+                        pipeline_params["layer_diffuse_decode_rgba.sd_version"] = "SDXL"
+
         return pipeline_params, faults
 
     def _get_appropriate_pipeline(self, params):

hordelib/model_manager/base.py

@@ -30,6 +30,7 @@
     MODEL_CATEGORY_NAMES.esrgan: MODEL_REFERENCE_CATEGORY.esrgan,
     MODEL_CATEGORY_NAMES.gfpgan: MODEL_REFERENCE_CATEGORY.gfpgan,
     MODEL_CATEGORY_NAMES.safety_checker: MODEL_REFERENCE_CATEGORY.safety_checker,
+    MODEL_CATEGORY_NAMES.miscellaneous: MODEL_REFERENCE_CATEGORY.miscellaneous,
 }
 
 

hordelib/model_manager/hyper.py

@@ -18,6 +18,7 @@
 from hordelib.model_manager.esrgan import EsrganModelManager
 from hordelib.model_manager.gfpgan import GfpganModelManager
 from hordelib.model_manager.lora import LoraModelManager
+from hordelib.model_manager.miscellaneous import MiscellaneousModelManager
 from hordelib.model_manager.safety_checker import SafetyCheckerModelManager
 from hordelib.model_manager.ti import TextualInversionModelManager
 
@@ -31,6 +32,7 @@
     MODEL_CATEGORY_NAMES.safety_checker: SafetyCheckerModelManager,
     MODEL_CATEGORY_NAMES.lora: LoraModelManager,
     MODEL_CATEGORY_NAMES.ti: TextualInversionModelManager,
+    MODEL_CATEGORY_NAMES.miscellaneous: MiscellaneousModelManager,
 }
 """A lookup table for the `BaseModelManager` types."""
 
@@ -91,6 +93,12 @@ def ti(self) -> TextualInversionModelManager | None:
         found_mm = self.get_model_manager_instance(TextualInversionModelManager)
         return found_mm if isinstance(found_mm, TextualInversionModelManager) else None
 
+    @property
+    def miscellaneous(self) -> MiscellaneousModelManager | None:
+        """The miscellaneous model manager instance. Returns `None` if not loaded."""
+        found_mm = self.get_model_manager_instance(MiscellaneousModelManager)
+        return found_mm if isinstance(found_mm, MiscellaneousModelManager) else None
+
     @property
     def models(self) -> dict:
         """All model manager's internal dictionaries of models, loaded from model database JSON files."""

hordelib/model_manager/miscellaneous.py

@@ -0,0 +1,15 @@
+from hordelib.consts import MODEL_CATEGORY_NAMES
+from hordelib.model_manager.base import BaseModelManager
+
+
+class MiscellaneousModelManager(BaseModelManager):  # FIXME # TODO?
+    def __init__(
+        self,
+        download_reference=False,
+        **kwargs,
+    ):
+        super().__init__(
+            model_category_name=MODEL_CATEGORY_NAMES.miscellaneous,
+            download_reference=download_reference,
+            **kwargs,
+        )

hordelib/nodes/comfyui_layerdiffuse/LICENSE

@@ -0,0 +1,201 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.