From b7515c5594f3dc62927cec03ed22a866fcfef166 Mon Sep 17 00:00:00 2001
From: wkdwnsqja <40404955+wkdwnsqja@users.noreply.github.com>
Date: Mon, 8 May 2023 22:07:22 +0900
Subject: [PATCH] enable Upscaler option

---
 src/lib/SideBars/Settings.svelte | 42 ++++++++++++++++++++++----------
 src/ts/database.ts               |  8 +++---
 src/ts/process/stableDiff.ts     |  6 ++++-
 3 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/src/lib/SideBars/Settings.svelte b/src/lib/SideBars/Settings.svelte
index b65e21ad..1908a607 100644
--- a/src/lib/SideBars/Settings.svelte
+++ b/src/lib/SideBars/Settings.svelte
@@ -246,23 +246,39 @@
         {/if}
         <span class="text-neutral-200 mt-2">WebUI {language.providerURL}</span>
         <input class="text-neutral-200 mb-4 p-2 bg-transparent input-text focus:bg-selected text-sm" placeholder="https://..." bind:value={$DataBase.webUiUrl}>
+        <span class="text-neutral-200">Steps</span>
+        <input class="text-neutral-200 mb-4 p-2 bg-transparent input-text focus:bg-selected text-sm" type="number" min={0} max="100" bind:value={$DataBase.sdSteps}>
+        
+        <span class="text-neutral-200">CFG Scale</span>
+        <input class="text-neutral-200 mb-4 p-2 bg-transparent input-text focus:bg-selected text-sm" type="number" min={0} max="20" bind:value={$DataBase.sdCFG}>
+
+        <span class="text-neutral-200">Width</span>
+        <input class="text-neutral-200 mb-4 p-2 bg-transparent input-text focus:bg-selected text-sm" type="number" min={0} max="2048" bind:value={$DataBase.sdConfig.width}>
+        <span class="text-neutral-200">Height</span>
+        <input class="text-neutral-200 mb-4 p-2 bg-transparent input-text focus:bg-selected text-sm" type="number" min={0} max="2048" bind:value={$DataBase.sdConfig.height}>
+        <span class="text-neutral-200">Sampler</span>
+        <input class="text-neutral-200 mb-4 p-2 bg-transparent input-text focus:bg-selected text-sm" bind:value={$DataBase.sdConfig.sampler_name}>
+        
+        <span class="text-neutral-200">Upscaler</span>
+        <select class="bg-transparent input-text mt-2 mb-4 text-gray-200 appearance-none text-sm" bind:value={$DataBase.sdConfig.enable_hr}>
+            <option value="false" class="bg-darkbg appearance-none">Disable</option>
+            <option value="true" class="bg-darkbg appearance-none">Enable</option>
+        </select>
+        {#if $DataBase.sdConfig.enable_hr === "true"}
+            <span class="text-neutral-200">denoising_strength</span>
+            <input class="text-neutral-200 mb-4 p-2 bg-transparent input-text focus:bg-selected text-sm" type="number" min={0} max="10" bind:value={$DataBase.sdConfig.denoising_strength}>
+            <span class="text-neutral-200">hr_scale</span>
+            <input class="text-neutral-200 mb-4 p-2 bg-transparent input-text focus:bg-selected text-sm" type="number" min={0} max="10" bind:value={$DataBase.sdConfig.hr_scale}>
+            <span class="text-neutral-200">Upscaler</span>
+            <input class="text-neutral-200 mb-4 p-2 bg-transparent input-text focus:bg-selected text-sm" bind:value={$DataBase.sdConfig.hr_upscaler}>
+        {/if}
     {/if}
 
 
-    <span class="text-neutral-200">Steps</span>
-    <input class="text-neutral-200 mb-4 p-2 bg-transparent input-text focus:bg-selected text-sm" type="number" min={0} max="100" bind:value={$DataBase.sdSteps}>
     
-    <span class="text-neutral-200">CFG Scale</span>
-    <input class="text-neutral-200 mb-4 p-2 bg-transparent input-text focus:bg-selected text-sm" type="number" min={0} max="20" bind:value={$DataBase.sdCFG}>
-
-    <span class="text-neutral-200">Width</span>
-    <input class="text-neutral-200 mb-4 p-2 bg-transparent input-text focus:bg-selected text-sm" type="number" min={0} max="2048" bind:value={$DataBase.sdConfig.width}>
-    <span class="text-neutral-200">Height</span>
-    <input class="text-neutral-200 mb-4 p-2 bg-transparent input-text focus:bg-selected text-sm" type="number" min={0} max="2048" bind:value={$DataBase.sdConfig.height}>
-    <span class="text-neutral-200">Sampler</span>
-    <input class="text-neutral-200 mb-4 p-2 bg-transparent input-text focus:bg-selected text-sm" bind:value={$DataBase.sdConfig.sampler_name}>
-
-{:else if subMenu === 3}
+    
+    
+{:else if subMenu == 3}
     <h2 class="mb-2 text-2xl font-bold mt-2">{language.display}</h2>
     <span class="text-neutral-200 mt-4">{language.UiLanguage}</span>
     <select class="bg-transparent input-text mt-2 text-gray-200 appearance-none text-sm" bind:value={$DataBase.language} on:change={async () => {
diff --git a/src/ts/database.ts b/src/ts/database.ts
index c1b071fb..9d917548 100644
--- a/src/ts/database.ts
+++ b/src/ts/database.ts
@@ -177,8 +177,9 @@ export function setDatabase(data:Database){
             height:512,
             sampler_name:"Euler a",
             script_name:"",
-            enable_hr:false,
-            hr_scale: 2,
+            denoising_strength:0.7,
+            enable_hr:true,
+            hr_scale:1.25,
             hr_upscaler:"Latent"
         }
     }
@@ -346,7 +347,8 @@ interface sdConfig{
     height:number
     sampler_name:string
     script_name:string
-    enable_hr:boolean
+    denoising_strength:number
+    enable_hr:string
     hr_scale: number
     hr_upscaler:string
 }
diff --git a/src/ts/process/stableDiff.ts b/src/ts/process/stableDiff.ts
index ebcc4f54..d34b9027 100644
--- a/src/ts/process/stableDiff.ts
+++ b/src/ts/process/stableDiff.ts
@@ -128,7 +128,11 @@ export async function stableDiff(currentChar:character,prompt:string){
                     "cfg_scale": db.sdCFG,
                     "prompt": prompts.join(','),
                     "negative_prompt": neg,
-                    'sampler_name': db.sdConfig.sampler_name
+                    'sampler_name': db.sdConfig.sampler_name,
+                    "enable_hr": db.sdConfig.enable_hr,
+                    "denoising_strength": db.sdConfig.denoising_strength,
+                    "hr_scale": db.sdConfig.hr_scale,
+                    "hr_upscaler": db.sdConfig.hr_upscaler
                 }
             })