Merge branch 'main' into lstein/global-configuration

This commit is contained in:
Lincoln Stein
2023-05-17 14:37:09 -04:00
committed by GitHub
170 changed files with 1360 additions and 3642 deletions

View File

@ -98,7 +98,8 @@ class CompelInvocation(BaseInvocation):
# TODO: support legacy blend?
prompt: Union[FlattenedPrompt, Blend] = Compel.parse_prompt_string(prompt_str)
conjunction = Compel.parse_prompt_string(prompt_str)
prompt: Union[FlattenedPrompt, Blend] = conjunction.prompts[0]
if context.services.configuration.log_tokenization:
log_tokenization_for_prompt_object(prompt, tokenizer)