refactor: Rename repo to match github
This commit is contained in:
@@ -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()
|
||||
|
||||
+1
-1
@@ -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):
|
||||
|
||||
@@ -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:
|
||||
|
||||
+2
-2
@@ -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):
|
||||
|
||||
+1
-1
@@ -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):
|
||||
|
||||
+1
-1
@@ -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,
|
||||
)
|
||||
|
||||
+3
-3
@@ -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):
|
||||
|
||||
@@ -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]
|
||||
|
||||
@@ -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:
|
||||
|
||||
+4
-4
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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):
|
||||
|
||||
+1
-1
@@ -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):
|
||||
|
||||
+4
-4
@@ -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):
|
||||
|
||||
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user