diff --git a/workflows/comfy/ComfyLauncher/ComfyRunnerForSidecar.py b/workflows/comfy/ComfyLauncher/ComfyRunnerForSidecar.py index bd9b396..0e18659 100644 --- a/workflows/comfy/ComfyLauncher/ComfyRunnerForSidecar.py +++ b/workflows/comfy/ComfyLauncher/ComfyRunnerForSidecar.py @@ -21,6 +21,9 @@ MAIN_IPA_WORKFLOW = os.environ.get("MAIN_IPA_WORKFLOW", "ipa_API_03-05-2024/yae_ FACE_DETAILER_WORKFLOW = os.environ.get("FACE_DETAILER_WORKFLOW", "yae_vid2vid_FaceDetailer_03-05_API.json") UPSCALER_WORKFLOW = os.environ.get("UPSCALER_WORKFLOW", "yae_vid2vid_Upscale_03-05_API.json") +MAIN_IPA_WORKFLOW = os.environ.get("MAIN_IPA_WORKFLOW", "ipa_API_27-05-2024/yae_vid2vid_mainAYS_29-05_API.json") +FACE_DETAILER_WORKFLOW = os.environ.get("FACE_DETAILER_WORKFLOW", "ipa_API_27-05-2024/yae_vid2vid_FaceDetailerlipsCN_22-05_API.json") +UPSCALER_WORKFLOW = os.environ.get("UPSCALER_WORKFLOW", "ipa_API_27-05-2024/yae_vid2vid_UpscaleAYS_27-05_API.json") class PipelineType(IntEnum): BASE = auto() diff --git a/workflows/comfy/Dockerfile b/workflows/comfy/Dockerfile index 7682b72..fc7b26a 100644 --- a/workflows/comfy/Dockerfile +++ b/workflows/comfy/Dockerfile @@ -76,6 +76,7 @@ RUN ComfyUI/venv/bin/python -m pip install -r required_requirements.txt --extra- COPY --chown=appuser:appgroup repos.json /app/repos.json RUN python3 install.py --repos-json repos.json +COPY --chown=appuser:appgroup custom_nodes/Yae_CustomNodes.py /app/ComfyUI/custom_nodes/Yae_CustomNodes.py COPY --chown=appuser:appgroup dependencies.json /app/dependencies.json COPY --chown=appuser:appgroup server_requirements.txt /app/server_requirements.txt diff --git a/workflows/comfy/custom_nodes/Yae_CustomNodes.py b/workflows/comfy/custom_nodes/Yae_CustomNodes.py new file mode 100644 index 0000000..b621a7c --- /dev/null +++ b/workflows/comfy/custom_nodes/Yae_CustomNodes.py @@ -0,0 +1,47 @@ +import sys +import os +import torch +from PIL import Image, ImageDraw, ImageOps +import math +import numpy as np + + +sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), "comfy")) + + +class YaeCombineConditionings: + @classmethod + def INPUT_TYPES(s): + return {"required": { + "conditioning1": ("CONDITIONING", ), + "conditioning2": ("CONDITIONING", ), + }, + } + + RETURN_TYPES = ("CONDITIONING", ) + FUNCTION = "doit" + + CATEGORY = "ImpactPack/Util" + + def doit(self, **kwargs): + res = [] + for k, v in kwargs.items(): + if v != 0: + res += v + + return (res, ) + + + + +NODE_CLASS_MAPPINGS = { + "YaeCombineConditionings": YaeCombineConditionings +} + +NODE_DISPLAY_NAME_MAPPINGS = { + "YaeCombineConditionings": "Yae's Combine Conditionings" +} + + + +