From 2abe1c1a46fdba21ffe2a13c96bea3d87fe205f1 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 7 Feb 2024 03:20:04 -0500 Subject: [PATCH 01/10] studio rollout domain check and session flag --- .../src/api/session/GetSessionInfo.ts | 3 +++ .../components/src/session/SessionWrapper.ts | 9 +++++++++ .../src/utils/StudioRolloutHostnameAllowed.ts | 19 +++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 packages/components/src/utils/StudioRolloutHostnameAllowed.ts diff --git a/packages/components/src/api/session/GetSessionInfo.ts b/packages/components/src/api/session/GetSessionInfo.ts index 1b9d8ea1a8..f9bade4f3c 100644 --- a/packages/components/src/api/session/GetSessionInfo.ts +++ b/packages/components/src/api/session/GetSessionInfo.ts @@ -18,6 +18,9 @@ export interface UserInfo { display_name: string, email_gravatar_hash: string, + // Rollout feature flags + can_access_studio: boolean, + // Usage can_use_tts: boolean, can_use_w2l: boolean, diff --git a/packages/components/src/session/SessionWrapper.ts b/packages/components/src/session/SessionWrapper.ts index 0e9cc9c14e..33b8c5d2e6 100644 --- a/packages/components/src/session/SessionWrapper.ts +++ b/packages/components/src/session/SessionWrapper.ts @@ -1,4 +1,5 @@ import { GetSessionInfo, GetSessionInfoIsOk, SessionInfoSuccessResponse } from '../api/session/GetSessionInfo' +import { StudioRolloutHostnameAllowed } from '../utils/StudioRolloutHostnameAllowed'; // A lot of the APIs return null or leave values absent. // I need to pick a single strategy and stick with it. @@ -44,6 +45,14 @@ export class SessionWrapper { return this.sessionStateResponse?.logged_in || false; } + // Feature flag rollout for Storyteller Studio + // This depends on the domain name and the backend. + public canAccessStudio() : boolean { + const hostnameAllowed = StudioRolloutHostnameAllowed(); + const userAllowed = this.sessionStateResponse?.user?.can_access_studio || false; + return hostnameAllowed && userAllowed; + } + // Username is all lowercase public getUsername() : string | undefined { return this.sessionStateResponse?.user?.username; diff --git a/packages/components/src/utils/StudioRolloutHostnameAllowed.ts b/packages/components/src/utils/StudioRolloutHostnameAllowed.ts new file mode 100644 index 0000000000..e98bfd83b9 --- /dev/null +++ b/packages/components/src/utils/StudioRolloutHostnameAllowed.ts @@ -0,0 +1,19 @@ + +// Check if hostname is allowed to display studio features. +// This should allow more frequently landing against production. +export function StudioRolloutHostnameAllowed() : boolean { + const allowed = StudioRolloutHostnameCheck(); + return allowed; +} + +function StudioRolloutHostnameCheck() : boolean { + // Do not allow "production" or "staging" domains to use studio yet. + // Other domains (local development and feature branches) are allowed. + switch (window.location.hostname) { + case 'fakeyou.com': + case 'storyteller.ai': + return false; + default: + return true; + } +} From aea007086772f273bec48fcc7f313f444d7afe82 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 7 Feb 2024 03:30:07 -0500 Subject: [PATCH 02/10] block access to video mocap --- .../fakeyou.com/src/v2/view/PageContainer.tsx | 2 ++ .../v2/view/_common/StudioNotAvailable.tsx | 19 +++++++++++++++++++ .../v2/view/pages/video_mocap/VideoMocap.tsx | 9 ++++++++- 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 packages/fakeyou.com/src/v2/view/_common/StudioNotAvailable.tsx diff --git a/packages/fakeyou.com/src/v2/view/PageContainer.tsx b/packages/fakeyou.com/src/v2/view/PageContainer.tsx index 04270e9ae7..d08ce2a1c6 100644 --- a/packages/fakeyou.com/src/v2/view/PageContainer.tsx +++ b/packages/fakeyou.com/src/v2/view/PageContainer.tsx @@ -824,6 +824,7 @@ class PageContainer extends React.Component< inferenceJobs: this.props.inferenceJobs, inferenceJobsByCategory: this.props.inferenceJobsByCategory, + sessionWrapper: this.props.sessionWrapper, }} /> @@ -1331,6 +1332,7 @@ class PageContainer extends React.Component< this.props.sessionSubscriptionsWrapper, inferenceJobs: this.props.inferenceJobs, inferenceJobsByCategory: this.props.inferenceJobsByCategory, + sessionWrapper: this.props.sessionWrapper, }} /> diff --git a/packages/fakeyou.com/src/v2/view/_common/StudioNotAvailable.tsx b/packages/fakeyou.com/src/v2/view/_common/StudioNotAvailable.tsx new file mode 100644 index 0000000000..2cecd47369 --- /dev/null +++ b/packages/fakeyou.com/src/v2/view/_common/StudioNotAvailable.tsx @@ -0,0 +1,19 @@ +import { DiscordLink2 } from "@storyteller/components/src/elements/DiscordLink2"; +import { Container } from "components/common"; +import PageHeader from "components/layout/PageHeader"; +import React from "react"; + +export function StudioNotAvailable() { + const subText = ( +

Please visit our to join the wait list.

+ ); + + return ( + + + + ); +} diff --git a/packages/fakeyou.com/src/v2/view/pages/video_mocap/VideoMocap.tsx b/packages/fakeyou.com/src/v2/view/pages/video_mocap/VideoMocap.tsx index 7893fec7cf..e0072e12e1 100644 --- a/packages/fakeyou.com/src/v2/view/pages/video_mocap/VideoMocap.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_mocap/VideoMocap.tsx @@ -21,6 +21,8 @@ import { faPersonRays, } from "@fortawesome/pro-solid-svg-icons"; import PageHeaderWithImage from "components/layout/PageHeaderWithImage"; +import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; +import { StudioNotAvailable } from "v2/view/_common/StudioNotAvailable"; export default function VideoMotionCapture(props: { enqueueInferenceJob: ( @@ -29,8 +31,9 @@ export default function VideoMotionCapture(props: { ) => void; inferenceJobs: Array; inferenceJobsByCategory: Map>; + sessionWrapper: SessionWrapper; }) { - const { enqueueInferenceJob } = props; + const { enqueueInferenceJob, sessionWrapper } = props; const { t } = useLocalize("VideoMotionCapture"); const { NO_FILE, FILE_UPLOADING, MOCAPNET_ENQUEUED } = states; const [pageState, dispatchPageState] = useReducer(reducer, { @@ -59,6 +62,10 @@ export default function VideoMotionCapture(props: { }, [pageState, enqueueInferenceJob]); const { pathname } = useLocation(); + if (!sessionWrapper.canAccessStudio()) { + return + } + if (pathname === `/video-mocap` || pathname === `/video-mocap/`) { return ; } From 155920b7234c0eefbb3a791cfdf2b6370aaaaf97 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 7 Feb 2024 03:42:11 -0500 Subject: [PATCH 03/10] hide top-level pages without studio access --- packages/fakeyou.com/src/v2/view/PageContainer.tsx | 6 +++++- .../view/pages/EngineCompositor/EngineCompositor.tsx | 11 ++++++++--- .../vc_model_list/StorytellerStudioListPage.tsx | 5 +++++ .../v2/view/pages/text_to_image/TextToImagePage.tsx | 8 ++++++++ .../v2/view/pages/video_workflow/VideoWorkflow.tsx | 9 ++++++++- 5 files changed, 34 insertions(+), 5 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/PageContainer.tsx b/packages/fakeyou.com/src/v2/view/PageContainer.tsx index d08ce2a1c6..f7631fd27a 100644 --- a/packages/fakeyou.com/src/v2/view/PageContainer.tsx +++ b/packages/fakeyou.com/src/v2/view/PageContainer.tsx @@ -838,6 +838,7 @@ class PageContainer extends React.Component< inferenceJobs: this.props.inferenceJobs, inferenceJobsByCategory: this.props.inferenceJobsByCategory, + sessionWrapper: this.props.sessionWrapper, }} /> @@ -847,6 +848,7 @@ class PageContainer extends React.Component< sessionSubscriptionsWrapper={ this.props.sessionSubscriptionsWrapper } + sessionWrapper={this.props.sessionWrapper} enqueueInferenceJob={this.props.enqueueInferenceJob} /> @@ -1313,7 +1315,9 @@ class PageContainer extends React.Component< - + diff --git a/packages/fakeyou.com/src/v2/view/pages/EngineCompositor/EngineCompositor.tsx b/packages/fakeyou.com/src/v2/view/pages/EngineCompositor/EngineCompositor.tsx index fb9bdbd520..f3c0b2cee8 100644 --- a/packages/fakeyou.com/src/v2/view/pages/EngineCompositor/EngineCompositor.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/EngineCompositor/EngineCompositor.tsx @@ -6,12 +6,15 @@ import { EnqueueEngineCompositing } from "@storyteller/components/src/api/engine import { FrontendInferenceJobType } from "@storyteller/components/src/jobs/InferenceJob"; import { v4 as uuidv4 } from "uuid"; import "./EngineCompositor.scss" +import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; +import { StudioNotAvailable } from "v2/view/_common/StudioNotAvailable"; interface Props { value?: any; + sessionWrapper: SessionWrapper; } -export default function EngineCompositor({ value }: Props) { +export default function EngineCompositor({ value, sessionWrapper }: Props) { const [mediaToken,mediaTokenSet] = useState(); const onChange = ({ target }: any) => mediaTokenSet(target.value); const inferenceJobs = useInferenceJobs(FrontendInferenceJobType.EngineComposition); @@ -23,12 +26,10 @@ export default function EngineCompositor({ value }: Props) { }) .then((res: any) => { if (res && res.success) { - console.log("🚛 success!",{ mediaToken, res }); inferenceJobs.enqueue( // I need to pass this res.inference_job_token, FrontendInferenceJobType.EngineComposition ); - } }); } @@ -40,6 +41,10 @@ export default function EngineCompositor({ value }: Props) { } }; + if (!sessionWrapper.canAccessStudio()) { + return + } + return
diff --git a/packages/fakeyou.com/src/v2/view/pages/storyteller_studio/vc_model_list/StorytellerStudioListPage.tsx b/packages/fakeyou.com/src/v2/view/pages/storyteller_studio/vc_model_list/StorytellerStudioListPage.tsx index dcf776d3f0..8b36c6c59d 100644 --- a/packages/fakeyou.com/src/v2/view/pages/storyteller_studio/vc_model_list/StorytellerStudioListPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/storyteller_studio/vc_model_list/StorytellerStudioListPage.tsx @@ -5,6 +5,7 @@ import { SessionSubscriptionsWrapper } from "@storyteller/components/src/session import PageHeaderWithImage from "components/layout/PageHeaderWithImage"; import { Container, Panel } from "components/common"; import { faCameraMovie } from "@fortawesome/pro-solid-svg-icons"; +import { StudioNotAvailable } from "v2/view/_common/StudioNotAvailable"; interface Props { sessionWrapper: SessionWrapper; @@ -12,6 +13,10 @@ interface Props { } function StorytellerStudioListPage(props: Props) { + if (!props.sessionWrapper.canAccessStudio()) { + return + } + return ( 0; + if (!sessionWrapper.canAccessStudio()) { + return + } + return ( void; inferenceJobs: Array; inferenceJobsByCategory: Map>; + sessionWrapper: SessionWrapper; }){ - const debug=true; + const debug = true; const {t} = useLocalize("VideoWorkflow"); const { NO_FILE } = states; const [pageState, dispatchPageState] = useReducer(reducer, { @@ -44,6 +47,10 @@ export default function StorytellerFilter(props:{ } }, [pageState, enqueueInferenceJob]); + if (!props.sessionWrapper.canAccessStudio()) { + return + } + return( Date: Wed, 7 Feb 2024 03:50:11 -0500 Subject: [PATCH 04/10] disable weights views for non-Studio --- packages/fakeyou.com/src/v2/view/PageContainer.tsx | 1 + .../src/v2/view/pages/weight/WeightPage.tsx | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/packages/fakeyou.com/src/v2/view/PageContainer.tsx b/packages/fakeyou.com/src/v2/view/PageContainer.tsx index f7631fd27a..e940538c04 100644 --- a/packages/fakeyou.com/src/v2/view/PageContainer.tsx +++ b/packages/fakeyou.com/src/v2/view/PageContainer.tsx @@ -373,6 +373,7 @@ class PageContainer extends React.Component< render={props => ( ; ttsInferenceJobs: Array; @@ -49,6 +52,7 @@ interface WeightProps { } export default function WeightPage({ + sessionWrapper, sessionSubscriptionsWrapper, inferenceJobs, ttsInferenceJobs, @@ -100,6 +104,15 @@ export default function WeightPage({ const deleteWeight = () => remove(!!user?.can_ban_users); + switch (weight?.weight_type) { + case WeightType.SD_15: + case WeightType.SDXL: + case WeightType.LORA: + if (!sessionWrapper.canAccessStudio()) { + return + } + } + function renderWeightComponent(weight: Weight) { switch (weight.weight_category) { case WeightCategory.TTS: From 313fcc58a032f58e135bd5a0dd3334b62cd4e9a0 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 7 Feb 2024 03:58:30 -0500 Subject: [PATCH 05/10] hide team (for now) --- .../src/v2/view/pages/about/about_page/AboutPage.tsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/pages/about/about_page/AboutPage.tsx b/packages/fakeyou.com/src/v2/view/pages/about/about_page/AboutPage.tsx index 6380c662b8..098207b10b 100644 --- a/packages/fakeyou.com/src/v2/view/pages/about/about_page/AboutPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/about/about_page/AboutPage.tsx @@ -104,6 +104,9 @@ function AboutPage(props: Props) { }, ]; + // NB: just to prevent yarn lints from complaining + console.log(teamMembers.length); + return ( - + {/*

Lorem Ipsum

@@ -124,7 +127,7 @@ function AboutPage(props: Props) { pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

- + */}

Our Mission

@@ -138,6 +141,7 @@ function AboutPage(props: Props) {

+ {/*

The Team

@@ -199,6 +203,7 @@ function AboutPage(props: Props) { ))}
+ */} ); } From 0b57859580b4ace6b353cab086fee5714388955f Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 7 Feb 2024 03:59:10 -0500 Subject: [PATCH 06/10] hide some staff --- .../v2/view/pages/about/about_page/AboutPage.tsx | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/pages/about/about_page/AboutPage.tsx b/packages/fakeyou.com/src/v2/view/pages/about/about_page/AboutPage.tsx index 098207b10b..8b272325ac 100644 --- a/packages/fakeyou.com/src/v2/view/pages/about/about_page/AboutPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/about/about_page/AboutPage.tsx @@ -77,21 +77,6 @@ function AboutPage(props: Props) { role: "Growth", imageSrc: "/images/avatars/default-pfp.png", }, - { - name: "Evgenii", - role: "Gen AI Artist", - imageSrc: "/images/avatars/default-pfp.png", - }, - { - name: "Steven", - role: "Gen AI Artist", - imageSrc: "/images/avatars/default-pfp.png", - }, - { - name: "Willis", - role: "Gen AI Artist", - imageSrc: "/images/avatars/default-pfp.png", - }, { name: "Jose", role: "Data Team", From b4bf7c4c11b27d091c138a5669b7d59b76ccc82f Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 7 Feb 2024 04:06:19 -0500 Subject: [PATCH 07/10] hide sidebar links --- .../src/components/layout/SideNav/SideNav.tsx | 165 ++++++++++-------- 1 file changed, 94 insertions(+), 71 deletions(-) diff --git a/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx b/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx index b8e0fa71ad..21c182e55c 100644 --- a/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx +++ b/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx @@ -256,6 +256,96 @@ export default function SideNav({ queueStats.legacy_tts.pending_job_count + queueStats.inference.by_queue.pending_tacotron2_jobs; + let maybeVideoGeneration = <>; + + if (sessionWrapper.canAccessStudio()) { + maybeVideoGeneration = ( + <> +
  • + + + {t("videoMotionCapture")} + +
    • + +
  • + + + {t("videoWorkflow")} + +
    • + +
  • + + + Storyteller Studio + {/* {t("videoStorytellerStudio")} */} + +
    • +
  • + + + Engine Compositor + {/* {t("videoStorytellerStudio")} */} + +
    • + + ); + } + + let maybeImageGeneration = <>; + + if (sessionWrapper.canAccessStudio()) { + maybeImageGeneration = ( + <> +
  • Image Generation
    • +
  • + + + Text to Image + {/* {t("videoStorytellerStudio")} */} + +
    • +
    + + ); + } + return ( <>
    -
  • - - - {t("videoMotionCapture")} - -
    • -
  • - - - {t("videoWorkflow")} - -
    • - -
  • - - - Storyteller Studio - {/* {t("videoStorytellerStudio")} */} - -
    • -
  • - - - Engine Compositor - {/* {t("videoStorytellerStudio")} */} - -
    • -
    -
  • Image Generation
    • -
  • - - - Text to Image - {/* {t("videoStorytellerStudio")} */} - -
    • + {maybeVideoGeneration}
    + + {maybeImageGeneration} +
  • {t("communityTitle")}
  • Date: Wed, 7 Feb 2024 10:07:36 -0500 Subject: [PATCH 08/10] second attempt to making the namespace change in the inference jobs end --- packages/components/src/api/ApiConfig.ts | 4 +- .../src/api/storyteller_filter/index.ts | 7 - .../EnqueueVideoWorkflow.tsx} | 8 +- .../src/api/video_workflow/index.ts | 7 + packages/components/src/jobs/InferenceJob.ts | 2 +- packages/fakeyou.com/src/App.tsx | 2 +- .../pages/video_workflow/VideoWorkflow.tsx | 4 +- .../components/pageFilterControls.tsx | 473 ++++++++++++++++++ .../video_workflow/components/pageJobList.tsx | 6 +- .../components/pageWorkflowControls/index.tsx | 1 + .../pageWorkflowControls.tsx | 15 +- 11 files changed, 502 insertions(+), 27 deletions(-) delete mode 100644 packages/components/src/api/storyteller_filter/index.ts rename packages/components/src/api/{storyteller_filter/EnqueueStorytellerFilter.tsx => video_workflow/EnqueueVideoWorkflow.tsx} (83%) create mode 100644 packages/components/src/api/video_workflow/index.ts create mode 100644 packages/fakeyou.com/src/v2/view/pages/video_workflow/components/pageFilterControls.tsx create mode 100644 packages/fakeyou.com/src/v2/view/pages/video_workflow/components/pageWorkflowControls/index.tsx rename packages/fakeyou.com/src/v2/view/pages/video_workflow/components/{ => pageWorkflowControls}/pageWorkflowControls.tsx (97%) diff --git a/packages/components/src/api/ApiConfig.ts b/packages/components/src/api/ApiConfig.ts index 59df11f2ba..42c934ed21 100644 --- a/packages/components/src/api/ApiConfig.ts +++ b/packages/components/src/api/ApiConfig.ts @@ -496,8 +496,8 @@ class ApiConfig { return `${this.getApiOrigin()}/v1/mocap/mocapnet/create`; } - // =============== Storyteller Filter =============== - enqueueStorytellerFilter(): string { + // =============== Video Workflow =============== + enqueueVideoWorkflow(): string { return `${this.getApiOrigin()}/v1/workflow/comfy/create`; } diff --git a/packages/components/src/api/storyteller_filter/index.ts b/packages/components/src/api/storyteller_filter/index.ts deleted file mode 100644 index aebe56e156..0000000000 --- a/packages/components/src/api/storyteller_filter/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -export type { - EnqueueStorytellerFilterRequest, EnqueueStorytellerFilterResponse, -} from './EnqueueStorytellerFilter'; - -export { - EnqueueStorytellerFilter -} from './EnqueueStorytellerFilter'; \ No newline at end of file diff --git a/packages/components/src/api/storyteller_filter/EnqueueStorytellerFilter.tsx b/packages/components/src/api/video_workflow/EnqueueVideoWorkflow.tsx similarity index 83% rename from packages/components/src/api/storyteller_filter/EnqueueStorytellerFilter.tsx rename to packages/components/src/api/video_workflow/EnqueueVideoWorkflow.tsx index 1da9000fc3..db261cff39 100644 --- a/packages/components/src/api/storyteller_filter/EnqueueStorytellerFilter.tsx +++ b/packages/components/src/api/video_workflow/EnqueueVideoWorkflow.tsx @@ -1,6 +1,6 @@ import { ApiConfig } from "@storyteller/components"; -export interface EnqueueStorytellerFilterRequest { +export interface EnqueueVideoWorkflowRequest { "uuid_idempotency_token": string, "maybe_sd_model": string, @@ -29,16 +29,16 @@ export interface EnqueueStorytellerFilterRequest { } } -export interface EnqueueStorytellerFilterResponse { +export interface EnqueueVideoWorkflowResponse { success: boolean, inference_job_token?: string, } -export async function EnqueueStorytellerFilter(request: EnqueueStorytellerFilterRequest) : Promise +export async function EnqueueVideoWorkflow(request: EnqueueVideoWorkflowRequest) : Promise { // const endpoint = "/v1/workflow/comfy/create"; - const endpoint = new ApiConfig().enqueueStorytellerFilter(); + const endpoint = new ApiConfig().enqueueVideoWorkflow(); return await fetch(endpoint, { method: 'POST', diff --git a/packages/components/src/api/video_workflow/index.ts b/packages/components/src/api/video_workflow/index.ts new file mode 100644 index 0000000000..6c3f2ee01b --- /dev/null +++ b/packages/components/src/api/video_workflow/index.ts @@ -0,0 +1,7 @@ +export type { + EnqueueVideoWorkflowRequest, EnqueueVideoWorkflowResponse, +} from './EnqueueVideoWorkflow'; + +export { + EnqueueVideoWorkflow +} from './EnqueueVideoWorkflow'; \ No newline at end of file diff --git a/packages/components/src/jobs/InferenceJob.ts b/packages/components/src/jobs/InferenceJob.ts index 88388e07b2..4ff6ad37db 100644 --- a/packages/components/src/jobs/InferenceJob.ts +++ b/packages/components/src/jobs/InferenceJob.ts @@ -12,7 +12,7 @@ export enum FrontendInferenceJobType { VideoMotionCapture, ConvertFbxtoGltf, EngineComposition, - StorytellerFilter, + VideoWorkflow, } // NB: Many of these fields are optional despite the response payload containing them diff --git a/packages/fakeyou.com/src/App.tsx b/packages/fakeyou.com/src/App.tsx index e6b7de0e21..1eaa81b114 100644 --- a/packages/fakeyou.com/src/App.tsx +++ b/packages/fakeyou.com/src/App.tsx @@ -210,7 +210,7 @@ function initInferenceJobsByCategoryMap(): Map< inferenceJobsByCategory.set(FrontendInferenceJobType.VideoMotionCapture, []); inferenceJobsByCategory.set(FrontendInferenceJobType.ImageGeneration, []); inferenceJobsByCategory.set(FrontendInferenceJobType.ConvertFbxtoGltf, []); - inferenceJobsByCategory.set(FrontendInferenceJobType.StorytellerFilter, []) + inferenceJobsByCategory.set(FrontendInferenceJobType.VideoWorkflow, []) return inferenceJobsByCategory; } diff --git a/packages/fakeyou.com/src/v2/view/pages/video_workflow/VideoWorkflow.tsx b/packages/fakeyou.com/src/v2/view/pages/video_workflow/VideoWorkflow.tsx index 0ea447f01f..ad2c8af1db 100644 --- a/packages/fakeyou.com/src/v2/view/pages/video_workflow/VideoWorkflow.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/video_workflow/VideoWorkflow.tsx @@ -26,7 +26,7 @@ export default function StorytellerFilter(props:{ const { enqueueInferenceJob } = props; useInferenceJobs( - FrontendInferenceJobType.StorytellerFilter + FrontendInferenceJobType.VideoWorkflow ); useEffect(() => { if ( @@ -35,7 +35,7 @@ export default function StorytellerFilter(props:{ ) { enqueueInferenceJob( pageState.inferenceJobToken, - FrontendInferenceJobType.StorytellerFilter + FrontendInferenceJobType.VideoWorkflow ); dispatchPageState({ type: "enqueueFilterSuccess", diff --git a/packages/fakeyou.com/src/v2/view/pages/video_workflow/components/pageFilterControls.tsx b/packages/fakeyou.com/src/v2/view/pages/video_workflow/components/pageFilterControls.tsx new file mode 100644 index 0000000000..8b3f149bb3 --- /dev/null +++ b/packages/fakeyou.com/src/v2/view/pages/video_workflow/components/pageFilterControls.tsx @@ -0,0 +1,473 @@ +import React, {useState} from "react"; +import { useParams, useHistory } from "react-router-dom"; +import { v4 as uuidv4 } from "uuid"; +import { faChevronRight } from "@fortawesome/pro-solid-svg-icons"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { useMedia } from "hooks"; + +import { BucketConfig } from "@storyteller/components/src/api/BucketConfig"; +import { EnqueueVideoWorkflow } from "@storyteller/components/src/api/video_workflow"; +import { states, Action, State } from "../videoWorkflowReducer"; +import { + Accordion, + Button, + BasicVideo, + Checkbox, + ErrorMessage, + Input, + InputSeed, + NumberSliderV2, + Panel, + SelectModal, + Spinner, + TextArea +} from "components/common"; + + +export default function PageWorkflowControls({ + t, pageState, dispatchPageState, parentPath +}: { + debug?: boolean; + t: Function; + pageState: State; + parentPath: string; + dispatchPageState: (action: Action) => void; +}) { + const { mediaToken } = useParams(); + useMedia({ + mediaToken: pageState.mediaFileToken || mediaToken, + onSuccess: (res: any) => { + dispatchPageState({ + type: 'loadFileSuccess', + payload: { + mediaFile: res, + mediaFileToken: pageState.mediaFileToken || mediaToken + } + }) + }, + }); + + const [filterState, setFilterState] = useState({ + outputPath: "vid2vid/SparseUpscaleInterp_00001.mp4", + workflowConfig: "weight_q8sz47gmfw2zx02snrbz88ns9", + seed: "", + sdModelToken: "", + loraModelToken: "", + posPrompt: "", + negPrompt: "", + firstPass: 1, + upscalePass: 0.42, + motionScale:1, + upscaleMultiplier: 1.5, + useEmptyLatent: false, + useFaceDetailer: false, + denoiseFaceDetailer: 0.45, + useLCM: false, + lcmCFG: 2, + lcmSteps: 8, + framesCap:16, + skipFrames:0, + nthFrames:2, + inputFps: 24, + interpolationMutiplier: 2, + cnTile: 0, + cnCanny: 0, + cnLinearAnime: 0, + cnLinearRealistic: 0, + cnDepth: 0, + cnOpenPose: 0, + cnPipeFace: 0, + cnSparse: 0.7, + }); + + const handleOnChange = (key: string, newValue:any,) => { + setFilterState((curr)=>({...curr, [key]: newValue})); + } + + const history = useHistory(); + const handleGenerate = ()=>{ + console.log("filterState:") + console.log(filterState) + + const request = { + "uuid_idempotency_token": uuidv4(), + "maybe_sd_model": filterState.sdModelToken, + "maybe_workflow_config": filterState.workflowConfig, + "maybe_input_file": pageState.mediaFileToken || mediaToken, + "maybe_output_path": filterState.outputPath, + "maybe_json_modifications": { + "$.510.inputs.Text": filterState.posPrompt, + "$.8.inputs.text": filterState.negPrompt, + "$.173.inputs.seed": filterState.seed, + "$.401.inputs.Value": filterState.firstPass, + "$.918.inputs.Value": filterState.motionScale, + "$.137.inputs.Value": filterState.framesCap, + "$.186.inputs.Value": filterState.skipFrames, + "$.140.inputs.Value": filterState.nthFrames, + "$.154.inputs.Value": filterState.inputFps, + "$.445.inputs.number": filterState.interpolationMutiplier, + "$.947.inputs.Value": filterState.cnTile, + "$.800.inputs.Value": filterState.cnCanny, + "$.797.inputs.Value": filterState.cnLinearAnime, + "$.796.inputs.Value": filterState.cnLinearRealistic, + "$.772.inputs.Value": filterState.cnDepth, + "$.771.inputs.Value": filterState.cnOpenPose, + "$.527.inputs.Value": filterState.cnPipeFace, + "$.403.inputs.Value": filterState.cnSparse + }, + } + EnqueueVideoWorkflow(request).then(res => { + if (res.success && res.inference_job_token) { + dispatchPageState({ + type: 'enqueueFilterSuccess', + payload: { + inferenceJobToken: res.inference_job_token + } + }) + }else{ + console.log(res); + } + }) + dispatchPageState({type: 'enqueueFilter'}) + history.push(`${parentPath}/jobs`); + } + + if (pageState.mediaFile){ + const mediaLink = new BucketConfig().getGcsUrl(pageState.mediaFile.public_bucket_path); + + if (mediaLink) + return( + <> + +
    +
    + +
    +
    + +
    +
    + +
    +
    +     + + +
    + { + handleOnChange("sdModelToken", token); + }} + tabs={[ + { + label: "All Weights", + tabKey: "allWeights", + typeFilter: "sd_1.5", + searcher: true, + type: "weights", + }, + { + label: "Bookmarked", + tabKey: "bookmarkedWeights", + typeFilter: "sd_1.5", + searcher: false, + type: "weights", + }, + ]} + /> +
    +
    + { + console.log(`calling from select modal result select ${token}`); + handleOnChange("loraModelToken", token); + }} + tabs={[ + { + label: "All LoRA Weights", + tabKey: "allLoraWeights", + typeFilter: "rvc_v2", + searcher: true, + type: "weights", + }, + { + label: "Bookmarked", + tabKey: "bookmarkedLoraWeights", + typeFilter: "rvc_v2", + searcher: false, + type: "weights", + }, + ]} + /> +
    +
    +
    +