From f488b1a7f27dff230bee2b1316119dea96b1cbb4 Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Thu, 11 May 2023 10:57:08 +1000 Subject: [PATCH] fix(nodes): fix usage of Optional --- invokeai/app/invocations/collections.py | 2 +- invokeai/app/invocations/generate.py | 2 +- invokeai/app/invocations/infill.py | 8 ++++---- invokeai/app/invocations/latent.py | 2 +- invokeai/app/services/default_graphs.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/invokeai/app/invocations/collections.py b/invokeai/app/invocations/collections.py index 62f6ad8037..93130bfaad 100644 --- a/invokeai/app/invocations/collections.py +++ b/invokeai/app/invocations/collections.py @@ -50,7 +50,7 @@ class RandomRangeInvocation(BaseInvocation): default=np.iinfo(np.int32).max, description="The exclusive high value" ) size: int = Field(default=1, description="The number of values to generate") - seed: Optional[int] = Field( + seed: int = Field( ge=0, le=SEED_MAX, description="The seed for the RNG (omit for random)", diff --git a/invokeai/app/invocations/generate.py b/invokeai/app/invocations/generate.py index 2ca3e98dfa..9a29502048 100644 --- a/invokeai/app/invocations/generate.py +++ b/invokeai/app/invocations/generate.py @@ -47,7 +47,7 @@ class TextToImageInvocation(BaseInvocation, SDImageInvocation): # TODO: consider making prompt optional to enable providing prompt through a link # fmt: off prompt: Optional[str] = Field(description="The prompt to generate an image from") - seed: Optional[int] = Field(ge=0, le=SEED_MAX, description="The seed to use (omit for random)", default_factory=get_random_seed) + seed: int = Field(ge=0, le=SEED_MAX, description="The seed to use (omit for random)", default_factory=get_random_seed) steps: int = Field(default=30, gt=0, description="The number of steps to use to generate the image") width: int = Field(default=512, multiple_of=8, gt=0, description="The width of the resulting image", ) height: int = Field(default=512, multiple_of=8, gt=0, description="The height of the resulting image", ) diff --git a/invokeai/app/invocations/infill.py b/invokeai/app/invocations/infill.py index 17a48cf47b..ac055cef5b 100644 --- a/invokeai/app/invocations/infill.py +++ b/invokeai/app/invocations/infill.py @@ -125,7 +125,7 @@ class InfillColorInvocation(BaseInvocation): """Infills transparent areas of an image with a solid color""" type: Literal["infill_rgba"] = "infill_rgba" - image: ImageField = Field(default=None, description="The image to infill") + image: Optional[ImageField] = Field(default=None, description="The image to infill") color: Optional[ColorField] = Field( default=ColorField(r=127, g=127, b=127, a=255), description="The color to use to infill", @@ -163,9 +163,9 @@ class InfillTileInvocation(BaseInvocation): type: Literal["infill_tile"] = "infill_tile" - image: ImageField = Field(default=None, description="The image to infill") + image: Optional[ImageField] = Field(default=None, description="The image to infill") tile_size: int = Field(default=32, ge=1, description="The tile size (px)") - seed: Optional[int] = Field( + seed: int = Field( ge=0, le=SEED_MAX, description="The seed to use for tile generation (omit for random)", @@ -204,7 +204,7 @@ class InfillPatchMatchInvocation(BaseInvocation): type: Literal["infill_patchmatch"] = "infill_patchmatch" - image: ImageField = Field(default=None, description="The image to infill") + image: Optional[ImageField] = Field(default=None, description="The image to infill") def invoke(self, context: InvocationContext) -> ImageOutput: image = context.services.images.get( diff --git a/invokeai/app/invocations/latent.py b/invokeai/app/invocations/latent.py index 861db7276f..c6ddcb0396 100644 --- a/invokeai/app/invocations/latent.py +++ b/invokeai/app/invocations/latent.py @@ -111,7 +111,7 @@ class NoiseInvocation(BaseInvocation): type: Literal["noise"] = "noise" # Inputs - seed: Optional[int] = Field(ge=0, le=SEED_MAX, description="The seed to use", default_factory=get_random_seed) + seed: int = Field(ge=0, le=SEED_MAX, description="The seed to use", default_factory=get_random_seed) width: int = Field(default=512, multiple_of=8, gt=0, description="The width of the resulting noise", ) height: int = Field(default=512, multiple_of=8, gt=0, description="The height of the resulting noise", ) diff --git a/invokeai/app/services/default_graphs.py b/invokeai/app/services/default_graphs.py index c8347c043f..0ac6b08b4d 100644 --- a/invokeai/app/services/default_graphs.py +++ b/invokeai/app/services/default_graphs.py @@ -51,7 +51,7 @@ def create_system_graphs(graph_library: ItemStorageABC[LibraryGraph]) -> list[Li graphs: list[LibraryGraph] = list() - text_to_image = graph_library.get(default_text_to_image_graph_id) + # text_to_image = graph_library.get(default_text_to_image_graph_id) # TODO: Check if the graph is the same as the default one, and if not, update it #if text_to_image is None: