diff --git a/.github/workflows/full_pipeline.yml b/.github/workflows/full_pipeline.yml index fc94d96..97136ed 100644 --- a/.github/workflows/full_pipeline.yml +++ b/.github/workflows/full_pipeline.yml @@ -21,7 +21,7 @@ jobs: with: ref: master fetch-depth: 0 - path: custom_nodes/ClipStuff + path: custom_nodes/KepPromptLang - name: Setup Python uses: actions/setup-python@v4 @@ -45,7 +45,7 @@ jobs: source ./.venv/bin/activate pip install torch --index-url https://download.pytorch.org/whl/cpu pip install -r requirements.txt - pip install -r custom_nodes/ClipStuff/requirements.txt + pip install -r custom_nodes/KepPromptLang/requirements.txt pip install huggingface_hub websocket-client # - name: Cache SD Checkpoint @@ -58,7 +58,7 @@ jobs: - name: Check and Download Model run: | source ./.venv/bin/activate - python custom_nodes/ClipStuff/test_files/check_and_download_model.py + python custom_nodes/KepPromptLang/test_files/check_and_download_model.py - name: Run in Background env: @@ -74,7 +74,7 @@ jobs: - name: Run Workflow run: | source ./.venv/bin/activate - python custom_nodes/ClipStuff/test_files/run_workflow.py + python custom_nodes/KepPromptLang/test_files/run_workflow.py - name: Upload Comfy Server Log if: always() diff --git a/lib/action/base.py b/lib/action/base.py index 83b510b..0cd68a8 100644 --- a/lib/action/base.py +++ b/lib/action/base.py @@ -4,7 +4,7 @@ from typing import Union, List from torch import Tensor from torch.nn import Embedding -from custom_nodes.ClipStuff.lib.parser.prompt_segment import PromptSegment +from custom_nodes.KepPromptLang.lib.parser.prompt_segment import PromptSegment class Action(ABC): diff --git a/lib/actions/action_utils.py b/lib/actions/action_utils.py index 3430964..3f676f2 100644 --- a/lib/actions/action_utils.py +++ b/lib/actions/action_utils.py @@ -1,8 +1,8 @@ from torch import Tensor from torch.nn import Embedding -from custom_nodes.ClipStuff.lib.action.base import Action -from custom_nodes.ClipStuff.lib.actions.types import SegOrAction +from custom_nodes.KepPromptLang.lib.action.base import Action +from custom_nodes.KepPromptLang.lib.actions.types import SegOrAction def get_embedding(seg_or_action: SegOrAction, embedding_module: Embedding) -> Tensor: diff --git a/lib/actions/diff.py b/lib/actions/diff.py index 1bda405..80cc49c 100644 --- a/lib/actions/diff.py +++ b/lib/actions/diff.py @@ -1,8 +1,8 @@ import torch from torch.nn import Embedding -from custom_nodes.ClipStuff.lib.action.base import Action, MultiArgAction -from custom_nodes.ClipStuff.lib.actions.action_utils import get_embedding +from custom_nodes.KepPromptLang.lib.action.base import Action, MultiArgAction +from custom_nodes.KepPromptLang.lib.actions.action_utils import get_embedding class DiffAction(MultiArgAction): diff --git a/lib/actions/neg.py b/lib/actions/neg.py index 644380f..533d081 100644 --- a/lib/actions/neg.py +++ b/lib/actions/neg.py @@ -1,7 +1,7 @@ import torch from torch.nn import Embedding -from custom_nodes.ClipStuff.lib.action.base import Action, SingleArgAction +from custom_nodes.KepPromptLang.lib.action.base import Action, SingleArgAction class NegAction(SingleArgAction): diff --git a/lib/actions/norm.py b/lib/actions/norm.py index 6cff916..86dcad3 100644 --- a/lib/actions/norm.py +++ b/lib/actions/norm.py @@ -1,7 +1,7 @@ import torch from torch.nn import Embedding -from custom_nodes.ClipStuff.lib.action.base import ( +from custom_nodes.KepPromptLang.lib.action.base import ( Action, SingleArgAction, ) diff --git a/lib/actions/sum.py b/lib/actions/sum.py index 450f479..731c3bd 100644 --- a/lib/actions/sum.py +++ b/lib/actions/sum.py @@ -3,9 +3,9 @@ from typing import Union, List import torch from torch.nn import Embedding -from custom_nodes.ClipStuff.lib.actions.action_utils import get_embedding -from custom_nodes.ClipStuff.lib.parser.prompt_segment import PromptSegment -from custom_nodes.ClipStuff.lib.action.base import Action +from custom_nodes.KepPromptLang.lib.actions.action_utils import get_embedding +from custom_nodes.KepPromptLang.lib.parser.prompt_segment import PromptSegment +from custom_nodes.KepPromptLang.lib.action.base import Action class SumAction(Action): diff --git a/lib/actions/types.py b/lib/actions/types.py index 598d779..8a71485 100644 --- a/lib/actions/types.py +++ b/lib/actions/types.py @@ -1,6 +1,6 @@ from typing import Union -from custom_nodes.ClipStuff.lib.parser.prompt_segment import PromptSegment -from custom_nodes.ClipStuff.lib.action.base import Action +from custom_nodes.KepPromptLang.lib.parser.prompt_segment import PromptSegment +from custom_nodes.KepPromptLang.lib.action.base import Action SegOrAction = Union[PromptSegment, Action] diff --git a/lib/actions/utils.py b/lib/actions/utils.py index 30e8ea5..e974086 100644 --- a/lib/actions/utils.py +++ b/lib/actions/utils.py @@ -1,6 +1,6 @@ from typing import List -from custom_nodes.ClipStuff.lib.actions.types import SegOrAction +from custom_nodes.KepPromptLang.lib.actions.types import SegOrAction def batch_size_info(batch: List[SegOrAction]): for segment in batch: diff --git a/lib/clip_model.py b/lib/clip_model.py index 267a243..9f0a8c2 100644 --- a/lib/clip_model.py +++ b/lib/clip_model.py @@ -7,10 +7,10 @@ from transformers import CLIPTextConfig, modeling_utils from comfy import model_management import comfy.ops -from custom_nodes.ClipStuff.lib.action.base import Action -from custom_nodes.ClipStuff.lib.actions.types import SegOrAction -from custom_nodes.ClipStuff.lib.fun_clip_stuff import PromptLangTextModel -from custom_nodes.ClipStuff.lib.parser.prompt_segment import PromptSegment +from custom_nodes.KepPromptLang.lib.action.base import Action +from custom_nodes.KepPromptLang.lib.actions.types import SegOrAction +from custom_nodes.KepPromptLang.lib.fun_clip_stuff import PromptLangTextModel +from custom_nodes.KepPromptLang.lib.parser.prompt_segment import PromptSegment # Methods with no comment can be assumed to be the same as comfy.sd1_clip.SD1ClipModel diff --git a/lib/fun_clip_stuff.py b/lib/fun_clip_stuff.py index 3fa72b5..13bd75c 100644 --- a/lib/fun_clip_stuff.py +++ b/lib/fun_clip_stuff.py @@ -10,8 +10,8 @@ from transformers.models.clip.modeling_clip import ( CLIPTextModel, ) -from custom_nodes.ClipStuff.lib.action.base import Action -from custom_nodes.ClipStuff.lib.actions.types import SegOrAction +from custom_nodes.KepPromptLang.lib.action.base import Action +from custom_nodes.KepPromptLang.lib.actions.types import SegOrAction def slerp(val, low, high): low = low.unsqueeze(0) diff --git a/lib/parser/transformer.py b/lib/parser/transformer.py index e11cfab..900906d 100644 --- a/lib/parser/transformer.py +++ b/lib/parser/transformer.py @@ -3,13 +3,13 @@ from typing import List from lark import Transformer, Token from comfy.sd1_clip import SD1Tokenizer -from custom_nodes.ClipStuff.lib.action.base import Action -from custom_nodes.ClipStuff.lib.actions.diff import DiffAction -from custom_nodes.ClipStuff.lib.parser.utils import build_prompt_segment -from custom_nodes.ClipStuff.lib.actions.neg import NegAction -from custom_nodes.ClipStuff.lib.actions.norm import NormAction -from custom_nodes.ClipStuff.lib.actions.sum import SumAction -from custom_nodes.ClipStuff.lib.parser.prompt_segment import PromptSegment +from custom_nodes.KepPromptLang.lib.action.base import Action +from custom_nodes.KepPromptLang.lib.actions.diff import DiffAction +from custom_nodes.KepPromptLang.lib.parser.utils import build_prompt_segment +from custom_nodes.KepPromptLang.lib.actions.neg import NegAction +from custom_nodes.KepPromptLang.lib.actions.norm import NormAction +from custom_nodes.KepPromptLang.lib.actions.sum import SumAction +from custom_nodes.KepPromptLang.lib.parser.prompt_segment import PromptSegment class PromptTransformer(Transformer): diff --git a/lib/parser/utils.py b/lib/parser/utils.py index 3ccffab..980a87f 100644 --- a/lib/parser/utils.py +++ b/lib/parser/utils.py @@ -1,7 +1,7 @@ from lark import Token from comfy.sd1_clip import SD1Tokenizer -from custom_nodes.ClipStuff.lib.parser.prompt_segment import PromptSegment +from custom_nodes.KepPromptLang.lib.parser.prompt_segment import PromptSegment def flatten_tree(tree): diff --git a/lib/tokenizer.py b/lib/tokenizer.py index 36813ac..f5f49f2 100644 --- a/lib/tokenizer.py +++ b/lib/tokenizer.py @@ -3,11 +3,11 @@ from typing import List from lark import Tree from comfy.sd1_clip import SD1Tokenizer -from custom_nodes.ClipStuff.lib.actions.types import SegOrAction +from custom_nodes.KepPromptLang.lib.actions.types import SegOrAction -from custom_nodes.ClipStuff.lib.parser import PromptParser -from custom_nodes.ClipStuff.lib.parser.transformer import PromptTransformer -from custom_nodes.ClipStuff.lib.parser.prompt_segment import PromptSegment +from custom_nodes.KepPromptLang.lib.parser import PromptParser +from custom_nodes.KepPromptLang.lib.parser.transformer import PromptTransformer +from custom_nodes.KepPromptLang.lib.parser.prompt_segment import PromptSegment class PromptLangTokenizer(SD1Tokenizer): def __init__(self, tokenizer_path=None, max_length=77, pad_with_end=True, embedding_directory=None, embedding_size=768, embedding_key='clip_l', special_tokens=None): diff --git a/nodes.py b/nodes.py index af12f7a..53dbc03 100644 --- a/nodes.py +++ b/nodes.py @@ -7,9 +7,9 @@ from PIL import Image import folder_paths import comfy.sd import comfy.ops -from custom_nodes.ClipStuff.lib.clip_model import PromptLangClipModel +from custom_nodes.KepPromptLang.lib.clip_model import PromptLangClipModel -from custom_nodes.ClipStuff.lib.tokenizer import PromptLangTokenizer +from custom_nodes.KepPromptLang.lib.tokenizer import PromptLangTokenizer class EmptyClass: