Merge branch 'main' into space-sdturbo

README.md

@@ -27,38 +27,39 @@ You need CUDA and Python 3.10, Node > 19, Mac with an M1/M2/M3 chip or Intel Arc
 ```bash
 python -m venv venv
 source venv/bin/activate
-pip3 install -r requirements.txt
+pip3 install -r server/requirements.txt
 cd frontend && npm install && npm run build && cd ..
-# fastest pipeline
-python run.py --reload --pipeline img2imgSD21Turbo 
+python server/main.py --reload --pipeline img2imgSDTurbo 
  ```
 
-# Pipelines
-You can build your own pipeline following examples here [here](pipelines),
-don't forget to fuild the frontend first 
+Don't forget to fuild the frontend!!! 
+
 ```bash
 cd frontend && npm install && npm run build && cd ..
 ```
 
+# Pipelines
+You can build your own pipeline following examples here [here](pipelines),
+
+
 # LCM
 ### Image to Image
 
 ```bash
-python run.py --reload --pipeline img2img 
+python server/main.py --reload --pipeline img2img 
 ```
 
 # LCM
 ### Text to Image
 
 ```bash
-python run.py --reload --pipeline txt2img 
+python server/main.py --reload --pipeline txt2img 
 ```
 
 ### Image to Image ControlNet Canny
 
-
 ```bash
-python run.py --reload --pipeline controlnet 
+python server/main.py --reload --pipeline controlnet 
 ```
 
 
@@ -67,39 +68,73 @@ python run.py --reload --pipeline controlnet
 Using LCM-LoRA, giving it the super power of doing inference in as little as 4 steps. [Learn more here](https://huggingface.co/blog/lcm_lora) or [technical report](https://huggingface.co/papers/2311.05556)
 
 
-
 ### Image to Image ControlNet Canny LoRa
 
 ```bash
-python run.py --reload --pipeline controlnetLoraSD15
+python server/main.py --reload --pipeline controlnetLoraSD15
 ```
 or SDXL, note that SDXL is slower than SD15 since the inference runs on 1024x1024 images
 
 ```bash
-python run.py --reload --pipeline controlnetLoraSDXL
+python server/main.py --reload --pipeline controlnetLoraSDXL
 ```
 
 ### Text to Image
 
 ```bash
-python run.py --reload --pipeline txt2imgLora
+python server/main.py --reload --pipeline txt2imgLora
 ```
 
-or 
-
 ```bash
-python run.py --reload --pipeline txt2imgLoraSDXL
+python server/main.py --reload --pipeline txt2imgLoraSDXL
 ```
+# Available Pipelines
+
+#### [LCM](https://huggingface.co/SimianLuo/LCM_Dreamshaper_v7)
+
+`img2img`  
+`txt2img`   
+`controlnet`   
+`txt2imgLora`   
+`controlnetLoraSD15` 
+
+#### [SD15](https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0)
+`controlnetLoraSDXL`   
+`txt2imgLoraSDXL`   
+
+#### [SDXL Turbo](https://huggingface.co/stabilityai/sd-xl-turbo)
+
+`img2imgSDXLTurbo`    
+`controlnetSDXLTurbo`   
+
+
+#### [SDTurbo](https://huggingface.co/stabilityai/sd-turbo)
+`img2imgSDTurbo`   
+`controlnetSDTurbo`   
+
+#### [Segmind-Vega](https://huggingface.co/segmind/Segmind-Vega)
+`controlnetSegmindVegaRT`   
+`img2imgSegmindVegaRT`   
 
 
 ### Setting environment variables
 
 
-`TIMEOUT`: limit user session timeout  
-`SAFETY_CHECKER`: disabled if you want NSFW filter off  
-`MAX_QUEUE_SIZE`: limit number of users on current app instance  
-`TORCH_COMPILE`: enable if you want to use torch compile for faster inference works well on A100 GPUs
-`USE_TAESD`: enable if you want to use Autoencoder Tiny
+* `--host`: Host address (default: 0.0.0.0)  
+* `--port`: Port number (default: 7860)  
+* `--reload`: Reload code on change  
+* `--max-queue-size`: Maximum queue size (optional)
+* `--timeout`: Timeout period (optional)
+* `--safety-checker`: Enable Safety Checker (optional) 
+* `--torch-compile`: Use Torch Compile
+* `--use-taesd` / `--no-taesd`: Use Tiny Autoencoder  
+* `--pipeline`: Pipeline to use (default: "txt2img")  
+* `--ssl-certfile`: SSL Certificate File (optional)
+* `--ssl-keyfile`: SSL Key File (optional)
+* `--debug`: Print Inference time  
+* `--compel`: Compel option  
+* `--sfast`: Enable Stable Fast   
+* `--onediff`: Enable OneDiff
 
 If you run using `bash build-run.sh` you can set `PIPELINE` variables to choose the pipeline you want to run
 
@@ -110,14 +145,14 @@ PIPELINE=txt2imgLoraSDXL bash build-run.sh
 and setting environment variables
 
 ```bash
-TIMEOUT=120 SAFETY_CHECKER=True MAX_QUEUE_SIZE=4 python run.py --reload --pipeline txt2imgLoraSDXL
+TIMEOUT=120 SAFETY_CHECKER=True MAX_QUEUE_SIZE=4 python server/main.py --reload --pipeline txt2imgLoraSDXL
 ```
 
 If you're running locally and want to test it on Mobile Safari, the webserver needs to be served over HTTPS, or follow this instruction on my [comment](https://github.com/radames/Real-Time-Latent-Consistency-Model/issues/17#issuecomment-1811957196)
 
 ```bash
 openssl req -newkey rsa:4096 -nodes -keyout key.pem -x509 -days 365 -out certificate.pem
-python run.py --reload --ssl-certfile=certificate.pem --ssl-keyfile=key.pem
+python server/main.py --reload --ssl-certfile=certificate.pem --ssl-keyfile=key.pem
 ```
 
 ## Docker
@@ -141,15 +176,18 @@ or with environment variables
 ```bash
 docker run -ti -e PIPELINE=txt2imgLoraSDXL -p 7860:7860 --gpus all lcm-live
 ```
-# Development Mode
-
 
-```bash
-python run.py --reload  
-```
 
 # Demo on Hugging Face
 
-https://huggingface.co/spaces/radames/Real-Time-Latent-Consistency-Model
+
+* [radames/Real-Time-Latent-Consistency-Model](https://huggingface.co/spaces/radames/Real-Time-Latent-Consistency-Model)  
+* [radames/Real-Time-SD-Turbo](https://huggingface.co/spaces/radames/Real-Time-SD-Turbo)  
+* [latent-consistency/Real-Time-LCM-ControlNet-Lora-SD1.5](https://huggingface.co/spaces/latent-consistency/Real-Time-LCM-ControlNet-Lora-SD1.5)  
+* [latent-consistency/Real-Time-LCM-Text-to-Image-Lora-SD1.5](https://huggingface.co/spaces/latent-consistency/Real-Time-LCM-Text-to-Image-Lora-SD1.5)  
+* [radames/Real-Time-Latent-Consistency-Model-Text-To-Image](https://huggingface.co/spaces/radames/Real-Time-Latent-Consistency-Model-Text-To-Image)  
+
+
+
 
 https://github.com/radames/Real-Time-Latent-Consistency-Model/assets/102277/c4003ac5-e7ff-44c0-97d3-464bb659de70

build-run.sh

@@ -17,4 +17,4 @@ if [ -z ${COMPILE+x} ]; then
 fi
 echo -e "\033[1;32m\npipeline: $PIPELINE \033[0m"
 echo -e "\033[1;32m\ncompile: $COMPILE \033[0m"
-python3 main.py --port 7860 --host 0.0.0.0 --pipeline $PIPELINE $COMPILE
+python3 ./server/main.py --port 7860 --host 0.0.0.0 --pipeline $PIPELINE $COMPILE

frontend/src/lib/components/AspectRatioSelect.svelte

@@ -0,0 +1,27 @@
+<script lang="ts">
+  import { createEventDispatcher } from 'svelte';
+
+  let options: string[] = ['1:1', '16:9', '4:3', '3:2', '3:4', '9:16'];
+  export let aspectRatio: number = 1;
+  const dispatchEvent = createEventDispatcher();
+
+  function onChange(e: Event) {
+    const target = e.target as HTMLSelectElement;
+    const value = target.value;
+    const [width, height] = value.split(':').map((v) => parseInt(v));
+    aspectRatio = width / height;
+    dispatchEvent('change', aspectRatio);
+  }
+</script>
+
+<div class="relative">
+  <select
+    on:change={onChange}
+    title="Aspect Ratio"
+    class="border-1 block cursor-pointer rounded-md border-gray-800 border-opacity-50 bg-slate-100 bg-opacity-30 p-1 font-medium text-white"
+  >
+    {#each options as option, i}
+      <option value={option}>{option}</option>
+    {/each}
+  </select>
+</div>

frontend/src/lib/components/ImagePlayer.svelte

@@ -4,11 +4,14 @@
 
   import Button from '$lib/components/Button.svelte';
   import Floppy from '$lib/icons/floppy.svelte';
-  import { snapImage } from '$lib/utils';
+  import Expand from '$lib/icons/expand.svelte';
+  import { snapImage, expandWindow } from '$lib/utils';
 
   $: isLCMRunning = $lcmLiveStatus !== LCMLiveStatus.DISCONNECTED;
   $: console.log('isLCMRunning', isLCMRunning);
   let imageEl: HTMLImageElement;
+  let expandedWindow: Window;
+  let isExpanded = false;
   async function takeSnapshot() {
     if (isLCMRunning) {
       await snapImage(imageEl, {
@@ -19,6 +22,18 @@
       });
     }
   }
+  async function toggleFullscreen() {
+    if (isLCMRunning && !isExpanded) {
+      expandedWindow = expandWindow('/api/stream/' + $streamId);
+      expandedWindow.addEventListener('beforeunload', () => {
+        isExpanded = false;
+      });
+      isExpanded = true;
+    } else {
+      expandedWindow?.close();
+      isExpanded = false;
+    }
+  }
 </script>
 
 <div
@@ -26,12 +41,21 @@
 >
   <!-- svelte-ignore a11y-missing-attribute -->
   {#if isLCMRunning}
-    <img
-      bind:this={imageEl}
-      class="aspect-square w-full rounded-lg"
-      src={'/api/stream/' + $streamId}
-    />
+    {#if !isExpanded}
+      <img
+        bind:this={imageEl}
+        class="aspect-square w-full rounded-lg"
+        src={'/api/stream/' + $streamId}
+      />
+    {/if}
     <div class="absolute bottom-1 right-1">
+      <Button
+        on:click={toggleFullscreen}
+        title={'Expand Fullscreen'}
+        classList={'text-sm ml-auto text-white p-1 shadow-lg rounded-lg opacity-50'}
+      >
+        <Expand classList={''} />
+      </Button>
       <Button
         on:click={takeSnapshot}
         disabled={!isLCMRunning}

frontend/src/lib/components/MediaListSwitcher.svelte

@@ -1,21 +1,28 @@
 <script lang="ts">
   import { mediaDevices, mediaStreamActions } from '$lib/mediaStream';
   import Screen from '$lib/icons/screen.svelte';
+  import AspectRatioSelect from './AspectRatioSelect.svelte';
   import { onMount } from 'svelte';
 
   let deviceId: string = '';
+  let aspectRatio: number = 1;
+
+  onMount(() => {
+    deviceId = $mediaDevices[0].deviceId;
+  });
   $: {
-    console.log($mediaDevices);
+    console.log(deviceId);
   }
   $: {
-    console.log(deviceId);
+    console.log(aspectRatio);
   }
-  onMount(() => {
-    deviceId = $mediaDevices[0].deviceId;
-  });
 </script>
 
-<div class="flex items-center justify-center text-xs">
+<div class="flex items-center justify-center text-xs backdrop-blur-sm backdrop-grayscale">
+  <AspectRatioSelect
+    bind:aspectRatio
+    on:change={() => mediaStreamActions.switchCamera(deviceId, aspectRatio)}
+  />
   <button
     title="Share your screen"
     class="border-1 my-1 flex cursor-pointer gap-1 rounded-md border-gray-500 border-opacity-50 bg-slate-100 bg-opacity-30 p-1 font-medium text-white"
@@ -28,7 +35,7 @@
   {#if $mediaDevices}
     <select
       bind:value={deviceId}
-      on:change={() => mediaStreamActions.switchCamera(deviceId)}
+      on:change={() => mediaStreamActions.switchCamera(deviceId, aspectRatio)}
       id="devices-list"
       class="border-1 block cursor-pointer rounded-md border-gray-800 border-opacity-50 bg-slate-100 bg-opacity-30 p-1 font-medium text-white"
     >

frontend/src/lib/components/VideoInput.svelte

@@ -10,6 +10,7 @@
     mediaDevices
   } from '$lib/mediaStream';
   import MediaListSwitcher from './MediaListSwitcher.svelte';
+
   export let width = 512;
   export let height = 512;
   const size = { width, height };
@@ -32,6 +33,7 @@
   $: {
     console.log(selectedDevice);
   }
+
   onDestroy(() => {
     if (videoFrameCallbackId) videoEl.cancelVideoFrameCallback(videoFrameCallbackId);
   });
@@ -47,18 +49,15 @@
     }
     const videoWidth = videoEl.videoWidth;
     const videoHeight = videoEl.videoHeight;
-    let height0 = videoHeight;
-    let width0 = videoWidth;
-    let x0 = 0;
-    let y0 = 0;
-    if (videoWidth > videoHeight) {
-      width0 = videoHeight;
-      x0 = (videoWidth - videoHeight) / 2;
-    } else {
-      height0 = videoWidth;
-      y0 = (videoHeight - videoWidth) / 2;
-    }
-    ctx.drawImage(videoEl, x0, y0, width0, height0, 0, 0, size.width, size.height);
+    // scale down video to fit canvas,  size.width, size.height
+    const scale = Math.min(size.width / videoWidth, size.height / videoHeight);
+    const width0 = videoWidth * scale;
+    const height0 = videoHeight * scale;
+    const x0 = (size.width - width0) / 2;
+    const y0 = (size.height - height0) / 2;
+    ctx.clearRect(0, 0, size.width, size.height);
+    ctx.drawImage(videoEl, x0, y0, width0, height0);
+
     const blob = await new Promise<Blob>((resolve) => {
       canvasEl.toBlob(
         (blob) => {
@@ -78,14 +77,14 @@
 </script>
 
 <div class="relative mx-auto max-w-lg overflow-hidden rounded-lg border border-slate-300">
-  <div class="relative z-10 aspect-square w-full object-cover">
+  <div class="relative z-10 flex aspect-square w-full items-center justify-center object-cover">
     {#if $mediaDevices.length > 0}
-      <div class="absolute bottom-0 right-0 z-10">
+      <div class="absolute bottom-0 right-0 z-10 w-full bg-slate-400 bg-opacity-40">
         <MediaListSwitcher />
       </div>
     {/if}
     <video
-      class="pointer-events-none aspect-square w-full object-cover"
+      class="pointer-events-none aspect-square w-full justify-center object-contain"
       bind:this={videoEl}
       on:loadeddata={() => {
         videoIsReady = true;

frontend/src/lib/icons/aspect.svelte

@@ -0,0 +1,10 @@
+<script lang="ts">
+  export let classList: string = '';
+</script>
+
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512" height="16px" class={classList}>
+  <path
+    fill="currentColor"
+    d="M32 32C14.3 32 0 46.3 0 64v96c0 17.7 14.3 32 32 32s32-14.3 32-32V96h64c17.7 0 32-14.3 32-32s-14.3-32-32-32H32zM64 352c0-17.7-14.3-32-32-32s-32 14.3-32 32v96c0 17.7 14.3 32 32 32h96c17.7 0 32-14.3 32-32s-14.3-32-32-32H64V352zM320 32c-17.7 0-32 14.3-32 32s14.3 32 32 32h64v64c0 17.7 14.3 32 32 32s32-14.3 32-32V64c0-17.7-14.3-32-32-32H320zM448 352c0-17.7-14.3-32-32-32s-32 14.3-32 32v64H320c-17.7 0-32 14.3-32 32s14.3 32 32 32h96c17.7 0 32-14.3 32-32V352z"
+  />
+</svg>

frontend/src/lib/icons/expand.svelte

@@ -0,0 +1,10 @@
+<script lang="ts">
+  export let classList: string = '';
+</script>
+
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" height="1em" class={classList}>
+  <path
+    fill="currentColor"
+    d="M.3 89.5C.1 91.6 0 93.8 0 96V224 416c0 35.3 28.7 64 64 64l384 0c35.3 0 64-28.7 64-64V224 96c0-35.3-28.7-64-64-64H64c-2.2 0-4.4 .1-6.5 .3c-9.2 .9-17.8 3.8-25.5 8.2C21.8 46.5 13.4 55.1 7.7 65.5c-3.9 7.3-6.5 15.4-7.4 24zM48 224H464l0 192c0 8.8-7.2 16-16 16L64 432c-8.8 0-16-7.2-16-16l0-192z"
+  />
+</svg>

frontend/src/lib/mediaStream.ts

@@ -1,5 +1,6 @@
-import { writable, type Writable, get } from 'svelte/store';
+import { writable, type Writable, type Readable, get, derived } from 'svelte/store';
 
+const BASE_HEIGHT = 720;
 export enum MediaStreamStatusEnum {
     INIT = "init",
     CONNECTED = "connected",
@@ -23,11 +24,17 @@ export const mediaStreamActions = {
                 console.error(err);
             });
     },
-    async start(mediaDevicedID?: string) {
+    async start(mediaDevicedID?: string, aspectRatio: number = 1) {
         const constraints = {
             audio: false,
             video: {
-                width: 1024, height: 1024, deviceId: mediaDevicedID
+                width: {
+                    ideal: BASE_HEIGHT * aspectRatio,
+                },
+                height: {
+                    ideal: BASE_HEIGHT,
+                },
+                deviceId: mediaDevicedID
             }
         };
 
@@ -36,6 +43,7 @@ export const mediaStreamActions = {
             .then((stream) => {
                 mediaStreamStatus.set(MediaStreamStatusEnum.CONNECTED);
                 mediaStream.set(stream);
+
             })
             .catch((err) => {
                 console.error(`${err.name}: ${err.message}`);
@@ -65,19 +73,33 @@ export const mediaStreamActions = {
             console.log(JSON.stringify(videoTrack.getConstraints(), null, 2));
             mediaStreamStatus.set(MediaStreamStatusEnum.CONNECTED);
             mediaStream.set(captureStream)
+
+            const capabilities = videoTrack.getCapabilities();
+            const aspectRatio = capabilities.aspectRatio;
+            console.log('Aspect Ratio Constraints:', aspectRatio);
         } catch (err) {
             console.error(err);
         }
 
     },
-    async switchCamera(mediaDevicedID: string) {
+    async switchCamera(mediaDevicedID: string, aspectRatio: number) {
+        console.log("Switching camera");
         if (get(mediaStreamStatus) !== MediaStreamStatusEnum.CONNECTED) {
             return;
         }
         const constraints = {
             audio: false,
-            video: { width: 1024, height: 1024, deviceId: mediaDevicedID }
+            video: {
+                width: {
+                    ideal: BASE_HEIGHT * aspectRatio,
+                },
+                height: {
+                    ideal: BASE_HEIGHT,
+                },
+                deviceId: mediaDevicedID
+            }
         };
+        console.log("Switching camera", constraints);
         await navigator.mediaDevices
             .getUserMedia(constraints)
             .then((stream) => {

frontend/src/lib/utils.ts

@@ -36,3 +36,46 @@ export function snapImage(imageEl: HTMLImageElement, info: IImageInfo) {
         console.log(err);
     }
 }
+
+export function expandWindow(steramURL: string): Window {
+    const html = `
+    <html>
+        <head>
+            <title>Real-Time Latent Consistency Model</title>
+            <style>
+                body {
+                    margin: 0;
+                    padding: 0;
+                    background-color: black;
+                }
+            </style>
+        </head>
+        <body>
+            <script>
+                let isFullscreen = false;
+                window.onkeydown = function(event) {
+                    switch (event.code) {
+                        case "Escape":
+                            window.close();
+                            break;
+                        case "Enter":
+                            if (isFullscreen) {
+                                document.exitFullscreen();
+                                isFullscreen = false;
+                            } else {
+                                document.documentElement.requestFullscreen();
+                                isFullscreen = true;
+                            }
+                            break;
+                    }
+                }
+            </script>
+
+            <img src="${steramURL}" style="width: 100%; height: 100%; object-fit: contain;" />
+        </body>
+    </html>
+    `;
+    const newWindow = window.open("", "_blank", "width=1024,height=1024,scrollbars=0,resizable=1,toolbar=0,menubar=0,location=0,directories=0,status=0") as Window;
+    newWindow.document.write(html);
+    return newWindow;
+}

frontend/src/routes/+page.svelte

@@ -113,19 +113,19 @@
     {/if}
   </article>
   {#if pipelineParams}
-    <article class="my-3 grid grid-cols-1 gap-3 sm:grid-cols-2">
+    <article class="my-3 grid grid-cols-1 gap-3 sm:grid-cols-4">
       {#if isImageMode}
-        <div class="sm:col-start-1">
+        <div class="col-span-2 sm:col-start-1">
           <VideoInput
             width={Number(pipelineParams.width.default)}
             height={Number(pipelineParams.height.default)}
           ></VideoInput>
         </div>
       {/if}
-      <div class={isImageMode ? 'sm:col-start-2' : 'col-span-2'}>
+      <div class={isImageMode ? 'col-span-2 sm:col-start-3' : 'col-span-4'}>
         <ImagePlayer />
       </div>
-      <div class="sm:col-span-2">
+      <div class="sm:col-span-4 sm:row-start-2">
         <Button on:click={toggleLcmLive} {disabled} classList={'text-lg my-1 p-2'}>
           {#if isLCMRunning}
             Stop

frontend/svelte.config.js

@@ -5,8 +5,8 @@ const config = {
   preprocess: vitePreprocess({ postcss: true }),
   kit: {
     adapter: adapter({
-      pages: '../public',
-      assets: '../public',
+      pages: 'public',
+      assets: 'public',
       fallback: undefined,
       precompress: false,
       strict: true

requirements.txt

@@ -1,16 +1,16 @@
-diffusers==0.24.0
-transformers==4.35.2
+git+https://github.com/huggingface/diffusers
+transformers==4.36.2
 --extra-index-url https://download.pytorch.org/whl/cu121;
 torch
-fastapi==0.104.1
-uvicorn[standard]==0.24.0.post1
-Pillow==10.1.0
-accelerate==0.24.0
+fastapi==0.108.0
+uvicorn[standard]==0.25.0
+Pillow==10.2.0
+accelerate==0.25.0
 compel==2.0.2
 controlnet-aux==0.0.7
 peft==0.6.0
 xformers; sys_platform != 'darwin' or platform_machine != 'arm64'
 markdown2
-stable_fast @ https://github.com/chengzeyi/stable-fast/releases/download/v0.0.15.post1/stable_fast-0.0.15.post1+torch211cu121-cp310-cp310-manylinux2014_x86_64.whl
-oneflow @ https://oneflow-pro.oss-cn-beijing.aliyuncs.com/branch/community/cu121/794a56cc787217f46b21f5cbc84f65295664b82c/oneflow-0.9.1%2Bcu121.git.794a56c-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
-git+https://github.com/Oneflow-Inc/onediff.git@main#egg=onediff
+stable_fast @ https://github.com/chengzeyi/stable-fast/releases/download/v1.0.2/stable_fast-1.0.2+torch211cu121-cp310-cp310-manylinux2014_x86_64.whl
+oneflow @ https://oneflow-pro.oss-cn-beijing.aliyuncs.com/branch/community/cu121/a0df8f27528ab5d55211b05e809c6ce3e1070f29/oneflow-0.9.1.dev20240104%2Bcu121-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
+git+https://github.com/siliconflow/onediff.git@main#egg=onediff

config.py → server/config.py

@@ -7,7 +7,6 @@ class Args(NamedTuple):
     host: str
     port: int
     reload: bool
-    mode: str
     max_queue_size: int
     timeout: float
     safety_checker: bool
@@ -17,7 +16,7 @@ class Args(NamedTuple):
     ssl_certfile: str
     ssl_keyfile: str
     sfast: bool
-    oneflow: bool = False
+    onediff: bool = False
     compel: bool = False
     debug: bool = False
 
@@ -35,15 +34,11 @@ TORCH_COMPILE = os.environ.get("TORCH_COMPILE", None) == "True"
 USE_TAESD = os.environ.get("USE_TAESD", "True") == "True"
 default_host = os.getenv("HOST", "0.0.0.0")
 default_port = int(os.getenv("PORT", "7860"))
-default_mode = os.getenv("MODE", "default")
 
 parser = argparse.ArgumentParser(description="Run the app")
 parser.add_argument("--host", type=str, default=default_host, help="Host address")
 parser.add_argument("--port", type=int, default=default_port, help="Port number")
 parser.add_argument("--reload", action="store_true", help="Reload code on change")
-parser.add_argument(
-    "--mode", type=str, default=default_mode, help="App Inferece Mode: txt2img, img2img"
-)
 parser.add_argument(
     "--max-queue-size",
     dest="max_queue_size",
@@ -117,10 +112,10 @@ parser.add_argument(
     help="Enable Stable Fast",
 )
 parser.add_argument(
-    "--oneflow",
+    "--onediff",
     action="store_true",
     default=False,
-    help="Enable OneFlow",
+    help="Enable OneDiff",
 )
 parser.set_defaults(taesd=USE_TAESD)
 

main.py → server/main.py

@@ -155,7 +155,9 @@ class App:
         if not os.path.exists("public"):
             os.makedirs("public")
 
-        self.app.mount("/", StaticFiles(directory="public", html=True), name="public")
+        self.app.mount(
+            "/", StaticFiles(directory="frontend/public", html=True), name="public"
+        )
 
 
 pipeline_class = get_pipeline_class(config.pipeline)

{pipelines → server/pipelines}/controlnet.py

@@ -187,8 +187,8 @@ class Pipeline:
             config.enable_cuda_graph = True
             self.pipe = compile(self.pipe, config=config)
 
-        if args.oneflow:
-            print("\nRunning oneflow compile\n")
+        if args.onediff:
+            print("\nRunning onediff compile\n")
             from onediff.infer_compiler import oneflow_compile
 
             self.pipe.unet = oneflow_compile(self.pipe.unet)

{pipelines → server/pipelines}/controlnetSDTurbo.py

@@ -194,8 +194,8 @@ class Pipeline:
             config.enable_cuda_graph = True
             self.pipe = compile(self.pipe, config=config)
 
-        if args.oneflow:
-            print("\nRunning oneflow compile\n")
+        if args.onediff:
+            print("\nRunning onediff compile\n")
             from onediff.infer_compiler import oneflow_compile
 
             self.pipe.unet = oneflow_compile(self.pipe.unet)

{pipelines → server/pipelines}/img2imgSDTurbo.py

@@ -121,8 +121,8 @@ class Pipeline:
             config.enable_cuda_graph = True
             self.pipe = compile(self.pipe, config=config)
 
-        if args.oneflow:
-            print("\nRunning oneflow compile\n")
+        if args.onediff:
+            print("\nRunning onediff compile\n")
             from onediff.infer_compiler import oneflow_compile
 
             self.pipe.unet = oneflow_compile(self.pipe.unet)