Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

(minor) Tweak field ordering and field names for tiling nodes.

Browse Source
This commit is contained in:
Ryan Dick 2023-11-30 10:44:21 -05:00 committed by Kent Keirsey
parent 57e70aaf50
commit 984e609c61
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
invokeai/app/invocations/latent.py
View File

@ -1194,12 +1194,12 @@ class CropLatentsCoreInvocation(BaseInvocation):
description=FieldDescriptions.latents, description=FieldDescriptions.latents,
input=Input.Connection, input=Input.Connection,
) )
x_offset: int = InputField( x: int = InputField(
ge=0, ge=0,
multiple_of=LATENT_SCALE_FACTOR, multiple_of=LATENT_SCALE_FACTOR,
description="The left x coordinate (in px) of the crop rectangle in image space. This value will be converted to a dimension in latent space.", description="The left x coordinate (in px) of the crop rectangle in image space. This value will be converted to a dimension in latent space.",
) )
y_offset: int = InputField( y: int = InputField(
ge=0, ge=0,
multiple_of=LATENT_SCALE_FACTOR, multiple_of=LATENT_SCALE_FACTOR,
description="The top y coordinate (in px) of the crop rectangle in image space. This value will be converted to a dimension in latent space.", description="The top y coordinate (in px) of the crop rectangle in image space. This value will be converted to a dimension in latent space.",
@ -1218,8 +1218,8 @@ class CropLatentsCoreInvocation(BaseInvocation):
def invoke(self, context: InvocationContext) -> LatentsOutput: def invoke(self, context: InvocationContext) -> LatentsOutput:
latents = context.services.latents.get(self.latents.latents_name) latents = context.services.latents.get(self.latents.latents_name)
x1 = self.x_offset // LATENT_SCALE_FACTOR x1 = self.x // LATENT_SCALE_FACTOR
y1 = self.y_offset // LATENT_SCALE_FACTOR y1 = self.y // LATENT_SCALE_FACTOR
x2 = x1 + (self.width // LATENT_SCALE_FACTOR) x2 = x1 + (self.width // LATENT_SCALE_FACTOR)
y2 = y1 + (self.height // LATENT_SCALE_FACTOR) y2 = y1 + (self.height // LATENT_SCALE_FACTOR)

8
invokeai/app/invocations/tiles.py
View File

@ -58,10 +58,10 @@ class CalculateImageTilesInvocation(BaseInvocation):
@invocation_output("tile_to_properties_output") @invocation_output("tile_to_properties_output")
class TileToPropertiesOutput(BaseInvocationOutput): class TileToPropertiesOutput(BaseInvocationOutput):
coords_top: int = OutputField(description="Top coordinate of the tile relative to its parent image.")
coords_bottom: int = OutputField(description="Bottom coordinate of the tile relative to its parent image.")
coords_left: int = OutputField(description="Left coordinate of the tile relative to its parent image.") coords_left: int = OutputField(description="Left coordinate of the tile relative to its parent image.")
coords_right: int = OutputField(description="Right coordinate of the tile relative to its parent image.") coords_right: int = OutputField(description="Right coordinate of the tile relative to its parent image.")
coords_top: int = OutputField(description="Top coordinate of the tile relative to its parent image.")
coords_bottom: int = OutputField(description="Bottom coordinate of the tile relative to its parent image.")
# HACK: The width and height fields are 'meta' fields that can easily be calculated from the other fields on this # HACK: The width and height fields are 'meta' fields that can easily be calculated from the other fields on this
# object. Including redundant fields that can cheaply/easily be re-calculated goes against conventional API design # object. Including redundant fields that can cheaply/easily be re-calculated goes against conventional API design
@ -85,10 +85,10 @@ class TileToPropertiesInvocation(BaseInvocation):
def invoke(self, context: InvocationContext) -> TileToPropertiesOutput: def invoke(self, context: InvocationContext) -> TileToPropertiesOutput:
return TileToPropertiesOutput( return TileToPropertiesOutput(
coords_top=self.tile.coords.top,
coords_bottom=self.tile.coords.bottom,
coords_left=self.tile.coords.left, coords_left=self.tile.coords.left,
coords_right=self.tile.coords.right, coords_right=self.tile.coords.right,
coords_top=self.tile.coords.top,
coords_bottom=self.tile.coords.bottom,
width=self.tile.coords.right - self.tile.coords.left, width=self.tile.coords.right - self.tile.coords.left,
height=self.tile.coords.bottom - self.tile.coords.top, height=self.tile.coords.bottom - self.tile.coords.top,
overlap_top=self.tile.overlap.top, overlap_top=self.tile.overlap.top,