From 259d0bba9821a524db4097d418625e46d9b174a8 Mon Sep 17 00:00:00 2001 From: Yuhwan Kim Date: Mon, 8 May 2023 09:11:57 +0900 Subject: [PATCH 1/8] Add Content-Type to SD request. --- src/ts/process/stableDiff.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ts/process/stableDiff.ts b/src/ts/process/stableDiff.ts index ebcc4f54..769e7d9c 100644 --- a/src/ts/process/stableDiff.ts +++ b/src/ts/process/stableDiff.ts @@ -129,6 +129,9 @@ export async function stableDiff(currentChar:character,prompt:string){ "prompt": prompts.join(','), "negative_prompt": neg, 'sampler_name': db.sdConfig.sampler_name + }, + headers:{ + 'Content-Type': 'application/json' } }) 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 2/8] 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} WebUI {language.providerURL} + Steps + + + CFG Scale + + + Width + + Height + + Sampler + + + Upscaler + + {#if $DataBase.sdConfig.enable_hr === "true"} + denoising_strength + + hr_scale + + Upscaler + + {/if} {/if} - Steps - - CFG Scale - - - Width - - Height - - Sampler - - -{:else if subMenu === 3} + + +{:else if subMenu == 3}

{language.display}

{language.UiLanguage} - {#if $DataBase.sdConfig.enable_hr === "true"} + {#if $DataBase.sdConfig.enable_hr === true} denoising_strength hr_scale diff --git a/src/ts/process/stableDiff.ts b/src/ts/process/stableDiff.ts index b8dae838..978bb479 100644 --- a/src/ts/process/stableDiff.ts +++ b/src/ts/process/stableDiff.ts @@ -4,6 +4,7 @@ import { requestChatData } from "./request" import { alertError } from "../alert" import { globalFetch } from "../globalApi" import { CharEmotion } from "../stores" +import type { OpenAIChat } from "." export async function stableDiff(currentChar:character,prompt:string){ @@ -133,7 +134,6 @@ export async function stableDiff(currentChar:character,prompt:string){ "denoising_strength": db.sdConfig.denoising_strength, "hr_scale": db.sdConfig.hr_scale, "hr_upscaler": db.sdConfig.hr_upscaler - 'sampler_name': db.sdConfig.sampler_name }, headers:{ 'Content-Type': 'application/json' From b80f583acafbef4507fd45d75c075d09c72ddfad Mon Sep 17 00:00:00 2001 From: kwaroran Date: Mon, 8 May 2023 22:48:31 +0900 Subject: [PATCH 6/8] added oogabooga help --- src/lang/en.ts | 4 +++- src/lib/SideBars/Settings.svelte | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/lang/en.ts b/src/lang/en.ts index 01476fc2..0d1cc831 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -57,7 +57,9 @@ export const languageEnglish = { + "- **Modify Request Data** modifys current chat data when sent.\n\nIN must be a regex without flags and *\\*.\n\nOUT is a normal string." + "\n\n If OUT starts with **@@**, it doesn't replaces the string, but instead does a special effect if matching string founds." + "\n\n- @@emo (emotion name)\n\n if character is Emotion Images mode, sets (emotion name) as emotion and prevents default.", - experimental: "This is a experimental setting. it might be unstable." + experimental: "This is a experimental setting. it might be unstable.", + oogaboogaURL: "If your WebUI supports older version of api, your url should look *like https:.../run/textgen*\n\n" + + "If your WebUI supports newVersion of api, your url should look like *https://.../api/v1/generate* and use the api server as host, and add --api to arguments." }, setup: { chooseProvider: "Choose AI Provider", diff --git a/src/lib/SideBars/Settings.svelte b/src/lib/SideBars/Settings.svelte index 40061de8..d661fdad 100644 --- a/src/lib/SideBars/Settings.svelte +++ b/src/lib/SideBars/Settings.svelte @@ -127,10 +127,13 @@ {/if} {#if $DataBase.aiModel === 'textgen_webui' || $DataBase.subModel === 'textgen_webui'} - TextGen {language.providerURL} + TextGen {language.providerURL} You must use WebUI without agpl license or use unmodified version with agpl license to observe the contents of the agpl license. You must use textgen webui with --no-stream and without --cai-chat or --chat + {#if !isTauri} + You are using web version. you must use ngrok or other tunnels to use your local webui. + {/if} {/if} {language.mainPrompt} From a44211e49961e911ef88ef473aa0e063099b4775 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Mon, 8 May 2023 22:52:45 +0900 Subject: [PATCH 7/8] updated version to 0.7.2 --- src-tauri/tauri.conf.json | 2 +- src/lib/SideBars/Settings.svelte | 4 ++++ src/ts/database.ts | 2 +- version.json | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 6fc3de8b..74b0fd39 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "RisuAI", - "version": "0.7.1" + "version": "0.7.2" }, "tauri": { "allowlist": { diff --git a/src/lib/SideBars/Settings.svelte b/src/lib/SideBars/Settings.svelte index d661fdad..79cecddf 100644 --- a/src/lib/SideBars/Settings.svelte +++ b/src/lib/SideBars/Settings.svelte @@ -267,6 +267,10 @@ +
+ + Enable Hires +
{#if $DataBase.sdConfig.enable_hr === true} denoising_strength diff --git a/src/ts/database.ts b/src/ts/database.ts index 27dc4673..11f14581 100644 --- a/src/ts/database.ts +++ b/src/ts/database.ts @@ -6,7 +6,7 @@ import { saveImage as saveImageGlobal } from './globalApi'; export const DataBase = writable({} as any as Database) export const loadedStore = writable(false) -export let appVer = '0.7.1' +export let appVer = '0.7.2' export function setDatabase(data:Database){ diff --git a/version.json b/version.json index 54a45e10..638300ad 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version":"0.7.1"} +{"version":"0.7.2"} From c4e2c8fa67b506882998278c240a5201d59423d5 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Mon, 8 May 2023 22:53:26 +0900 Subject: [PATCH 8/8] [chore] removed windows from github actions --- .github/workflows/github-actions-builder.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-builder.yml b/.github/workflows/github-actions-builder.yml index a51d6fcc..8abf199d 100644 --- a/.github/workflows/github-actions-builder.yml +++ b/.github/workflows/github-actions-builder.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [ubuntu-20.04,macos-latest,windows-latest] + platform: [ubuntu-20.04,macos-latest] runs-on: ${{ matrix.platform }} steps: