@sogni-ai/sogni-client 4.0.0-alpha.45 → 4.0.0-alpha.46

package/src/lib/validation.ts

@@ -1,15 +1,7 @@
-import {
-  isRawForgeSampler,
-  isForgeSampler,
-  SupportedForgeSamplers
-} from '../Projects/types/ForgeSamplerParams';
-import {
-  isForgeScheduler,
-  isRawForgeScheduler,
-  SupportedForgeSchedulers
-} from '../Projects/types/ForgeSchedulerParams';
-import { isComfySampler, SupportedComfySamplers } from '../Projects/types/ComfySamplerParams';
-import { isComfyScheduler, SupportedComfySchedulers } from '../Projects/types/ComfySchedulerParams';
+import { ApiError } from '../ApiClient';
+import { ModelOptions } from '../Projects/types/ModelOptions';
+import { schedulerAliasToValue } from '../Projects/utils/scheduler';
+import { samplerAliasToValue } from '../Projects/utils/samplers';
 
 export function validateCustomImageSize(value: any): number {
   return validateNumber(value, { min: 256, max: 2048, propertyName: 'Width and height' });
@@ -64,36 +56,6 @@ export function validateNumber(
   return number;
 }
 
-export function validateForgeSampler(value?: string) {
-  if (!value) {
-    return null;
-  }
-  if (isRawForgeSampler(value)) {
-    return value;
-  }
-  if (isForgeSampler(value)) {
-    return SupportedForgeSamplers[value];
-  }
-  throw new Error(
-    `Invalid sampler: ${value}. Supported options: ${Object.keys(SupportedForgeSamplers).join(', ')}`
-  );
-}
-
-export function validateForgeScheduler(value?: string) {
-  if (!value) {
-    return null;
-  }
-  if (isRawForgeScheduler(value)) {
-    return value;
-  }
-  if (isForgeScheduler(value)) {
-    return SupportedForgeSchedulers[value];
-  }
-  throw new Error(
-    `Invalid scheduler: ${value}. Supported options: ${Object.keys(SupportedForgeSchedulers).join(', ')}`
-  );
-}
-
 /**
  * Validate teacacheThreshold for T2V and I2V models.
  * Range: 0.0-1.0. 0.0 = disabled.
@@ -112,53 +74,42 @@ export function validateTeacacheThreshold(value?: number): number | undefined {
   return num;
 }
 
-/**
- * Validate ComfyUI sampler for video models.
- * Returns the sampler string directly (no mapping needed).
- */
-export function validateComfySampler(value?: string): string | undefined {
-  if (!value) {
-    return undefined;
-  }
-  if (isComfySampler(value)) {
-    return SupportedComfySamplers[value];
-  }
-  throw new Error(
-    `Invalid comfySampler: ${value}. Supported options: ${Object.keys(SupportedComfySamplers).join(', ')}`
-  );
-}
-
-/**
- * Validate ComfyUI scheduler for video models.
- * Returns the scheduler string directly (no mapping needed).
- */
-export function validateComfyScheduler(value?: string): string | undefined {
-  if (!value) {
-    return undefined;
-  }
-  if (isComfyScheduler(value)) {
-    return SupportedComfySchedulers[value];
-  }
-  throw new Error(
-    `Invalid comfyScheduler: ${value}. Supported options: ${Object.keys(SupportedComfySchedulers).join(', ')}`
-  );
-}
-
 export function isComfyModel(modelId: string): boolean {
   const COMFY_PREFIXES = ['z_image_', 'qwen_image_', 'flux2_', 'wan_'];
   return COMFY_PREFIXES.some((prefix) => modelId.startsWith(prefix));
 }
 
-export function validateSampler(modelId: string, sampler: string) {
-  if (isComfyModel(modelId)) {
-    return validateComfySampler(sampler);
+function validateOption<T = unknown>(value: T, options: T[], errorMessage: string): T {
+  if (!options.includes(value)) {
+    throw new ApiError(400, {
+      status: 'error',
+      errorCode: 0,
+      message: errorMessage
+    });
+  }
+  return value;
+}
+
+export function validateSampler(value: string | undefined, options: ModelOptions) {
+  if (!options.sampler.allowed.length || !value) {
+    return null;
   }
-  return validateForgeSampler(sampler);
+  const option = validateOption(
+    value,
+    options.sampler.allowed,
+    `Invalid sampler ${value}. Must be one of "${options.sampler.allowed.join('", "')}".`
+  );
+  return samplerAliasToValue(option);
 }
 
-export function validateScheduler(modelId: string, scheduler: string) {
-  if (isComfyModel(modelId)) {
-    return validateComfyScheduler(scheduler);
+export function validateScheduler(value: string | undefined, options: ModelOptions) {
+  if (!options.scheduler.allowed.length || !value) {
+    return null;
   }
-  return validateForgeScheduler(scheduler);
+  const option = validateOption(
+    value,
+    options.scheduler.allowed,
+    `Invalid scheduler ${value}. Must be one of "${options.scheduler.allowed.join('", "')}".`
+  );
+  return schedulerAliasToValue(option);
 }

package/dist/Projects/types/ComfySchedulerParams.d.ts

@@ -1,17 +0,0 @@
-/**
- * ComfyUI scheduler parameters for video models and ComfyUI-based image models.
- * These use lowercase underscore format directly matching ComfyUI's internal names.
- */
-export declare const SupportedComfySchedulers: {
-    simple: string;
-    normal: string;
-    karras: string;
-    exponential: string;
-    sgm_uniform: string;
-    ddim_uniform: string;
-    beta: string;
-    linear_quadratic: string;
-    kl_optimal: string;
-};
-export declare function isComfyScheduler(scheduler: string): scheduler is ComfyScheduler;
-export type ComfyScheduler = keyof typeof SupportedComfySchedulers;

package/dist/Projects/types/ComfySchedulerParams.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SupportedComfySchedulers = void 0;
-exports.isComfyScheduler = isComfyScheduler;
-/**
- * ComfyUI scheduler parameters for video models and ComfyUI-based image models.
- * These use lowercase underscore format directly matching ComfyUI's internal names.
- */
-exports.SupportedComfySchedulers = {
-    simple: 'simple',
-    normal: 'normal',
-    karras: 'karras',
-    exponential: 'exponential',
-    sgm_uniform: 'sgm_uniform',
-    ddim_uniform: 'ddim_uniform',
-    beta: 'beta',
-    linear_quadratic: 'linear_quadratic',
-    kl_optimal: 'kl_optimal'
-};
-function isComfyScheduler(scheduler) {
-    return scheduler in exports.SupportedComfySchedulers;
-}
-//# sourceMappingURL=ComfySchedulerParams.js.map

package/dist/Projects/types/ComfySchedulerParams.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ComfySchedulerParams.js","sourceRoot":"","sources":["../../../src/Projects/types/ComfySchedulerParams.ts"],"names":[],"mappings":";;;AAgBA,4CAEC;AAlBD;;;GAGG;AACU,QAAA,wBAAwB,GAAG;IACtC,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,WAAW,EAAE,aAAa;IAC1B,WAAW,EAAE,aAAa;IAC1B,YAAY,EAAE,cAAc;IAC5B,IAAI,EAAE,MAAM;IACZ,gBAAgB,EAAE,kBAAkB;IACpC,UAAU,EAAE,YAAY;CACzB,CAAC;AAEF,SAAgB,gBAAgB,CAAC,SAAiB;IAChD,OAAO,SAAS,IAAI,gCAAwB,CAAC;AAC/C,CAAC"}

package/dist/Projects/types/ForgeSamplerParams.d.ts

@@ -1,27 +0,0 @@
-export declare const SupportedForgeSamplers: {
-    euler: string;
-    euler_ancestral: string;
-    heun: string;
-    dpmpp_2m: string;
-    dpmpp_2m_sde: string;
-    dpmpp_sde: string;
-    dpmpp_3m_sde: string;
-    uni_pc: string;
-    lcm: string;
-    lms: string;
-    dpm_2: string;
-    dpm_2_ancestral: string;
-    dpm_fast: string;
-    dpm_adaptive: string;
-    dpmpp_2s_ancestral: string;
-    ddpm: string;
-    dfs_sd3: string;
-    dpm_pp: string;
-    dpm_pp_sde: string;
-    dpm_pp_2m: string;
-    euler_a: string;
-    pndm_plms: string;
-};
-export declare function isForgeSampler(sampler: string): sampler is ForgeSampler;
-export declare function isRawForgeSampler(sampler: string): boolean;
-export type ForgeSampler = keyof typeof SupportedForgeSamplers;

package/dist/Projects/types/ForgeSamplerParams.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ForgeSamplerParams.js","sourceRoot":"","sources":["../../../src/Projects/types/ForgeSamplerParams.ts"],"names":[],"mappings":";;;AA2BA,wCAEC;AAED,8CAGC;AAlCY,QAAA,sBAAsB,GAAG;IACpC,KAAK,EAAE,OAAO;IACd,eAAe,EAAE,iBAAiB;IAClC,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,UAAU;IACpB,YAAY,EAAE,cAAc;IAC5B,SAAS,EAAE,WAAW;IACtB,YAAY,EAAE,cAAc;IAC5B,MAAM,EAAE,OAAO;IACf,GAAG,EAAE,gCAAgC;IACrC,kCAAkC;IAClC,GAAG,EAAE,KAAK;IACV,KAAK,EAAE,OAAO;IACd,eAAe,EAAE,iBAAiB;IAClC,QAAQ,EAAE,UAAU;IACpB,YAAY,EAAE,cAAc;IAC5B,kBAAkB,EAAE,oBAAoB;IACxC,IAAI,EAAE,MAAM;IACZ,4BAA4B;IAC5B,OAAO,EAAE,+BAA+B;IACxC,MAAM,EAAE,qCAAqC;IAC7C,UAAU,EAAE,WAAW;IACvB,SAAS,EAAE,UAAU;IACrB,OAAO,EAAE,SAAS;IAClB,SAAS,EAAE,iCAAiC;CAC7C,CAAC;AAEF,SAAgB,cAAc,CAAC,OAAe;IAC5C,OAAO,OAAO,IAAI,8BAAsB,CAAC;AAC3C,CAAC;AAED,SAAgB,iBAAiB,CAAC,OAAe;IAC/C,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,8BAAsB,CAAC,CAAC;IACvD,OAAO,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACpC,CAAC"}

package/dist/Projects/types/ForgeSchedulerParams.d.ts

@@ -1,17 +0,0 @@
-export declare const SupportedForgeSchedulers: {
-    simple: string;
-    normal: string;
-    karras: string;
-    exponential: string;
-    sgm_uniform: string;
-    ddim_uniform: string;
-    beta: string;
-    linear_quadratic: string;
-    kl_optimal: string;
-    ddim: string;
-    leading: string;
-    linear: string;
-};
-export declare function isForgeScheduler(scheduler: string): scheduler is ForgeScheduler;
-export declare function isRawForgeScheduler(scheduler: string): boolean;
-export type ForgeScheduler = keyof typeof SupportedForgeSchedulers;

package/dist/Projects/types/ForgeSchedulerParams.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SupportedForgeSchedulers = void 0;
-exports.isForgeScheduler = isForgeScheduler;
-exports.isRawForgeScheduler = isRawForgeScheduler;
-exports.SupportedForgeSchedulers = {
-    simple: 'Simple',
-    normal: 'Normal',
-    karras: 'Karras',
-    exponential: 'Exponential',
-    sgm_uniform: 'SGM Uniform',
-    ddim_uniform: 'DDIM Uniform',
-    beta: 'Beta',
-    linear_quadratic: 'Linear Quadratic',
-    kl_optimal: 'KL Optimal',
-    // Legacy aliases
-    ddim: 'DDIM',
-    leading: 'Leading',
-    linear: 'Linear'
-};
-function isForgeScheduler(scheduler) {
-    return scheduler in exports.SupportedForgeSchedulers;
-}
-function isRawForgeScheduler(scheduler) {
-    const schedulers = Object.values(exports.SupportedForgeSchedulers);
-    return schedulers.includes(scheduler);
-}
-//# sourceMappingURL=ForgeSchedulerParams.js.map

package/dist/Projects/types/ForgeSchedulerParams.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ForgeSchedulerParams.js","sourceRoot":"","sources":["../../../src/Projects/types/ForgeSchedulerParams.ts"],"names":[],"mappings":";;;AAgBA,4CAEC;AAED,kDAGC;AAvBY,QAAA,wBAAwB,GAAG;IACtC,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,WAAW,EAAE,aAAa;IAC1B,WAAW,EAAE,aAAa;IAC1B,YAAY,EAAE,cAAc;IAC5B,IAAI,EAAE,MAAM;IACZ,gBAAgB,EAAE,kBAAkB;IACpC,UAAU,EAAE,YAAY;IACxB,iBAAiB;IACjB,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,QAAQ;CACjB,CAAC;AAEF,SAAgB,gBAAgB,CAAC,SAAiB;IAChD,OAAO,SAAS,IAAI,gCAAwB,CAAC;AAC/C,CAAC;AAED,SAAgB,mBAAmB,CAAC,SAAiB;IACnD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,gCAAwB,CAAC,CAAC;IAC3D,OAAO,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;AACxC,CAAC"}

package/dist/Projects/utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/Projects/utils.ts"],"names":[],"mappings":";;;AAEA,sDASC;AAOD,oCAEC;AAMD,oDAQC;AAhCD,SAAgB,qBAAqB,CAAC,QAA6B;IACjE,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,OAAO;YACV,OAAO,IAAI,CAAC;QACd,KAAK,OAAO;YACV,OAAO,IAAI,CAAC;QACd;YACE,OAAO,IAAI,CAAC;IAChB,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,SAAgB,YAAY,CAAC,OAAe;IAC1C,OAAO,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC;AAED;;;GAGG;AACH,SAAgB,oBAAoB,CAAC,OAAe;IAClD,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAC;IACzD,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,KAAK,CAAC;IAC3C,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,KAAK,CAAC;IAC3C,IAAI,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;QAAE,OAAO,cAAc,CAAC;IAC7D,IAAI,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC;QAAE,OAAO,iBAAiB,CAAC;IACnE,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,KAAK,CAAC;IAC3C,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACU,QAAA,qBAAqB,GAG9B;IACF,GAAG,EAAE;QACH,cAAc,EAAE,WAAW;QAC3B,iBAAiB,EAAE,WAAW;QAC9B,cAAc,EAAE,WAAW;QAC3B,cAAc,EAAE,WAAW;KAC5B;IACD,GAAG,EAAE;QACH,cAAc,EAAE,UAAU;QAC1B,iBAAiB,EAAE,UAAU;QAC7B,cAAc,EAAE,WAAW;QAC3B,cAAc,EAAE,WAAW;KAC5B;IACD,GAAG,EAAE;QACH,cAAc,EAAE,UAAU;QAC1B,cAAc,EAAE,UAAU;QAC1B,iBAAiB,EAAE,WAAW;QAC9B,cAAc,EAAE,WAAW;KAC5B;IACD,cAAc,EAAE;QACd,cAAc,EAAE,UAAU;QAC1B,cAAc,EAAE,UAAU;QAC1B,iBAAiB,EAAE,WAAW;QAC9B,cAAc,EAAE,WAAW;KAC5B;IACD,iBAAiB,EAAE;QACjB,cAAc,EAAE,UAAU;QAC1B,cAAc,EAAE,UAAU;QAC1B,iBAAiB,EAAE,WAAW;QAC9B,cAAc,EAAE,WAAW;KAC5B;CACF,CAAC"}

package/dist/lib/utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,kCAMC;AAED,gDAMC;AAED,sBAEC;AApBD,2CAAuC;AAEvC,SAAgB,WAAW,CAAC,KAAa;IACvC,MAAM,IAAI,GAAG,IAAA,sBAAS,EAA0D,KAAK,CAAC,CAAC;IACvF,OAAO;QACL,aAAa,EAAE,IAAI,CAAC,IAAI;QACxB,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;KACrC,CAAC;AACJ,CAAC;AAED,SAAgB,kBAAkB,CAAC,KAAa;IAC9C,MAAM,IAAI,GAAG,IAAA,sBAAS,EAA0D,KAAK,CAAC,CAAC;IACvF,OAAO;QACL,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;KACrC,CAAC;AACJ,CAAC;AAED,SAAsB,KAAK,CAAC,EAAU;;QACpC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;IAC3D,CAAC;CAAA"}

package/src/Projects/types/ComfySchedulerParams.ts

@@ -1,21 +0,0 @@
-/**
- * ComfyUI scheduler parameters for video models and ComfyUI-based image models.
- * These use lowercase underscore format directly matching ComfyUI's internal names.
- */
-export const SupportedComfySchedulers = {
-  simple: 'simple',
-  normal: 'normal',
-  karras: 'karras',
-  exponential: 'exponential',
-  sgm_uniform: 'sgm_uniform',
-  ddim_uniform: 'ddim_uniform',
-  beta: 'beta',
-  linear_quadratic: 'linear_quadratic',
-  kl_optimal: 'kl_optimal'
-};
-
-export function isComfyScheduler(scheduler: string): scheduler is ComfyScheduler {
-  return scheduler in SupportedComfySchedulers;
-}
-
-export type ComfyScheduler = keyof typeof SupportedComfySchedulers;

package/src/Projects/types/ForgeSchedulerParams.ts

@@ -1,26 +0,0 @@
-export const SupportedForgeSchedulers = {
-  simple: 'Simple',
-  normal: 'Normal',
-  karras: 'Karras',
-  exponential: 'Exponential',
-  sgm_uniform: 'SGM Uniform',
-  ddim_uniform: 'DDIM Uniform',
-  beta: 'Beta',
-  linear_quadratic: 'Linear Quadratic',
-  kl_optimal: 'KL Optimal',
-  // Legacy aliases
-  ddim: 'DDIM',
-  leading: 'Leading',
-  linear: 'Linear'
-};
-
-export function isForgeScheduler(scheduler: string): scheduler is ForgeScheduler {
-  return scheduler in SupportedForgeSchedulers;
-}
-
-export function isRawForgeScheduler(scheduler: string): boolean {
-  const schedulers = Object.values(SupportedForgeSchedulers);
-  return schedulers.includes(scheduler);
-}
-
-export type ForgeScheduler = keyof typeof SupportedForgeSchedulers;