windmill-components 1.60.3 → 1.70.0

package/components/scriptEditor/LogPanel.svelte

@@ -70,6 +70,7 @@ function closeDrawer() {
 					<Pane class="relative">
 						<LogViewer
 							duration={previewJob?.['duration_ms']}
+							mem={previewJob?.['mem_peak']}
 							content={previewJob?.logs}
 							isLoading={previewIsLoading}
 						/>
@@ -84,7 +85,7 @@ function closeDrawer() {
 								{#if previewIsLoading}
 									<Loader2 class="animate-spin" />
 								{:else}
-									Test to see the result here'
+									Test to see the result here
 								{/if}
 							</div>
 						{/if}

package/components/sidebar/SidebarContent.svelte

@@ -17,7 +17,7 @@ $: secondaryMenuLinks = [
         label: 'Workspace',
         href: '/workspace_settings',
         icon: faCog,
-        disabled: !$userStore?.is_admin
+        disabled: !$userStore?.is_admin && !$userStore?.is_super_admin
     },
     { label: 'Workers', href: '/workers', icon: faRobot, disabled: $userStore?.operator }
 ];

package/components/sidebar/UserMenu.svelte

@@ -1,15 +1,15 @@
-<script>import { logout } from '../../logout';
-import { userStore, usersWorkspaceStore, superadmin, usageStore } from '../../stores';
+<script>import { goto } from '$app/navigation';
+import { logout } from '../../logout';
+import { userStore, usersWorkspaceStore, superadmin, usageStore, premiumStore } from '../../stores';
 import { classNames, isCloudHosted } from '../../utils';
-import { faAngleDoubleDown, faCrown, faHardHat, faPlay, faUser } from '@fortawesome/free-solid-svg-icons';
-import { createEventDispatcher } from 'svelte';
+import { faCrown, faHardHat, faUser } from '@fortawesome/free-solid-svg-icons';
 import Icon from 'svelte-awesome';
 import Menu from '../common/menu/Menu.svelte';
-let dispatch = createEventDispatcher();
+import { SUPERADMIN_SETTINGS_HASH, USER_SETTINGS_HASH } from './settings';
 export let isCollapsed = false;
 </script>
 
-<Menu placement="bottom-start">
+<Menu let:close placement="bottom-start">
 	<button
 		slot="trigger"
 		type="button"
@@ -51,8 +51,7 @@ export let isCollapsed = false;
 
 		<div class="py-1" role="none">
 			<a
-				on:click={() => dispatch('user-settings')}
-				href="#user-settings"
+				href={USER_SETTINGS_HASH}
 				class="text-gray-700 block px-4 py-2 text-sm hover:bg-gray-100 hover:text-gray-900"
 				role="menuitem"
 				tabindex="-1"
@@ -63,8 +62,7 @@ export let isCollapsed = false;
 		{#if $superadmin}
 			<div class="py-1" role="none">
 				<a
-					on:click={() => dispatch('superadmin-settings')}
-					href="#superadmin-settings"
+					href={SUPERADMIN_SETTINGS_HASH}
 					class="text-gray-700 block px-4 py-2 text-sm hover:bg-gray-100 hover:text-gray-900"
 					role="menuitem"
 					tabindex="-1"
@@ -84,12 +82,44 @@ export let isCollapsed = false;
 				Sign out
 			</button>
 		</div>
-		{#if isCloudHosted()}
-			<div class="py-1" role="none">
-				<span class="text-gray-700 block w-full text-left px-4 py-2 text-sm"
-					>{$usageStore}/1000 free-tier executions</span
-				>
-			</div>
+		{#if isCloudHosted() && $premiumStore}
+			{#if !$premiumStore.premium}
+				<div class="py-1" role="none">
+					<span class="text-gray-700 block w-full text-left px-4 py-2 text-sm"
+						>{$usageStore}/1000 free-tier executions</span
+					>
+					<div class="w-full bg-gray-200 h-1">
+						<div class="bg-blue-400 h-1" style="width: {Math.min($usageStore, 1000) / 10}%" />
+					</div>
+					{#if $userStore?.is_admin}
+						<button
+							type="button"
+							class="text-gray-700 block font-normal w-full text-left px-4 py-2 text-sm hover:bg-gray-100 hover:text-gray-900"
+							role="menuitem"
+							tabindex="-1"
+							on:click={() => {
+								close()
+								goto('/workspace_settings?tab=premium')
+							}}
+						>
+							Upgrade
+						</button>
+					{/if}
+				</div>
+			{:else}
+				<div class="py-1" role="none">
+					<button
+						type="button"
+						class="text-gray-700 block font-normal w-full text-left px-4 py-2 text-sm hover:bg-gray-100 hover:text-gray-900"
+						role="menuitem"
+						tabindex="-1"
+						on:click={() => {
+							close()
+							goto('/workspace_settings?tab=premium')
+						}}>Premium plan</button
+					>
+				</div>
+			{/if}
 		{/if}
 	</div>
 </Menu>

package/components/sidebar/UserMenu.svelte.d.ts

@@ -4,9 +4,6 @@ declare const __propDef: {
         isCollapsed?: boolean | undefined;
     };
     events: {
-        'user-settings': CustomEvent<any>;
-        'superadmin-settings': CustomEvent<any>;
-    } & {
         [evt: string]: CustomEvent<any>;
     };
     slots: {};

package/components/sidebar/WorkspaceMenu.svelte

@@ -27,8 +27,10 @@ export let isCollapsed = false;
 			<table class="w-full">
 				{#each $userWorkspaces as workspace}
 					<tr
-						class="text-xs cursor-pointer hover:bg-gray-100"
+						class="text-xs 
+						{$workspaceStore === workspace.id ? 'cursor-default bg-blue-50' : 'cursor-pointer hover:bg-gray-100'}"
 						on:click={() => {
+							if($workspaceStore === workspace.id) { return }
 							switchWorkspace(workspace.id)
 							close()
 						}}

package/components/sidebar/settings.d.ts

@@ -0,0 +1,2 @@
+export declare const USER_SETTINGS_HASH: "#user-settings";
+export declare const SUPERADMIN_SETTINGS_HASH: "#superadmin-settings";

package/components/sidebar/settings.js

@@ -0,0 +1,2 @@
+export const USER_SETTINGS_HASH = '#user-settings';
+export const SUPERADMIN_SETTINGS_HASH = '#superadmin-settings';

package/gen/core/OpenAPI.js

@@ -1,6 +1,6 @@
 export const OpenAPI = {
     BASE: '/api',
-    VERSION: '1.59.0',
+    VERSION: '1.83.1',
     WITH_CREDENTIALS: false,
     CREDENTIALS: 'include',
     TOKEN: undefined,

package/gen/models/CompletedJob.d.ts

@@ -35,6 +35,7 @@ export type CompletedJob = {
     is_skipped: boolean;
     email: string;
     visible_to_owner: boolean;
+    mem_peak?: number;
 };
 export declare namespace CompletedJob {
     enum job_kind {

package/gen/models/FlowModule.d.ts

@@ -3,7 +3,6 @@ import type { InputTransform } from './InputTransform';
 import type { Retry } from './Retry';
 export type FlowModule = {
     id: string;
-    input_transforms?: Record<string, InputTransform>;
     value: FlowModuleValue;
     stop_after_if?: {
         skip_if_stopped?: boolean;

package/gen/models/QueuedJob.d.ts

@@ -33,6 +33,7 @@ export type QueuedJob = {
     language?: QueuedJob.language;
     email: string;
     visible_to_owner: boolean;
+    mem_peak?: number;
 };
 export declare namespace QueuedJob {
     enum job_kind {

package/gen/models/WorkerPing.d.ts

@@ -1,7 +1,7 @@
 export type WorkerPing = {
     worker: string;
     worker_instance: string;
-    ping_at: string;
+    last_ping?: number;
     started_at: string;
     ip: string;
     jobs_executed: number;

package/gen/services/FlowService.d.ts

@@ -134,4 +134,13 @@ export declare class FlowService {
         workspace: string;
         path: string;
     }): CancelablePromise<string>;
+    /**
+     * delete flow by path
+     * @returns string flow delete
+     * @throws ApiError
+     */
+    static deleteFlowByPath({ workspace, path, }: {
+        workspace: string;
+        path: string;
+    }): CancelablePromise<string>;
 }

package/gen/services/FlowService.js

@@ -142,4 +142,19 @@ export class FlowService {
             },
         });
     }
+    /**
+     * delete flow by path
+     * @returns string flow delete
+     * @throws ApiError
+     */
+    static deleteFlowByPath({ workspace, path, }) {
+        return __request(OpenAPI, {
+            method: 'DELETE',
+            url: '/w/{workspace}/flows/delete/{path}',
+            path: {
+                'workspace': workspace,
+                'path': path,
+            },
+        });
+    }
 }

package/gen/services/JobService.d.ts

@@ -40,7 +40,7 @@ export declare class JobService {
      * @returns any job result
      * @throws ApiError
      */
-    static runWaitResultScriptByPath({ workspace, path, requestBody, scheduledFor, scheduledInSecs, parentJob, includeHeader, }: {
+    static runWaitResultScriptByPath({ workspace, path, requestBody, scheduledFor, scheduledInSecs, parentJob, includeHeader, queueLimit, }: {
         workspace: string;
         path: string;
         /**
@@ -65,20 +65,53 @@ export declare class JobService {
          *
          */
         includeHeader?: string;
+        /**
+         * The maximum size of the queue for which the request would get rejected if that job would push it above that limit
+         *
+         */
+        queueLimit?: string;
+    }): CancelablePromise<any>;
+    /**
+     * run flow by path and wait until completion
+     * @returns any job result
+     * @throws ApiError
+     */
+    static runWaitResultFlowByPath({ workspace, path, requestBody, scheduledFor, scheduledInSecs, includeHeader, queueLimit, }: {
+        workspace: string;
+        path: string;
+        /**
+         * script args
+         */
+        requestBody: ScriptArgs;
+        /**
+         * when to schedule this job (leave empty for immediate run)
+         */
+        scheduledFor?: string;
+        /**
+         * schedule the script to execute in the number of seconds starting now
+         */
+        scheduledInSecs?: number;
+        /**
+         * List of headers's keys (separated with ',') whove value are added to the args
+         * Header's key lowercased and '-'' replaced to '_' such that 'Content-Type' becomes the 'content_type' arg key
+         *
+         */
+        includeHeader?: string;
+        /**
+         * The maximum size of the queue for which the request would get rejected if that job would push it above that limit
+         *
+         */
+        queueLimit?: string;
     }): CancelablePromise<any>;
     /**
      * get job result by id
      * @returns any job result
      * @throws ApiError
      */
-    static resultById({ workspace, flowJobId, nodeId, skipDirect, }: {
+    static resultById({ workspace, flowJobId, nodeId, }: {
         workspace: string;
         flowJobId: string;
         nodeId: string;
-        /**
-         * Skip checking that the node is part of the given flow.
-         */
-        skipDirect?: boolean;
     }): CancelablePromise<any>;
     /**
      * run flow by path
@@ -199,7 +232,7 @@ export declare class JobService {
      * @returns QueuedJob All available queued jobs
      * @throws ApiError
      */
-    static listQueue({ workspace, orderDesc, createdBy, parentJob, scriptPathExact, scriptPathStart, scriptHash, createdBefore, createdAfter, success, jobKinds, suspended, running, }: {
+    static listQueue({ workspace, orderDesc, createdBy, parentJob, scriptPathExact, scriptPathStart, scriptHash, startedBefore, startedAfter, success, jobKinds, suspended, running, args, result, }: {
         workspace: string;
         /**
          * order by desc order (default true)
@@ -228,11 +261,11 @@ export declare class JobService {
         /**
          * filter on created before (inclusive) timestamp
          */
-        createdBefore?: string;
+        startedBefore?: string;
         /**
          * filter on created after (exclusive) timestamp
          */
-        createdAfter?: string;
+        startedAfter?: string;
         /**
          * filter on successful jobs
          */
@@ -249,13 +282,21 @@ export declare class JobService {
          * filter on running jobs
          */
         running?: boolean;
+        /**
+         * filter on jobs containing those args as a json subset (@> in postgres)
+         */
+        args?: string;
+        /**
+         * filter on jobs containing those result as a json subset (@> in postgres)
+         */
+        result?: string;
     }): CancelablePromise<Array<QueuedJob>>;
     /**
      * list all available completed jobs
      * @returns CompletedJob All available completed jobs
      * @throws ApiError
      */
-    static listCompletedJobs({ workspace, orderDesc, createdBy, parentJob, scriptPathExact, scriptPathStart, scriptHash, createdBefore, createdAfter, success, jobKinds, isSkipped, isFlowStep, }: {
+    static listCompletedJobs({ workspace, orderDesc, createdBy, parentJob, scriptPathExact, scriptPathStart, scriptHash, startedBefore, startedAfter, success, jobKinds, args, result, isSkipped, isFlowStep, }: {
         workspace: string;
         /**
          * order by desc order (default true)
@@ -284,11 +325,11 @@ export declare class JobService {
         /**
          * filter on created before (inclusive) timestamp
          */
-        createdBefore?: string;
+        startedBefore?: string;
         /**
          * filter on created after (exclusive) timestamp
          */
-        createdAfter?: string;
+        startedAfter?: string;
         /**
          * filter on successful jobs
          */
@@ -297,6 +338,14 @@ export declare class JobService {
          * filter on job kind (values 'preview', 'script', 'dependencies', 'flow') separated by,
          */
         jobKinds?: string;
+        /**
+         * filter on jobs containing those args as a json subset (@> in postgres)
+         */
+        args?: string;
+        /**
+         * filter on jobs containing those result as a json subset (@> in postgres)
+         */
+        result?: string;
         /**
          * is the job skipped
          */
@@ -311,7 +360,7 @@ export declare class JobService {
      * @returns Job All jobs
      * @throws ApiError
      */
-    static listJobs({ workspace, createdBy, parentJob, scriptPathExact, scriptPathStart, scriptHash, createdBefore, createdAfter, jobKinds, isSkipped, isFlowStep, success, }: {
+    static listJobs({ workspace, createdBy, parentJob, scriptPathExact, scriptPathStart, scriptHash, startedBefore, startedAfter, jobKinds, args, result, isSkipped, isFlowStep, success, }: {
         workspace: string;
         /**
          * mask to filter exact matching user creator
@@ -336,15 +385,23 @@ export declare class JobService {
         /**
          * filter on created before (inclusive) timestamp
          */
-        createdBefore?: string;
+        startedBefore?: string;
         /**
          * filter on created after (exclusive) timestamp
          */
-        createdAfter?: string;
+        startedAfter?: string;
         /**
          * filter on job kind (values 'preview', 'script', 'dependencies', 'flow') separated by,
          */
         jobKinds?: string;
+        /**
+         * filter on jobs containing those args as a json subset (@> in postgres)
+         */
+        args?: string;
+        /**
+         * filter on jobs containing those result as a json subset (@> in postgres)
+         */
+        result?: string;
         /**
          * is the job skipped
          */
@@ -381,6 +438,7 @@ export declare class JobService {
         running?: boolean;
         completed?: boolean;
         new_logs?: string;
+        mem_peak?: number;
     }>;
     /**
      * get completed job
@@ -391,6 +449,15 @@ export declare class JobService {
         workspace: string;
         id: string;
     }): CancelablePromise<CompletedJob>;
+    /**
+     * get completed job result
+     * @returns any result
+     * @throws ApiError
+     */
+    static getCompletedJobResult({ workspace, id, }: {
+        workspace: string;
+        id: string;
+    }): CancelablePromise<any>;
     /**
      * delete completed job (erase content but keep run id)
      * @returns CompletedJob job details
@@ -415,6 +482,21 @@ export declare class JobService {
             reason?: string;
         };
     }): CancelablePromise<string>;
+    /**
+     * force cancel queued job
+     * @returns string job canceled
+     * @throws ApiError
+     */
+    static forceCancelQueuedJob({ workspace, id, requestBody, }: {
+        workspace: string;
+        id: string;
+        /**
+         * reason
+         */
+        requestBody: {
+            reason?: string;
+        };
+    }): CancelablePromise<string>;
     /**
      * create an HMac signature given a job id and a resume id
      * @returns string job signature

package/gen/services/JobService.js

@@ -29,7 +29,7 @@ export class JobService {
      * @returns any job result
      * @throws ApiError
      */
-    static runWaitResultScriptByPath({ workspace, path, requestBody, scheduledFor, scheduledInSecs, parentJob, includeHeader, }) {
+    static runWaitResultScriptByPath({ workspace, path, requestBody, scheduledFor, scheduledInSecs, parentJob, includeHeader, queueLimit, }) {
         return __request(OpenAPI, {
             method: 'POST',
             url: '/w/{workspace}/jobs/run_wait_result/p/{path}',
@@ -42,6 +42,30 @@ export class JobService {
                 'scheduled_in_secs': scheduledInSecs,
                 'parent_job': parentJob,
                 'include_header': includeHeader,
+                'queue_limit': queueLimit,
+            },
+            body: requestBody,
+            mediaType: 'application/json',
+        });
+    }
+    /**
+     * run flow by path and wait until completion
+     * @returns any job result
+     * @throws ApiError
+     */
+    static runWaitResultFlowByPath({ workspace, path, requestBody, scheduledFor, scheduledInSecs, includeHeader, queueLimit, }) {
+        return __request(OpenAPI, {
+            method: 'POST',
+            url: '/w/{workspace}/jobs/run_wait_result/f/{path}',
+            path: {
+                'workspace': workspace,
+                'path': path,
+            },
+            query: {
+                'scheduled_for': scheduledFor,
+                'scheduled_in_secs': scheduledInSecs,
+                'include_header': includeHeader,
+                'queue_limit': queueLimit,
             },
             body: requestBody,
             mediaType: 'application/json',
@@ -52,7 +76,7 @@ export class JobService {
      * @returns any job result
      * @throws ApiError
      */
-    static resultById({ workspace, flowJobId, nodeId, skipDirect, }) {
+    static resultById({ workspace, flowJobId, nodeId, }) {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/w/{workspace}/jobs/result_by_id/{flow_job_id}/{node_id}',
@@ -61,9 +85,6 @@ export class JobService {
                 'flow_job_id': flowJobId,
                 'node_id': nodeId,
             },
-            query: {
-                'skip_direct': skipDirect,
-            },
         });
     }
     /**
@@ -159,7 +180,7 @@ export class JobService {
      * @returns QueuedJob All available queued jobs
      * @throws ApiError
      */
-    static listQueue({ workspace, orderDesc, createdBy, parentJob, scriptPathExact, scriptPathStart, scriptHash, createdBefore, createdAfter, success, jobKinds, suspended, running, }) {
+    static listQueue({ workspace, orderDesc, createdBy, parentJob, scriptPathExact, scriptPathStart, scriptHash, startedBefore, startedAfter, success, jobKinds, suspended, running, args, result, }) {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/w/{workspace}/jobs/queue/list',
@@ -173,12 +194,14 @@ export class JobService {
                 'script_path_exact': scriptPathExact,
                 'script_path_start': scriptPathStart,
                 'script_hash': scriptHash,
-                'created_before': createdBefore,
-                'created_after': createdAfter,
+                'started_before': startedBefore,
+                'started_after': startedAfter,
                 'success': success,
                 'job_kinds': jobKinds,
                 'suspended': suspended,
                 'running': running,
+                'args': args,
+                'result': result,
             },
         });
     }
@@ -187,7 +210,7 @@ export class JobService {
      * @returns CompletedJob All available completed jobs
      * @throws ApiError
      */
-    static listCompletedJobs({ workspace, orderDesc, createdBy, parentJob, scriptPathExact, scriptPathStart, scriptHash, createdBefore, createdAfter, success, jobKinds, isSkipped, isFlowStep, }) {
+    static listCompletedJobs({ workspace, orderDesc, createdBy, parentJob, scriptPathExact, scriptPathStart, scriptHash, startedBefore, startedAfter, success, jobKinds, args, result, isSkipped, isFlowStep, }) {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/w/{workspace}/jobs/completed/list',
@@ -201,10 +224,12 @@ export class JobService {
                 'script_path_exact': scriptPathExact,
                 'script_path_start': scriptPathStart,
                 'script_hash': scriptHash,
-                'created_before': createdBefore,
-                'created_after': createdAfter,
+                'started_before': startedBefore,
+                'started_after': startedAfter,
                 'success': success,
                 'job_kinds': jobKinds,
+                'args': args,
+                'result': result,
                 'is_skipped': isSkipped,
                 'is_flow_step': isFlowStep,
             },
@@ -215,7 +240,7 @@ export class JobService {
      * @returns Job All jobs
      * @throws ApiError
      */
-    static listJobs({ workspace, createdBy, parentJob, scriptPathExact, scriptPathStart, scriptHash, createdBefore, createdAfter, jobKinds, isSkipped, isFlowStep, success, }) {
+    static listJobs({ workspace, createdBy, parentJob, scriptPathExact, scriptPathStart, scriptHash, startedBefore, startedAfter, jobKinds, args, result, isSkipped, isFlowStep, success, }) {
         return __request(OpenAPI, {
             method: 'GET',
             url: '/w/{workspace}/jobs/list',
@@ -228,9 +253,11 @@ export class JobService {
                 'script_path_exact': scriptPathExact,
                 'script_path_start': scriptPathStart,
                 'script_hash': scriptHash,
-                'created_before': createdBefore,
-                'created_after': createdAfter,
+                'started_before': startedBefore,
+                'started_after': startedAfter,
                 'job_kinds': jobKinds,
+                'args': args,
+                'result': result,
                 'is_skipped': isSkipped,
                 'is_flow_step': isFlowStep,
                 'success': success,
@@ -286,6 +313,21 @@ export class JobService {
             },
         });
     }
+    /**
+     * get completed job result
+     * @returns any result
+     * @throws ApiError
+     */
+    static getCompletedJobResult({ workspace, id, }) {
+        return __request(OpenAPI, {
+            method: 'GET',
+            url: '/w/{workspace}/jobs/completed/get_result/{id}',
+            path: {
+                'workspace': workspace,
+                'id': id,
+            },
+        });
+    }
     /**
      * delete completed job (erase content but keep run id)
      * @returns CompletedJob job details
@@ -309,7 +351,24 @@ export class JobService {
     static cancelQueuedJob({ workspace, id, requestBody, }) {
         return __request(OpenAPI, {
             method: 'POST',
-            url: '/w/{workspace}/jobs/queue/cancel/{id}',
+            url: '/w/{workspace}/jobs_u/queue/cancel/{id}',
+            path: {
+                'workspace': workspace,
+                'id': id,
+            },
+            body: requestBody,
+            mediaType: 'application/json',
+        });
+    }
+    /**
+     * force cancel queued job
+     * @returns string job canceled
+     * @throws ApiError
+     */
+    static forceCancelQueuedJob({ workspace, id, requestBody, }) {
+        return __request(OpenAPI, {
+            method: 'POST',
+            url: '/w/{workspace}/jobs_u/queue/force_cancel/{id}',
             path: {
                 'workspace': workspace,
                 'id': id,

package/gen/services/ScriptService.d.ts

@@ -216,7 +216,7 @@ export declare class ScriptService {
         hash: string;
     }): CancelablePromise<Script>;
     /**
-     * delete script by hash (erase content but keep hash)
+     * delete script by hash (erase content but keep hash, require admin)
      * @returns Script script details
      * @throws ApiError
      */
@@ -224,6 +224,15 @@ export declare class ScriptService {
         workspace: string;
         hash: string;
     }): CancelablePromise<Script>;
+    /**
+     * delete all scripts at a given path (require admin)
+     * @returns string script path
+     * @throws ApiError
+     */
+    static deleteScriptByPath({ workspace, path, }: {
+        workspace: string;
+        path: string;
+    }): CancelablePromise<string>;
     /**
      * get script by path
      * @returns Script script details