Merge branch 'main' into feat/ip-adapter

This commit is contained in:
Ryan Dick
2023-09-15 13:15:25 -04:00
266 changed files with 8450 additions and 2829 deletions

View File

@ -4,13 +4,7 @@ from typing import List, Union
import torch
from compel import Compel, ReturnedEmbeddingsType
from compel.prompt_parser import (
Blend,
Conjunction,
CrossAttentionControlSubstitute,
FlattenedPrompt,
Fragment,
)
from compel.prompt_parser import Blend, Conjunction, CrossAttentionControlSubstitute, FlattenedPrompt, Fragment
from invokeai.app.invocations.primitives import ConditioningField, ConditioningOutput
from invokeai.backend.stable_diffusion.diffusion.conditioning_data import (