From 046de9bf3a751c9586fa1b8437887a211c11a023 Mon Sep 17 00:00:00 2001
From: Sean Sube <seansube@gmail.com>
Date: Tue, 12 Sep 2023 19:17:20 -0500
Subject: [PATCH] combine defaults and model params for now

---
 gui/src/client/types.ts | 6 ++++--
 gui/src/client/utils.ts | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gui/src/client/types.ts b/gui/src/client/types.ts
index dfc240bb..291199e0 100644
--- a/gui/src/client/types.ts
+++ b/gui/src/client/types.ts
@@ -194,10 +194,12 @@ export interface OutputStage {
 }
 
 export interface ChainPipeline {
-  defaults?: {
+  /* defaults?: {
     txt2img?: Txt2ImgParams;
     img2img?: Img2ImgParams;
-  };
+  }; */
+
+  defaults?: Txt2ImgParams & ModelParams;
 
   stages: Array<Txt2ImgStage | Img2ImgStage | GridStage | OutputStage>;
 }
diff --git a/gui/src/client/utils.ts b/gui/src/client/utils.ts
index 88d79ff1..3bd3d403 100644
--- a/gui/src/client/utils.ts
+++ b/gui/src/client/utils.ts
@@ -42,7 +42,8 @@ export function replacePromptTokens(grid: PipelineGrid, params: Txt2ImgParams, c
 export function buildPipelineForTxt2ImgGrid(grid: PipelineGrid, model: ModelParams, params: Txt2ImgParams, upscale?: UpscaleParams, highres?: HighresParams): ChainPipeline {
   const pipeline: ChainPipeline = {
     defaults: {
-      txt2img: params,
+      ...model,
+      ...params,
     },
     stages: [],
   };