Fixed streaming image sequence issue

app.py

@@ -26,7 +26,11 @@ activeLatents = None
 
 def GenerateNewLatentsForInference():
     global latents, oldLatents
-    oldLatents = latents
+    if activeLatents is not None:
+        oldLatents = activeLatents
+    else:
+        oldLatents = latents
+
     if deviceStr == "cuda":
         latents = torch.randn(latentsSize, device=device, dtype=torch.float16)
     else:
@@ -47,7 +51,7 @@ def InitializeOutpainting():
 
 # Based on: https://discuss.pytorch.org/t/help-regarding-slerp-function-for-generative-model-sampling/32475/4
 # Further optimized to trade a divide operation for a multiply
-def slerp(start, end, alpha):
+def Slerp(start, end, alpha):
     start_norm = torch.norm(start, dim=1, keepdim=True)
     end_norm = torch.norm(end, dim=1, keepdim=True)
     omega = torch.acos((start*end/(start_norm*end_norm)).sum(1))
@@ -56,7 +60,7 @@ def slerp(start, end, alpha):
     second = torch.sin(alpha*omega)/sinOmega
     return first.unsqueeze(1)*start + second.unsqueeze(1)*end
 
-def diffuse(latentWalk, staticLatents, generatorSeed, inputImage, mask, pauseInference, prompt, negativePrompt, guidanceScale, numInferenceSteps):
+def Diffuse(latentWalk, staticLatents, generatorSeed, inputImage, mask, pauseInference, prompt, negativePrompt, guidanceScale, numInferenceSteps):
     global lastImage, lastSeed, generator, oldLatentWalk, activeLatents
 
     if mask is None or pauseInference is True:
@@ -66,7 +70,7 @@ def diffuse(latentWalk, staticLatents, generatorSeed, inputImage, mask, pauseInf
         GenerateNewLatentsForInference()
 
     if oldLatentWalk != latentWalk:
-        activeLatents = slerp(oldLatents, latents, latentWalk)
+        activeLatents = Slerp(oldLatents, latents, latentWalk)
         oldLatentWalk = latentWalk
     
     if lastSeed != generatorSeed:
@@ -82,7 +86,8 @@ def diffuse(latentWalk, staticLatents, generatorSeed, inputImage, mask, pauseInf
                     latents=activeLatents,
                     generator=generator).images[0]
 
-    lastImage = newImage
+    if not pauseInference:
+        lastImage = newImage
 
     return newImage
 
@@ -105,25 +110,40 @@ negPromptDesc = "This text will help deter the generation from converging toward
 outputText = "This inferred imagery expands the field of view from the masked area of the input camera feed."
 latentWalkDesc = "This allows you to walk short spans across the latent space with relatively continuous gradients."
 
-prompt = gradio.Textbox(label="Prompt", info=promptDesc, placeholder="A person in a room with colored hair", lines=3)
-negativePrompt = gradio.Textbox(label="Negative Prompt", info=negPromptDesc, placeholder="Facial hair", lines=3)
-inputImage = gradio.Image(label="Input Feed", source="webcam", shape=[512,512], streaming=True)
-mask = gradio.Image(label="Mask", type="pil", value=defaultMask)
-outputImage = gradio.Image(label="Extrapolated Field of View")
-guidanceScale = gradio.Slider(label="Guidance Scale", info="A higher value causes the generation to be more relative to the text prompt conditioning.", maximum=100, minimum=1, value=7.5)
-numInferenceSteps = gradio.Slider(label="Number of Inference Steps", info=numInfStepsDesc, maximum=100, minimum=1, value=20)
-generatorSeed = gradio.Slider(label="Generator Seed", info=generatorSeedDesc, maximum=10000, value=lastSeed)
-staticLatents = gradio.Checkbox(label="Static Latents", info=staticLatentsDesc, value=True)
-latentWalk = gradio.Slider(label="Latent Walk", info=latentWalkDesc, maximum=1.0, minimum=0.0, value=0.0)
-pauseInference = gradio.Checkbox(label="Pause Inference", value=False)
-#modelIndex = gradio.Dropdown(modelNames, label="Model", value="runwayml/stable-diffusion-inpainting")
-
-description = "This generative machine learning demonstration streams stable diffusion outpainting inference live from your camera on your computer or phone to expand your local reality and create an alternate world. High quality frame to frame determinism is a hard problem to solve for latent diffusion models as the generation is inherently relative to input noise distributions for the latents, and many factors such as the inherent Bayer noise from the camera images as well as anything that is altered between camera images (such as focus, white balance, etc) causes non-determinism between frames. Some methods apply spationtemporal attention, but this demonstration focuses on the control over the input latents to navigate the latent space. <b>Increase the lighting of your physical scene from your camera's perspective, and avoid self shadows of scene content, to improve the quality and consistency of the scene generation.</b>"
-article = "This demonstration should initialize automatically from the default values, and run relatively well, but if the output is not an ideal reconstruction of your physical local space from your camera's perspective, then you should adjust the generator seed to take large walks across the latent space. In addition, the static latents can be disable to continously walk the latent space, and then it can be set to static again when a better region of the embedded space is found, but this will increase frame to fram non-determinism. You can also condition the generation using prompts to re-enforce or change aspects of the scene. <b>If you see a black image instead of a generated output image, then you are running into the safety checker. </b>This can trigger inconsistently even when the generated content is purely PG. If this happens, then increase the lighting of the scene and also increase the number of inference steps to improve the generated predicition to reduce the likelihood of the saftey checker triggering a false positive."
-
-inputs=[latentWalk, staticLatents, generatorSeed, inputImage, mask, pauseInference, prompt, negativePrompt, guidanceScale, numInferenceSteps]
-ux = gradio.Interface(fn=diffuse, title="View Diffusion", article=article, description=description, inputs=inputs, outputs=outputImage, live=True)
+with gradio.Blocks(live=True) as ux:
+    gradio.Markdown("This generative machine learning demonstration streams stable diffusion outpainting inference live from your camera on your computer or phone to expand your local reality and create an alternate world. High quality frame to frame determinism is a hard problem to solve for latent diffusion models as the generation is inherently relative to input noise distributions for the latents, and many factors such as the inherent Bayer noise from the camera images as well as anything that is altered between camera images (such as focus, white balance, etc) causes non-determinism between frames. Some methods apply spationtemporal attention, but this demonstration focuses on the control over the input latents to navigate the latent space. **Increase the lighting of your physical scene from your camera's perspective, and avoid self shadows of scene content, to improve the quality and consistency of the scene generation.**")
+    with gradio.Row():
+        with gradio.Column():
+            staticLatents = gradio.Checkbox(label="Static Latents", info=staticLatentsDesc, value=True)
+            inputImage = gradio.Image(label="Input Feed", source="webcam", shape=[512,512], streaming=True)
+            mask = gradio.Image(label="Mask", type="pil", value=defaultMask)
+            prompt = gradio.Textbox(label="Prompt", info=promptDesc, placeholder="A person in a room with colored hair", lines=3)
+            negativePrompt = gradio.Textbox(label="Negative Prompt", info=negPromptDesc, placeholder="Facial hair", lines=3)
+            guidanceScale = gradio.Slider(label="Guidance Scale", info="A higher value causes the generation to be more relative to the text prompt conditioning.", maximum=100, minimum=1, value=7.5)
+            numInferenceSteps = gradio.Slider(label="Number of Inference Steps", info=numInfStepsDesc, maximum=100, minimum=1, value=20)
+            generatorSeed = gradio.Slider(label="Generator Seed", info=generatorSeedDesc, maximum=10000, value=lastSeed)
+            #modelIndex = gradio.Dropdown(modelNames, label="Model", value="runwayml/stable-diffusion-inpainting")
+            inputImage.style(full_width=True)
+        
+        with gradio.Column():
+            #generateLatents = gradio.Button(value="Generate New Latents")
+            latentWalk = gradio.Slider(label="Latent Walk", info=latentWalkDesc, maximum=1.0, minimum=0.0, value=0.0)
+            outputImage = gradio.Image(label="Extrapolated Field of View")
+            pauseInference = gradio.Checkbox(label="Pause Inference", value=False)
+
+    inferenceInputs = [latentWalk, staticLatents, generatorSeed, inputImage, mask, pauseInference, prompt, negativePrompt, guidanceScale, numInferenceSteps]
+    #generateLatents.click(GenerateNewLatentsForInference)
+    inputImage.change(fn=Diffuse, inputs=inferenceInputs, outputs=outputImage, show_progress=False)
+
+    #inputExamples = gradio.Examples([["assets/masks/diamond.png"],
+    #                                 ["assets/masks/sphere.png"],
+    #                                 ["assets/masks/square.png"]],
+    #                                inputs=inferenceInputs,)
+    
+    gradio.Markdown("This demonstration should initialize automatically from the default values, and run relatively well, but if the output is not an ideal reconstruction of your physical local space from your camera's perspective, then you should adjust the generator seed to take large walks across the latent space. In addition, the static latents can be disable to continously walk the latent space, and then it can be set to static again when a better region of the embedded space is found, but this will increase frame to fram non-determinism. You can also condition the generation using prompts to re-enforce or change aspects of the scene. **If you see a black image instead of a generated output image, then you are running into the safety checker.** This can trigger inconsistently even when the generated content is purely PG. If this happens, then increase the lighting of the scene and also increase the number of inference steps to improve the generated predicition to reduce the likelihood of the saftey checker triggering a false positive.")
+
+#inputs=[latentWalk, staticLatents, generatorSeed, inputImage, mask, pauseInference, prompt, negativePrompt, guidanceScale, numInferenceSteps]
+#ux = gradio.Interface(fn=diffuse, title="View Diffusion", article=article, description=description, inputs=inputs, outputs=outputImage, examples=inputExamples, live=True)
 
 print("Launching Demo")
-
 ux.launch()