@scenario-labs/sdk 2.2.1 → 2.4.0-alpha.1

package/src/lib/workflow_converter.ts

@@ -47,7 +47,7 @@ export type WorkflowEditorNode =
     }
   | { id: string; type: 'transformText'; data: NodeCommonData & { value?: string } }
   | { id: string; type: 'splitText'; data: NodeCommonData & { splitDelimiter?: string } }
-  | { id: string; type: 'aspectRatio'; data: NodeCommonData & { output?: string } }
+  | { id: string; type: 'aspectRatio'; data: NodeCommonData & { output?: string; quality?: string } }
   | { id: string; type: 'groupItems'; data: NodeCommonData & { value?: string } }
   | {
       id: string;
@@ -62,7 +62,16 @@ export type WorkflowEditorNode =
       data: NodeCommonData & { conditionBlocks?: WorkflowEditorConditionBlock[] };
     }
   | { id: string; type: 'approval'; data: NodeCommonData & { message?: string } }
-  | { id: string; type: string; data: NodeCommonData };
+  | {
+      id: string;
+      type: 'modelInput';
+      data: NodeCommonData & {
+        inputName: string;
+        form?: Record<string, unknown>;
+        parentModelNodeId?: string;
+        modelId?: string;
+      };
+    };
 
 export type WorkflowEditorEdge = {
   source: string;
@@ -111,7 +120,14 @@ export type WorkflowEditorModel = {
   };
 };
 
+type ModelInputNodeData = NodeCommonData & {
+  inputName: string;
+  form?: Record<string, unknown>;
+};
+
 const RUNNABLE_TYPES = new Set(['model', 'llm', 'forEach', 'forEachEnd']);
+const MODEL_CUSTOM_INPUT_HANDLE_SUFFIX = '-source-custom';
+
 export const ASPECT_RATIO_PRESETS = [
   '21:9',
   '16:9',
@@ -660,9 +676,28 @@ function applyAspectRatioInputs(args: {
   flowId: string;
   aspectRatioRef: WorkflowEditorFlowInputRef;
   model: WorkflowEditorModel;
+  aspectRatioQuality: string | undefined;
 }): void {
   const modelInputNames = getAspectRatioModelInputNames(args.model);
-  const modelBounds = getAspectRatioBounds(args.model, modelInputNames);
+  const rawModelBounds = getAspectRatioBounds(args.model, modelInputNames);
+  const quality = args.aspectRatioQuality;
+  const maxDimensionCap =
+    quality === 'high' ? 2048
+    : quality === 'medium' ? 1024
+    : undefined;
+  const isCapApplied =
+    rawModelBounds != null &&
+    maxDimensionCap != null &&
+    (rawModelBounds.maxWidth > maxDimensionCap || rawModelBounds.maxHeight > maxDimensionCap);
+  const modelBounds =
+    rawModelBounds && maxDimensionCap != null ?
+      {
+        ...rawModelBounds,
+        maxWidth: Math.min(rawModelBounds.maxWidth, maxDimensionCap),
+        maxHeight: Math.min(rawModelBounds.maxHeight, maxDimensionCap),
+        multipleOf: isCapApplied ? Math.min(rawModelBounds.multipleOf, 8) : rawModelBounds.multipleOf,
+      }
+    : rawModelBounds;
   const { widthInputName, heightInputName, aspectRatioInputName } = modelInputNames;
 
   if (aspectRatioInputName) {
@@ -808,6 +843,13 @@ function getNodeOutputValue(
     }
     return (Array.isArray(d.value) ? d.value : d.value) || undefined;
   }
+  if (node.type === 'modelInput') {
+    const value = getModelInputNodeStaticValue(node);
+    if (value === undefined) return undefined;
+    if (typeof value === 'boolean') return value ? 'true' : 'false';
+    if (typeof value === 'number') return String(value);
+    return value;
+  }
   return undefined;
 }
 
@@ -899,6 +941,54 @@ function normalizeNodes(nodes: WorkflowEditorNode[]): WorkflowEditorNode[] {
   });
 }
 
+function getIsModelCustomInputHandleId(handleId: string | null | undefined): boolean {
+  return !!handleId && handleId.endsWith(MODEL_CUSTOM_INPUT_HANDLE_SUFFIX);
+}
+
+function getModelInputEdgeInputName(
+  edge: WorkflowEditorEdge,
+  handle: WorkflowEditorHandleInput | undefined,
+  nodes: WorkflowEditorNode[],
+): string | undefined {
+  if (handle?.name) return handle.name;
+  const targetNode = nodes.find((n) => n.id === edge.target);
+  if (targetNode?.type !== 'modelInput') return undefined;
+  if (handle?.type === 'custom' || getIsModelCustomInputHandleId(edge.sourceHandle)) {
+    return (targetNode.data as ModelInputNodeData).inputName;
+  }
+  return undefined;
+}
+
+function getModelInputNodeStaticValue(node: WorkflowEditorNode): string | number | boolean | undefined {
+  if (node.type !== 'modelInput') return undefined;
+  const data = node.data as ModelInputNodeData;
+  const value = data.form?.[data.inputName];
+  if (value === undefined) return undefined;
+  if (typeof value === 'boolean' || typeof value === 'number' || typeof value === 'string') return value;
+  return undefined;
+}
+
+function pushModelFlowInputFromEdge(
+  flowInputs: WorkflowEditorFlowInput[],
+  existingIndex: number,
+  inputName: string,
+  inputType: string,
+  edge: WorkflowEditorEdge,
+  ctx: SourceRefContext,
+  filteredNodes: WorkflowEditorNode[],
+): void {
+  const ref = getSourceRef(edge, ctx);
+  if (ref) {
+    setOrPushFlowInput(flowInputs, existingIndex, { name: inputName, type: inputType, ref });
+    return;
+  }
+  const targetNode = filteredNodes.find((n) => n.id === edge.target);
+  if (targetNode?.type === 'modelInput') {
+    const staticInput = toStaticInput(inputName, inputType, getModelInputNodeStaticValue(targetNode));
+    if (staticInput) setOrPushFlowInput(flowInputs, existingIndex, staticInput);
+  }
+}
+
 // ---- Main function ----
 
 /**
@@ -973,7 +1063,7 @@ export function convertWorkflowEditorToFlow(
 
   const nodeIdToFlowIdMap = new Map<string, string>(
     sortedNodes
-      .filter((n) => !inputNodeIds.includes(n.id) && n.type !== 'forEachEnd')
+      .filter((n) => !inputNodeIds.includes(n.id) && n.type !== 'forEachEnd' && n.type !== 'modelInput')
       .map((n) => [n.id, nodeIdToFlowId(n.id)]),
   );
   const nodeIdToInputNameMap = new Map<string, string>(inputNodeIds.map((id) => [id, nodeIdToFlowId(id)]));
@@ -1065,24 +1155,25 @@ export function convertWorkflowEditorToFlow(
       for (const edge of incomingEdges) {
         if (edge.sourceHandle === conditionalHandleId) continue;
         const handle = getInputHandle(edge, node.data.inputHandles);
-        if (!handle?.name) continue;
-        if (handleTypeIncludes(handle.type, 'aspectRatio')) {
+        const inputName = getModelInputEdgeInputName(edge, handle, nodes);
+        if (!inputName) continue;
+        if (handleTypeIncludes(handle?.type, 'aspectRatio')) {
           aspectRatioEdges.push(edge);
           continue;
         }
-        const existing = edgesByInput.get(handle.name);
+        const existing = edgesByInput.get(inputName);
         if (existing) existing.push(edge);
-        else edgesByInput.set(handle.name, [edge]);
+        else edgesByInput.set(inputName, [edge]);
       }
 
       if (nodeData.form) {
         for (const [key, value] of Object.entries(nodeData.form)) {
           if (value === undefined || value === '') continue;
-          const modelInput = modelInputs?.find((inp) => inp.name === key);
+          const modelFormInput = modelInputs?.find((inp) => inp.name === key);
 
-          if (modelInput?.type === 'inputs_array') {
+          if (modelFormInput?.type === 'inputs_array') {
             if (!getIsFormArray(value)) continue;
-            const nestedInputs = modelInput.inputs ?? [];
+            const nestedInputs = modelFormInput.inputs ?? [];
             const items: WorkflowEditorFlowInput[][] = [];
 
             for (const [index, form] of (value as Record<string, unknown>[]).entries()) {
@@ -1106,7 +1197,7 @@ export function convertWorkflowEditorToFlow(
             if (items.length > 0) flowInputs.push({ name: key, type: 'inputs_array', items });
           } else {
             const type =
-              modelInput?.type ??
+              modelFormInput?.type ??
               (typeof value === 'number' ? 'number'
               : typeof value === 'boolean' ? 'boolean'
               : 'string');
@@ -1118,6 +1209,9 @@ export function convertWorkflowEditorToFlow(
 
       if (aspectRatioEdges.length > 0 && model) {
         const aspectRatioRef = getSourceRef(aspectRatioEdges[0]!, ctx);
+        const aspectRatioNode = nodes.find((candidate) => candidate.id === aspectRatioEdges[0]!.target);
+        const aspectRatioQuality =
+          aspectRatioNode?.type === 'aspectRatio' ? aspectRatioNode.data.quality : undefined;
         if (aspectRatioRef) {
           applyAspectRatioInputs({
             flow,
@@ -1125,6 +1219,7 @@ export function convertWorkflowEditorToFlow(
             flowId,
             aspectRatioRef,
             model,
+            aspectRatioQuality,
           });
         }
       }
@@ -1136,9 +1231,15 @@ export function convertWorkflowEditorToFlow(
         const inputType = modelInput.type;
 
         if (inputEdges.length === 1) {
-          const ref = getSourceRef(inputEdges[0]!, ctx);
-          if (!ref) continue;
-          setOrPushFlowInput(flowInputs, existingIndex, { name: inputName, type: inputType, ref });
+          pushModelFlowInputFromEdge(
+            flowInputs,
+            existingIndex,
+            inputName,
+            inputType,
+            inputEdges[0]!,
+            ctx,
+            filteredNodes,
+          );
         } else {
           const allConditional = inputEdges.every((e) => getIsConditionallyExecuted(e.target, nodes, edges));
 
@@ -1202,7 +1303,9 @@ export function convertWorkflowEditorToFlow(
 
               if (
                 !targetNode?.data.isInput &&
-                (targetNode?.type === 'asset' || targetNode?.type === 'text')
+                (targetNode?.type === 'asset' ||
+                  targetNode?.type === 'text' ||
+                  targetNode?.type === 'modelInput')
               ) {
                 transformInputs.push({
                   name: targetNodeKey,
@@ -1241,9 +1344,15 @@ export function convertWorkflowEditorToFlow(
               ref: { node: concatItem.id, name: 'all' },
             });
           } else {
-            const ref = getSourceRef(inputEdges[0]!, ctx);
-            if (!ref) continue;
-            setOrPushFlowInput(flowInputs, existingIndex, { name: inputName, type: inputType, ref });
+            pushModelFlowInputFromEdge(
+              flowInputs,
+              existingIndex,
+              inputName,
+              inputType,
+              inputEdges[0]!,
+              ctx,
+              filteredNodes,
+            );
           }
         }
       }

package/src/lib/workflow_import_validator.ts

@@ -19,7 +19,8 @@ export type WorkflowEditorNodeType =
   | 'forEach'
   | 'forEachEnd'
   | 'stickyNote'
-  | 'approval';
+  | 'approval'
+  | 'modelInput';
 
 export const VALID_EDITOR_NODE_TYPES: readonly WorkflowEditorNodeType[] = [
   'text',
@@ -36,6 +37,7 @@ export const VALID_EDITOR_NODE_TYPES: readonly WorkflowEditorNodeType[] = [
   'forEachEnd',
   'stickyNote',
   'approval',
+  'modelInput',
 ];
 
 export interface WorkflowExportData {

package/src/resources/assets/assets.ts

@@ -9515,7 +9515,7 @@ export namespace AssetUploadResponse {
         /**
          * The status of the node. Only available for WorkflowJob nodes.
          */
-        status: 'failure' | 'pending' | 'processing' | 'skipped' | 'success';
+        status: 'failure' | 'pending' | 'processing' | 'rejected' | 'skipped' | 'success';
 
         /**
          * The type of the job for the node.