Allow Lua image generation to set NovelAI orientation

src/ts/process/scriptings.ts

@@ -7,7 +7,7 @@ import { get } from "svelte/store";
 import { DBState, ReloadChatPointer, ReloadGUIPointer, selectedCharID } from "../stores.svelte";
 import { alertSelect, alertError, alertInput, alertNormal, alertConfirm } from "../alert";
 import { HypaProcesser } from "./memory/hypamemory";
-import { generateAIImage } from "./stableDiff";
+import { generateAIImage, type ImageGenerationOptions } from "./stableDiff";
 import { writeInlayImage, getInlayAsset } from "./files/inlays";
 import type { OpenAIChat, MultiModal } from "./index.svelte";
 import { requestChatData, type StreamResponseChunk } from "./request/request";
@@ -389,11 +389,16 @@ export async function runScripted(code:string, arg:{
                 }
             })
 
-            declareAPI('generateImage', async (id:string, value:string, negValue:string = '') => {
+            declareAPI('generateImage', async (id:string, value:string, negValue:string = '', options?:ImageGenerationOptions) => {
                 if(!ScriptingLowLevelIds.has(id)){
                     return
                 }
-                const gen = await generateAIImage(value, char as character, negValue, 'inlay')
+                const orientation = options?.orientation
+                if(orientation !== undefined && orientation !== 'landscape' && orientation !== 'portrait'){
+                    return 'Error: Image orientation must be landscape or portrait, received ' + orientation
+                }
+
+                const gen = await generateAIImage(value, char as character, negValue, 'inlay', options)
                 if(!gen){
                     return 'Error: Image generation failed'
                 }

src/ts/process/stableDiff.test.ts

@@ -0,0 +1,25 @@
+import { describe, expect, test, vi } from 'vitest'
+
+vi.mock('../alert', () => ({ alertError: vi.fn() }))
+vi.mock('../globalApi.svelte', () => ({ globalFetch: vi.fn(), readImage: vi.fn() }))
+vi.mock('../kei/kei', () => ({ keiServerURL: '' }))
+vi.mock('../storage/database.svelte', () => ({ getDatabase: vi.fn() }))
+vi.mock('../stores.svelte', () => ({ CharEmotion: { set: vi.fn() } }))
+vi.mock('./processzip', () => ({ processZip: vi.fn() }))
+vi.mock('./request/request', () => ({ requestChatData: vi.fn() }))
+
+import { applyImageOrientation } from './stableDiff'
+
+describe('applyImageOrientation', () => {
+  test('keeps configured dimensions without an orientation', () => {
+    expect(applyImageOrientation(1024, 640)).toEqual({ height: 640, width: 1024 })
+  })
+
+  test('places the longer edge on the width for landscape', () => {
+    expect(applyImageOrientation(640, 1024, 'landscape')).toEqual({ height: 640, width: 1024 })
+  })
+
+  test('places the longer edge on the height for portrait', () => {
+    expect(applyImageOrientation(1024, 640, 'portrait')).toEqual({ height: 1024, width: 640 })
+  })
+})

src/ts/process/stableDiff.ts

@@ -61,7 +61,7 @@ export async function stableDiff(currentChar:character,prompt:string){
     return await generateAIImage(genPrompt, currentChar, neg, '')
 }
 
-export async function generateAIImage(genPrompt:string, currentChar:character, neg:string, returnSdData:string):Promise<string|false>{
+export async function generateAIImage(genPrompt:string, currentChar:character, neg:string, returnSdData:string, options?:ImageGenerationOptions):Promise<string|false>{
     const db = getDatabase()
     console.log(db.sdProvider)
     if(db.sdProvider === 'webui'){
@@ -121,6 +121,8 @@ export async function generateAIImage(genPrompt:string, currentChar:character, n
         }
     }
     if(db.sdProvider === 'novelai'){
+        const dimensions = applyImageOrientation(db.NAIImgConfig.width, db.NAIImgConfig.height, options?.orientation)
+
         genPrompt = genPrompt
             .replaceAll('\\(', "♧")
             .replaceAll('\\)', "♤")
@@ -142,8 +144,8 @@ export async function generateAIImage(genPrompt:string, currentChar:character, n
                     "controlnet_strength": 1,
                     "dynamic_thresholding": db.NAIImgModel.includes('nai-diffusion-3') || db.NAIImgModel.includes('nai-diffusion-furry-3') || db.NAIImgModel.includes('nai-diffusion-2') ? db.NAIImgConfig.decrisp : false,
                     "n_samples": 1,
-                    "width": db.NAIImgConfig.width,
-                    "height": db.NAIImgConfig.height,
+                    "width": dimensions.width,
+                    "height": dimensions.height,
                     "sampler": db.NAIImgConfig.sampler,
                     "steps": db.NAIImgConfig.steps,
                     "scale": db.NAIImgConfig.scale,
@@ -946,3 +948,33 @@ export async function generateAIImage(genPrompt:string, currentChar:character, n
     }
     return ''
 }
+
+export type ImageOrientation = 'landscape' | 'portrait'
+
+export interface ImageGenerationOptions {
+    orientation?: ImageOrientation
+}
+
+/**
+ * Places the longer edge on the width for landscape and on the height for portrait.
+ */
+export function applyImageOrientation(width: number, height: number, orientation?: ImageOrientation) {
+    if (!orientation) {
+        return { height, width }
+    }
+
+    const longerEdge = Math.max(height, width)
+    const shorterEdge = Math.min(height, width)
+
+    if (orientation === 'landscape') {
+        return {
+            height: shorterEdge,
+            width: longerEdge,
+        }
+    }
+
+    return {
+        height: longerEdge,
+        width: shorterEdge,
+    }
+}