From d633eb1612f5817262abd0b2e7e8092feeb673b2 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Fri, 28 Jul 2023 21:56:22 -0400 Subject: [PATCH 1/4] remove pydantic and numpy from pyproject.toml --- pyproject.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a97830c670..96d9438d71 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -59,13 +59,11 @@ dependencies = [ "matplotlib", # needed for plotting of Penner easing functions "mediapipe", # needed for "mediapipeface" controlnet model "npyscreen", - "numpy==1.24.4", "omegaconf", "opencv-python", "picklescan", "pillow", "prompt-toolkit", - "pydantic==1.10.10", "pympler~=1.0.1", "pypatchmatch", 'pyperclip', From 71768f59889a09eecf74289f52ac8c6023d027ce Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Sat, 29 Jul 2023 13:04:34 -0400 Subject: [PATCH 2/4] restore unpinned versions of pydantic and numpy --- pyproject.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 96d9438d71..eabc445c1a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,9 +58,11 @@ dependencies = [ "invisible-watermark~=0.2.0", # needed to install SDXL base and refiner using their repo_ids "matplotlib", # needed for plotting of Penner easing functions "mediapipe", # needed for "mediapipeface" controlnet model + "numpy", "npyscreen", "omegaconf", "opencv-python", + "pydantic==1.*", "picklescan", "pillow", "prompt-toolkit", From 60f5606c2da233062b166514e3df461de1ae3f5a Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Sat, 29 Jul 2023 13:28:29 -0400 Subject: [PATCH 3/4] downgrade torchmetrics to fix model import problem --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index eabc445c1a..9cad874ccf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -81,7 +81,7 @@ dependencies = [ "test-tube~=0.7.5", "torch~=2.0.1", "torchvision~=0.15.2", - "torchmetrics~=1.0.1", + "torchmetrics~=0.11.0", "torchsde~=0.2.5", "transformers~=4.31.0", "uvicorn[standard]~=0.21.1", From 6ce059f063f5a122bbc60c8a901accf26472e364 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Sat, 29 Jul 2023 17:26:40 -0400 Subject: [PATCH 4/4] blackified again --- invokeai/app/invocations/params.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/invokeai/app/invocations/params.py b/invokeai/app/invocations/params.py index 1a03baa7cc..513eb8762f 100644 --- a/invokeai/app/invocations/params.py +++ b/invokeai/app/invocations/params.py @@ -6,8 +6,7 @@ from pydantic import Field from invokeai.app.invocations.prompt import PromptOutput -from .baseinvocation import (BaseInvocation, BaseInvocationOutput, - InvocationConfig, InvocationContext) +from .baseinvocation import BaseInvocation, BaseInvocationOutput, InvocationConfig, InvocationContext from .math import FloatOutput, IntOutput # Pass-through parameter nodes - used by subgraphs @@ -68,6 +67,7 @@ class ParamStringInvocation(BaseInvocation): def invoke(self, context: InvocationContext) -> StringOutput: return StringOutput(text=self.text) + class ParamPromptInvocation(BaseInvocation): """A prompt input parameter""" @@ -80,4 +80,4 @@ class ParamPromptInvocation(BaseInvocation): } def invoke(self, context: InvocationContext) -> PromptOutput: - return PromptOutput(prompt=self.prompt) \ No newline at end of file + return PromptOutput(prompt=self.prompt)