fix: fix emotion change logic, refine custom host logic

Author: k3scat

examples/custom-host-test.js

@@ -5,21 +5,18 @@ const {
   Sampler,
   createCustomHost,
 } = require("nekoai-js");
-require("dotenv").config();
 
 // Test function for custom host
 async function testCustomHost() {
   const client = new NovelAI({
-    token: process.env.NOVELAI_TOKEN,
+    token: process.env.CUSTOM_TOKEN,
   });
 
   console.log("Testing custom host...");
 
   // Create a custom host (this example uses the official API endpoint, but you can use any compatible server)
   const customHost = createCustomHost(
-    "https://api.novelai.net", // URL - replace with your custom host
-    "application/x-zip-compressed", // Accept header
-    "custom-api", // Name for the host (used in filenames)
+    "https://image.novelai.net", // Custom host URL
   );
 
   try {
@@ -52,29 +49,6 @@ async function testCustomHost() {
     } else {
       console.log("No images were generated");
     }
-
-    // Also test a director tool with custom host
-    console.log("Testing director tool with custom host...");
-
-    try {
-      // Use the web endpoint for director tools (proper custom host would use your own endpoint)
-      const directorHost = createCustomHost(
-        "https://image.novelai.net",
-        "binary/octet-stream",
-        "custom-director",
-      );
-
-      // Try a director tool with the custom host
-      // Note: You'll need an existing image file at this path
-      const lineArtResult = await client.lineArt(
-        "./examples/input/image.png",
-        directorHost,
-      );
-      const savePath = await lineArtResult.save("./examples/output");
-      console.log(`Line art saved to ${savePath}`);
-    } catch (error) {
-      console.error("Error with director tool using custom host:", error);
-    }
   } catch (error) {
     console.error("Error generating image with custom host:", error);
   }

examples/director-tools-test.js

@@ -88,8 +88,8 @@ async function testDirectorTools() {
     try {
       const emotionResult = await client.changeEmotion({
         image: imageInput,
-        emotion: EmotionOptions.HAPPY,
-        prompt: "laughing",
+        emotion: "happy",
+        prompt: "",
         emotionLevel: EmotionLevel.NORMAL,
       });
       const savePath = await emotionResult.save(

examples/model-v4-5-multichar-test.js

@@ -13,12 +13,12 @@ async function testModelV45MultiChar() {
     const images = await client.generateImage(
       {
         prompt: "two people, classroom, school uniform, detailed background",
-        model: Model.V4_5_CUR,
-        resPreset: Resolution.NORMAL_LANDSCAPE,
+        model: "nai-diffusion-4-5-curated",
+        resPreset: "normal_landscape",
         steps: 28,
         scale: 5.5,
-        sampler: Sampler.EULER_ANC,
-        noiseSchedule: Noise.KARRAS,
+        sampler: "k_euler_ancestral",
+        noiseSchedule: "karras",
         negativePrompt:
           "nsfw, lowres, bad anatomy, bad hands, text, error, missing fingers, extra digit",
         // Character prompts for multiple characters
@@ -45,7 +45,9 @@ async function testModelV45MultiChar() {
       console.log(`Generated ${images.length} image(s)`);
       // Save the images to the output directory
       for (const [index, image] of images.entries()) {
-        const path = await image.save("./examples/output/model-v4-5-multichar-test.png");
+        const path = await image.save(
+          "./examples/output/model-v4-5-multichar-test.png",
+        );
         console.log(`Saved image ${index + 1} to ${path}`);
       }
     } else {

src/client.ts

@@ -14,7 +14,6 @@ import {
 } from "./constants";
 import { Image } from "./image";
 import {
-  ChangeEmotionOptions,
   DirectorRequest,
   HostInstance,
   ImageInput,
@@ -599,31 +598,32 @@ export class NovelAI {
   /**
    * Change the emotion of a character in an image
    *
-   * @param options - Options for changing emotion
-   * @param options.image - Image input (path, Blob, File, URL, etc.)
-   * @param options.emotion - Target emotion to change to
-   * @param options.prompt - Additional prompt to add to the request
-   * @param options.emotionLevel - Level of emotion change (0-5, optional)
+   * @param image - Image input (path, Blob, File, URL, etc.)
    * @param host - Host to use for the request (optional)
+   * @param emotion - Target emotion to change to
+   * @param prompt - Additional prompt to add to the request
+   * @param emotionLevel - Level of emotion change (0-5, optional)
    * @returns Promise resolving to an Image object
    */
   async changeEmotion(
-    options: ChangeEmotionOptions,
+    image: ImageInput,
     host?: Host | HostInstance,
+    emotion: string = EmotionOptions.NEUTRAL,
+    prompt: string = "",
+    emotionLevel: EmotionLevel = EmotionLevel.NORMAL,
+
   ): Promise<Image> {
-    const parsedImage = await parseImage(options.image);
+    const parsedImage = await parseImage(image);
 
-    // Create the prompt string in the format "originalEmotion;;targetEmotion,"
-    const originalEmotion = options.prompt || EmotionOptions.NEUTRAL;
-    const prompt = `${originalEmotion};;${options.emotion},`;
+    const final_prompt = `${emotion};;${prompt}`;
 
     const request: DirectorRequest = {
       req_type: DirectorTools.EMOTION,
       width: parsedImage.width,
       height: parsedImage.height,
       image: parsedImage.base64,
-      prompt,
-      defry: options.emotionLevel ?? EmotionLevel.NORMAL,
+      prompt: final_prompt,
+      defry: emotionLevel ?? EmotionLevel.NORMAL,
     };
 
     return this.useDirectorTool(request, host);

src/constants.ts

@@ -35,7 +35,7 @@ export const HOST_INSTANCES: Record<Host, HostInstance> = {
  */
 export function createCustomHost(
   url: string,
-  accept: string,
+  accept: string = "binary/octet-stream",
   name = "custom",
 ): HostInstance {
   return {

src/index.ts

@@ -22,7 +22,6 @@ export {
 
 // Export types
 export type {
-  ChangeEmotionOptions,
   CharacterCaption,
   CharacterPrompt,
   CustomHost,

src/types.ts

@@ -255,12 +255,6 @@ export type DirectorRequest =
   | ColorizeRequest
   | EmotionRequest;
 
-export interface ChangeEmotionOptions {
-  image: ImageInput;
-  emotion: EmotionOptions | string;
-  prompt?:  string;
-  emotionLevel?: EmotionLevel | number;
-}
 
 export interface NovelAIOptions {
   token: string;