feat(Dockerfile): make SDv2 the default (+ some formatting cleanup)

gadicc · gadicc · commit c1e73efcdb6e · 2022-11-27T08:58:40.000Z
diff --git a/Dockerfile b/Dockerfile
@@ -93,8 +93,10 @@ ENV HF_AUTH_TOKEN=${HF_AUTH_TOKEN}
 # 3) Your own unique model id if using CHECKPOINT_URL below.
 # 4) "ALL" to download all known models (useful for dev)
 # "runwayml/stable-diffusion-v1-5", "runwayml/stable-diffusion-inpainting"
-# "CompVis/stable-diffusion-v1-4", "hakurei/waifu-diffusion","stabilityai/stable-diffusion-2",stabilityai/stable-diffusion-2-inpainting etc.
-ARG MODEL_ID="runwayml/stable-diffusion-v1-5"
+# "CompVis/stable-diffusion-v1-4", "hakurei/waifu-diffusion",
+# "stabilityai/stable-diffusion-2",
+# "stabilityai/stable-diffusion-2-inpainting" etc.
+ARG MODEL_ID="stabilityai/stable-diffusion-2"
 ENV MODEL_ID=${MODEL_ID}
 
 # "" = model default.
diff --git a/loadModel.py b/loadModel.py
@@ -14,8 +14,9 @@
     # "hakurei/waifu-diffusion-v1-3", - not as diffusers yet
     "runwayml/stable-diffusion-inpainting",
     "runwayml/stable-diffusion-v1-5",
-    "stabilityai/stable-diffusion-2-inpainting",
     "stabilityai/stable-diffusion-2"
+    "stabilityai/stable-diffusion-2-base"
+    "stabilityai/stable-diffusion-2-inpainting",
 ]
 
 

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,9 @@`
`14`	`14`	`# "hakurei/waifu-diffusion-v1-3", - not as diffusers yet`
`15`	`15`	`"runwayml/stable-diffusion-inpainting",`
`16`	`16`	`"runwayml/stable-diffusion-v1-5",`
`17`		`- "stabilityai/stable-diffusion-2-inpainting",`
`18`	`17`	`"stabilityai/stable-diffusion-2"`
	`18`	`+ "stabilityai/stable-diffusion-2-base"`
	`19`	`+ "stabilityai/stable-diffusion-2-inpainting",`
`19`	`20`	`]`
`20`	`21`
`21`	`22`