@datalayer/core 1.0.22 → 1.0.23

package/lib/components/billing/BillableAccountSelect.js

@@ -12,7 +12,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * only need to provide a value/onChange pair and optionally observe the full
  * resolved account via `onSelectedAccountChange`.
  */
-import { useCallback, useEffect, useMemo, Fragment } from 'react';
+import { useCallback, useEffect, useMemo, useRef, Fragment } from 'react';
 import { ActionList, ActionMenu, Button, Flash, FormControl, Label, Spinner, Text, } from '@primer/react';
 import { OrganizationIcon, PeopleIcon, PersonIcon, } from '@primer/octicons-react';
 import { Box } from '@datalayer/primer-addons';
@@ -196,6 +196,9 @@ export function BillableAccountSelect({ value, onChange, onSelectedAccountChange
             : undefined;
         if (fromCookie)
             return fromCookie;
+        const personalEligible = eligibleBillable.find(a => a.accountType === 'user' && a.accountUid === personalAccountUid);
+        if (personalEligible)
+            return personalEligible;
         const byPrincipal = selectedPrincipalUid
             ? eligibleBillable.find(account => {
                 if (account.accountUid !== selectedPrincipalUid)
@@ -209,9 +212,6 @@ export function BillableAccountSelect({ value, onChange, onSelectedAccountChange
             : undefined;
         if (byPrincipal)
             return byPrincipal;
-        const personalEligible = eligibleBillable.find(a => a.accountType === 'user' && a.accountUid === personalAccountUid);
-        if (personalEligible)
-            return personalEligible;
         const firstOrg = eligibleBillable.find(a => a.accountType === 'organization');
         if (preferOrganizationDefault && firstOrg)
             return firstOrg;
@@ -228,10 +228,45 @@ export function BillableAccountSelect({ value, onChange, onSelectedAccountChange
         writeBillableAccountCookie(accountUid);
         onChange(accountUid);
     }, [onChange]);
+    // Apply persisted selection (cookie) once accounts are resolved. Runs once
+    // per mount so users can still change selection afterwards; falls back to
+    // personal user account when the stored uid is unknown/ineligible.
+    const initialSelectionAppliedRef = useRef(false);
+    useEffect(() => {
+        if (isLoading)
+            return;
+        if (initialSelectionAppliedRef.current)
+            return;
+        if (eligibleBillable.length === 0 && accounts.length === 0)
+            return;
+        initialSelectionAppliedRef.current = true;
+        const storedAccount = storedBillableAccountUid
+            ? eligibleBillable.find(a => a.accountUid === storedBillableAccountUid)
+            : undefined;
+        const personalAccount = eligibleBillable.find(a => a.accountType === 'user' && a.accountUid === personalAccountUid);
+        const target = storedAccount || personalAccount || preferredEligible;
+        if (!target)
+            return;
+        if (target.accountUid !== value) {
+            writeBillableAccountCookie(target.accountUid);
+            onChange(target.accountUid);
+        }
+    }, [
+        isLoading,
+        accounts,
+        eligibleBillable,
+        storedBillableAccountUid,
+        personalAccountUid,
+        preferredEligible,
+        value,
+        onChange,
+    ]);
     // Auto-select a sensible default when current value is empty/ineligible.
     useEffect(() => {
         if (isLoading)
             return;
+        if (!initialSelectionAppliedRef.current)
+            return;
         if (!preferredEligible) {
             if (value)
                 onChange('');
@@ -239,6 +274,7 @@ export function BillableAccountSelect({ value, onChange, onSelectedAccountChange
         }
         const current = accounts.find(a => a.accountUid === value);
         if (!current || !current.isEligible) {
+            writeBillableAccountCookie(preferredEligible.accountUid);
             onChange(preferredEligible.accountUid);
         }
     }, [isLoading, preferredEligible, accounts, value, onChange]);

package/lib/components/display/JupyterDialog.d.ts

@@ -33,6 +33,11 @@ export interface IDialogWrapperOptions<T> {
      * The top level text for the dialog.
      */
     title: string;
+    /**
+     * Optional async hook called before an accept button closes the dialog.
+     * Return false to keep the dialog open.
+     */
+    onWillAccept: (result: Dialog.IResult<T>) => Promise<boolean | void> | boolean | void;
 }
 /**
  * A primer dialog mimicking the JupyterLab dialog interface
@@ -45,6 +50,8 @@ export declare class JupyterDialog<T> extends ReactWidget {
     protected buttons: Dialog.IButton[];
     protected host: HTMLElement;
     protected dialogTitle?: string;
+    protected onWillAccept?: (result: Dialog.IResult<T>) => Promise<boolean | void> | boolean | void;
+    private _pendingButtonIndex;
     private _closing;
     private _result;
     /**
@@ -60,7 +67,7 @@ export declare class JupyterDialog<T> extends ReactWidget {
      * @returns a promise that resolves with the result of the dialog.
      */
     launch(): Promise<Dialog.IResult<T>>;
-    protected handleButton: (idx: number) => void;
+    protected handleButton: (idx: number) => Promise<void>;
     protected setButton: (button: Dialog.IButton) => void;
     protected setChecked: (c: boolean) => void;
     protected setValue: (v: T | Error) => void;

package/lib/components/display/JupyterDialog.js

@@ -9,7 +9,7 @@ import { ReactWidget } from '@jupyterlab/ui-components';
 import { PromiseDelegate } from '@lumino/coreutils';
 import { Widget } from '@lumino/widgets';
 import { FocusKeys } from '@primer/behaviors';
-import { Checkbox, FormControl, useFocusZone } from '@primer/react';
+import { Checkbox, FormControl, Spinner, useFocusZone } from '@primer/react';
 import { Dialog as PrimerDialog, } from '@primer/react/experimental';
 import { JupyterReactTheme } from '@datalayer/jupyter-react';
 function DialogFooter(props) {
@@ -33,6 +33,8 @@ export class JupyterDialog extends ReactWidget {
     buttons;
     host;
     dialogTitle;
+    onWillAccept;
+    _pendingButtonIndex = null;
     _closing = new PromiseDelegate();
     _result = {
         button: null,
@@ -52,6 +54,7 @@ export class JupyterDialog extends ReactWidget {
             Dialog.okButton(),
         ];
         this.dialogTitle = options.title;
+        this.onWillAccept = options.onWillAccept;
     }
     _renderBody = (props) => (_jsx(PrimerDialog.Body, { children: createElement(this.body, {
             ...props,
@@ -61,7 +64,11 @@ export class JupyterDialog extends ReactWidget {
     render() {
         // TODO title color is enforced for JupyterLab.
         // This may be fixed in the jupyter-react theme (Primer generates h1 for the dialog title).
-        return (_jsx(JupyterReactTheme, { children: _jsx(PrimerDialog, { title: _jsx("span", { style: { color: 'var(--fgColor-default)' }, children: this.dialogTitle }), onClose: this.close, renderBody: this._renderBody, renderFooter: this._renderFooter, footerButtons: this.buttons.map((but, idx) => {
+        return (_jsx(JupyterReactTheme, { children: _jsx(PrimerDialog, { title: _jsx("span", { style: { color: 'var(--fgColor-default)' }, children: this.dialogTitle }), onClose: () => {
+                    if (this._pendingButtonIndex === null) {
+                        this.close();
+                    }
+                }, renderBody: this._renderBody, renderFooter: this._renderFooter, footerButtons: this.buttons.map((but, idx) => {
                     const footerButton = {
                         buttonType: but.displayType === 'default'
                             ? but.accept
@@ -71,8 +78,9 @@ export class JupyterDialog extends ReactWidget {
                         onClick: () => {
                             this.handleButton(idx);
                         },
-                        content: but.label,
+                        content: this._pendingButtonIndex === idx ? (_jsx(Spinner, { size: "small" })) : (but.label),
                         'aria-label': but.ariaLabel,
+                        disabled: this._pendingButtonIndex !== null,
                         autoFocus: but.accept,
                     };
                     return footerButton;
@@ -88,8 +96,30 @@ export class JupyterDialog extends ReactWidget {
         await this._closing.promise;
         return this._result;
     }
-    handleButton = (idx) => {
-        this.setButton(this.buttons[idx]);
+    handleButton = async (idx) => {
+        if (this._pendingButtonIndex !== null) {
+            return;
+        }
+        const button = this.buttons[idx];
+        this.setButton(button);
+        if (button.accept && this.onWillAccept) {
+            this._pendingButtonIndex = idx;
+            this.update();
+            try {
+                const shouldClose = await this.onWillAccept(this._result);
+                if (shouldClose === false) {
+                    this._pendingButtonIndex = null;
+                    this.update();
+                    return;
+                }
+            }
+            catch (error) {
+                this._pendingButtonIndex = null;
+                this.update();
+                throw error;
+            }
+        }
+        this._pendingButtonIndex = null;
         this.close();
     };
     setButton = (button) => {
@@ -107,6 +137,9 @@ export class JupyterDialog extends ReactWidget {
         }
     };
     close = () => {
+        if (this._pendingButtonIndex !== null) {
+            return;
+        }
         Widget.detach(this);
         this._closing.resolve();
     };

package/lib/components/runtimes/RuntimeLauncherDialog.d.ts

@@ -46,6 +46,10 @@ export interface IRuntimeLauncherDialogProps {
      * Upgrade subscription URL
      */
     upgradeSubscription?: string;
+    /**
+     * Optional submit button label override.
+     */
+    submitLabel?: string;
 }
 /**
  * Start Runtime Launcher Dialog.

package/lib/components/runtimes/RuntimeLauncherDialog.js

@@ -31,8 +31,9 @@ const NOT_AVAILABLE_RETRIES = 5;
  * Start Runtime Launcher Dialog.
  */
 export function RuntimeLauncherDialog(props) {
-    const { dialogTitle, kernelSnapshot, manager, onSubmit, markdownParser, sanitizer, upgradeSubscription, startRuntime = true, } = props;
+    const { dialogTitle, kernelSnapshot, manager, onSubmit, markdownParser, sanitizer, upgradeSubscription, submitLabel, startRuntime = true, } = props;
     const hasExample = startRuntime === 'with-example';
+    const shouldStartRuntime = startRuntime !== 'defer';
     const user = iamStore.getState().user;
     const environments = manager.environments.get();
     const { configuration } = useCoreStore();
@@ -49,7 +50,7 @@ export function RuntimeLauncherDialog(props) {
     const jupyterReactStore = useJupyterReactStore();
     const jupyterLabAdapter = jupyterReactStore.jupyterLabAdapter;
     const [selection, setSelection] = useState((kernelSnapshot?.environment || environments[0]?.name) ?? '');
-    const [timeLimit, setTimeLimit] = useState(Math.min(credits?.available ?? 0, 10));
+    const [timeLimit, setTimeLimit] = useState(10);
     const [runtimeName, setRuntimeName] = useState(environments[0]?.runtime?.givenNameTemplate || environments[0]?.title || '');
     // Whether the runtim name has been changed by the user or not
     const [hasCustomRuntimeName, setHasCustomRuntimeName] = useState(false);
@@ -60,16 +61,36 @@ export function RuntimeLauncherDialog(props) {
     const [flashLevel, setFlashLevel] = useState('danger');
     const isMounted = useIsMounted();
     useEffect(() => {
-        if (startRuntime) {
+        if (shouldStartRuntime) {
             refreshCredits();
         }
-    }, [startRuntime]);
+    }, [shouldStartRuntime]);
     const spec = useMemo(() => environments.find(spec => spec.name === selection), [environments, selection]);
     const description = spec?.description ?? '';
     const burningRate = spec?.burning_rate ?? 1;
     const creditsToMinutes = 1.0 / burningRate / 60.0;
-    const max = Math.floor((credits?.available ?? 0) * creditsToMinutes);
-    const outOfCredits = startRuntime && (!credits?.available || max < Number.EPSILON);
+    const includedRuns = user?.subscription?.usage?.included_runs ??
+        user?.subscription?.included_runs;
+    const currentRuns = user?.subscription?.usage?.current_runs ??
+        user?.subscription?.current_runs ??
+        user?.subscription?.used_runs;
+    const hasKnownRunAllowance = typeof includedRuns === 'number';
+    const hasRemainingRuns = hasKnownRunAllowance &&
+        typeof currentRuns === 'number' &&
+        includedRuns > 0 &&
+        currentRuns < includedRuns;
+    const hasKnownCredits = typeof credits?.available === 'number';
+    const maxFromCredits = hasKnownCredits
+        ? Math.floor((credits.available ?? 0) * creditsToMinutes)
+        : 10;
+    const effectiveMaxMinutes = hasKnownCredits && hasKnownRunAllowance && !hasRemainingRuns
+        ? Math.max(1, maxFromCredits)
+        : Math.max(10, maxFromCredits > 0 ? maxFromCredits : 0);
+    const outOfCredits = shouldStartRuntime &&
+        hasKnownCredits &&
+        hasKnownRunAllowance &&
+        !hasRemainingRuns &&
+        ((credits.available ?? 0) <= 0 || maxFromCredits < Number.EPSILON);
     const handleSelectionChange = useCallback((e) => {
         const selection = e.target.value;
         setSelection(selection);
@@ -81,7 +102,7 @@ export function RuntimeLauncherDialog(props) {
     const handleSubmitRuntime = useCallback(async () => {
         if (selection) {
             setError(undefined);
-            setWaitingForRuntime(true);
+            setWaitingForRuntime(shouldStartRuntime);
             const spec = environments.find(s => s.name === selection);
             const desc = {
                 name: selection,
@@ -99,7 +120,7 @@ export function RuntimeLauncherDialog(props) {
                 desc.params['capabilities'] = ['user_storage'];
             }
             let success = true;
-            if (startRuntime && startRuntime !== 'defer') {
+            if (shouldStartRuntime) {
                 success = false;
                 let availableTrial = 1;
                 let retryDelay = NOT_AVAILABLE_INIT_RETRY;
@@ -178,6 +199,9 @@ export function RuntimeLauncherDialog(props) {
                 success = await startNewKernel();
             }
             if (success && isMounted()) {
+                if (!shouldStartRuntime) {
+                    setWaitingForRuntime(false);
+                }
                 onSubmit(desc);
             }
         }
@@ -191,6 +215,7 @@ export function RuntimeLauncherDialog(props) {
         openExample,
         jupyterLabAdapter,
         timeLimit,
+        shouldStartRuntime,
         isMounted,
     ]);
     const handleUserStorageChange = useCallback((e) => {
@@ -228,8 +253,8 @@ export function RuntimeLauncherDialog(props) {
             {
                 buttonType: 'primary',
                 onClick: handleSubmitRuntime,
-                content: waitingForRuntime ? (_jsx(Spinner, { size: "small" })) : (startRuntime ?? true) ? ('Launch') : ('Assign from the Environment'),
-                disabled: waitingForRuntime || outOfCredits || timeLimit < Number.EPSILON,
+                content: waitingForRuntime ? (_jsx(Spinner, { size: "small" })) : ((submitLabel ?? ((startRuntime ?? true) ? 'Launch' : 'Assign'))),
+                disabled: waitingForRuntime || !selection || outOfCredits,
                 autoFocus: true,
             },
         ], children: _jsxs(Box, { as: "form", onKeyDown: event => {
@@ -244,7 +269,7 @@ export function RuntimeLauncherDialog(props) {
                         ? () => {
                             navigate(USAGE_ROUTE);
                         }
-                        : undefined, disabled: outOfCredits, label: 'Time reservation', max: max, time: timeLimit, burningRate: burningRate, onTimeChange: setTimeLimit, error: outOfCredits ? 'You must add credits to your account.' : undefined })), !configuration.whiteLabel && (_jsxs(FormControl, { layout: "horizontal", children: [_jsxs(FormControl.Label, { id: "user-storage-label", children: ["User storage", _jsx(Tooltip, { text: 'The runtime will be slower to start.', direction: "e", style: { marginLeft: 3 }, children: _jsx(IconButton, { icon: AlertIcon, "aria-label": "", variant: "invisible" }) })] }), _jsx(ToggleSwitch, { checked: userStorage, size: "small", onClick: handleUserStorageChange, "aria-labelledby": "user-storage-label" })] })), _jsxs(FormControl, { sx: { paddingTop: '10px' }, children: [_jsx(FormControl.Label, { children: "Runtime name" }), _jsx(TextInput, { name: "name", value: runtimeName, onChange: handleKernelNameChange, block: true })] }), hasExample &&
+                        : undefined, disabled: outOfCredits, label: 'Time reservation', max: effectiveMaxMinutes, time: timeLimit, burningRate: burningRate, onTimeChange: setTimeLimit, error: outOfCredits ? 'You must add credits to your account.' : undefined })), !configuration.whiteLabel && (_jsxs(FormControl, { layout: "horizontal", children: [_jsxs(FormControl.Label, { id: "user-storage-label", children: ["User storage", _jsx(Tooltip, { text: 'The runtime will be slower to start.', direction: "e", style: { marginLeft: 3 }, children: _jsx(IconButton, { icon: AlertIcon, "aria-label": "", variant: "invisible" }) })] }), _jsx(ToggleSwitch, { checked: userStorage, size: "small", onClick: handleUserStorageChange, "aria-labelledby": "user-storage-label" })] })), _jsxs(FormControl, { sx: { paddingTop: '10px' }, children: [_jsx(FormControl.Label, { children: "Runtime name" }), _jsx(TextInput, { name: "name", value: runtimeName, onChange: handleKernelNameChange, block: true })] }), hasExample &&
                     jupyterLabAdapter?.jupyterLab &&
                     !configuration.whiteLabel && (_jsxs(FormControl, { sx: { paddingTop: '10px' }, children: [_jsx(FormControl.Label, { id: "open-example-label", children: "Open example notebook" }), _jsx(ToggleSwitch, { disabled: !environments.find(spec => spec.name === selection)?.example, checked: openExample, size: "small", onClick: handleSwitchClick, "aria-labelledby": "open-example-label" })] })), error && (_jsx(FlashClosable, { variant: flashLevel, actions: navigate && upgradeSubscription && flashLevel === 'warning' ? (_jsx(Button, { onClick: handleUpgrade, title: 'Upgrade your subscription.', children: "Upgrade" })) : undefined, children: error }))] }) }));
 }

package/lib/components/runtimes/RuntimePickerCell.js

@@ -99,6 +99,6 @@ export function RuntimePickerCell(props) {
     const datalayerMeta = model.getMetadata('datalayer') ?? {};
     return (_jsxs(_Fragment, { children: [_jsx(RuntimePickerBase, { display: "menu", filterRuntime: filterKernel, preference: preference, multiServiceManager: multiServiceManager, runtimeDesc: datalayerMeta.kernel ? datalayerMeta.kernel : undefined, setRuntimeDesc: setSelectedRuntimeDesc, variant: 'cell', preActions: _jsxs(ActionList.Item, { disabled: !multiServiceManager.remote, onSelect: setCell, selected: hasCellRuntime, title: !multiServiceManager.remote
                         ? 'You are not connected with Datalayer.'
-                        : 'Assign a new temporary Runtime on each Cell execution.', children: [_jsx(ActionList.LeadingVisual, { children: _jsx(CloudUploadIcon, {}) }), trans.__('Assign a Cell Runtime')] }), postActions: token || !logIn ? (_jsxs(_Fragment, { children: [RuntimeSnippetsFacade.supports(preference?.language ?? '') && (_jsx(ActionList.Item, { onSelect: openVariableDialog, disabled: !isForeign, title: trans.__('Define variables to transfer between the document kernel and the cell kernel.'), children: trans.__('Define Cell Variables Transfer') })), !configuration.whiteLabel && (_jsx(ActionList.Item, { onSelect: openSnippetDialog, disabled: snippets.length === 0, title: trans.__('Inject a code snippet at the end of the cell.'), children: trans.__('Inject Code Snippet') }))] })) : (_jsx(ActionList.Item, { onSelect: props.logIn, title: 'Connect to the Runtime provider.', children: _jsx(ExternalTokenSilentLogin, { message: "Connect to the Runtime provider" }) })), translator: translator }), isVariableDialogOpen && (_jsx(RuntimeCellVariablesDialog, { model: model, onClose: closeVariableDialog, preference: preference, sessionContext: sessionContext, translator: translator })), isSnippetDialogOpen && (_jsx(SnippetDialog, { language: language, model: model, snippets: snippets, onClose: closeSnippetDialog, markdownParser: markdownParser, sanitizer: sanitizer })), isKernelDialogOpen && (_jsx(RuntimeLauncherDialog, { manager: multiServiceManager.remote, onSubmit: onStartRemote, startRuntime: false, markdownParser: markdownParser, sanitizer: sanitizer }))] }));
+                        : 'Assign a new temporary Runtime on each Cell execution.', children: [_jsx(ActionList.LeadingVisual, { children: _jsx(CloudUploadIcon, {}) }), trans.__('Assign a Cell Runtime')] }), postActions: token || !logIn ? (_jsxs(_Fragment, { children: [RuntimeSnippetsFacade.supports(preference?.language ?? '') && (_jsx(ActionList.Item, { onSelect: openVariableDialog, disabled: !isForeign, title: trans.__('Define variables to transfer between the document kernel and the cell kernel.'), children: trans.__('Define Cell Variables Transfer') })), !configuration.whiteLabel && (_jsx(ActionList.Item, { onSelect: openSnippetDialog, disabled: snippets.length === 0, title: trans.__('Inject a code snippet at the end of the cell.'), children: trans.__('Inject Code Snippet') }))] })) : (_jsx(ActionList.Item, { onSelect: props.logIn, title: 'Connect to the Runtime provider.', children: _jsx(ExternalTokenSilentLogin, { message: "Connect to the Runtime provider" }) })), translator: translator }), isVariableDialogOpen && (_jsx(RuntimeCellVariablesDialog, { model: model, onClose: closeVariableDialog, preference: preference, sessionContext: sessionContext, translator: translator })), isSnippetDialogOpen && (_jsx(SnippetDialog, { language: language, model: model, snippets: snippets, onClose: closeSnippetDialog, markdownParser: markdownParser, sanitizer: sanitizer })), isKernelDialogOpen && (_jsx(RuntimeLauncherDialog, { manager: multiServiceManager.remote, onSubmit: onStartRemote, startRuntime: true, submitLabel: "Assign", markdownParser: markdownParser, sanitizer: sanitizer }))] }));
 }
 export default RuntimePickerCell;

package/lib/components/runtimes/RuntimePickerNotebook.js

@@ -21,9 +21,9 @@ import { RuntimePickerBase } from './RuntimePickerBase.js';
 export function RuntimePickerNotebook(props) {
     const { multiServiceManager, sessionContext, setValue, translator } = props;
     const { configuration } = useCoreStore();
-    const { credits, refreshCredits, token } = useIAMStore();
+    const { credits, refreshCredits, token, user } = useIAMStore();
     const [selectedRuntimeDesc, setSelectedRuntimeDesc] = useState();
-    const [timeLimit, setTimeLimit] = useState(Math.min(credits?.available ?? 0, 10));
+    const [timeLimit, setTimeLimit] = useState(10);
     const [userStorage, setUserStorage] = useState(false);
     const [canTransferFrom, setTransferFrom] = useState(false);
     const [canTransferTo, setTransferTo] = useState(false);
@@ -112,31 +112,96 @@ export function RuntimePickerNotebook(props) {
         setUserStorage(!userStorage);
     }, [userStorage]);
     useEffect(() => {
-        const creditsLimit = selectedRuntimeDesc?.location === 'remote' &&
-            selectedRuntimeDesc.burningRate
-            ? Math.min(timeLimit, MAXIMAL_RUNTIME_TIME_RESERVATION_MINUTES) *
-                selectedRuntimeDesc.burningRate *
+        const resolvedBurningRate = selectedRuntimeDesc?.burningRate ??
+            multiServiceManager.remote?.environments
+                .get()
+                .find(env => env.name === selectedRuntimeDesc?.name)?.burning_rate;
+        const includedRuns = user?.subscription?.usage?.included_runs ??
+            user?.subscription?.included_runs;
+        const currentRuns = user?.subscription?.usage?.current_runs ??
+            user?.subscription?.current_runs ??
+            user?.subscription?.used_runs;
+        const hasKnownRunAllowance = typeof includedRuns === 'number';
+        const hasRemainingRuns = hasKnownRunAllowance &&
+            typeof currentRuns === 'number' &&
+            includedRuns > 0 &&
+            currentRuns < includedRuns;
+        const hasKnownCredits = typeof credits?.available === 'number';
+        const maxMinutes = selectedRuntimeDesc?.location === 'remote' && resolvedBurningRate
+            ? Math.floor((credits?.available ?? 0) / resolvedBurningRate / 60.0)
+            : undefined;
+        const effectiveTimeLimit = selectedRuntimeDesc?.location === 'remote'
+            ? Math.max(1, Math.min(timeLimit, maxMinutes && maxMinutes > 0 ? maxMinutes : 10))
+            : timeLimit;
+        const creditsLimit = selectedRuntimeDesc?.location === 'remote' && resolvedBurningRate
+            ? Math.min(effectiveTimeLimit, MAXIMAL_RUNTIME_TIME_RESERVATION_MINUTES) *
+                resolvedBurningRate *
                 60
             : undefined;
-        setValue(creditsLimit !== 0
-            ? {
-                runtime: selectedRuntimeDesc
-                    ? {
-                        environmentName: ['browser', 'remote'].includes(selectedRuntimeDesc.location)
-                            ? `${selectedRuntimeDesc.location}-${selectedRuntimeDesc.name}`
-                            : selectedRuntimeDesc.name,
-                        id: selectedRuntimeDesc.kernelId,
-                        creditsLimit,
-                        capabilities: userStorage ? ['user_storage'] : undefined,
-                    }
-                    : null,
-                selectedVariables: toTransfer,
+        const requiresRuntimeStart = !!selectedRuntimeDesc && !selectedRuntimeDesc.kernelId;
+        if (requiresRuntimeStart && selectedRuntimeDesc.location === 'remote') {
+            if (!resolvedBurningRate || !Number.isFinite(resolvedBurningRate)) {
+                setValue({ runtime: null, selectedVariables: toTransfer });
+                return;
+            }
+            if (hasKnownCredits &&
+                hasKnownRunAllowance &&
+                !hasRemainingRuns &&
+                (!creditsLimit || creditsLimit <= 0)) {
+                setValue({ runtime: null, selectedVariables: toTransfer });
+                return;
             }
-            : new Error('Credits limit must be strictly positive.'));
-    }, [selectedRuntimeDesc, userStorage, toTransfer, timeLimit]);
+        }
+        setValue({
+            runtime: selectedRuntimeDesc
+                ? {
+                    environmentName: ['browser', 'remote'].includes(selectedRuntimeDesc.location)
+                        ? `${selectedRuntimeDesc.location}-${selectedRuntimeDesc.name}`
+                        : selectedRuntimeDesc.name,
+                    id: selectedRuntimeDesc.kernelId,
+                    creditsLimit,
+                    capabilities: userStorage ? ['user_storage'] : undefined,
+                }
+                : null,
+            selectedVariables: toTransfer,
+        });
+    }, [
+        selectedRuntimeDesc,
+        userStorage,
+        toTransfer,
+        timeLimit,
+        multiServiceManager.remote,
+        credits?.available,
+        user,
+    ]);
     const { kernelPreference: { canStart }, } = sessionContext;
-    const max = Math.floor((credits?.available ?? 0) / (selectedRuntimeDesc?.burningRate ?? -1) / 60.0);
-    const outOfCredits = !credits?.available || max < Number.EPSILON;
+    const resolvedBurningRate = selectedRuntimeDesc?.burningRate ??
+        multiServiceManager.remote?.environments
+            .get()
+            .find(env => env.name === selectedRuntimeDesc?.name)?.burning_rate;
+    const maxFromCredits = resolvedBurningRate
+        ? Math.floor((credits?.available ?? 0) / resolvedBurningRate / 60.0)
+        : -1;
+    const includedRuns = user?.subscription?.usage?.included_runs ??
+        user?.subscription?.included_runs;
+    const currentRuns = user?.subscription?.usage?.current_runs ??
+        user?.subscription?.current_runs ??
+        user?.subscription?.used_runs;
+    const hasKnownRunAllowance = typeof includedRuns === 'number';
+    const hasRemainingRuns = hasKnownRunAllowance &&
+        typeof currentRuns === 'number' &&
+        includedRuns > 0 &&
+        currentRuns < includedRuns;
+    const hasKnownCredits = typeof credits?.available === 'number';
+    const effectiveMaxMinutes = selectedRuntimeDesc?.location === 'remote'
+        ? hasKnownCredits && hasKnownRunAllowance && !hasRemainingRuns
+            ? Math.max(1, maxFromCredits)
+            : Math.max(10, maxFromCredits > 0 ? maxFromCredits : 0)
+        : Math.max(1, maxFromCredits);
+    const outOfCredits = hasKnownCredits &&
+        hasKnownRunAllowance &&
+        !hasRemainingRuns &&
+        maxFromCredits < Number.EPSILON;
     return (_jsxs(Box, { as: "form", className: "dla-Runtimes-picker", children: [_jsx(Box, { sx: { padding: 'var(--stack-padding-condensed) 0' }, children: _jsx(RuntimePickerBase, { display: "radio", disabled: canStart === false, preference: {
                         id: sessionContext.session?.id,
                         kernelDisplayName: sessionContext.kernelPreference.shouldStart
@@ -156,7 +221,7 @@ export function RuntimePickerNotebook(props) {
                   </Button>
                   */
                     _jsx(_Fragment, {})) : (_jsx(ActionList.Item, { onSelect: props.logIn, title: 'Connect to Runtime provider.', children: _jsx(ExternalTokenSilentLogin, { message: "Connect to the Runtime provider" }) })) }) }), !selectedRuntimeDesc?.kernelId &&
-                selectedRuntimeDesc?.location === 'remote' && (_jsxs(_Fragment, { children: [_jsx(RuntimeReservationControl, { disabled: outOfCredits || selectedRuntimeDesc?.location !== 'remote', label: 'Time reservation', max: max < 0 ? 1 : max, time: timeLimit, onTimeChange: setTimeLimit, error: outOfCredits && max >= 0
+                selectedRuntimeDesc?.location === 'remote' && (_jsxs(_Fragment, { children: [_jsx(RuntimeReservationControl, { disabled: outOfCredits || selectedRuntimeDesc?.location !== 'remote', label: 'Time reservation', max: effectiveMaxMinutes, time: timeLimit, onTimeChange: setTimeLimit, error: outOfCredits && maxFromCredits >= 0
                             ? 'You must add credits to your account.'
                             : timeLimit === 0
                                 ? 'You must set a time limit.'

package/lib/components/runtimes/RuntimeReservationControl.js

@@ -18,7 +18,18 @@ export const MAXIMAL_RUNTIME_TIME_RESERVATION_MINUTES = 24 * 60;
  */
 export function RuntimeReservationControl(props) {
     const { addCredits, burningRate, disabled, error, label, max: maxProps, onTimeChange, time, } = props;
-    const max = Math.min(maxProps, MAXIMAL_RUNTIME_TIME_RESERVATION_MINUTES);
+    const max = Math.max(1, Math.min(maxProps, MAXIMAL_RUNTIME_TIME_RESERVATION_MINUTES));
+    const displayedTime = Number.isFinite(time)
+        ? Math.min(max, Math.max(1, time))
+        : 1;
+    const handleTimeChange = (valueOrEvent) => {
+        const rawValue = typeof valueOrEvent === 'number'
+            ? valueOrEvent
+            : parseFloat(valueOrEvent?.target?.value);
+        if (Number.isFinite(rawValue)) {
+            onTimeChange(Math.min(max, Math.max(1, rawValue)));
+        }
+    };
     // Temporary workaround to not show disabled components.
     const hidden = disabled;
     return !hidden ? (_jsxs(FormControl, { disabled: disabled, sx: { paddingBottom: 'var(--stack-padding-condensed)' }, children: [_jsx(FormControl.Label, { children: label }), _jsxs(Box, { style: {
@@ -27,7 +38,5 @@ export function RuntimeReservationControl(props) {
                     gridTemplateColumns: 'max-content 1fr max-content max-content',
                     gridGap: 'var(--stack-gap-condensed)',
                     width: '100%',
-                }, children: [_jsx(Slider, { step: 1, min: 1, max: max, value: time, onChange: onTimeChange, disabled: disabled, label: "", displayValue: false }), _jsx(TextInput, { type: "number", step: "1", min: "1", max: max, disabled: disabled, value: Math.min(max, time).toFixed(2), onChange: event => {
-                            onTimeChange(parseFloat(event.target.value));
-                        } }), (max === 0 || max > Number.EPSILON) && (_jsxs(_Fragment, { children: [_jsxs(Text, { children: ["out of ", maxProps, " available minutes"] }), addCredits && (_jsx(IconButton, { icon: PlusIcon, "aria-label": "Add credits", onClick: () => addCredits() }))] }))] }), _jsxs(FormControl.Caption, { children: ["Maximum execution time that can be consumed by the runtime. It must be less than ", (MAXIMAL_RUNTIME_TIME_RESERVATION_MINUTES / 60).toFixed(0), ' ', "hours.", burningRate && (_jsxs(_Fragment, { children: [_jsx("br", {}), `With the current value, the runtime execution will consume at most ${(time * burningRate * 60).toFixed(2)} credits.`] }))] }), error && (_jsx(FormControl.Validation, { variant: "error", children: error }))] })) : (_jsx(_Fragment, {}));
+                }, children: [_jsx(Slider, { step: 1, min: 1, max: max, value: displayedTime, onChange: handleTimeChange, disabled: disabled, label: "", displayValue: false }), _jsx(TextInput, { type: "number", step: "1", min: "1", max: max, disabled: disabled, value: displayedTime.toFixed(2), onChange: handleTimeChange }), (max === 0 || max > Number.EPSILON) && (_jsxs(_Fragment, { children: [_jsxs(Text, { children: ["out of ", maxProps, " available minutes"] }), addCredits && (_jsx(IconButton, { icon: PlusIcon, "aria-label": "Add credits", onClick: () => addCredits() }))] }))] }), _jsxs(FormControl.Caption, { children: ["Maximum execution time that can be consumed by the runtime. It must be less than ", (MAXIMAL_RUNTIME_TIME_RESERVATION_MINUTES / 60).toFixed(0), ' ', "hours.", burningRate && (_jsxs(_Fragment, { children: [_jsx("br", {}), `With the current value, the runtime execution will consume at most ${(time * burningRate * 60).toFixed(2)} credits.`] }))] }), error && (_jsx(FormControl.Validation, { variant: "error", children: error }))] })) : (_jsx(_Fragment, {}));
 }

package/lib/stateful/runtimes/actions.js

@@ -8,7 +8,7 @@
 import { URLExt } from '@jupyterlab/coreutils';
 import { PromiseDelegate } from '@lumino/coreutils';
 import { Upload } from 'tus-js-client';
-import { requestDatalayerAPI, } from '../../api/index.js';
+import { requestDatalayerAPI } from '../../api/index.js';
 import { asCodeSandboxSnapshot } from '../../models/index.js';
 import { iamStore, runtimesStore } from '../../state/index.js';
 /**
@@ -30,6 +30,12 @@ export async function getEnvironments() {
  */
 export async function createRuntime(options) {
     const { externalToken, token } = iamStore.getState();
+    if (typeof options.creditsLimit !== 'number' ||
+        !Number.isFinite(options.creditsLimit) ||
+        options.creditsLimit <= 0) {
+        throw new Error(`Invalid runtime creditsLimit for environment ${options.environmentName}. ` +
+            'A positive number is required.');
+    }
     const body = {
         environment_name: options.environmentName,
         type: options.type ?? 'notebook',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datalayer/core",
-  "version": "1.0.22",
+  "version": "1.0.23",
   "type": "module",
   "workspaces": [
     ".",