@marimo-team/frontend 0.22.4-dev0 → 0.22.4-dev10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/assets/{CellStatus-Cf0Jlrcs.js → CellStatus-Cj_aMmmE.js} +1 -1
- package/dist/assets/{ConnectedDataExplorerComponent-DUxaLoL7.js → ConnectedDataExplorerComponent-Dksi3IQd.js} +1 -1
- package/dist/assets/{JsonOutput-Ctdzcd2D.js → JsonOutput-heEAqE8H.js} +5 -5
- package/dist/assets/MarimoErrorOutput-EEO_bAbD.js +7 -0
- package/dist/assets/RenderHTML-CvgwqLt6.js +1 -0
- package/dist/assets/{add-cell-with-ai-C0J3LyiV.js → add-cell-with-ai-0ix1W1XL.js} +16 -16
- package/dist/assets/{add-connection-dialog-CEquGDgf.js → add-connection-dialog-C6EGRNCR.js} +1 -1
- package/dist/assets/{agent-panel-BxXEWtsJ.js → agent-panel-CEpFr5i0.js} +3 -3
- package/dist/assets/{ai-model-dropdown-D14GiszF.js → ai-model-dropdown-DeJNr_5y.js} +4 -4
- package/dist/assets/{app-config-button-v-557oRb.js → app-config-button-D_F4_5Oy.js} +1 -1
- package/dist/assets/{cell-editor-B8HsInsi.js → cell-editor-DAw6YxwR.js} +10 -10
- package/dist/assets/{cell-link-Cimoe3Fv.js → cell-link-CUOy8qvK.js} +1 -1
- package/dist/assets/cells-C9wzDxwr.js +229 -0
- package/dist/assets/{chat-display-hfpeXiYe.js → chat-display-CQUXzNpU.js} +1 -1
- package/dist/assets/{chat-panel-DxT370nA.js → chat-panel-C_NSR1GT.js} +1 -1
- package/dist/assets/{chat-ui-Dv4y0-td.js → chat-ui-Dy2xkVP7.js} +4 -4
- package/dist/assets/{column-preview-BlmqVfbV.js → column-preview-D9viH8oS.js} +1 -1
- package/dist/assets/{command-palette-B4mH4ZSa.js → command-palette-CYqukIao.js} +1 -1
- package/dist/assets/{common-BZK7spst.js → common-D_w2m-ro.js} +1 -1
- package/dist/assets/{components-DpxyscxU.js → components-CtW4EQ0a.js} +1 -1
- package/dist/assets/{components-D2OlyENc.js → components-DMCRbi3Y.js} +1 -1
- package/dist/assets/{config-CmaJdl9U.js → config-DCMsCquu.js} +1 -1
- package/dist/assets/{datasource-D9nfSxKS.js → datasource-o22Gadpo.js} +2 -2
- package/dist/assets/{dependency-graph-panel-5MbMtFss.js → dependency-graph-panel-CgvfWoUz.js} +4 -4
- package/dist/assets/{documentation-panel-DPdXS3YO.js → documentation-panel-BLrwS8mG.js} +1 -1
- package/dist/assets/{download-BFQaUFKI.js → download-Bpd05cN4.js} +3 -3
- package/dist/assets/{edit-page-hUrrzd-W.js → edit-page-ByLzpRKM.js} +7 -7
- package/dist/assets/{error-panel-DV8jpRsf.js → error-panel-ChRfACaA.js} +1 -1
- package/dist/assets/{file-explorer-panel-Bg6RAr5R.js → file-explorer-panel-DGIa-t9I.js} +3 -3
- package/dist/assets/{file-icons-DSJsG_mI.js → file-icons-BJUn_Zwi.js} +1 -1
- package/dist/assets/floating-outline-CEoUA-ND.js +1 -0
- package/dist/assets/{focus-C5u0JQUq.js → focus-4jo_CuOp.js} +1 -1
- package/dist/assets/{form-DkNMeOSQ.js → form-yizCLBQu.js} +1 -1
- package/dist/assets/{glide-data-editor-a3qLDl-r.js → glide-data-editor-B8IKnskT.js} +1 -1
- package/dist/assets/{globals-DK8gKReW.js → globals-CinMfY9h.js} +1 -1
- package/dist/assets/{home-page-BrqppCUS.js → home-page-tqfl2F4G.js} +2 -2
- package/dist/assets/{hooks-wt7ylZro.js → hooks-CKIyvt9N.js} +1 -1
- package/dist/assets/{html-to-image-BRbQwG7G.js → html-to-image-DN6TNqeX.js} +1 -1
- package/dist/assets/index-BNN_F0CC.css +2 -0
- package/dist/assets/index-CaFbHOEK.js +42 -0
- package/dist/assets/kiosk-mode-CMcS0n9N.js +1 -0
- package/dist/assets/layout-zIm4ogA2.js +5 -0
- package/dist/assets/{logs-panel-CNVgwoHO.js → logs-panel-D1sZXqHo.js} +1 -1
- package/dist/assets/{markdown-renderer-B91NzmVT.js → markdown-renderer-B-YFfOW1.js} +2 -2
- package/dist/assets/{mermaid-BQRzyqkQ.js → mermaid-CMMJIxJ5.js} +1 -1
- package/dist/assets/{name-cell-input-hsV_b1Op.js → name-cell-input-BpUnj_OW.js} +1 -1
- package/dist/assets/{outline-panel-C3jvSnZF.js → outline-panel-Cyc-3UPs.js} +1 -1
- package/dist/assets/{packages-panel-0_Z5vM7i.js → packages-panel-BKB49Pn0.js} +1 -1
- package/dist/assets/panels-C0kGoK7J.js +1 -0
- package/dist/assets/process-output-DRHgVscl.js +1 -0
- package/dist/assets/{readonly-python-code-oFCRG7Wt.js → readonly-python-code-BNv35LAm.js} +1 -1
- package/dist/assets/{renderShortcut-Bjt8kSBs.js → renderShortcut-9B7Z8taX.js} +1 -1
- package/dist/assets/{run-page-D7ezkhN_.js → run-page-BoiyjeoB.js} +1 -1
- package/dist/assets/{scratchpad-panel-BELUYBUe.js → scratchpad-panel-o2wFoJUh.js} +1 -1
- package/dist/assets/{session-panel-BfReO77m.js → session-panel-BoqrSaAQ.js} +1 -1
- package/dist/assets/{snippets-panel-CDqEDwpY.js → snippets-panel-DB9DRB1O.js} +1 -1
- package/dist/assets/{state-BBVlYaRC.js → state-BeEg2EJ6.js} +1 -1
- package/dist/assets/{state-BpEWsL00.js → state-Cybx0BE_.js} +3 -3
- package/dist/assets/{switch-DqrqDBdD.js → switch-BOBVe-9H.js} +1 -1
- package/dist/assets/{terminal-DXod4Bkk.js → terminal-BpQ9AtyJ.js} +1 -1
- package/dist/assets/{textarea-DJEKmYtw.js → textarea-DoPazz3x.js} +1 -1
- package/dist/assets/{tracing-panel-ksnvVrMH.js → tracing-panel-GFrltKb1.js} +2 -2
- package/dist/assets/{tracing-CLWi5jD3.js → tracing-qb2BTgvS.js} +1 -1
- package/dist/assets/{useAddCell-mJ1PkF-E.js → useAddCell-TIHLIw_p.js} +1 -1
- package/dist/assets/{useBoolean-DN8PHql0.js → useBoolean-Dvk5-C1P.js} +1 -1
- package/dist/assets/useCellActionButton-D6Wt_LnE.js +1 -0
- package/dist/assets/{useDeleteCell-B0OAS0ly.js → useDeleteCell-DHcT-SKt.js} +1 -1
- package/dist/assets/{useDependencyPanelTab-BuZ0fgAR.js → useDependencyPanelTab-B0iWJBOX.js} +1 -1
- package/dist/assets/{useHotkey-C05CMwqk.js → useHotkey-BY9xqWO8.js} +1 -1
- package/dist/assets/useNotebookActions-DGjP_qmV.js +1 -0
- package/dist/assets/useRunCells-DQQ6CB8T.js +1 -0
- package/dist/assets/{useSplitCell-CeL7eJq1.js → useSplitCell-CNLAHTUp.js} +1 -1
- package/dist/assets/{useTheme-wMq5x3Hi.js → useTheme-B1JCa4JT.js} +1 -1
- package/dist/assets/utils-8btzWeZg.js +1 -0
- package/dist/assets/{vega-component-CdvEZvzS.js → vega-component-BLi2Qo88.js} +1 -1
- package/dist/index.html +30 -30
- package/package.json +1 -1
- package/src/components/editor/TracebackModalContainer.tsx +22 -0
- package/src/components/editor/errors/traceback-modal.tsx +87 -0
- package/src/components/editor/output/MarimoErrorOutput.tsx +23 -3
- package/src/components/editor/renderers/vertical-layout/vertical-layout.tsx +16 -2
- package/src/components/ui/toast.tsx +3 -1
- package/src/core/MarimoApp.tsx +2 -0
- package/src/core/cells/__tests__/apply-transaction.test.ts +28 -0
- package/src/core/cells/cells.ts +13 -1
- package/src/core/cells/logs.ts +48 -9
- package/src/core/config/__tests__/config-schema.test.ts +2 -0
- package/src/core/config/config-schema.ts +1 -0
- package/src/core/errors/traceback-atom.ts +9 -0
- package/src/plugins/impl/anywidget/AnyWidgetPlugin.tsx +8 -6
- package/src/plugins/impl/anywidget/__tests__/AnyWidgetPlugin.test.tsx +25 -0
- package/dist/assets/MarimoErrorOutput-dTNCLY-Q.js +0 -7
- package/dist/assets/RenderHTML-C5GEp4ca.js +0 -1
- package/dist/assets/cells-CcsG9Aum.js +0 -229
- package/dist/assets/floating-outline-Cfa1ESSb.js +0 -1
- package/dist/assets/index-B_DGbLw5.js +0 -42
- package/dist/assets/index-BkdonYlq.css +0 -2
- package/dist/assets/kiosk-mode-Cu86-jaD.js +0 -1
- package/dist/assets/layout-CsKQkdEh.js +0 -5
- package/dist/assets/panels-D87Ptke4.js +0 -1
- package/dist/assets/process-output-CsvKn_Mr.js +0 -1
- package/dist/assets/useCellActionButton-4HWj1rt3.js +0 -1
- package/dist/assets/useNotebookActions-DXmWi5xU.js +0 -1
- package/dist/assets/useRunCells-Du76UV1R.js +0 -1
- package/dist/assets/utils-DKaC_ndw.js +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
import{s as z}from"./chunk-LvLJmgfZ.js";import{n as C}from"./useEvent-D91BmmQi.js";import{t as Y}from"./react-Bj1aDYRI.js";import"./react-dom-CSu739Rf.js";import{t as tt}from"./compiler-runtime-B3qBwwSJ.js";import{t as et}from"./debounce-BbSyBDA8.js";import{_,d as T}from"./useEventListener-DGjKht0c.js";import{n as V}from"./config-CmaJdl9U.js";import{t as nt}from"./cn-DYvqRARy.js";import{t as rt}from"./jsx-runtime-Blw4afVn.js";import"./fullscreen-k58KVlT-.js";import{t as at}from"./tooltip-DmqhBBs6.js";import{r as it}from"./button-BKVLeSTX.js";import{d as N}from"./arrays-DAC2orgH.js";import{u as ot}from"./toDate-BGIVWsZ9.js";import"./session-DDorezMU.js";import{r as lt}from"./useTheme-wMq5x3Hi.js";import{t as ct}from"./isValid-CtiDIjiD.js";import{a as st,r as mt,t as pt}from"./utils-COwZ1qVI.js";import{n as ut}from"./vega-loader.browser-CRZ52CKf.js";import{t as ft}from"./react-vega-o-uiEUqD.js";import"./defaultLocale-D_rSvXvJ.js";import"./defaultLocale-C92Rrpmf.js";import{r as dt,t as ht}from"./alert-DrrhKX67.js";import{n as gt}from"./error-banner-B3Vr5jH0.js";import{n as yt}from"./useAsyncData-BPlezez1.js";import{t as vt}from"./formats-Cl4zm1Jf.js";import{t as H}from"./useDeepCompareMemoize-Bj2wGMJg.js";var kt=tt(),S=z(Y(),1);function bt(t){return t.data&&"url"in t.data&&(t.data.url=V(t.data.url).href),t}const u={arc:"arc",area:"area",bar:"bar",image:"image",line:"line",point:"point",rect:"rect",rule:"rule",text:"text",tick:"tick",trail:"trail",circle:"circle",square:"square",geoshape:"geoshape"};var F=new Set(["boxplot","errorband","errorbar"]);const x={getMarkType(t){let e=typeof t=="string"?t:t.type;if(F.has(e))throw Error("Not supported");return e},isInteractive(t){let e=typeof t=="string"?t:t.type;return!F.has(e)},makeClickable(t){let e=typeof t=="string"?t:t.type;return e in u?typeof t=="string"?{type:t,cursor:"pointer",tooltip:!0}:{...t,type:e,cursor:"pointer",tooltip:!0}:t},getOpacity(t){return typeof t=="string"?null:"opacity"in t&&typeof t.opacity=="number"?t.opacity:null}},y={point(t){return t==null?"select_point":`select_point_${t}`},interval(t){return t==null?"select_interval":`select_interval_${t}`},legendSelection(t){return`legend_selection_${t}`},binColoring(t){return t==null?"bin_coloring":`bin_coloring_${t}`},HIGHLIGHT:"highlight",PAN_ZOOM:"pan_zoom",hasPoint(t){return t.some(e=>e.startsWith("select_point"))},hasInterval(t){return t.some(e=>e.startsWith("select_interval"))},hasLegend(t){return t.some(e=>e.startsWith("legend_selection"))},hasPanZoom(t){return t.some(e=>e.startsWith("pan_zoom"))},isBinColoring(t){return t.startsWith("bin_coloring")}},j={highlight(){return{name:y.HIGHLIGHT,select:{type:"point",on:"mouseover"}}},interval(t,e){return{name:y.interval(e),select:{type:"interval",encodings:W(t),mark:{fill:"#669EFF",fillOpacity:.07,stroke:"#669EFF",strokeOpacity:.4},on:"[mousedown[!event.metaKey], mouseup] > mousemove[!event.metaKey]",translate:"[mousedown[!event.metaKey], mouseup] > mousemove[!event.metaKey]"}}},point(t,e){return{name:y.point(e),select:{type:"point",encodings:W(t),on:"click[!event.metaKey]"}}},binColoring(t){return{name:y.binColoring(t),select:{type:"point",on:"click[!event.metaKey]"}}},legend(t){return{name:y.legendSelection(t),select:{type:"point",fields:[t]},bind:"legend"}},panZoom(){return{name:y.PAN_ZOOM,bind:"scales",select:{type:"interval",on:"[mousedown[event.metaKey], window:mouseup] > window:mousemove!",translate:"[mousedown[event.metaKey], window:mouseup] > window:mousemove!",zoom:"wheel![event.metaKey]"}}}};function W(t){switch(x.getMarkType(t.mark)){case u.image:case u.trail:return;case u.area:case u.arc:return["color"];case u.bar:{let e=wt(t);return e==="horizontal"?["y"]:e==="vertical"?["x"]:void 0}case u.circle:case u.geoshape:case u.line:case u.point:case u.rect:case u.rule:case u.square:case u.text:case u.tick:return["x","y"]}}function P(t){return"params"in t&&t.params&&t.params.length>0?N(t.params.filter(e=>e==null?!1:"select"in e&&e.select!==void 0).map(e=>e.name)):"layer"in t?N(t.layer.flatMap(P)):"vconcat"in t?N(t.vconcat.flatMap(P)):"hconcat"in t?N(t.hconcat.flatMap(P)):[]}function wt(t){var a,r;if(!t||!("mark"in t))return;let e=(a=t.encoding)==null?void 0:a.x,n=(r=t.encoding)==null?void 0:r.y;if(e&&"type"in e&&e.type==="nominal")return"vertical";if(n&&"type"in n&&n.type==="nominal"||e&&"aggregate"in e)return"horizontal";if(n&&"aggregate"in n)return"vertical"}function St(t){if(!t.encoding)return[];let e=[];for(let n of Object.values(t.encoding))n&&typeof n=="object"&&"bin"in n&&n.bin&&"field"in n&&typeof n.field=="string"&&e.push(n.field);return e}function D(t){if(!t||!("encoding"in t))return[];let{encoding:e}=t;return e?Object.entries(e).flatMap(n=>{let[a,r]=n;return!r||!xt.has(a)?[]:"field"in r&&typeof r.field=="string"?[r.field]:"condition"in r&&r.condition&&typeof r.condition=="object"&&"field"in r.condition&&r.condition.field&&typeof r.condition.field=="string"?[r.condition.field]:[]}):[]}var xt=new Set(["color","fill","fillOpacity","opacity","shape","size"]);function G(t,e,n,a){let r=n.filter(o=>y.isBinColoring(o)),i={and:(r.length>0?r:n).map(o=>({param:o}))};if(t==="opacity"){let o=x.getOpacity(a)||1;return{...e,opacity:{condition:{test:i,value:o},value:o/5}}}else return e}function At(t){if(!("select"in t)||!t.select)return JSON.stringify(t);let e=t.select;if(typeof e=="string")return JSON.stringify({type:e,bind:t.bind});let n={type:e.type,encodings:"encodings"in e&&e.encodings?[...e.encodings].toSorted():void 0,fields:"fields"in e&&e.fields?[...e.fields].toSorted():void 0,bind:t.bind};return JSON.stringify(n)}function $(t){let e=E(t);if(e.length===0)return t;let n=_t(e);return n.length===0?t:{...L(K(t,new Set(n.map(a=>a.name))),n.map(a=>a.name)),params:[...t.params||[],...n]}}function E(t){let e=[];if("vconcat"in t&&Array.isArray(t.vconcat))for(let n of t.vconcat)e.push(...E(n));else if("hconcat"in t&&Array.isArray(t.hconcat))for(let n of t.hconcat)e.push(...E(n));else{if("layer"in t)return[];"mark"in t&&"params"in t&&t.params&&t.params.length>0&&e.push({params:t.params})}return e}function _t(t){if(t.length===0)return[];let e=new Map,n=t.length;for(let{params:r}of t){let i=new Set;for(let o of r){let l=At(o);i.has(l)||(i.add(l),e.has(l)||e.set(l,{count:0,param:o}),e.get(l).count++)}}let a=[];for(let[,{count:r,param:i}]of e)r===n&&a.push(i);return a}function K(t,e){if("vconcat"in t&&Array.isArray(t.vconcat))return{...t,vconcat:t.vconcat.map(n=>K(n,e))};if("hconcat"in t&&Array.isArray(t.hconcat))return{...t,hconcat:t.hconcat.map(n=>K(n,e))};if("mark"in t&&"params"in t&&t.params){let n=t.params,a=[];for(let r of n){if(!r||typeof r!="object"||!("name"in r)){a.push(r);continue}e.has(r.name)||a.push(r)}if(a.length===0){let{params:r,...i}=t;return i}return{...t,params:a}}return t}function L(t,e){return"vconcat"in t&&Array.isArray(t.vconcat)?{...t,vconcat:t.vconcat.map(n=>L(n,e))}:"hconcat"in t&&Array.isArray(t.hconcat)?{...t,hconcat:t.hconcat.map(n=>L(n,e))}:"layer"in t?t:"mark"in t&&x.isInteractive(t.mark)?{...t,mark:x.makeClickable(t.mark),encoding:G("opacity",t.encoding||{},e,t.mark)}:t}function Z(t,e){var l,k;let{chartSelection:n=!0,fieldSelection:a=!0}=e;if(!n&&!a)return t;(l=t.params)!=null&&l.some(s=>s.bind==="legend")&&(a=!1);let r=(k=t.params)==null?void 0:k.some(s=>!s.bind);r&&(n=!1);let i="vconcat"in t||"hconcat"in t;if(r&&i)return t;if("vconcat"in t){let s=t.vconcat.map(m=>"mark"in m?Z(m,{chartSelection:n,fieldSelection:a}):m);return $({...t,vconcat:s})}if("hconcat"in t){let s=t.hconcat.map(m=>"mark"in m?Z(m,{chartSelection:n,fieldSelection:a}):m);return $({...t,hconcat:s})}if("layer"in t){let s=t.params&&t.params.length>0,m=a!==!1&&!s,v=[];if(m){let p=t.layer.flatMap(f=>"mark"in f?D(f):[]);v=[...new Set(p)],Array.isArray(a)&&(v=v.filter(f=>a.includes(f)))}let w=t.layer.map((p,f)=>{if(!("mark"in p))return p;let h=p;if(f===0&&v.length>0){let O=v.map(M=>j.legend(M));h={...h,params:[...h.params||[],...O]}}return h=q(h,n,f),h=R(h),f===0&&(h=J(h)),h});return{...t,layer:w}}if(!("mark"in t)||!x.isInteractive(t.mark))return t;let o=t;return o=jt(o,a),o=q(o,n,void 0),o=R(o),o=J(o),o}function jt(t,e){if(e===!1)return t;let n=D(t);Array.isArray(e)&&(n=n.filter(i=>e.includes(i)));let a=n.map(i=>j.legend(i)),r=[...t.params||[],...a];return{...t,params:r}}function q(t,e,n){if(e===!1)return t;let a;try{a=x.getMarkType(t.mark)}catch{return t}if(a==="geoshape")return t;let r=St(t),i=e===!0?r.length>0?["point"]:Ot(a):[e];if(!i||i.length===0)return t;let o=i.map(k=>k==="interval"?j.interval(t,n):j.point(t,n)),l=[...t.params||[],...o];return r.length>0&&i.includes("point")&&l.push(j.binColoring(n)),{...t,params:l}}function J(t){let e;try{e=x.getMarkType(t.mark)}catch{}if(e==="geoshape")return t;let n=t.params||[];return n.some(a=>a.bind==="scales")?t:{...t,params:[...n,j.panZoom()]}}function R(t){let e="encoding"in t?t.encoding:void 0,n=t.params||[],a=n.map(r=>r.name);return n.length===0||!x.isInteractive(t.mark)?t:{...t,mark:x.makeClickable(t.mark),encoding:G("opacity",e||{},a,t.mark)}}function Ot(t){switch(t){case"arc":case"area":return["point"];case"text":case"bar":return["point","interval"];case"line":return;default:return["point","interval"]}}async function Mt(t){if(!t)return t;let e="datasets"in t?{...t.datasets}:{},n=async r=>{if(!r)return r;if("layer"in r){let l=await Promise.all(r.layer.map(n));r={...r,layer:l}}if("hconcat"in r){let l=await Promise.all(r.hconcat.map(n));r={...r,hconcat:l}}if("vconcat"in r){let l=await Promise.all(r.vconcat.map(n));r={...r,vconcat:l}}if("spec"in r&&(r={...r,spec:await n(r.spec)}),!r.data||!("url"in r.data))return r;let i;try{i=V(r.data.url)}catch{return r}let o=await st(i.href,r.data.format);return e[i.pathname]=o,{...r,data:{name:i.pathname}}},a=await n(t);return Object.keys(e).length===0?a:{...a,datasets:e}}var d=z(rt(),1);ut("arrow",vt);var Nt=t=>{let e=(0,kt.c)(12),{value:n,setValue:a,chartSelection:r,fieldSelection:i,spec:o,embedOptions:l}=t,k,s;e[0]===o?(k=e[1],s=e[2]):(k=async()=>Mt(o),s=[o],e[0]=o,e[1]=k,e[2]=s);let{data:m,error:v}=yt(k,s);if(v){let p;return e[3]===v?p=e[4]:(p=(0,d.jsx)(gt,{error:v}),e[3]=v,e[4]=p),p}if(!m)return null;let w;return e[5]!==r||e[6]!==l||e[7]!==i||e[8]!==m||e[9]!==a||e[10]!==n?(w=(0,d.jsx)(Pt,{value:n,setValue:a,chartSelection:r,fieldSelection:i,spec:m,embedOptions:l}),e[5]=r,e[6]=l,e[7]=i,e[8]=m,e[9]=a,e[10]=n,e[11]=w):w=e[11],w},Pt=({value:t,setValue:e,chartSelection:n,fieldSelection:a,spec:r,embedOptions:i})=>{let{theme:o}=lt(),l=(0,S.useRef)(null),k=(0,S.useRef)(void 0),[s,m]=(0,S.useState)(),v=(0,S.useMemo)(()=>i&&"actions"in i?i.actions:{source:!1,compiled:!1},[i]),w=H(r),p=(0,S.useMemo)(()=>Z(bt(w),{chartSelection:n,fieldSelection:a}),[w,n,a]),f=(0,S.useMemo)(()=>P(p),[p]),h=C(c=>{e({...t,...c})}),O=(0,S.useMemo)(()=>et((c,g)=>{_.debug("[Vega signal]",c,g);let b=T.mapValues(g,Ct);b=T.mapValues(b,It),h({[c]:b})},100),[h]),M=H(f),I=(0,S.useMemo)(()=>M.reduce((c,g)=>(y.PAN_ZOOM===g||y.isBinColoring(g)||c.push({signalName:g,handler:(b,X)=>O(b,X)}),c),[]),[M,O]),B=C(c=>{_.error(c),_.debug(p),m(c)}),Q=C(c=>{_.debug("[Vega view] created",c),k.current=c,m(void 0)}),U=()=>{let c=[];return y.hasPoint(f)&&c.push(["Point selection","click to select a point; hold shift for multi-select"]),y.hasInterval(f)&&c.push(["Interval selection","click and drag to select an interval"]),y.hasLegend(f)&&c.push(["Legend selection","click to select a legend item; hold shift for multi-select"]),y.hasPanZoom(f)&&c.push(["Pan","hold the meta key and drag"],["Zoom","hold the meta key and scroll"]),c.length===0?null:(0,d.jsx)(at,{delayDuration:300,side:"left",content:(0,d.jsx)("div",{className:"text-xs flex flex-col",children:c.map((g,b)=>(0,d.jsxs)("div",{children:[(0,d.jsxs)("span",{className:"font-bold tracking-wide",children:[g[0],":"]})," ",g[1]]},b))}),children:(0,d.jsx)(ot,{className:"absolute bottom-1 right-0 m-2 h-4 w-4 cursor-help text-muted-foreground hover:text-foreground"})})},A=ft({ref:l,spec:p,options:{theme:o==="dark"?"dark":void 0,actions:v,mode:"vega-lite",tooltip:mt.call,renderer:"canvas"},onError:B,onEmbed:Q});return(0,S.useEffect)(()=>(I.forEach(({signalName:c,handler:g})=>{try{A==null||A.view.addSignalListener(c,g)}catch(b){_.error(b)}}),()=>{I.forEach(({signalName:c,handler:g})=>{try{A==null||A.view.removeSignalListener(c,g)}catch(b){_.error(b)}})}),[A,I]),(0,d.jsxs)(d.Fragment,{children:[s&&(0,d.jsxs)(ht,{variant:"destructive",children:[(0,d.jsx)(dt,{children:s.message}),(0,d.jsx)("div",{className:"text-md",children:s.stack})]}),(0,d.jsxs)("div",{className:nt("relative"),onPointerDown:it.stopPropagation(),children:[(0,d.jsx)("div",{ref:l,"data-container-width":pt(p)}),U()]})]})};function It(t){return t instanceof Set?[...t]:t}function Ct(t){return Array.isArray(t)?t.map(e=>e instanceof Date&&ct(e)?new Date(e).getTime():e):t}var Et=Nt;export{Et as default};
|
|
1
|
+
import{s as z}from"./chunk-LvLJmgfZ.js";import{n as C}from"./useEvent-D91BmmQi.js";import{t as Y}from"./react-Bj1aDYRI.js";import"./react-dom-CSu739Rf.js";import{t as tt}from"./compiler-runtime-B3qBwwSJ.js";import{t as et}from"./debounce-BbSyBDA8.js";import{_,d as T}from"./useEventListener-DGjKht0c.js";import{n as V}from"./config-DCMsCquu.js";import{t as nt}from"./cn-DYvqRARy.js";import{t as rt}from"./jsx-runtime-Blw4afVn.js";import"./fullscreen-k58KVlT-.js";import{t as at}from"./tooltip-DmqhBBs6.js";import{r as it}from"./button-BKVLeSTX.js";import{d as N}from"./arrays-DAC2orgH.js";import{u as ot}from"./toDate-BGIVWsZ9.js";import"./session-DDorezMU.js";import{r as lt}from"./useTheme-B1JCa4JT.js";import{t as ct}from"./isValid-CtiDIjiD.js";import{a as st,r as mt,t as pt}from"./utils-COwZ1qVI.js";import{n as ut}from"./vega-loader.browser-CRZ52CKf.js";import{t as ft}from"./react-vega-o-uiEUqD.js";import"./defaultLocale-D_rSvXvJ.js";import"./defaultLocale-C92Rrpmf.js";import{r as dt,t as ht}from"./alert-DrrhKX67.js";import{n as gt}from"./error-banner-B3Vr5jH0.js";import{n as yt}from"./useAsyncData-BPlezez1.js";import{t as vt}from"./formats-Cl4zm1Jf.js";import{t as H}from"./useDeepCompareMemoize-Bj2wGMJg.js";var kt=tt(),S=z(Y(),1);function bt(t){return t.data&&"url"in t.data&&(t.data.url=V(t.data.url).href),t}const u={arc:"arc",area:"area",bar:"bar",image:"image",line:"line",point:"point",rect:"rect",rule:"rule",text:"text",tick:"tick",trail:"trail",circle:"circle",square:"square",geoshape:"geoshape"};var F=new Set(["boxplot","errorband","errorbar"]);const x={getMarkType(t){let e=typeof t=="string"?t:t.type;if(F.has(e))throw Error("Not supported");return e},isInteractive(t){let e=typeof t=="string"?t:t.type;return!F.has(e)},makeClickable(t){let e=typeof t=="string"?t:t.type;return e in u?typeof t=="string"?{type:t,cursor:"pointer",tooltip:!0}:{...t,type:e,cursor:"pointer",tooltip:!0}:t},getOpacity(t){return typeof t=="string"?null:"opacity"in t&&typeof t.opacity=="number"?t.opacity:null}},y={point(t){return t==null?"select_point":`select_point_${t}`},interval(t){return t==null?"select_interval":`select_interval_${t}`},legendSelection(t){return`legend_selection_${t}`},binColoring(t){return t==null?"bin_coloring":`bin_coloring_${t}`},HIGHLIGHT:"highlight",PAN_ZOOM:"pan_zoom",hasPoint(t){return t.some(e=>e.startsWith("select_point"))},hasInterval(t){return t.some(e=>e.startsWith("select_interval"))},hasLegend(t){return t.some(e=>e.startsWith("legend_selection"))},hasPanZoom(t){return t.some(e=>e.startsWith("pan_zoom"))},isBinColoring(t){return t.startsWith("bin_coloring")}},j={highlight(){return{name:y.HIGHLIGHT,select:{type:"point",on:"mouseover"}}},interval(t,e){return{name:y.interval(e),select:{type:"interval",encodings:W(t),mark:{fill:"#669EFF",fillOpacity:.07,stroke:"#669EFF",strokeOpacity:.4},on:"[mousedown[!event.metaKey], mouseup] > mousemove[!event.metaKey]",translate:"[mousedown[!event.metaKey], mouseup] > mousemove[!event.metaKey]"}}},point(t,e){return{name:y.point(e),select:{type:"point",encodings:W(t),on:"click[!event.metaKey]"}}},binColoring(t){return{name:y.binColoring(t),select:{type:"point",on:"click[!event.metaKey]"}}},legend(t){return{name:y.legendSelection(t),select:{type:"point",fields:[t]},bind:"legend"}},panZoom(){return{name:y.PAN_ZOOM,bind:"scales",select:{type:"interval",on:"[mousedown[event.metaKey], window:mouseup] > window:mousemove!",translate:"[mousedown[event.metaKey], window:mouseup] > window:mousemove!",zoom:"wheel![event.metaKey]"}}}};function W(t){switch(x.getMarkType(t.mark)){case u.image:case u.trail:return;case u.area:case u.arc:return["color"];case u.bar:{let e=wt(t);return e==="horizontal"?["y"]:e==="vertical"?["x"]:void 0}case u.circle:case u.geoshape:case u.line:case u.point:case u.rect:case u.rule:case u.square:case u.text:case u.tick:return["x","y"]}}function P(t){return"params"in t&&t.params&&t.params.length>0?N(t.params.filter(e=>e==null?!1:"select"in e&&e.select!==void 0).map(e=>e.name)):"layer"in t?N(t.layer.flatMap(P)):"vconcat"in t?N(t.vconcat.flatMap(P)):"hconcat"in t?N(t.hconcat.flatMap(P)):[]}function wt(t){var a,r;if(!t||!("mark"in t))return;let e=(a=t.encoding)==null?void 0:a.x,n=(r=t.encoding)==null?void 0:r.y;if(e&&"type"in e&&e.type==="nominal")return"vertical";if(n&&"type"in n&&n.type==="nominal"||e&&"aggregate"in e)return"horizontal";if(n&&"aggregate"in n)return"vertical"}function St(t){if(!t.encoding)return[];let e=[];for(let n of Object.values(t.encoding))n&&typeof n=="object"&&"bin"in n&&n.bin&&"field"in n&&typeof n.field=="string"&&e.push(n.field);return e}function D(t){if(!t||!("encoding"in t))return[];let{encoding:e}=t;return e?Object.entries(e).flatMap(n=>{let[a,r]=n;return!r||!xt.has(a)?[]:"field"in r&&typeof r.field=="string"?[r.field]:"condition"in r&&r.condition&&typeof r.condition=="object"&&"field"in r.condition&&r.condition.field&&typeof r.condition.field=="string"?[r.condition.field]:[]}):[]}var xt=new Set(["color","fill","fillOpacity","opacity","shape","size"]);function G(t,e,n,a){let r=n.filter(o=>y.isBinColoring(o)),i={and:(r.length>0?r:n).map(o=>({param:o}))};if(t==="opacity"){let o=x.getOpacity(a)||1;return{...e,opacity:{condition:{test:i,value:o},value:o/5}}}else return e}function At(t){if(!("select"in t)||!t.select)return JSON.stringify(t);let e=t.select;if(typeof e=="string")return JSON.stringify({type:e,bind:t.bind});let n={type:e.type,encodings:"encodings"in e&&e.encodings?[...e.encodings].toSorted():void 0,fields:"fields"in e&&e.fields?[...e.fields].toSorted():void 0,bind:t.bind};return JSON.stringify(n)}function $(t){let e=E(t);if(e.length===0)return t;let n=_t(e);return n.length===0?t:{...L(K(t,new Set(n.map(a=>a.name))),n.map(a=>a.name)),params:[...t.params||[],...n]}}function E(t){let e=[];if("vconcat"in t&&Array.isArray(t.vconcat))for(let n of t.vconcat)e.push(...E(n));else if("hconcat"in t&&Array.isArray(t.hconcat))for(let n of t.hconcat)e.push(...E(n));else{if("layer"in t)return[];"mark"in t&&"params"in t&&t.params&&t.params.length>0&&e.push({params:t.params})}return e}function _t(t){if(t.length===0)return[];let e=new Map,n=t.length;for(let{params:r}of t){let i=new Set;for(let o of r){let l=At(o);i.has(l)||(i.add(l),e.has(l)||e.set(l,{count:0,param:o}),e.get(l).count++)}}let a=[];for(let[,{count:r,param:i}]of e)r===n&&a.push(i);return a}function K(t,e){if("vconcat"in t&&Array.isArray(t.vconcat))return{...t,vconcat:t.vconcat.map(n=>K(n,e))};if("hconcat"in t&&Array.isArray(t.hconcat))return{...t,hconcat:t.hconcat.map(n=>K(n,e))};if("mark"in t&&"params"in t&&t.params){let n=t.params,a=[];for(let r of n){if(!r||typeof r!="object"||!("name"in r)){a.push(r);continue}e.has(r.name)||a.push(r)}if(a.length===0){let{params:r,...i}=t;return i}return{...t,params:a}}return t}function L(t,e){return"vconcat"in t&&Array.isArray(t.vconcat)?{...t,vconcat:t.vconcat.map(n=>L(n,e))}:"hconcat"in t&&Array.isArray(t.hconcat)?{...t,hconcat:t.hconcat.map(n=>L(n,e))}:"layer"in t?t:"mark"in t&&x.isInteractive(t.mark)?{...t,mark:x.makeClickable(t.mark),encoding:G("opacity",t.encoding||{},e,t.mark)}:t}function Z(t,e){var l,k;let{chartSelection:n=!0,fieldSelection:a=!0}=e;if(!n&&!a)return t;(l=t.params)!=null&&l.some(s=>s.bind==="legend")&&(a=!1);let r=(k=t.params)==null?void 0:k.some(s=>!s.bind);r&&(n=!1);let i="vconcat"in t||"hconcat"in t;if(r&&i)return t;if("vconcat"in t){let s=t.vconcat.map(m=>"mark"in m?Z(m,{chartSelection:n,fieldSelection:a}):m);return $({...t,vconcat:s})}if("hconcat"in t){let s=t.hconcat.map(m=>"mark"in m?Z(m,{chartSelection:n,fieldSelection:a}):m);return $({...t,hconcat:s})}if("layer"in t){let s=t.params&&t.params.length>0,m=a!==!1&&!s,v=[];if(m){let p=t.layer.flatMap(f=>"mark"in f?D(f):[]);v=[...new Set(p)],Array.isArray(a)&&(v=v.filter(f=>a.includes(f)))}let w=t.layer.map((p,f)=>{if(!("mark"in p))return p;let h=p;if(f===0&&v.length>0){let O=v.map(M=>j.legend(M));h={...h,params:[...h.params||[],...O]}}return h=q(h,n,f),h=R(h),f===0&&(h=J(h)),h});return{...t,layer:w}}if(!("mark"in t)||!x.isInteractive(t.mark))return t;let o=t;return o=jt(o,a),o=q(o,n,void 0),o=R(o),o=J(o),o}function jt(t,e){if(e===!1)return t;let n=D(t);Array.isArray(e)&&(n=n.filter(i=>e.includes(i)));let a=n.map(i=>j.legend(i)),r=[...t.params||[],...a];return{...t,params:r}}function q(t,e,n){if(e===!1)return t;let a;try{a=x.getMarkType(t.mark)}catch{return t}if(a==="geoshape")return t;let r=St(t),i=e===!0?r.length>0?["point"]:Ot(a):[e];if(!i||i.length===0)return t;let o=i.map(k=>k==="interval"?j.interval(t,n):j.point(t,n)),l=[...t.params||[],...o];return r.length>0&&i.includes("point")&&l.push(j.binColoring(n)),{...t,params:l}}function J(t){let e;try{e=x.getMarkType(t.mark)}catch{}if(e==="geoshape")return t;let n=t.params||[];return n.some(a=>a.bind==="scales")?t:{...t,params:[...n,j.panZoom()]}}function R(t){let e="encoding"in t?t.encoding:void 0,n=t.params||[],a=n.map(r=>r.name);return n.length===0||!x.isInteractive(t.mark)?t:{...t,mark:x.makeClickable(t.mark),encoding:G("opacity",e||{},a,t.mark)}}function Ot(t){switch(t){case"arc":case"area":return["point"];case"text":case"bar":return["point","interval"];case"line":return;default:return["point","interval"]}}async function Mt(t){if(!t)return t;let e="datasets"in t?{...t.datasets}:{},n=async r=>{if(!r)return r;if("layer"in r){let l=await Promise.all(r.layer.map(n));r={...r,layer:l}}if("hconcat"in r){let l=await Promise.all(r.hconcat.map(n));r={...r,hconcat:l}}if("vconcat"in r){let l=await Promise.all(r.vconcat.map(n));r={...r,vconcat:l}}if("spec"in r&&(r={...r,spec:await n(r.spec)}),!r.data||!("url"in r.data))return r;let i;try{i=V(r.data.url)}catch{return r}let o=await st(i.href,r.data.format);return e[i.pathname]=o,{...r,data:{name:i.pathname}}},a=await n(t);return Object.keys(e).length===0?a:{...a,datasets:e}}var d=z(rt(),1);ut("arrow",vt);var Nt=t=>{let e=(0,kt.c)(12),{value:n,setValue:a,chartSelection:r,fieldSelection:i,spec:o,embedOptions:l}=t,k,s;e[0]===o?(k=e[1],s=e[2]):(k=async()=>Mt(o),s=[o],e[0]=o,e[1]=k,e[2]=s);let{data:m,error:v}=yt(k,s);if(v){let p;return e[3]===v?p=e[4]:(p=(0,d.jsx)(gt,{error:v}),e[3]=v,e[4]=p),p}if(!m)return null;let w;return e[5]!==r||e[6]!==l||e[7]!==i||e[8]!==m||e[9]!==a||e[10]!==n?(w=(0,d.jsx)(Pt,{value:n,setValue:a,chartSelection:r,fieldSelection:i,spec:m,embedOptions:l}),e[5]=r,e[6]=l,e[7]=i,e[8]=m,e[9]=a,e[10]=n,e[11]=w):w=e[11],w},Pt=({value:t,setValue:e,chartSelection:n,fieldSelection:a,spec:r,embedOptions:i})=>{let{theme:o}=lt(),l=(0,S.useRef)(null),k=(0,S.useRef)(void 0),[s,m]=(0,S.useState)(),v=(0,S.useMemo)(()=>i&&"actions"in i?i.actions:{source:!1,compiled:!1},[i]),w=H(r),p=(0,S.useMemo)(()=>Z(bt(w),{chartSelection:n,fieldSelection:a}),[w,n,a]),f=(0,S.useMemo)(()=>P(p),[p]),h=C(c=>{e({...t,...c})}),O=(0,S.useMemo)(()=>et((c,g)=>{_.debug("[Vega signal]",c,g);let b=T.mapValues(g,Ct);b=T.mapValues(b,It),h({[c]:b})},100),[h]),M=H(f),I=(0,S.useMemo)(()=>M.reduce((c,g)=>(y.PAN_ZOOM===g||y.isBinColoring(g)||c.push({signalName:g,handler:(b,X)=>O(b,X)}),c),[]),[M,O]),B=C(c=>{_.error(c),_.debug(p),m(c)}),Q=C(c=>{_.debug("[Vega view] created",c),k.current=c,m(void 0)}),U=()=>{let c=[];return y.hasPoint(f)&&c.push(["Point selection","click to select a point; hold shift for multi-select"]),y.hasInterval(f)&&c.push(["Interval selection","click and drag to select an interval"]),y.hasLegend(f)&&c.push(["Legend selection","click to select a legend item; hold shift for multi-select"]),y.hasPanZoom(f)&&c.push(["Pan","hold the meta key and drag"],["Zoom","hold the meta key and scroll"]),c.length===0?null:(0,d.jsx)(at,{delayDuration:300,side:"left",content:(0,d.jsx)("div",{className:"text-xs flex flex-col",children:c.map((g,b)=>(0,d.jsxs)("div",{children:[(0,d.jsxs)("span",{className:"font-bold tracking-wide",children:[g[0],":"]})," ",g[1]]},b))}),children:(0,d.jsx)(ot,{className:"absolute bottom-1 right-0 m-2 h-4 w-4 cursor-help text-muted-foreground hover:text-foreground"})})},A=ft({ref:l,spec:p,options:{theme:o==="dark"?"dark":void 0,actions:v,mode:"vega-lite",tooltip:mt.call,renderer:"canvas"},onError:B,onEmbed:Q});return(0,S.useEffect)(()=>(I.forEach(({signalName:c,handler:g})=>{try{A==null||A.view.addSignalListener(c,g)}catch(b){_.error(b)}}),()=>{I.forEach(({signalName:c,handler:g})=>{try{A==null||A.view.removeSignalListener(c,g)}catch(b){_.error(b)}})}),[A,I]),(0,d.jsxs)(d.Fragment,{children:[s&&(0,d.jsxs)(ht,{variant:"destructive",children:[(0,d.jsx)(dt,{children:s.message}),(0,d.jsx)("div",{className:"text-md",children:s.stack})]}),(0,d.jsxs)("div",{className:nt("relative"),onPointerDown:it.stopPropagation(),children:[(0,d.jsx)("div",{ref:l,"data-container-width":pt(p)}),U()]})]})};function It(t){return t instanceof Set?[...t]:t}function Ct(t){return Array.isArray(t)?t.map(e=>e instanceof Date&&ct(e)?new Date(e).getTime():e):t}var Et=Nt;export{Et as default};
|
package/dist/index.html
CHANGED
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
<marimo-server-token data-token="{{ server_token }}" hidden></marimo-server-token>
|
|
67
67
|
<!-- /TODO -->
|
|
68
68
|
<title>{{ title }}</title>
|
|
69
|
-
<script type="module" crossorigin src="./assets/index-
|
|
69
|
+
<script type="module" crossorigin src="./assets/index-CaFbHOEK.js"></script>
|
|
70
70
|
<link rel="modulepreload" crossorigin href="./assets/preload-helper-DItdS47A.js">
|
|
71
71
|
<link rel="modulepreload" crossorigin href="./assets/chunk-LvLJmgfZ.js">
|
|
72
72
|
<link rel="modulepreload" crossorigin href="./assets/react-Bj1aDYRI.js">
|
|
@@ -98,17 +98,17 @@
|
|
|
98
98
|
<link rel="modulepreload" crossorigin href="./assets/isArrayLikeObject-ODovYgPQ.js">
|
|
99
99
|
<link rel="modulepreload" crossorigin href="./assets/merge-BOaDhCTH.js">
|
|
100
100
|
<link rel="modulepreload" crossorigin href="./assets/zod-H_cgTO0M.js">
|
|
101
|
-
<link rel="modulepreload" crossorigin href="./assets/utils-
|
|
101
|
+
<link rel="modulepreload" crossorigin href="./assets/utils-8btzWeZg.js">
|
|
102
102
|
<link rel="modulepreload" crossorigin href="./assets/Deferred-DMWKlZOV.js">
|
|
103
103
|
<link rel="modulepreload" crossorigin href="./assets/uuid-DercMavo.js">
|
|
104
104
|
<link rel="modulepreload" crossorigin href="./assets/DeferredRequestRegistry-KOgQgaJP.js">
|
|
105
105
|
<link rel="modulepreload" crossorigin href="./assets/constants-tOPFFcLZ.js">
|
|
106
106
|
<link rel="modulepreload" crossorigin href="./assets/session-DDorezMU.js">
|
|
107
|
-
<link rel="modulepreload" crossorigin href="./assets/config-
|
|
107
|
+
<link rel="modulepreload" crossorigin href="./assets/config-DCMsCquu.js">
|
|
108
108
|
<link rel="modulepreload" crossorigin href="./assets/requests-9-v2bhoi.js">
|
|
109
109
|
<link rel="modulepreload" crossorigin href="./assets/useLifecycle-N3bfh_O1.js">
|
|
110
110
|
<link rel="modulepreload" crossorigin href="./assets/useNonce-CbdaHKzX.js">
|
|
111
|
-
<link rel="modulepreload" crossorigin href="./assets/useTheme-
|
|
111
|
+
<link rel="modulepreload" crossorigin href="./assets/useTheme-B1JCa4JT.js">
|
|
112
112
|
<link rel="modulepreload" crossorigin href="./assets/arrays-DAC2orgH.js">
|
|
113
113
|
<link rel="modulepreload" crossorigin href="./assets/strings-pfr2N700.js">
|
|
114
114
|
<link rel="modulepreload" crossorigin href="./assets/once-hq2TLzOp.js">
|
|
@@ -134,7 +134,7 @@
|
|
|
134
134
|
<link rel="modulepreload" crossorigin href="./assets/debounce-BbSyBDA8.js">
|
|
135
135
|
<link rel="modulepreload" crossorigin href="./assets/database-zap-BxfYZ6ML.js">
|
|
136
136
|
<link rel="modulepreload" crossorigin href="./assets/main-BNL5rxQw.js">
|
|
137
|
-
<link rel="modulepreload" crossorigin href="./assets/cells-
|
|
137
|
+
<link rel="modulepreload" crossorigin href="./assets/cells-C9wzDxwr.js">
|
|
138
138
|
<link rel="modulepreload" crossorigin href="./assets/ErrorBoundary-dxChUL02.js">
|
|
139
139
|
<link rel="modulepreload" crossorigin href="./assets/kbd-BbX-cXm5.js">
|
|
140
140
|
<link rel="modulepreload" crossorigin href="./assets/useInstallPackage-EEg9LCNy.js">
|
|
@@ -148,33 +148,33 @@
|
|
|
148
148
|
<link rel="modulepreload" crossorigin href="./assets/usePress-YLit4doY.js">
|
|
149
149
|
<link rel="modulepreload" crossorigin href="./assets/input-DjrybsRY.js">
|
|
150
150
|
<link rel="modulepreload" crossorigin href="./assets/ImperativeModal-DSu22ncS.js">
|
|
151
|
-
<link rel="modulepreload" crossorigin href="./assets/cell-link-
|
|
151
|
+
<link rel="modulepreload" crossorigin href="./assets/cell-link-CUOy8qvK.js">
|
|
152
152
|
<link rel="modulepreload" crossorigin href="./assets/multi-map-MSuUqmbC.js">
|
|
153
153
|
<link rel="modulepreload" crossorigin href="./assets/alert-DrrhKX67.js">
|
|
154
154
|
<link rel="modulepreload" crossorigin href="./assets/chevron-right-CgvDWFE3.js">
|
|
155
155
|
<link rel="modulepreload" crossorigin href="./assets/dropdown-menu-DrHAuMTb.js">
|
|
156
156
|
<link rel="modulepreload" crossorigin href="./assets/links-NCBzUApL.js">
|
|
157
|
-
<link rel="modulepreload" crossorigin href="./assets/datasource-
|
|
158
|
-
<link rel="modulepreload" crossorigin href="./assets/state-
|
|
157
|
+
<link rel="modulepreload" crossorigin href="./assets/datasource-o22Gadpo.js">
|
|
158
|
+
<link rel="modulepreload" crossorigin href="./assets/state-BeEg2EJ6.js">
|
|
159
159
|
<link rel="modulepreload" crossorigin href="./assets/sparkles-DczT6OBt.js">
|
|
160
|
-
<link rel="modulepreload" crossorigin href="./assets/MarimoErrorOutput-
|
|
160
|
+
<link rel="modulepreload" crossorigin href="./assets/MarimoErrorOutput-EEO_bAbD.js">
|
|
161
161
|
<link rel="modulepreload" crossorigin href="./assets/copy-C8iWa1qI.js">
|
|
162
162
|
<link rel="modulepreload" crossorigin href="./assets/copy-DFMsQ6MJ.js">
|
|
163
163
|
<link rel="modulepreload" crossorigin href="./assets/copy-icon-CG2ao3lW.js">
|
|
164
164
|
<link rel="modulepreload" crossorigin href="./assets/spinner-AR54Ic3-.js">
|
|
165
|
-
<link rel="modulepreload" crossorigin href="./assets/html-to-image-
|
|
166
|
-
<link rel="modulepreload" crossorigin href="./assets/focus-
|
|
165
|
+
<link rel="modulepreload" crossorigin href="./assets/html-to-image-DN6TNqeX.js">
|
|
166
|
+
<link rel="modulepreload" crossorigin href="./assets/focus-4jo_CuOp.js">
|
|
167
167
|
<link rel="modulepreload" crossorigin href="./assets/useAsyncData-BPlezez1.js">
|
|
168
168
|
<link rel="modulepreload" crossorigin href="./assets/LazyAnyLanguageCodeMirror-BEdv0N9X.js">
|
|
169
169
|
<link rel="modulepreload" crossorigin href="./assets/micromark-factory-space-BygYYKhs.js">
|
|
170
170
|
<link rel="modulepreload" crossorigin href="./assets/chunk-5FQGJX7Z-OcP0iC1i.js">
|
|
171
|
-
<link rel="modulepreload" crossorigin href="./assets/markdown-renderer-
|
|
171
|
+
<link rel="modulepreload" crossorigin href="./assets/markdown-renderer-B-YFfOW1.js">
|
|
172
172
|
<link rel="modulepreload" crossorigin href="./assets/command-C0h2HiOh.js">
|
|
173
173
|
<link rel="modulepreload" crossorigin href="./assets/popover-AtoFZ7i4.js">
|
|
174
174
|
<link rel="modulepreload" crossorigin href="./assets/errors-DVkmLSXX.js">
|
|
175
|
-
<link rel="modulepreload" crossorigin href="./assets/download-
|
|
176
|
-
<link rel="modulepreload" crossorigin href="./assets/useRunCells-
|
|
177
|
-
<link rel="modulepreload" crossorigin href="./assets/RenderHTML-
|
|
175
|
+
<link rel="modulepreload" crossorigin href="./assets/download-Bpd05cN4.js">
|
|
176
|
+
<link rel="modulepreload" crossorigin href="./assets/useRunCells-DQQ6CB8T.js">
|
|
177
|
+
<link rel="modulepreload" crossorigin href="./assets/RenderHTML-CvgwqLt6.js">
|
|
178
178
|
<link rel="modulepreload" crossorigin href="./assets/table-D5iZuBiR.js">
|
|
179
179
|
<link rel="modulepreload" crossorigin href="./assets/useIframeCapabilities-YemHpw31.js">
|
|
180
180
|
<link rel="modulepreload" crossorigin href="./assets/error-banner-B3Vr5jH0.js">
|
|
@@ -192,44 +192,44 @@
|
|
|
192
192
|
<link rel="modulepreload" crossorigin href="./assets/table-qC3alE1r.js">
|
|
193
193
|
<link rel="modulepreload" crossorigin href="./assets/message-circle-ehj_MdGz.js">
|
|
194
194
|
<link rel="modulepreload" crossorigin href="./assets/react-resizable-panels.browser.esm-D0qmuH5W.js">
|
|
195
|
-
<link rel="modulepreload" crossorigin href="./assets/JsonOutput-
|
|
195
|
+
<link rel="modulepreload" crossorigin href="./assets/JsonOutput-heEAqE8H.js">
|
|
196
196
|
<link rel="modulepreload" crossorigin href="./assets/chart-no-axes-column-CsXoiEZx.js">
|
|
197
197
|
<link rel="modulepreload" crossorigin href="./assets/square-function-DIHpmVFo.js">
|
|
198
198
|
<link rel="modulepreload" crossorigin href="./assets/spec-CFx2bitO.js">
|
|
199
199
|
<link rel="modulepreload" crossorigin href="./assets/ellipsis-vertical-DEH0lwkn.js">
|
|
200
200
|
<link rel="modulepreload" crossorigin href="./assets/refresh-cw-CoFbRtMK.js">
|
|
201
|
-
<link rel="modulepreload" crossorigin href="./assets/components-
|
|
202
|
-
<link rel="modulepreload" crossorigin href="./assets/column-preview-
|
|
201
|
+
<link rel="modulepreload" crossorigin href="./assets/components-CtW4EQ0a.js">
|
|
202
|
+
<link rel="modulepreload" crossorigin href="./assets/column-preview-D9viH8oS.js">
|
|
203
203
|
<link rel="modulepreload" crossorigin href="./assets/icons-UbXYeuXE.js">
|
|
204
|
-
<link rel="modulepreload" crossorigin href="./assets/floating-outline-
|
|
205
|
-
<link rel="modulepreload" crossorigin href="./assets/useAddCell-
|
|
204
|
+
<link rel="modulepreload" crossorigin href="./assets/floating-outline-CEoUA-ND.js">
|
|
205
|
+
<link rel="modulepreload" crossorigin href="./assets/useAddCell-TIHLIw_p.js">
|
|
206
206
|
<link rel="modulepreload" crossorigin href="./assets/objectWithoutPropertiesLoose-DaPAPabU.js">
|
|
207
207
|
<link rel="modulepreload" crossorigin href="./assets/esm-BV1ClmM0.js">
|
|
208
208
|
<link rel="modulepreload" crossorigin href="./assets/eye-off-DgRJ-xBZ.js">
|
|
209
209
|
<link rel="modulepreload" crossorigin href="./assets/plus-DWrQrVLZ.js">
|
|
210
|
-
<link rel="modulepreload" crossorigin href="./assets/readonly-python-code-
|
|
210
|
+
<link rel="modulepreload" crossorigin href="./assets/readonly-python-code-BNv35LAm.js">
|
|
211
211
|
<link rel="modulepreload" crossorigin href="./assets/file-headphone-5_PGMxRL.js">
|
|
212
212
|
<link rel="modulepreload" crossorigin href="./assets/file-DaJ4JeZH.js">
|
|
213
213
|
<link rel="modulepreload" crossorigin href="./assets/image-CpSydGUq.js">
|
|
214
|
-
<link rel="modulepreload" crossorigin href="./assets/file-icons-
|
|
215
|
-
<link rel="modulepreload" crossorigin href="./assets/switch-
|
|
214
|
+
<link rel="modulepreload" crossorigin href="./assets/file-icons-BJUn_Zwi.js">
|
|
215
|
+
<link rel="modulepreload" crossorigin href="./assets/switch-BOBVe-9H.js">
|
|
216
216
|
<link rel="modulepreload" crossorigin href="./assets/events-BRAWQiYK.js">
|
|
217
|
-
<link rel="modulepreload" crossorigin href="./assets/globals-
|
|
217
|
+
<link rel="modulepreload" crossorigin href="./assets/globals-CinMfY9h.js">
|
|
218
218
|
<link rel="modulepreload" crossorigin href="./assets/share-DkQqqFqC.js">
|
|
219
219
|
<link rel="modulepreload" crossorigin href="./assets/blob-CpeNXBj-.js">
|
|
220
220
|
<link rel="modulepreload" crossorigin href="./assets/memoize-BwAF2XN5.js">
|
|
221
221
|
<link rel="modulepreload" crossorigin href="./assets/get-D7jeR2wg.js">
|
|
222
222
|
<link rel="modulepreload" crossorigin href="./assets/_baseSet-49dbm-yb.js">
|
|
223
|
-
<link rel="modulepreload" crossorigin href="./assets/state-
|
|
223
|
+
<link rel="modulepreload" crossorigin href="./assets/state-Cybx0BE_.js">
|
|
224
224
|
<link rel="modulepreload" crossorigin href="./assets/label-C89F4v17.js">
|
|
225
|
-
<link rel="modulepreload" crossorigin href="./assets/textarea-
|
|
225
|
+
<link rel="modulepreload" crossorigin href="./assets/textarea-DoPazz3x.js">
|
|
226
226
|
<link rel="modulepreload" crossorigin href="./assets/refresh-ccw-DxvV30QW.js">
|
|
227
227
|
<link rel="modulepreload" crossorigin href="./assets/trash-2-CwDX6_Ac.js">
|
|
228
|
-
<link rel="modulepreload" crossorigin href="./assets/form-
|
|
229
|
-
<link rel="modulepreload" crossorigin href="./assets/renderShortcut-
|
|
228
|
+
<link rel="modulepreload" crossorigin href="./assets/form-yizCLBQu.js">
|
|
229
|
+
<link rel="modulepreload" crossorigin href="./assets/renderShortcut-9B7Z8taX.js">
|
|
230
230
|
<link rel="modulepreload" crossorigin href="./assets/field-C6i22m8B.js">
|
|
231
231
|
<link rel="modulepreload" crossorigin href="./assets/VisuallyHidden-DVY6OceZ.js">
|
|
232
|
-
<link rel="modulepreload" crossorigin href="./assets/useBoolean-
|
|
232
|
+
<link rel="modulepreload" crossorigin href="./assets/useBoolean-Dvk5-C1P.js">
|
|
233
233
|
<link rel="modulepreload" crossorigin href="./assets/useDeepCompareMemoize-Bj2wGMJg.js">
|
|
234
234
|
<link rel="modulepreload" crossorigin href="./assets/types-BUmn6Kar.js">
|
|
235
235
|
<link rel="modulepreload" crossorigin href="./assets/fileToBase64-D7Ur9Qxq.js">
|
|
@@ -245,7 +245,7 @@
|
|
|
245
245
|
<link rel="stylesheet" crossorigin href="./assets/cells-jmgGt1lS.css">
|
|
246
246
|
<link rel="stylesheet" crossorigin href="./assets/markdown-renderer-DdDKmWlR.css">
|
|
247
247
|
<link rel="stylesheet" crossorigin href="./assets/JsonOutput-B7vuddcd.css">
|
|
248
|
-
<link rel="stylesheet" crossorigin href="./assets/index-
|
|
248
|
+
<link rel="stylesheet" crossorigin href="./assets/index-BNN_F0CC.css">
|
|
249
249
|
</head>
|
|
250
250
|
<body>
|
|
251
251
|
<div id="root"></div>
|
package/package.json
CHANGED
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/* Copyright 2024 Marimo. All rights reserved. */
|
|
2
|
+
import React from "react";
|
|
3
|
+
import { useAtom } from "jotai";
|
|
4
|
+
import { tracebackModalAtom } from "@/core/errors/traceback-atom";
|
|
5
|
+
import { TracebackModal } from "./errors/traceback-modal";
|
|
6
|
+
|
|
7
|
+
export const TracebackModalContainer: React.FC = () => {
|
|
8
|
+
const [tracebackData, setTracebackData] = useAtom(tracebackModalAtom);
|
|
9
|
+
|
|
10
|
+
if (!tracebackData) {
|
|
11
|
+
return null;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
return (
|
|
15
|
+
<TracebackModal
|
|
16
|
+
isOpen={true}
|
|
17
|
+
onClose={() => setTracebackData(null)}
|
|
18
|
+
traceback={tracebackData.traceback}
|
|
19
|
+
errorMessage={tracebackData.errorMessage}
|
|
20
|
+
/>
|
|
21
|
+
);
|
|
22
|
+
};
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
/* Copyright 2026 Marimo. All rights reserved. */
|
|
2
|
+
import React from "react";
|
|
3
|
+
import { Button } from "@/components/ui/button";
|
|
4
|
+
import {
|
|
5
|
+
AlertDialog,
|
|
6
|
+
AlertDialogAction,
|
|
7
|
+
AlertDialogContent,
|
|
8
|
+
AlertDialogDescription,
|
|
9
|
+
AlertDialogFooter,
|
|
10
|
+
AlertDialogHeader,
|
|
11
|
+
AlertDialogTitle,
|
|
12
|
+
} from "@/components/ui/alert-dialog";
|
|
13
|
+
import { CopyIcon } from "lucide-react";
|
|
14
|
+
import { toast } from "@/components/ui/use-toast";
|
|
15
|
+
|
|
16
|
+
interface TracebackModalProps {
|
|
17
|
+
isOpen: boolean;
|
|
18
|
+
onClose: () => void;
|
|
19
|
+
traceback: string;
|
|
20
|
+
errorMessage: string;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
export const TracebackModal: React.FC<TracebackModalProps> = ({
|
|
24
|
+
isOpen,
|
|
25
|
+
onClose,
|
|
26
|
+
traceback,
|
|
27
|
+
errorMessage,
|
|
28
|
+
}) => {
|
|
29
|
+
const handleCopy = async () => {
|
|
30
|
+
// Strip HTML tags for clipboard
|
|
31
|
+
const tempDiv = document.createElement("div");
|
|
32
|
+
tempDiv.innerHTML = traceback;
|
|
33
|
+
const textContent = tempDiv.textContent || tempDiv.innerText || "";
|
|
34
|
+
|
|
35
|
+
try {
|
|
36
|
+
await navigator.clipboard.writeText(textContent);
|
|
37
|
+
toast({
|
|
38
|
+
title: "Copied to clipboard",
|
|
39
|
+
description: "Traceback has been copied to your clipboard.",
|
|
40
|
+
});
|
|
41
|
+
} catch {
|
|
42
|
+
toast({
|
|
43
|
+
title: "Failed to copy",
|
|
44
|
+
description: "Could not copy to clipboard.",
|
|
45
|
+
variant: "danger",
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
};
|
|
49
|
+
|
|
50
|
+
return (
|
|
51
|
+
<AlertDialog open={isOpen} onOpenChange={(open) => !open && onClose()}>
|
|
52
|
+
<AlertDialogContent className="max-w-4xl max-h-[80vh]">
|
|
53
|
+
<AlertDialogHeader>
|
|
54
|
+
<AlertDialogTitle className="text-destructive">
|
|
55
|
+
{errorMessage}
|
|
56
|
+
</AlertDialogTitle>
|
|
57
|
+
<AlertDialogDescription>
|
|
58
|
+
Click the traceback to select and copy.
|
|
59
|
+
</AlertDialogDescription>
|
|
60
|
+
</AlertDialogHeader>
|
|
61
|
+
<div className="my-4 overflow-auto">
|
|
62
|
+
<div className="flex items-center justify-between mb-2">
|
|
63
|
+
<span className="text-sm font-medium text-muted-foreground">
|
|
64
|
+
Traceback
|
|
65
|
+
</span>
|
|
66
|
+
<Button
|
|
67
|
+
variant="outline"
|
|
68
|
+
size="xs"
|
|
69
|
+
onClick={handleCopy}
|
|
70
|
+
className="flex items-center gap-1"
|
|
71
|
+
>
|
|
72
|
+
<CopyIcon className="h-3 w-3" />
|
|
73
|
+
Copy
|
|
74
|
+
</Button>
|
|
75
|
+
</div>
|
|
76
|
+
<div
|
|
77
|
+
className="font-code text-sm p-4 bg-muted rounded border overflow-auto max-h-[50vh] cursor-text select-text"
|
|
78
|
+
dangerouslySetInnerHTML={{ __html: traceback }}
|
|
79
|
+
/>
|
|
80
|
+
</div>
|
|
81
|
+
<AlertDialogFooter>
|
|
82
|
+
<AlertDialogAction onClick={onClose}>Close</AlertDialogAction>
|
|
83
|
+
</AlertDialogFooter>
|
|
84
|
+
</AlertDialogContent>
|
|
85
|
+
</AlertDialog>
|
|
86
|
+
);
|
|
87
|
+
};
|
|
@@ -477,6 +477,7 @@ export const MarimoErrorOutput = ({
|
|
|
477
477
|
);
|
|
478
478
|
}
|
|
479
479
|
|
|
480
|
+
// All other exceptions
|
|
480
481
|
return (
|
|
481
482
|
<li className="my-2" key={`exception-${idx}`}>
|
|
482
483
|
{error.raising_cell == null ? (
|
|
@@ -484,14 +485,33 @@ export const MarimoErrorOutput = ({
|
|
|
484
485
|
<p className="text-muted-foreground">
|
|
485
486
|
{processTextForUrls(error.msg, `exception-${idx}`)}
|
|
486
487
|
</p>
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
488
|
+
{"traceback" in error && error.traceback ? (
|
|
489
|
+
<div
|
|
490
|
+
className="font-code text-sm mt-2 p-3 bg-muted rounded border overflow-auto max-h-[50vh] cursor-text select-text"
|
|
491
|
+
// biome-ignore lint/security/noDangerouslySetInnerHtml: traceback from backend
|
|
492
|
+
dangerouslySetInnerHTML={{
|
|
493
|
+
__html: error.traceback,
|
|
494
|
+
}}
|
|
495
|
+
/>
|
|
496
|
+
) : (
|
|
497
|
+
<div className="text-muted-foreground mt-2">
|
|
498
|
+
See the console area for a traceback.
|
|
499
|
+
</div>
|
|
500
|
+
)}
|
|
490
501
|
</div>
|
|
491
502
|
) : (
|
|
492
503
|
<div>
|
|
493
504
|
{processTextForUrls(error.msg, `exception-${idx}`)}
|
|
494
505
|
<CellLinkError cellId={error.raising_cell} />
|
|
506
|
+
{"traceback" in error && error.traceback && (
|
|
507
|
+
<div
|
|
508
|
+
className="font-code text-sm mt-2 p-3 bg-muted rounded border overflow-auto max-h-[50vh] cursor-text select-text"
|
|
509
|
+
// biome-ignore lint/security/noDangerouslySetInnerHtml: traceback from backend
|
|
510
|
+
dangerouslySetInnerHTML={{
|
|
511
|
+
__html: error.traceback,
|
|
512
|
+
}}
|
|
513
|
+
/>
|
|
514
|
+
)}
|
|
495
515
|
</div>
|
|
496
516
|
)}
|
|
497
517
|
</li>
|
|
@@ -32,7 +32,7 @@ import type { CellData, CellRuntimeState } from "@/core/cells/types";
|
|
|
32
32
|
import { MarkdownLanguageAdapter } from "@/core/codemirror/language/languages/markdown";
|
|
33
33
|
import { useResolvedMarimoConfig } from "@/core/config/config";
|
|
34
34
|
import { CSSClasses, KnownQueryParams } from "@/core/constants";
|
|
35
|
-
import type { OutputMessage } from "@/core/kernel/messages";
|
|
35
|
+
import type { MarimoError, OutputMessage } from "@/core/kernel/messages";
|
|
36
36
|
import { kernelStateAtom } from "@/core/kernel/state";
|
|
37
37
|
import { showCodeInRunModeAtom } from "@/core/meta/state";
|
|
38
38
|
import { isErrorMime } from "@/core/mime";
|
|
@@ -121,6 +121,7 @@ const VerticalLayoutRenderer: React.FC<VerticalLayoutProps> = ({
|
|
|
121
121
|
staleInputs={cell.staleInputs}
|
|
122
122
|
name={cell.name}
|
|
123
123
|
kiosk={kioskMode}
|
|
124
|
+
showErrorTracebacks={userConfig.runtime.show_tracebacks ?? false}
|
|
124
125
|
/>
|
|
125
126
|
);
|
|
126
127
|
};
|
|
@@ -330,6 +331,7 @@ interface VerticalCellProps extends Pick<
|
|
|
330
331
|
showCode: boolean;
|
|
331
332
|
name: string;
|
|
332
333
|
kiosk: boolean;
|
|
334
|
+
showErrorTracebacks: boolean;
|
|
333
335
|
}
|
|
334
336
|
|
|
335
337
|
const VerticalCell = memo(
|
|
@@ -350,6 +352,7 @@ const VerticalCell = memo(
|
|
|
350
352
|
mode,
|
|
351
353
|
name,
|
|
352
354
|
kiosk,
|
|
355
|
+
showErrorTracebacks,
|
|
353
356
|
}: VerticalCellProps) => {
|
|
354
357
|
const cellRef = useRef<HTMLDivElement>(null);
|
|
355
358
|
|
|
@@ -427,7 +430,18 @@ const VerticalCell = memo(
|
|
|
427
430
|
}
|
|
428
431
|
|
|
429
432
|
const outputIsError = isErrorMime(output?.mimetype);
|
|
430
|
-
|
|
433
|
+
// When show_tracebacks is enabled, show error outputs inline
|
|
434
|
+
// instead of hiding them
|
|
435
|
+
const hasTraceback =
|
|
436
|
+
showErrorTracebacks &&
|
|
437
|
+
outputIsError &&
|
|
438
|
+
Array.isArray(output?.data) &&
|
|
439
|
+
output.data.some(
|
|
440
|
+
(e: MarimoError) =>
|
|
441
|
+
e.type === "exception" && "traceback" in e && e.traceback,
|
|
442
|
+
);
|
|
443
|
+
const hidden =
|
|
444
|
+
(errored || interrupted || stopped || outputIsError) && !hasTraceback;
|
|
431
445
|
if (hidden) {
|
|
432
446
|
return null;
|
|
433
447
|
}
|
|
@@ -118,7 +118,9 @@ ToastDescription.displayName = ToastPrimitives.Description.displayName;
|
|
|
118
118
|
|
|
119
119
|
type ToastProps = React.ComponentPropsWithoutRef<typeof Toast>;
|
|
120
120
|
|
|
121
|
-
type ToastActionElement = React.ReactElement<
|
|
121
|
+
type ToastActionElement = React.ReactElement<
|
|
122
|
+
React.ComponentProps<typeof ToastAction>
|
|
123
|
+
>;
|
|
122
124
|
|
|
123
125
|
export {
|
|
124
126
|
type ToastProps,
|
package/src/core/MarimoApp.tsx
CHANGED
|
@@ -13,6 +13,7 @@ import { CssVariables } from "@/theme/ThemeProvider";
|
|
|
13
13
|
import { reactLazyWithPreload } from "@/utils/lazy";
|
|
14
14
|
import { ErrorBoundary } from "../components/editor/boundary/ErrorBoundary";
|
|
15
15
|
import { KernelStartupErrorModal } from "../components/editor/KernelStartupErrorModal";
|
|
16
|
+
import { TracebackModalContainer } from "../components/editor/TracebackModalContainer";
|
|
16
17
|
import { ModalProvider } from "../components/modal/ImperativeModal";
|
|
17
18
|
import { Toaster } from "../components/ui/toaster";
|
|
18
19
|
import { TooltipProvider } from "../components/ui/tooltip";
|
|
@@ -105,6 +106,7 @@ const Providers = memo(({ children }: PropsWithChildren) => {
|
|
|
105
106
|
<Toaster />
|
|
106
107
|
<TailwindIndicator />
|
|
107
108
|
<KernelStartupErrorModal />
|
|
109
|
+
<TracebackModalContainer />
|
|
108
110
|
</ModalProvider>
|
|
109
111
|
</LocaleProvider>
|
|
110
112
|
</SlotzProvider>
|
|
@@ -267,6 +267,34 @@ describe("applyTransactionChanges edge cases", () => {
|
|
|
267
267
|
`);
|
|
268
268
|
});
|
|
269
269
|
|
|
270
|
+
it("delete-cell for nonexistent cell does not crash subsequent changes", () => {
|
|
271
|
+
setup("a", "b", "c");
|
|
272
|
+
const [, b] = state.cellIds.inOrderIds;
|
|
273
|
+
// Simulate the scenario from the bug report: a delete-cell for a cell ID
|
|
274
|
+
// that was never added to the frontend, followed by a create-cell and
|
|
275
|
+
// a set-code update. The delete should be silently skipped, and the rest
|
|
276
|
+
// of the transaction should still apply.
|
|
277
|
+
apply([
|
|
278
|
+
{ type: "delete-cell", cellId: cellId("nonexistent") },
|
|
279
|
+
{
|
|
280
|
+
type: "create-cell",
|
|
281
|
+
cellId: cellId("VrZA"),
|
|
282
|
+
code: "import altair as alt",
|
|
283
|
+
name: "",
|
|
284
|
+
config: { hide_code: true },
|
|
285
|
+
},
|
|
286
|
+
{ type: "set-code", cellId: b, code: "updated" },
|
|
287
|
+
]);
|
|
288
|
+
expect(pretty(state)).toMatchInlineSnapshot(`
|
|
289
|
+
"
|
|
290
|
+
0: 'a'
|
|
291
|
+
1: 'updated'
|
|
292
|
+
2: 'c'
|
|
293
|
+
VrZA: 'import altair as alt' [hide_code]
|
|
294
|
+
"
|
|
295
|
+
`);
|
|
296
|
+
});
|
|
297
|
+
|
|
270
298
|
it("empty changes is a no-op", () => {
|
|
271
299
|
setup("a", "b");
|
|
272
300
|
apply([]);
|
package/src/core/cells/cells.ts
CHANGED
|
@@ -6,6 +6,7 @@ import { type Atom, atom, useAtom, useAtomValue } from "jotai";
|
|
|
6
6
|
import { atomFamily, selectAtom, splitAtom } from "jotai/utils";
|
|
7
7
|
import { createRef, type ReducerWithoutAction } from "react";
|
|
8
8
|
import type { CellHandle } from "@/components/editor/notebook-cell";
|
|
9
|
+
import type { CollapsibleTree } from "@/utils/id-tree";
|
|
9
10
|
import {
|
|
10
11
|
type CellColumnId,
|
|
11
12
|
type CellIndex,
|
|
@@ -578,7 +579,18 @@ const {
|
|
|
578
579
|
return state;
|
|
579
580
|
}
|
|
580
581
|
|
|
581
|
-
|
|
582
|
+
let column: CollapsibleTree<CellId>;
|
|
583
|
+
try {
|
|
584
|
+
column = state.cellIds.findWithId(cellId);
|
|
585
|
+
} catch (error) {
|
|
586
|
+
// Expected for kernel-only cells or out-of-order transactions.
|
|
587
|
+
Logger.warn("Skipping delete for missing cellId", {
|
|
588
|
+
cellId,
|
|
589
|
+
error,
|
|
590
|
+
});
|
|
591
|
+
return state;
|
|
592
|
+
}
|
|
593
|
+
|
|
582
594
|
const cellIndex = column.indexOfOrThrow(cellId);
|
|
583
595
|
const focusIndex = cellIndex === 0 ? 1 : cellIndex - 1;
|
|
584
596
|
let scrollKey: CellId | null = null;
|
package/src/core/cells/logs.ts
CHANGED
|
@@ -7,6 +7,10 @@ import { Strings } from "@/utils/strings";
|
|
|
7
7
|
import type { CellMessage, OutputMessage } from "../kernel/messages";
|
|
8
8
|
import { isErrorMime } from "../mime";
|
|
9
9
|
import type { CellId } from "./ids";
|
|
10
|
+
import { store } from "../state/jotai";
|
|
11
|
+
import { tracebackModalAtom } from "../errors/traceback-atom";
|
|
12
|
+
import React from "react";
|
|
13
|
+
import { ToastAction } from "@/components/ui/toast";
|
|
10
14
|
|
|
11
15
|
export interface CellLog {
|
|
12
16
|
timestamp: number;
|
|
@@ -72,17 +76,52 @@ export function getCellLogsForMessage(cell: CellMessage): CellLog[] {
|
|
|
72
76
|
});
|
|
73
77
|
});
|
|
74
78
|
|
|
75
|
-
|
|
76
|
-
|
|
79
|
+
// Find exception errors and check for traceback
|
|
80
|
+
const exceptionErrors = cell.output.data.filter(
|
|
81
|
+
(error) =>
|
|
82
|
+
("type" in error && error.type === "exception") ||
|
|
83
|
+
error.type === "internal",
|
|
77
84
|
);
|
|
78
|
-
|
|
85
|
+
|
|
86
|
+
if (exceptionErrors.length > 0 && !didAlreadyToastError) {
|
|
79
87
|
didAlreadyToastError = true;
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
88
|
+
|
|
89
|
+
// Find first error with a traceback
|
|
90
|
+
const errorWithTraceback = exceptionErrors.find(
|
|
91
|
+
(error) => error.traceback,
|
|
92
|
+
);
|
|
93
|
+
|
|
94
|
+
if (errorWithTraceback) {
|
|
95
|
+
// Show toast with action button to open modal
|
|
96
|
+
const handleClick = () => {
|
|
97
|
+
store.set(tracebackModalAtom, {
|
|
98
|
+
traceback: errorWithTraceback.traceback,
|
|
99
|
+
errorMessage:
|
|
100
|
+
errorWithTraceback.msg || "An internal error occurred",
|
|
101
|
+
});
|
|
102
|
+
};
|
|
103
|
+
|
|
104
|
+
toast({
|
|
105
|
+
title: "An internal error occurred",
|
|
106
|
+
description:
|
|
107
|
+
errorWithTraceback.msg || "Click 'View' to see traceback",
|
|
108
|
+
variant: "danger",
|
|
109
|
+
action: React.createElement(
|
|
110
|
+
ToastAction,
|
|
111
|
+
{
|
|
112
|
+
altText: "View traceback",
|
|
113
|
+
onClick: handleClick,
|
|
114
|
+
},
|
|
115
|
+
"View",
|
|
116
|
+
),
|
|
117
|
+
});
|
|
118
|
+
} else {
|
|
119
|
+
toast({
|
|
120
|
+
title: "An internal error occurred",
|
|
121
|
+
description: "See console for details.",
|
|
122
|
+
variant: "danger",
|
|
123
|
+
});
|
|
124
|
+
}
|
|
86
125
|
}
|
|
87
126
|
}
|
|
88
127
|
|
|
@@ -90,6 +90,7 @@ test("default UserConfig - empty", () => {
|
|
|
90
90
|
"default_sql_output": "auto",
|
|
91
91
|
"on_cell_change": "autorun",
|
|
92
92
|
"reactive_tests": true,
|
|
93
|
+
"show_tracebacks": false,
|
|
93
94
|
"watcher_on_save": "lazy",
|
|
94
95
|
},
|
|
95
96
|
"save": {
|
|
@@ -160,6 +161,7 @@ test("default UserConfig - one level", () => {
|
|
|
160
161
|
"default_sql_output": "auto",
|
|
161
162
|
"on_cell_change": "autorun",
|
|
162
163
|
"reactive_tests": true,
|
|
164
|
+
"show_tracebacks": false,
|
|
163
165
|
"watcher_on_save": "lazy",
|
|
164
166
|
},
|
|
165
167
|
"save": {
|