Publish V3.9 source with per-chunk references and retained V3.8X2 workflows
This commit is contained in:
+35
-25
@@ -65,11 +65,14 @@ def resolve_reference_image_inputs(
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ReferenceAssets:
|
||||
images: tuple[torch.Tensor, ...]
|
||||
latents: tuple[torch.Tensor | None, ...]
|
||||
image_hashes: tuple[str, ...]
|
||||
combined_hash: str
|
||||
size_mode: str
|
||||
images: tuple[torch.Tensor, ...]
|
||||
latents: tuple[torch.Tensor | None, ...]
|
||||
image_hashes: tuple[str, ...]
|
||||
combined_hash: str
|
||||
size_mode: str
|
||||
# Internal source identity, aligned with the compact images/hash/latent tuples.
|
||||
# An empty tuple keeps manually constructed legacy assets compatible.
|
||||
source_slot_ids: tuple[str, ...] = ()
|
||||
|
||||
@property
|
||||
def count(self) -> int:
|
||||
@@ -194,7 +197,7 @@ def _resize_reference(
|
||||
return resized.movedim(1, -1).contiguous()
|
||||
|
||||
|
||||
def prepare_reference_assets(
|
||||
def prepare_reference_assets(
|
||||
*,
|
||||
reference_image_1: torch.Tensor | None,
|
||||
reference_image_2: torch.Tensor | None,
|
||||
@@ -205,28 +208,34 @@ def prepare_reference_assets(
|
||||
reference_image_4: torch.Tensor | None = None,
|
||||
reference_image_5: torch.Tensor | None = None,
|
||||
image_references: ReferenceImageBundle | None = None,
|
||||
) -> ReferenceAssets | None:
|
||||
selected_source_slot_ids: tuple[str, ...] | None = None,
|
||||
) -> ReferenceAssets | None:
|
||||
# Match Core's dynamic Reference inputs: bypassed or otherwise absent
|
||||
# sockets are ignored, then active images are numbered contiguously in
|
||||
# connection order as Picture 1..N.
|
||||
inputs = [
|
||||
image
|
||||
for image in resolve_reference_image_inputs(
|
||||
reference_image_1, reference_image_2, reference_image_3,
|
||||
reference_image_4, reference_image_5, image_references,
|
||||
)
|
||||
if image is not None
|
||||
]
|
||||
if not inputs:
|
||||
return None
|
||||
images = tuple(
|
||||
_resize_reference(
|
||||
_validate_image(f"Reference Image {index}", image),
|
||||
resolved_inputs = resolve_reference_image_inputs(
|
||||
reference_image_1, reference_image_2, reference_image_3,
|
||||
reference_image_4, reference_image_5, image_references,
|
||||
)
|
||||
selected_slots = (
|
||||
None if selected_source_slot_ids is None else set(selected_source_slot_ids)
|
||||
)
|
||||
active_slots = [
|
||||
(f"R{slot_number}", image)
|
||||
for slot_number, image in enumerate(resolved_inputs, start=1)
|
||||
if image is not None
|
||||
and (selected_slots is None or f"R{slot_number}" in selected_slots)
|
||||
]
|
||||
if not active_slots:
|
||||
return None
|
||||
images = tuple(
|
||||
_resize_reference(
|
||||
_validate_image(f"Reference Image {index}", image),
|
||||
output_width=int(output_width),
|
||||
output_height=int(output_height),
|
||||
size_mode=size_mode,
|
||||
)
|
||||
for index, image in enumerate(inputs, start=1)
|
||||
for index, (_, image) in enumerate(active_slots, start=1)
|
||||
)
|
||||
image_hashes = tuple(_tensor_hash(image) for image in images)
|
||||
combined_hash = _canonical_hash(
|
||||
@@ -239,10 +248,11 @@ def prepare_reference_assets(
|
||||
return ReferenceAssets(
|
||||
images=images,
|
||||
latents=tuple(None for _ in images),
|
||||
image_hashes=image_hashes,
|
||||
combined_hash=combined_hash,
|
||||
size_mode=size_mode,
|
||||
)
|
||||
image_hashes=image_hashes,
|
||||
combined_hash=combined_hash,
|
||||
size_mode=size_mode,
|
||||
source_slot_ids=tuple(slot_id for slot_id, _ in active_slots),
|
||||
)
|
||||
|
||||
|
||||
def encode_reference_latents(video_vae: Any, assets: ReferenceAssets) -> ReferenceAssets:
|
||||
|
||||
Reference in New Issue
Block a user