Merge branch 'develop' into feat/live-monorepo-types

elizaOS · Dec 23, 2024 · d451b60 · d451b60
2 parents b4e35a4 + 8a0c051
commit d451b60
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/packages/core/src/generation.ts b/packages/core/src/generation.ts
@@ -935,6 +935,8 @@ export const generateImage = async (
         seed?: number;
         modelId?: string;
         jobId?: string;
+        stylePreset?: string;
+        hideWatermark?: boolean;
     },
     runtime: IAgentRuntime
 ): Promise<{
@@ -1121,9 +1123,12 @@ export const generateImage = async (
                         model: data.modelId || "fluently-xl",
                         prompt: data.prompt,
                         negative_prompt: data.negativePrompt,
-                        width: data.width || 1024,
-                        height: data.height || 1024,
-                        steps: data.numIterations || 20,
+                        width: data.width,
+                        height: data.height,
+                        steps: data.numIterations,
+                        seed: data.seed,
+                        style_preset: data.stylePreset,
+                        hide_watermark: data.hideWatermark,
                     }),
                 }
             );

diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -718,6 +718,8 @@ export type Character = {
             modelId?: string;
             jobId?: string;
             count?: number;
+            stylePreset?: string;
+            hideWatermark?: boolean;
         };
         voice?: {
             model?: string; // For VITS

diff --git a/packages/plugin-image-generation/src/index.ts b/packages/plugin-image-generation/src/index.ts
@@ -109,6 +109,8 @@ const imageGeneration: Action = {
             seed?: number;
             modelId?: string;
             jobId?: string;
+            stylePreset?: string;
+            hideWatermark?: boolean;
         },
         callback: HandlerCallback
     ) => {
@@ -140,6 +142,8 @@ const imageGeneration: Action = {
                 ...(options.seed != null || imageSettings.seed != null ? { seed: options.seed || imageSettings.seed } : {}),
                 ...(options.modelId != null || imageSettings.modelId != null ? { modelId: options.modelId || imageSettings.modelId } : {}),
                 ...(options.jobId != null || imageSettings.jobId != null ? { jobId: options.jobId || imageSettings.jobId } : {}),
+                ...(options.stylePreset != null || imageSettings.stylePreset != null ? { stylePreset: options.stylePreset || imageSettings.stylePreset } : {}),
+                ...(options.hideWatermark != null || imageSettings.hideWatermark != null ? { hideWatermark: options.hideWatermark || imageSettings.hideWatermark } : {}),
             },
             runtime
         );