windmill-components 1.504.6 → 1.510.1

package/package/components/copilot/lib.js

@@ -66,6 +66,20 @@ function getModelMaxTokens(model) {
     }
     return 8192;
 }
+export function getModelContextWindow(model) {
+    if (model.startsWith('gpt-4.1') || model.startsWith('gemini')) {
+        return 1000000;
+    }
+    else if (model.startsWith('gpt-4o') || model.startsWith('llama-3.3')) {
+        return 128000;
+    }
+    else if (model.startsWith('claude') || model.startsWith('o4-mini') || model.startsWith('o3')) {
+        return 200000;
+    }
+    else {
+        return 128000;
+    }
+}
 function getModelSpecificConfig(modelProvider, tools) {
     if ((modelProvider.provider === 'openai' || modelProvider.provider === 'azure_openai') &&
         modelProvider.model.startsWith('o')) {
@@ -373,6 +387,7 @@ const mistralFimResponseSchema = z.object({
     }))
 });
 export const FIM_MAX_TOKENS = 256;
+const FIM_MAX_LINES = 8;
 export async function getFimCompletion(prompt, suffix, providerModel, abortController) {
     const fetchOptions = {
         signal: abortController.signal,
@@ -396,16 +411,19 @@ export async function getFimCompletion(prompt, suffix, providerModel, abortContr
     const body = await response.json();
     const parsedBody = mistralFimResponseSchema.parse(body);
     const choice = parsedBody.choices[0];
-    if (choice) {
-        if (choice.finish_reason === 'length' && choice.message.content) {
-            // take all the lines before the last
-            const lines = choice.message.content.split('\n');
-            const joined = lines.slice(0, -1).join('\n');
-            return joined;
-        }
-        else {
-            return choice.message.content || '';
+    if (choice && choice.message.content !== undefined) {
+        let lines = choice.message.content.split('\n');
+        // If finish_reason is 'length', remove the last line
+        if (choice.finish_reason === 'length') {
+            if (lines.length > 1) {
+                lines = lines.slice(0, -1);
+            }
+            else {
+                lines = [];
+            }
         }
+        lines = lines.slice(0, FIM_MAX_LINES);
+        return lines.join('\n');
     }
     else {
         return undefined;

package/package/components/custom_ui.d.ts

@@ -53,6 +53,7 @@ export type PreviewPanelUi = {
     displayResult?: DisplayResultUi;
     disableVariablePicker?: boolean;
     disableDownload?: boolean;
+    tagLabel?: string;
 };
 export type EditorBarUi = {
     contextVar?: boolean;

package/package/components/flows/FlowAssetsHandler.svelte

@@ -0,0 +1,133 @@
+<script lang="ts" module>export function initFlowGraphAssetsCtx({ getModules }) {
+    let s = $state({
+        val: {
+            selectedAsset: undefined,
+            dbManagerDrawer: undefined,
+            s3FilePicker: undefined,
+            resourceEditorDrawer: undefined,
+            resourceMetadataCache: {},
+            additionalAssetsMap: {},
+            computeAssetsCount: (asset) => {
+                return getAllModules(getModules())
+                    .flatMap((m) => getFlowModuleAssets(m, s.val.additionalAssetsMap) ?? [])
+                    .filter((a) => assetEq(asset, a)).length;
+            }
+        }
+    });
+    return s;
+}
+</script>
+
+<script lang="ts">import { inferAssets } from '../../infer';
+import { assetEq, getFlowModuleAssets } from '../assets/lib';
+import OnChange from '../common/OnChange.svelte';
+import { getAllModules } from './flowExplorer';
+import { getContext, untrack } from 'svelte';
+import { AssetService, ResourceService } from '../../gen';
+import { deepEqual } from 'fast-equals';
+import { workspaceStore } from '../../stores';
+import S3FilePicker from '../S3FilePicker.svelte';
+import DbManagerDrawer from '../DBManagerDrawer.svelte';
+import ResourceEditorDrawer from '../ResourceEditorDrawer.svelte';
+let { modules, enableParser = false, enableDbExplore = false, enablePathScriptAndFlowAssets = false } = $props();
+const flowGraphAssetsCtx = getContext('FlowGraphAssetContext');
+let allModules = $derived(getAllModules(modules));
+// Fetch resource metadata for the ExploreAssetButton
+const resMetadataCache = $derived(flowGraphAssetsCtx?.val.resourceMetadataCache);
+$effect(() => {
+    if (!resMetadataCache || !enableDbExplore)
+        return;
+    const assets = allModules.flatMap((m) => getFlowModuleAssets(m, flowGraphAssetsCtx?.val.additionalAssetsMap) ?? []) ?? [];
+    for (const asset of assets) {
+        if (asset.kind !== 'resource' || asset.path in resMetadataCache)
+            continue;
+        resMetadataCache[asset.path] = undefined; // avoid fetching multiple times because of async
+        ResourceService.getResource({ path: asset.path, workspace: $workspaceStore })
+            .then((r) => (resMetadataCache[asset.path] = { resource_type: r.resource_type }))
+            .catch((err) => {
+            console.error("Couldn't fetch resource", asset.path, err);
+        });
+    }
+});
+// Fetch transitive assets (path scripts and flows)
+$effect(() => {
+    if (!$workspaceStore || !flowGraphAssetsCtx || !enablePathScriptAndFlowAssets)
+        return;
+    let usages = [];
+    let modIds = [];
+    for (const mod of allModules) {
+        if (mod.id in flowGraphAssetsCtx.val.additionalAssetsMap)
+            continue;
+        flowGraphAssetsCtx.val.additionalAssetsMap[mod.id] = []; // avoid fetching multiple times because of async
+        if (mod.value.type === 'flow' || mod.value.type === 'script') {
+            usages.push({ path: mod.value.path, kind: mod.value.type });
+            modIds.push(mod.id);
+        }
+    }
+    if (usages.length) {
+        AssetService.listAssetsByUsage({
+            workspace: $workspaceStore,
+            requestBody: { usages }
+        }).then((result) => {
+            result.forEach((assets, idx) => {
+                flowGraphAssetsCtx.val.additionalAssetsMap[modIds[idx]] = assets;
+            });
+        });
+    }
+});
+// Prune all additionalAssetsMap entries from deleted modules
+$effect(() => {
+    if (!flowGraphAssetsCtx)
+        return;
+    const modulesSet = new Set(allModules.map((m) => m.id));
+    for (const key of Object.keys(flowGraphAssetsCtx.val.additionalAssetsMap)) {
+        if (!modulesSet.has(key)) {
+            delete flowGraphAssetsCtx.val.additionalAssetsMap[key];
+        }
+    }
+});
+async function parseAndUpdateRawScriptModule(v) {
+    try {
+        let parsedAssets = await inferAssets(v.language, v.content);
+        for (const asset of parsedAssets) {
+            const old = v.assets?.find((a) => assetEq(a, asset));
+            if (old?.alt_access_type)
+                asset.alt_access_type = old.alt_access_type;
+        }
+        if (!deepEqual(v.assets, parsedAssets))
+            v.assets = parsedAssets;
+    }
+    catch (e) { }
+}
+// Check for raw script modules whose assets were not parsed. Useful for flows created
+// before the assets feature was introduced.
+$effect(() => {
+    if (!enableParser)
+        return;
+    untrack(() => {
+        setTimeout(() => {
+            for (const mod of allModules) {
+                if (mod.value.type === 'rawscript' && mod.value.assets === undefined) {
+                    console.log('RawScript module', mod.id, 'without assets field, parsing');
+                    parseAndUpdateRawScriptModule(mod.value);
+                }
+            }
+        }, 500); // ensure modules are loaded
+    });
+});
+</script>
+
+{#if enableParser}
+	{#each allModules as mod (mod.id)}
+		{#if mod.value.type === 'rawscript'}
+			{@const v = mod.value}
+			<OnChange key={v.content} onChange={() => parseAndUpdateRawScriptModule(v)} />
+		{/if}
+	{/each}
+{/if}
+
+{#if flowGraphAssetsCtx}
+	<S3FilePicker bind:this={flowGraphAssetsCtx.val.s3FilePicker} readOnlyMode />
+	<DbManagerDrawer bind:this={flowGraphAssetsCtx.val.dbManagerDrawer} />
+	<ResourceEditorDrawer bind:this={flowGraphAssetsCtx.val.resourceEditorDrawer} />
+{/if}

package/package/components/flows/FlowAssetsHandler.svelte.d.ts

@@ -0,0 +1,14 @@
+export declare function initFlowGraphAssetsCtx({ getModules }: {
+    getModules: () => FlowModule[];
+}): FlowGraphAssetContext;
+import type { FlowGraphAssetContext } from './types';
+import { type FlowModule } from '../../gen';
+type $$ComponentProps = {
+    modules: FlowModule[];
+    enableParser?: boolean;
+    enableDbExplore?: boolean;
+    enablePathScriptAndFlowAssets?: boolean;
+};
+declare const FlowAssetsHandler: import("svelte").Component<$$ComponentProps, {}, "">;
+type FlowAssetsHandler = ReturnType<typeof FlowAssetsHandler>;
+export default FlowAssetsHandler;

package/package/components/flows/content/FlowModuleComponent.svelte

@@ -45,10 +45,9 @@ import { JobService } from '../../../gen';
 import { workspaceStore } from '../../../stores';
 import { checkIfParentLoop } from '../utils';
 import ModulePreviewResultViewer from '../../ModulePreviewResultViewer.svelte';
-import { refreshStateStore, usePromise } from '../../../svelte5Utils.svelte';
+import { refreshStateStore } from '../../../svelte5Utils.svelte';
 import { getStepHistoryLoaderContext } from '../../stepHistoryLoader.svelte';
 import AssetsDropdownButton from '../../assets/AssetsDropdownButton.svelte';
-import { inferAssets } from '../../../infer';
 const { selectedId, currentEditor, previewArgs, flowStateStore, flowStore, pathStore, saveDraft, customUi, executionCount } = getContext('FlowEditorContext');
 let { flowModule = $bindable(), failureModule = false, preprocessorModule = false, parentModule = $bindable(), previousModule, scriptKind = 'script', scriptTemplate = 'script', noEditor, enableAi, savedModule = undefined, forceTestTab = false, highlightArg = undefined } = $props();
 let workspaceScriptTag = $state(undefined);
@@ -74,6 +73,7 @@ let lastJob = $state(undefined);
 let testJob = $state(undefined);
 let testIsLoading = $state(false);
 let scriptProgress = $state(undefined);
+let assets = $derived((flowModule.value.type === 'rawscript' && flowModule.value.assets) || []);
 function onModulesChange(savedModule, flowModule) {
     // console.log('onModulesChange', savedModule, flowModule)
     return savedModule?.value?.type === 'rawscript' &&
@@ -136,10 +136,12 @@ let forceReload = $state(0);
 let editorPanelSize = $state(noEditor ? 0 : flowModule.value.type == 'script' ? 30 : 50);
 let editorSettingsPanelSize = $state(100 - untrack(() => editorPanelSize));
 let stepHistoryLoader = getStepHistoryLoaderContext();
+let lastJobId = undefined;
 function onSelectedIdChange() {
     if (!$flowStateStore?.[$selectedId]?.schema && flowModule) {
         reload(flowModule);
     }
+    lastJobId = undefined;
 }
 async function getLastJob() {
     if (!$flowStateStore ||
@@ -149,11 +151,19 @@ async function getLastJob() {
         !$flowStateStore[flowModule.id]?.previewWorkspaceId) {
         return;
     }
+    if (lastJobId == $flowStateStore[flowModule.id]?.previewJobId ||
+        lastJob?.id == $flowStateStore[flowModule.id]?.previewJobId ||
+        $flowStateStore[flowModule.id]?.previewSuccess == undefined) {
+        return;
+    }
+    lastJobId = $flowStateStore[flowModule.id]?.previewJobId;
     const job = await JobService.getJob({
         workspace: $flowStateStore[flowModule.id]?.previewWorkspaceId ?? '',
-        id: $flowStateStore[flowModule.id]?.previewJobId ?? ''
+        id: $flowStateStore[flowModule.id]?.previewJobId ?? '',
+        noCode: true
     });
-    if (job) {
+    if (job && job.type === 'CompletedJob') {
+        lastJobId = $flowStateStore[flowModule.id]?.previewJobId;
         lastJob = job;
     }
 }
@@ -222,15 +232,6 @@ $effect(() => {
         }, 100);
     }
 });
-let assets = usePromise(async () => flowModule.value.type === 'rawscript'
-    ? await inferAssets(flowModule.value.language, flowModule.value.content)
-    : undefined, { clearValueOnRefresh: false, loadInit: false });
-$effect(() => {
-    if (flowModule.value.type !== 'rawscript')
-        return;
-    [flowModule.value.content, flowModule.value.language];
-    untrack(() => assets.refresh());
-});
 let rawScriptLang = $derived(flowModule.value.type == 'rawscript' ? flowModule.value.language : undefined);
 </script>
 
@@ -339,11 +340,8 @@ let rawScriptLang = $derived(flowModule.value.type == 'rawscript' ? flowModule.v
 								{#if !noEditor}
 									{#key flowModule.id}
 										<div class="absolute top-2 right-4 z-10 flex flex-row gap-2">
-											{#if assets.value?.length}
-												<AssetsDropdownButton
-													assets={assets.value}
-													bind:fallbackAccessTypes={flowModule.value.asset_fallback_access_types}
-												/>
+											{#if assets?.length}
+												<AssetsDropdownButton {assets} />
 											{/if}
 										</div>
 										<Editor

package/package/components/flows/flowStore.d.ts

@@ -14,7 +14,7 @@ export declare function getFirstStepSchema(flowState: FlowState, flow: OpenFlow)
         value: {
             language?: "deno" | "bun" | "python3" | "go" | "bash" | "powershell" | "postgresql" | "mysql" | "bigquery" | "snowflake" | "mssql" | "oracledb" | "graphql" | "nativets" | "php" | undefined;
             path?: string | undefined;
-            type: "rawscript" | "script" | "flow" | "forloopflow" | "branchone" | "branchall" | "identity" | "whileloopflow";
+            type: "rawscript" | "script" | "flow" | "forloopflow" | "whileloopflow" | "branchone" | "branchall" | "identity";
         };
     };
     connectFirstNode: () => void;

package/package/components/flows/map/FlowModuleSchemaItem.svelte

@@ -358,6 +358,7 @@ outline-[1px] outline dark:outline-gray-500 outline-gray-300 bg-surface duration
 				onclick={stopPropagation(
 					preventDefault((event) => dispatch('delete', { id, type: modType }))
 				)}
+				onpointerdown={stopPropagation(preventDefault(() => {}))}
 			>
 				<X class="mx-[3px]" size={12} strokeWidth={2} />
 			</button>

package/package/components/flows/propPicker/OutputPicker.svelte

@@ -46,13 +46,15 @@ function updatePositioning(historyOpen, zoom) {
         placement: 'bottom',
         gutter: 0,
         offset: { mainAxis: 3, crossAxis: 69 * zoom },
-        overflowPadding: historyOpen ? 250 : 8
+        overflowPadding: historyOpen ? 250 : 8,
+        flip: false
     });
     popover?.updatePositioning({
         placement: 'bottom',
         gutter: 0,
         offset: { mainAxis: 3, crossAxis: showInput ? -69 * zoom : 0 },
-        overflowPadding: historyOpen ? 250 : 8
+        overflowPadding: historyOpen ? 250 : 8,
+        flip: false
     });
 }
 $effect(() => {
@@ -104,7 +106,8 @@ onMount(() => {
 						placement: 'bottom',
 						gutter: 0,
 						offset: { mainAxis: 3, crossAxis: 69 },
-						overflowPadding: historyOpen ? 250 : 8
+						overflowPadding: historyOpen ? 250 : 8,
+						flip: false
 					}}
 					usePointerDownOutside
 					closeOnOutsideClick={false}
@@ -139,12 +142,14 @@ onMount(() => {
 					{/snippet}
 				</Popover>
 			{/if}
+
 			<Popover
 				floatingConfig={{
 					placement: 'bottom',
 					gutter: 0,
 					offset: { mainAxis: 3, crossAxis: showInput ? -69 : 0 },
-					overflowPadding: historyOpen ? 250 : 8
+					overflowPadding: historyOpen ? 250 : 8,
+					flip: false
 				}}
 				usePointerDownOutside
 				closeOnOutsideClick={false}

package/package/components/flows/scheduleUtils.js

@@ -135,7 +135,7 @@ export async function saveScheduleFromCfg(scheduleCfg, edit, workspace) {
         on_success: scheduleCfg.on_success,
         on_success_extra_args: scheduleCfg.on_success_extra_args,
         ws_error_handler_muted: scheduleCfg.ws_error_handler_muted,
-        retry: scheduleCfg.retry,
+        retry: !scheduleCfg.is_flow ? scheduleCfg.retry : undefined,
         summary: scheduleCfg.summary,
         description: scheduleCfg.description,
         no_flow_overlap: scheduleCfg.no_flow_overlap,

package/package/components/flows/types.d.ts

@@ -70,11 +70,12 @@ export type FlowEditorContext = {
 };
 export type FlowGraphAssetContext = StateStore<{
     selectedAsset: Asset | undefined;
-    assetsMap: Record<string, AssetWithAccessType[]>;
     s3FilePicker: S3FilePicker | undefined;
     dbManagerDrawer: DbManagerDrawer | undefined;
     resourceEditorDrawer: ResourceEditorDrawer | undefined;
     resourceMetadataCache: Record<string, {
         resource_type?: string;
     } | undefined>;
+    additionalAssetsMap: Record<string, AssetWithAccessType[]>;
+    computeAssetsCount: (asset: Asset) => number;
 }>;

package/package/components/graph/FlowGraphV2.svelte

@@ -1,4 +1,4 @@
-<script lang="ts">import { AssetService, FlowService, ResourceService } from '../../gen';
+<script lang="ts">import { FlowService } from '../../gen';
 import { NODE } from '.';
 import { getContext, onDestroy, setContext, tick, untrack } from 'svelte';
 import { get, writable } from 'svelte/store';
@@ -32,20 +32,13 @@ import SubflowBound from './renderers/nodes/SubflowBound.svelte';
 import { deepEqual } from 'fast-equals';
 import ViewportResizer from './ViewportResizer.svelte';
 import AssetNode, { computeAssetNodes } from './renderers/nodes/AssetNode.svelte';
-import { getAllModules } from '../flows/flowExplorer';
-import { inferAssets } from '../../infer';
-import OnChange from '../common/OnChange.svelte';
-import S3FilePicker from '../S3FilePicker.svelte';
-import DbManagerDrawer from '../DBManagerDrawer.svelte';
-import ResourceEditorDrawer from '../ResourceEditorDrawer.svelte';
-import { assetEq } from '../assets/lib';
 import AssetsOverflowedNode from './renderers/nodes/AssetsOverflowedNode.svelte';
 let useDataflow = writable(false);
 const triggerContext = getContext('TriggerContext');
 let fullWidth = 0;
 let width = $state(0);
 let simplifiableFlow = $state(undefined);
-let { onInsert = undefined, onDelete = undefined, onMove = undefined, onDeleteBranch = undefined, onNewBranch = undefined, onSelect = undefined, onChangeId = undefined, onUpdateMock = undefined, onSelectedIteration = undefined, success = undefined, modules = [], failureModule = undefined, preprocessorModule = undefined, minHeight = 0, maxHeight = undefined, notSelectable = false, flowModuleStates = undefined, selectedId = writable(undefined), path = undefined, newFlow = false, insertable = false, earlyStop = false, cache = false, scroll = false, moving = undefined, download = false, fullSize = false, disableAi = false, triggerNode = false, workspace = $workspaceStore ?? 'NO_WORKSPACE', editMode = false, allowSimplifiedPoll = true, expandedSubflows = $bindable({}), inputAssets, onTestUpTo = undefined, onEditInput = undefined, isOwner = false, onTestFlow = undefined, isRunning = false, onCancelTestFlow = undefined, onOpenPreview = undefined, onHideJobStatus = undefined, individualStepTests = false, flowJob = undefined, showJobStatus = false, suspendStatus = writable({}), flowHasChanged = false } = $props();
+let { onInsert = undefined, onDelete = undefined, onMove = undefined, onDeleteBranch = undefined, onNewBranch = undefined, onSelect = undefined, onChangeId = undefined, onUpdateMock = undefined, onSelectedIteration = undefined, success = undefined, modules = [], failureModule = undefined, preprocessorModule = undefined, minHeight = 0, maxHeight = undefined, notSelectable = false, flowModuleStates = undefined, selectedId = writable(undefined), path = undefined, newFlow = false, insertable = false, earlyStop = false, cache = false, scroll = false, moving = undefined, download = false, fullSize = false, disableAi = false, triggerNode = false, workspace = $workspaceStore ?? 'NO_WORKSPACE', editMode = false, allowSimplifiedPoll = true, expandedSubflows = $bindable({}), onTestUpTo = undefined, onEditInput = undefined, isOwner = false, onTestFlow = undefined, isRunning = false, onCancelTestFlow = undefined, onOpenPreview = undefined, onHideJobStatus = undefined, individualStepTests = false, flowJob = undefined, showJobStatus = false, suspendStatus = writable({}), flowHasChanged = false } = $props();
 setContext('FlowGraphContext', { selectedId, useDataflow });
 if (triggerContext && allowSimplifiedPoll) {
     if (isSimplifiable(modules)) {
@@ -55,66 +48,6 @@ if (triggerContext && allowSimplifiedPoll) {
         computeSimplifiableFlow(modules ?? [], value ?? false);
     });
 }
-const flowGraphAssetsCtx = $state({
-    val: {
-        assetsMap: inputAssets ? { Input: inputAssets } : {},
-        selectedAsset: undefined,
-        dbManagerDrawer: undefined,
-        s3FilePicker: undefined,
-        resourceEditorDrawer: undefined,
-        resourceMetadataCache: {}
-    }
-});
-setContext('FlowGraphAssetContext', flowGraphAssetsCtx);
-const assetsMap = $derived(flowGraphAssetsCtx.val.assetsMap);
-$effect(() => {
-    if (inputAssets)
-        flowGraphAssetsCtx.val.assetsMap.Input = inputAssets;
-});
-// Fetch resource metadata for the ExploreAssetButton
-const resMetadataCache = $derived(flowGraphAssetsCtx.val.resourceMetadataCache);
-$effect(() => {
-    for (const asset of Object.values(assetsMap ?? []).flatMap((x) => x)) {
-        if (asset.kind !== 'resource' || asset.path in resMetadataCache)
-            continue;
-        resMetadataCache[asset.path] = undefined; // avoid fetching multiple times because of async
-        ResourceService.getResource({ path: asset.path, workspace: $workspaceStore }).then((r) => (resMetadataCache[asset.path] = { resource_type: r.resource_type }));
-    }
-});
-// Fetch transitive assets (path scripts and flows)
-$effect(() => {
-    if (!$workspaceStore)
-        return;
-    let usages = [];
-    let modIds = [];
-    for (const mod of getAllModules(modules)) {
-        if (mod.id in assetsMap)
-            continue;
-        assetsMap[mod.id] = []; // avoid fetching multiple times because of async
-        if (mod.value.type === 'flow' || mod.value.type === 'script') {
-            usages.push({ path: mod.value.path, kind: mod.value.type });
-            modIds.push(mod.id);
-        }
-    }
-    if (usages.length) {
-        AssetService.listAssetsByUsage({
-            workspace: $workspaceStore,
-            requestBody: { usages }
-        }).then((result) => {
-            result.forEach((assets, idx) => {
-                assetsMap[modIds[idx]] = assets;
-            });
-        });
-    }
-});
-// Prune assetsMap to only contain assets that are actually used
-$effect(() => {
-    const allModules = new Set(getAllModules(modules).map((mod) => mod.id));
-    for (const modId in assetsMap) {
-        if (modId !== 'Input' && !allModules.has(modId))
-            delete assetsMap[modId];
-    }
-});
 function computeSimplifiableFlow(modules, simplifiedFlow) {
     const isSimplif = isSimplifiable(modules);
     simplifiableFlow = isSimplif ? { simplifiedFlow } : undefined;
@@ -289,11 +222,7 @@ async function updateStores() {
     }
     let newGraph = graph;
     newGraph.nodes.sort((a, b) => b.id.localeCompare(a.id));
-    [nodes, edges] = computeAssetNodes(layoutNodes(newGraph.nodes), newGraph.edges, assetsMap, {
-        moving,
-        eventHandlers: eventHandler,
-        disableAi
-    });
+    [nodes, edges] = computeAssetNodes(layoutNodes(newGraph.nodes), newGraph.edges);
     await tick();
     height = Math.max(...nodes.map((n) => n.position.y + NODE.height + 100), minHeight);
 }
@@ -326,11 +255,13 @@ const proOptions = { hideAttribution: true };
 // 	centerViewport(width)
 // })
 let yamlEditorDrawer = $state(undefined);
+const flowGraphAssetsCtx = getContext('FlowGraphAssetContext');
 $effect(() => {
     allowSimplifiedPoll && modules && untrack(() => onModulesChange(modules ?? []));
 });
 $effect(() => {
-    modules && untrack(() => onModulesChange2(modules));
+    readFieldsRecursively(modules);
+    untrack(() => onModulesChange2(modules));
 });
 let graph = $derived.by(() => {
     moduleCounter;
@@ -350,13 +281,13 @@ let graph = $derived.by(() => {
         flowJob,
         showJobStatus,
         suspendStatus,
-        flowHasChanged
+        flowHasChanged,
+        additionalAssetsMap: flowGraphAssetsCtx?.val.additionalAssetsMap
     }, failureModule, preprocessorModule, eventHandler, success, $useDataflow, $selectedId, moving, simplifiableFlow, triggerNode ? path : undefined, expandedSubflows);
 });
 $effect(() => {
     ;
     [graph, allowSimplifiedPoll];
-    readFieldsRecursively(assetsMap);
     untrack(() => updateStores());
 });
 let showDataflow = $derived($selectedId != undefined &&
@@ -481,33 +412,6 @@ export function isNodeVisible(nodeId) {
 	{/if}
 </div>
 
-{#each getAllModules(modules) as mod (mod.id)}
-	{#if mod.value.type === 'rawscript'}
-		{@const v = mod.value}
-		<OnChange
-			key={[v.content, v.asset_fallback_access_types]}
-			runFirstEffect
-			onChange={() =>
-				inferAssets(v.language, v.content)
-					.then((assets) => {
-						for (const override of v.asset_fallback_access_types ?? []) {
-							assets = assets.map((asset) => {
-								if (assetEq(asset, override) && !asset.access_type)
-									return { ...asset, access_type: override.access_type }
-								return asset
-							})
-						}
-						if (assetsMap && !deepEqual(assetsMap[mod.id], assets)) assetsMap[mod.id] = assets
-					})
-					.catch((e) => {})}
-		/>
-	{/if}
-{/each}
-
-<S3FilePicker bind:this={flowGraphAssetsCtx.val.s3FilePicker} readOnlyMode />
-<DbManagerDrawer bind:this={flowGraphAssetsCtx.val.dbManagerDrawer} />
-<ResourceEditorDrawer bind:this={flowGraphAssetsCtx.val.resourceEditorDrawer} />
-
 <style>
 	:global(.svelte-flow__handle) {
 		opacity: 0;

package/package/components/graph/FlowGraphV2.svelte.d.ts

@@ -3,7 +3,6 @@ import { type GraphModuleState } from '.';
 import { type Writable } from 'svelte/store';
 import '@xyflow/svelte/dist/base.css';
 import { type InlineScript, type InsertKind, type onSelectedIteration } from './graphBuilder.svelte';
-import { type AssetWithAccessType } from '../assets/lib';
 interface Props {
     success?: boolean | undefined;
     modules?: FlowModule[] | undefined;
@@ -29,7 +28,6 @@ interface Props {
     editMode?: boolean;
     allowSimplifiedPoll?: boolean;
     expandedSubflows?: Record<string, FlowModule[]>;
-    inputAssets?: AssetWithAccessType[];
     isOwner?: boolean;
     isRunning?: boolean;
     individualStepTests?: boolean;

package/package/components/graph/graphBuilder.svelte.d.ts

@@ -1,7 +1,7 @@
 import type { FlowModule, Job, RawScript, Script } from '../../gen';
 import { type Edge } from '@xyflow/svelte';
 import type { GraphModuleState } from './model';
-import type { AssetWithAccessType } from '../assets/lib';
+import { type AssetWithAltAccessType } from '../assets/lib';
 import type { Writable } from 'svelte/store';
 export type InsertKind = 'script' | 'forloop' | 'whileloop' | 'branchone' | 'branchall' | 'flow' | 'trigger' | 'approval' | 'end';
 export type InlineScript = {
@@ -88,6 +88,7 @@ export type InputN = {
         flowJob: Job | undefined;
         showJobStatus: boolean;
         flowHasChanged: boolean;
+        assets?: AssetWithAltAccessType[] | undefined;
     };
 };
 export type ModuleN = {
@@ -104,6 +105,7 @@ export type ModuleN = {
         editMode: boolean;
         flowJob: Job | undefined;
         isOwner: boolean;
+        assets: AssetWithAltAccessType[] | undefined;
     };
 };
 export type BranchAllStartN = {
@@ -236,13 +238,13 @@ export type TriggerN = {
 export type AssetN = {
     type: 'asset';
     data: {
-        asset: AssetWithAccessType;
+        asset: AssetWithAltAccessType;
     };
 };
 export type AssetsOverflowedN = {
     type: 'assetsOverflowed';
     data: {
-        overflowedAssets: AssetWithAccessType[];
+        overflowedAssets: AssetWithAltAccessType[];
     };
 };
 export declare function graphBuilder(modules: FlowModule[] | undefined, extra: {
@@ -265,6 +267,7 @@ export declare function graphBuilder(modules: FlowModule[] | undefined, extra: {
         nb: number;
     }>>;
     flowHasChanged: boolean;
+    additionalAssetsMap?: Record<string, AssetWithAltAccessType[]>;
 }, failureModule: FlowModule | undefined, preprocessorModule: FlowModule | undefined, eventHandlers: GraphEventHandlers, success: boolean | undefined, useDataflow: boolean | undefined, selectedId: string | undefined, moving: string | undefined, simplifiableFlow: SimplifiableFlow | undefined, flowPathForTriggerNode: string | undefined, expandedSubflows: Record<string, FlowModule[]>): {
     nodes: NodeLayout[];
     edges: Edge[];