From a93a34af0b2fc9dd0868d30409bfc1edc4468f17 Mon Sep 17 00:00:00 2001 From: wil Date: Wed, 13 Mar 2024 11:53:21 -0400 Subject: [PATCH] now default cn and prompts are bound to the sd weight --- .../pages/video_styletransfer/commons.tsx | 5 ++- .../pageVSTApp/compAdvanceOptions.tsx | 6 ++-- .../components/pageVSTApp/compStyleModal.tsx | 35 +++++++++++++++---- .../components/pageVSTApp/dataCnPresets.tsx | 6 ++-- .../pageVSTApp/dataDefaultValues.tsx | 32 +++++++++++++---- .../components/pageVSTApp/dataStyleModels.tsx | 20 ++++++++++- .../components/pageVSTApp/helpers.tsx | 29 ++++++++++++--- .../components/pageVSTApp/pageVSTApp.tsx | 13 +++++-- 8 files changed, 119 insertions(+), 27 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/commons.tsx b/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/commons.tsx index 9871ebb1b1..9ba40a317e 100644 --- a/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/commons.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/commons.tsx @@ -18,6 +18,7 @@ export function TableOfKeyValues( title: string; keyValues:{ [key:string]:number|string|boolean|undefined + |{ [key:string]:number|string} }; height?: number | string }){ @@ -33,7 +34,9 @@ export function TableOfKeyValues( {title} { Object.entries(keyValues).map(([key, val], index: number)=>{ - return {`${key}`}{`${val}`} + if(key!=="defaultCN" && key!=="defaultPrompts") + return {`${key}`}{`${val}`} + else return null }) } ); diff --git a/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/compAdvanceOptions.tsx b/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/compAdvanceOptions.tsx index 3948bb95ac..ae03d04b94 100644 --- a/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/compAdvanceOptions.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/compAdvanceOptions.tsx @@ -25,18 +25,20 @@ import { fullbodyPreset, landscapePreset, typogPreset, - defaultPreset, + // defaultPreset, } from "./dataCnPresets"; export default function CompAdvanceOptions({ - debug, + debug: propsDebug = false, t, vstValues: vstVal, onChange: handleOnChange, + currDefaultCN: defaultPreset }: { debug?: boolean; t: Function; vstValues: VSTType; + currDefaultCN: {[key: string]: number}; onChange: (val: { [key: string]: number | string | boolean | undefined; }) => void; diff --git a/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/compStyleModal.tsx b/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/compStyleModal.tsx index 9524a8273b..f7870a308b 100644 --- a/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/compStyleModal.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/compStyleModal.tsx @@ -8,6 +8,7 @@ import { SelectModalV2 } from "components/common/SelectModal"; import { WeightCategory } from "@storyteller/components/src/api/_common/enums/WeightCategory"; import styleModels from './dataStyleModels'; +import { defaultPreset as noStyleCNPreset } from './dataCnPresets'; export default function CompStyleModal({ debug, @@ -19,7 +20,8 @@ export default function CompStyleModal({ t: Function; value: string; onChange: (val: { - [key: string]: number | string | boolean | undefined; + [key: string]: number | string | boolean | undefined + | {[key: string]: number | string }; }) => void; }){ const gridContainerRef = useRef(null); @@ -34,6 +36,18 @@ export default function CompStyleModal({ onClear={()=>onChange({ sdModelToken: "", sdModelTitle: "", + defaultCN: noStyleCNPreset, + defaultPrompts:{ + positivePrompt:"", + negativePrompt:"", + positivePromptHidden:"", + negativePromptHidden:"", + }, + ...noStyleCNPreset, + positivePrompt:"", + negativePrompt:"", + positivePromptHidden:"", + negativePromptHidden:"", })} > { - onChange({ - sdModelToken:data.token, - sdModelTitle: data.title, - }) - setOnSelectTimeStamp(new Date()); + const selectedStyle = styleModels.find( + (styleItem)=>styleItem.weight_token = data.token + ); + if(selectedStyle!==undefined){ + onChange({ + sdModelToken:data.token, + sdModelTitle: data.title, + defaultCN: selectedStyle.defaultCN, + defaultPrompts: selectedStyle.defaultPrompts, + ...selectedStyle.defaultCN, + ...selectedStyle.defaultPrompts + }); + setOnSelectTimeStamp(new Date()); + } } }; //console.log(data); diff --git a/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/dataCnPresets.tsx b/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/dataCnPresets.tsx index 5e6a3dcb15..2482908761 100644 --- a/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/dataCnPresets.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/dataCnPresets.tsx @@ -10,13 +10,13 @@ type CNPreset = const defaultPreset = { cnCanny: 0, cnDepth: 0, - cnLineArtAnime: 0.7, + cnLineArtAnime: 0, cnLineArtRealistic: 0, cnLipsStrength: 0, - cnOpenPose: 1, + cnOpenPose: 0, cnPipeFace: 0, cnSparseScribble: 0, - cnSoftEdge: 1, + cnSoftEdge: 0, cnRegularSteps: 20, } diff --git a/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/dataDefaultValues.tsx b/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/dataDefaultValues.tsx index 7273dc7976..cfa41317ce 100644 --- a/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/dataDefaultValues.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/dataDefaultValues.tsx @@ -1,7 +1,9 @@ -import { defaultPreset as defaultCN } from "./dataCnPresets"; +// import { defaultPreset as defaultCN } from "./dataCnPresets"; import styleModels from "./dataStyleModels"; +import { VSTType } from "./helpers"; export {initialValues, hiddenValues}; -const initialValues = { + +const initialValues: VSTType = { //files Settings fileToken: "", outputPath: "vid2vid/SparseUpscaleInterp_00001.mp4", @@ -17,17 +19,33 @@ const initialValues = { workflowConfig: "weight_0a04e66y14t4e2bwxjfyg1mb2", sdModelToken: styleModels[0].weight_token, sdModelTitle: styleModels[0].title, - loraModelToken: "", - loraModelStrength: 0, + // loraModelToken: "", + // loraModelStrength: 0, //basics inputFps: 24, - posPrompt: "perfect anime illustration,(best-quality:0.8),", - negPrompt: "", + ...styleModels[0].defaultPrompts, + // positivePrompt:"", + // negativePrompt:"", + // positivePromptHidden:"", + // negativePromptHidden:"", visibility: "private", //Control Net - ...defaultCN + ...styleModels[0].defaultCN, + // cnCanny: 0, + // cnDepth: 0, + // cnLineArtAnime: 0, + // cnLineArtRealistic: 0, + // cnLipsStrength: 0, + // cnOpenPose: 0, + // cnPipeFace: 0, + // cnSparseScribble: 0, + // cnSoftEdge: 0, + // cnRegularSteps: 0, + + defaultCN:styleModels[0].defaultCN, + defaultPrompts:styleModels[0].defaultPrompts, }; const hiddenValues = { diff --git a/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/dataStyleModels.tsx b/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/dataStyleModels.tsx index 74915b39bd..31446ab284 100644 --- a/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/dataStyleModels.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/dataStyleModels.tsx @@ -33,7 +33,25 @@ const styleModels = [ "bookmark_count": 1 }, "created_at": "2024-02-28T21:00:43Z", - "updated_at": "2024-02-28T21:00:43Z" + "updated_at": "2024-02-28T21:00:43Z", + defaultCN:{ + cnCanny: 0, + cnDepth: 0, + cnLineArtAnime: 0.7, + cnLineArtRealistic: 0, + cnLipsStrength: 0, + cnOpenPose: 1, + cnPipeFace: 0, + cnSparseScribble: 0, + cnSoftEdge: 1, + cnRegularSteps: 20, + }, + defaultPrompts:{ + positivePrompt:"perfect anime illustration,(best-quality:0.8),", + negativePrompt:"", + positivePromptHidden:"", + negativePromptHidden:"flare, lens flare, glare,naked, nsfw, text, logo, watermark:1.3, letterboxed,embedding:easynegative, embedding:badhandv4,(worst quality, low quality:1.4), lowres, blurry, monochrome, ", + } }, // { // "weight_token": "weight_vbz0wq7wkv80casj3vfptrrpg", diff --git a/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/helpers.tsx b/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/helpers.tsx index cc0681c64d..61167f549f 100644 --- a/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/helpers.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/helpers.tsx @@ -21,8 +21,10 @@ export type VSTType = { //basics inputFps: number; - posPrompt: string; - negPrompt: string; + positivePrompt: string; + negativePrompt: string; + positivePromptHidden:string, + negativePromptHidden:string, visibility: string; //advance @@ -36,6 +38,25 @@ export type VSTType = { cnSparseScribble: number; cnSoftEdge: number; cnRegularSteps: number + + defaultCN: { + cnCanny: number; + cnDepth: number; + cnLineArtAnime: number; + cnLineArtRealistic: number; + cnLipsStrength: number; + cnOpenPose: number; + cnPipeFace: number; + cnSparseScribble: number; + cnSoftEdge: number; + cnRegularSteps: number + }, + defaultPrompts:{ + positivePrompt:string, + negativePrompt:string, + positivePromptHidden:string, + negativePromptHidden:string, + } } export function isInputValid(keyValues: {[key:string]:number|string|boolean|undefined}){ @@ -61,9 +82,9 @@ export function mapRequest(vstValues: VSTType){ "maybe_json_modifications": { "$.154.inputs.Value": vstValues.inputFps, "$.510.inputs.Text": - hiddenValues.posPrompt + vstValues.posPrompt, + vstValues.positivePromptHidden + vstValues.positivePrompt, "$.8.inputs.text": - hiddenValues.negPrompt+ vstValues.negPrompt, + vstValues.negativePromptHidden+ vstValues.negativePrompt, "$.401.inputs.Value": 0.7, //Denoise First Pass "$.140.inputs.Value": 1, // Every nth frame diff --git a/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/pageVSTApp.tsx b/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/pageVSTApp.tsx index 78355b6f30..0c42975b65 100644 --- a/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/pageVSTApp.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_styletransfer/components/pageVSTApp/pageVSTApp.tsx @@ -38,7 +38,13 @@ export default function PageVSTApp({ }); const handleOnChange = (val: { - [key: string]: number | string | boolean | undefined; + [key: string]: + number | + string | + boolean | + undefined | + {[key: string]: number | string} + ; }) => { setVstValues(curr => ({ ...curr, ...val })); }; @@ -97,7 +103,7 @@ export default function PageVSTApp({ placeholder: t("input.placeholder.prompt"), onChange: (e: React.ChangeEvent) => handleOnChange({ posPrompt: e.target.value }), - value: vstValues.posPrompt, + value: vstValues.positivePrompt, required: false, }} /> @@ -107,7 +113,7 @@ export default function PageVSTApp({ placeholder: t("input.placeholder.negPrompt"), onChange: (e: React.ChangeEvent) => handleOnChange({ negPrompt: e.target.value }), - value: vstValues.negPrompt, + value: vstValues.negativePrompt, required: false, }} /> @@ -121,6 +127,7 @@ export default function PageVSTApp({