Code

Regional Prompting (Node only)#5916

Code

Merged

hipsterusername merged 23 commits intomaininvoke-ai/InvokeAI:mainfrom ryan/regional-prompting-naiveinvoke-ai/InvokeAI:ryan/regional-prompting-naiveCopy head branch name to clipboardApr 9, 2024

+969-366

Commits

Commits on Apr 3, 2024

• Add a MaskField primitive, and add a mask to the ConditioningField primitive type.

  RyanJDick

  committed
  46d83a3

  Copy full SHA for 46d83a3

• Add RectangleMaskInvocation.

  RyanJDick

  committed
  1da8423

  Copy full SHA for 1da8423

• Update compel nodes to accept an optional prompt mask.

  RyanJDick

  committed
  bf3ee1f

  Copy full SHA for bf3ee1f

• Remove scheduler_args from ConditioningData structure.

  RyanJDick

  committed
  ef9e0c9

  Copy full SHA for ef9e0c9

• Split ip_adapter_conditioning out from ConditioningData.

  RyanJDick

  committed
  7fe6f03

  Copy full SHA for 7fe6f03

• Rename ConditioningData -> TextConditioningData.

  RyanJDick

  committed
  8923289

  Copy full SHA for 8923289

• Improve documentation of conditioning_data.py.

  RyanJDick

  committed
  b76bb45

  Copy full SHA for b76bb45

• Add TextConditioningRegions to the TextConditioningData data structure.

  RyanJDick

  committed
  c059bc3

  Copy full SHA for c059bc3

• Add support for lists of prompt embeddings to be passed to the DenoiseLatents invocation, and add handling of the conditioning region masks in DenoiseLatents.

  RyanJDick

  committed
  93056e4

  Copy full SHA for 93056e4

• Add RegionalPromptData class for managing prompt region masks.

  RyanJDick

  committed
  dc90ff2

  Copy full SHA for dc90ff2

• Initialize a RegionalPromptAttnProcessor2_0 class by copying AttnProcessor2_0 from diffusers.

  RyanJDick

  committed
  b76720f

  Copy full SHA for b76720f

• Update CustomAttention to support both IP-Adapters and regional prompting.

  RyanJDick

  committed
  203d4a6

  Copy full SHA for 203d4a6

• Create a UNetAttentionPatcher for patching UNet models with CustomAttnProcessor2_0 modules.

  RyanJDick

  committed
  787a085

  Copy full SHA for 787a085

• Update the diffusion logic to use the new regional prompting feature.

  RyanJDick

  committed
  ee34091

  Copy full SHA for ee34091

• (minor) The latest ruff version has _slightly_ different formatting preferences.

  RyanJDick

  committed
  4f97192

  Copy full SHA for 4f97192

Commits on Apr 8, 2024

• Merge branch 'main' into ryan/regional-prompting-naive

  psychedelicious

  authored
  b0edf59

  Copy full SHA for b0edf59

• feat(nodes): add prompt region from image nodes

  psychedelicious

  committed
  3a531c5

  Copy full SHA for 3a531c5

• Pull the upstream changes from diffusers' AttnProcessor2_0 into CustomAttnProcessor2_0. This fixes a bug in CustomAttnProcessor2_0 that was being triggered when peft was not installed. The bug was …

  Show description for 98900a7
  RyanJDick

  committed
  98900a7

  Copy full SHA for 98900a7

• Fix dimensions of mask produced by ExtractMasksAndPromptsInvocation. Also, added a clearer error message in case the same error is introduced in the future.

  RyanJDick

  committed
  826f3d6

  Copy full SHA for 826f3d6

• Rename MaskField to be a generice TensorField.

  RyanJDick

  committed
  26a2b23

  Copy full SHA for 26a2b23

• Add utility to_standard_float_mask(...) to convert various mask formats to a standardized format.

  RyanJDick

  committed
  eb32842

  Copy full SHA for eb32842

Commits on Apr 9, 2024

• Merge branch 'main' into ryan/regional-prompting-naive

  psychedelicious

  authored
  7bd902a

  Copy full SHA for 7bd902a

• Revert "feat(nodes): add prompt region from image nodes"

  Show description for 3e61d5f
  psychedelicious

  committed
  3e61d5f

  Copy full SHA for 3e61d5f