A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
add signature docstring, and remove list of autocompletion after empty paren & commas (#7331)
Shahmir Varqhaf532bb830f33
diff --git a/docs/_static/docs-signature-hint.png b/docs/_static/docs-signature-hint.pngnew file mode 100644index 0000000000..6cf6612901Binary files /dev/null and b/docs/_static/docs-signature-hint.png differdiff --git a/docs/guides/editor_features/overview.md b/docs/guides/editor_features/overview.mdindex edbe076685..3ca8e7704a 100644--- a/docs/guides/editor_features/overview.md+++ b/docs/guides/editor_features/overview.md@@ -150,6 +150,18 @@ create.- `Cmd/Ctrl-Click` on a variable to jump to its definition- Right-click on a variable to see a context menu with options to jump to its definition+## Signature hints++Signature hints show a function’s docstring above your code as you type, making it easy to recall its arguments and usage.+Enable this feature under the **Editor** section in the Settings panel.++<div align="center">+<figure>+<img src="/_static/docs-signature-hint.png" width="600px" />+</figure>+</div>++## Keyboard shortcutsWe've kept some well-known [keyboarddiff --git a/frontend/package.json b/frontend/package.jsonindex 6469eba87d..1acf47c9ca 100644--- a/frontend/package.json+++ b/frontend/package.json@@ -51,7 +51,7 @@"@lezer/markdown": "^1.6.0","@lezer/python": "^1.1.18","@marimo-team/codemirror-ai": "^0.3.2",- "@marimo-team/codemirror-languageserver": "^1.16.0",+ "@marimo-team/codemirror-languageserver": "^1.16.7","@marimo-team/codemirror-mcp": "^0.1.5","@marimo-team/codemirror-sql": "^0.2.4","@marimo-team/llm-info": "workspace:*",diff --git a/frontend/src/components/app-config/user-config-form.tsx b/frontend/src/components/app-config/user-config-form.tsxindex 64db954654..73de740acc 100644--- a/frontend/src/components/app-config/user-config-form.tsx+++ b/frontend/src/components/app-config/user-config-form.tsx@@ -399,6 +399,38 @@ export const UserConfigForm: React.FC = () => {</div>)}/>+ <FormField+ control={form.control}+ name="completion.signature_hint_on_typing"+ render={({ field }) => (+ <div className="flex flex-col space-y-1">+ <FormItem className={formItemClasses}>+ <FormLabel className="font-normal">+ Signature hints+ </FormLabel>+ <FormControl>+ <Checkbox+ data-testid="signature-hint-on-type-checkbox"+ checked={field.value ?? false}+ disabled={field.disabled}+ onCheckedChange={(checked) => {+ field.onChange(Boolean(checked));+ }}+ />+ </FormControl>+ <FormMessage />+ <IsOverridden+ userConfig={config}+ name="completion.signature_hint_on_typing"+ />+ </FormItem>+ <FormDescription>+ Display signature hints while typing within function+ calls.+ </FormDescription>+ </div>+ )}+ /></SettingGroup><SettingGroup title="Language Servers"><FormDescription>diff --git a/frontend/src/components/editor/__tests__/data-attributes.test.tsx b/frontend/src/components/editor/__tests__/data-attributes.test.tsxindex 1a7dadd3aa..8f7861c487 100644--- a/frontend/src/components/editor/__tests__/data-attributes.test.tsx+++ b/frontend/src/components/editor/__tests__/data-attributes.test.tsx@@ -65,6 +65,7 @@ describe("Cell data attributes", () => {keymap: { preset: "default" },completion: {activate_on_typing: true,+ signature_hint_on_typing: false,copilot: false,},formatting: { line_length: 88 },diff --git a/frontend/src/components/editor/cell/code/cell-editor.tsx b/frontend/src/components/editor/cell/code/cell-editor.tsxindex f1036459ff..7d1d950501 100644--- a/frontend/src/components/editor/cell/code/cell-editor.tsx+++ b/frontend/src/components/editor/cell/code/cell-editor.tsx@@ -38,7 +38,10 @@ import { invariant } from "@/utils/invariant";import { mergeRefs } from "@/utils/mergeRefs";import { AiCompletionEditor } from "../../ai/ai-completion-editor";import { HideCodeButton } from "../../code/readonly-python-code";-import { useCellEditorNavigationProps } from "../../navigation/navigation";+import {+ closeSignatureHelp,+ useCellEditorNavigationProps,+} from "../../navigation/navigation";import { useDeleteCellCallback } from "../useDeleteCell";import { useSplitCellCallback } from "../useSplitCell";import { LanguageToggles } from "./language-toggle";@@ -123,6 +126,12 @@ const CellEditorInternal = ({return false;}runCell();++ // Close the signature help to maintain a clear view of the output and code+ if (editorViewRef.current) {+ closeSignatureHelp(editorViewRef.current);+ }+return true;});diff --git a/frontend/src/components/editor/navigation/__tests__/navigation.test.ts b/frontend/src/components/editor/navigation/__tests__/navigation.test.tsindex 357baf079e..1dbec2e06a 100644--- a/frontend/src/components/editor/navigation/__tests__/navigation.test.ts+++ b/frontend/src/components/editor/navigation/__tests__/navigation.test.ts@@ -1675,6 +1675,7 @@ describe("useCellEditorNavigationProps", () => {{ from: 15, to: 15, empty: true },],},+ field: vi.fn().mockReturnValue(false),},dispatch: vi.fn(),} as unknown as EditorView,@@ -1717,6 +1718,7 @@ describe("useCellEditorNavigationProps", () => {current: {state: {selection: { main: { from: 5, to: 5, empty: true } },+ field: vi.fn().mockReturnValue(false),},dispatch: vi.fn(),} as unknown as EditorView,diff --git a/frontend/src/components/editor/navigation/navigation.ts b/frontend/src/components/editor/navigation/navigation.tsindex ff9026ae53..e3b208cd96 100644--- a/frontend/src/components/editor/navigation/navigation.ts+++ b/frontend/src/components/editor/navigation/navigation.ts@@ -3,6 +3,10 @@import { closeCompletion, completionStatus } from "@codemirror/autocomplete";import { simplifySelection } from "@codemirror/commands";import type { EditorView } from "@codemirror/view";+import {+ setSignatureHelpTooltip,+ signatureHelpTooltipField,+} from "@marimo-team/codemirror-languageserver";import { useAtomValue, useSetAtom, useStore } from "jotai";import { useMemo } from "react";import { mergeProps, useFocusWithin, useKeyboard } from "react-aria";@@ -83,7 +87,10 @@ function addSingleHandler(handler: HotkeyHandler["bulkHandle"]): HotkeyHandler {};}-function useCellFocusProps(cellId: CellId) {+function useCellFocusProps(+ cellId: CellId,+ editorView: React.RefObject<EditorView | null>,+) {const focusActions = useCellFocusActions();const actions = useCellActions();const temporarilyShownCodeActions = useTemporarilyShownCodeActions();@@ -99,6 +106,10 @@ function useCellFocusProps(cellId: CellId) {temporarilyShownCodeActions.remove(cellId);actions.markTouched({ cellId });focusActions.blurCell();+ // Close signature help when clicking outside the cell+ if (editorView.current) {+ closeSignatureHelp(editorView.current);+ }},});@@ -167,7 +178,7 @@ export function useCellNavigationProps() => parseShortcut(hotkeys.getHotkey(shortcut).key)(evt.nativeEvent || evt);// Callbacks occur at the cell level and descedants.- const focusWithinProps = useCellFocusProps(cellId);+ const focusWithinProps = useCellFocusProps(cellId, editorView);const { keyboardProps } = useKeyboard({onKeyDown: (evt) => {@@ -645,9 +656,17 @@ export function useCellEditorNavigationProps(return;}+ const hasSignatureHelp = state.field(signatureHelpTooltipField, false);const hasAutocompletePopup = completionStatus(state) !== null;+ if (hasSignatureHelp) {+ closeSignatureHelp(view);+ }+if (hasAutocompletePopup) {closeCompletion(view);+ }++ if (hasSignatureHelp || hasAutocompletePopup) {return;}@@ -703,3 +722,9 @@ function findClosestAdjacentCell(// no aligned cells (column beyond other), jump to last elementreturn adjacentColumn.last();}++export function closeSignatureHelp(view: EditorView) {+ if (view.state.field(signatureHelpTooltipField, false)) {+ view.dispatch({ effects: setSignatureHelpTooltip.of(null) });+ }+}diff --git a/frontend/src/core/ai/tools/__tests__/edit-notebook-tool.test.ts b/frontend/src/core/ai/tools/__tests__/edit-notebook-tool.test.tsindex d4a454941c..5da25e3ec8 100644--- a/frontend/src/core/ai/tools/__tests__/edit-notebook-tool.test.ts+++ b/frontend/src/core/ai/tools/__tests__/edit-notebook-tool.test.ts@@ -36,6 +36,7 @@ function createMockEditorView(code: string): EditorView {completionConfig: {copilot: false,activate_on_typing: true,+ signature_hint_on_typing: false,codeium_api_key: null,},hotkeys: new OverridingHotkeyProvider({}),@@ -46,6 +47,7 @@ function createMockEditorView(code: string): EditorView {completionConfig: {copilot: false,activate_on_typing: true,+ signature_hint_on_typing: false,codeium_api_key: null,},hotkeys: new OverridingHotkeyProvider({}),diff --git a/frontend/src/core/cells/__tests__/cells.test.ts b/frontend/src/core/cells/__tests__/cells.test.tsindex 6a694104a1..4776df39c4 100644--- a/frontend/src/core/cells/__tests__/cells.test.ts+++ b/frontend/src/core/cells/__tests__/cells.test.ts@@ -87,6 +87,7 @@ function createEditor(content: string) {cellId: "cell1" as CellId,completionConfig: {activate_on_typing: true,+ signature_hint_on_typing: false,copilot: false,codeium_api_key: null,},diff --git a/frontend/src/core/codemirror/__tests__/format.test.ts b/frontend/src/core/codemirror/__tests__/format.test.tsindex d9987693d8..40c9956e36 100644--- a/frontend/src/core/codemirror/__tests__/format.test.ts+++ b/frontend/src/core/codemirror/__tests__/format.test.ts@@ -54,6 +54,7 @@ function createEditor(content: string, cellId: CellId) {cellId,completionConfig: {activate_on_typing: true,+ signature_hint_on_typing: false,copilot: false,codeium_api_key: null,},diff --git a/frontend/src/core/codemirror/__tests__/setup.test.ts b/frontend/src/core/codemirror/__tests__/setup.test.tsindex 8ac14c216f..3c70504d29 100644--- a/frontend/src/core/codemirror/__tests__/setup.test.ts+++ b/frontend/src/core/codemirror/__tests__/setup.test.ts@@ -48,6 +48,7 @@ function getOpts() {} as unknown as CodemirrorCellActions,completionConfig: {activate_on_typing: false,+ signature_hint_on_typing: false,copilot: false,codeium_api_key: null,},diff --git a/frontend/src/core/codemirror/completion/__tests__/hints.test.ts b/frontend/src/core/codemirror/completion/__tests__/hints.test.tsindex 26508c645d..a9dcda7c03 100644--- a/frontend/src/core/codemirror/completion/__tests__/hints.test.ts+++ b/frontend/src/core/codemirror/completion/__tests__/hints.test.ts@@ -81,4 +81,20 @@ describe("getPositionAtWordBounds", () => {doc.slice(result.startToken, result.endToken).toString(),).toMatchInlineSnapshot('"my_100_var"');});++ it("should include function name when cursor inside empty call", () => {+ const callDoc = Text.of(["func()"]);+ const pos = "func(".length;+ const result = getPositionAtWordBounds(callDoc, pos);++ expect(result).toMatchInlineSnapshot(`+ {+ "endToken": 4,+ "startToken": 0,+ }+ `);+ expect(+ callDoc.slice(result.startToken, result.endToken).toString(),+ ).toMatchInlineSnapshot('"func"');+ });});diff --git a/frontend/src/core/codemirror/completion/hints.ts b/frontend/src/core/codemirror/completion/hints.tsindex a9eb059533..02d0ca1e46 100644--- a/frontend/src/core/codemirror/completion/hints.ts+++ b/frontend/src/core/codemirror/completion/hints.ts@@ -81,8 +81,20 @@ async function requestDocumentation({}export function getPositionAtWordBounds(doc: Text, pos: number) {- let startToken = pos;- let endToken = pos;+ let cursorPos = pos;++ const charBefore =+ cursorPos > 0 ? doc.sliceString(cursorPos - 1, cursorPos) : "";+ const charAfter =+ cursorPos < doc.length ? doc.sliceString(cursorPos, cursorPos + 1) : "";++ // If the cursor is inside function call parentheses, move the cursor to the start of the function call+ if (charBefore === "(" && charAfter === ")") {+ cursorPos -= 1;+ }++ let startToken = cursorPos;+ let endToken = cursorPos;// Start of wordwhile (startToken > 0) {diff --git a/frontend/src/core/codemirror/copilot/__tests__/getCodes.test.ts b/frontend/src/core/codemirror/copilot/__tests__/getCodes.test.tsindex 4345dbe2db..4848c53b09 100644--- a/frontend/src/core/codemirror/copilot/__tests__/getCodes.test.ts+++ b/frontend/src/core/codemirror/copilot/__tests__/getCodes.test.ts@@ -37,6 +37,7 @@ function createMockEditorView(code: string) {completionConfig: {copilot: false,activate_on_typing: true,+ signature_hint_on_typing: false,codeium_api_key: null,},hotkeys: new OverridingHotkeyProvider({}),@@ -47,6 +48,7 @@ function createMockEditorView(code: string) {completionConfig: {copilot: false,activate_on_typing: true,+ signature_hint_on_typing: false,codeium_api_key: null,},hotkeys: new OverridingHotkeyProvider({}),diff --git a/frontend/src/core/codemirror/language/__tests__/extension.test.ts b/frontend/src/core/codemirror/language/__tests__/extension.test.tsindex ca082a4277..ac49b5a4be 100644--- a/frontend/src/core/codemirror/language/__tests__/extension.test.ts+++ b/frontend/src/core/codemirror/language/__tests__/extension.test.ts@@ -41,6 +41,7 @@ function createState(content: string, selection?: { anchor: number }) {completionConfig: {copilot: false,activate_on_typing: true,+ signature_hint_on_typing: false,codeium_api_key: null,},lspConfig: {},@@ -51,6 +52,7 @@ function createState(content: string, selection?: { anchor: number }) {completionConfig: {copilot: false,activate_on_typing: true,+ signature_hint_on_typing: false,codeium_api_key: null,},hotkeys: new OverridingHotkeyProvider({}),diff --git a/frontend/src/core/codemirror/language/__tests__/utils.test.ts b/frontend/src/core/codemirror/language/__tests__/utils.test.tsindex 8ba5e38e93..65b48469f2 100644--- a/frontend/src/core/codemirror/language/__tests__/utils.test.ts+++ b/frontend/src/core/codemirror/language/__tests__/utils.test.ts@@ -21,6 +21,7 @@ function createEditor(doc: string) {adaptiveLanguageConfiguration({completionConfig: {activate_on_typing: true,+ signature_hint_on_typing: false,copilot: false,codeium_api_key: null,},@@ -32,6 +33,7 @@ function createEditor(doc: string) {cellConfigExtension({completionConfig: {activate_on_typing: true,+ signature_hint_on_typing: false,copilot: false,codeium_api_key: null,},diff --git a/frontend/src/core/codemirror/language/languages/python.ts b/frontend/src/core/codemirror/language/languages/python.tsindex 422993d9b3..90932aa86d 100644--- a/frontend/src/core/codemirror/language/languages/python.ts+++ b/frontend/src/core/codemirror/language/languages/python.ts@@ -267,6 +267,21 @@ export class PythonLanguageAdapter implements LanguageAdapter<{}> {clients.push(pyrightClient(lspConfig));}+ const signatureActivateOnTyping =+ completionConfig.signature_hint_on_typing;++ // Match completions before the cursor is at the end of a word,+ // after a dot, after a slash (and with/without a comma).+ const defaultMatchCompletion = /(\w+|\w+\.|\(|\/|,)$/;+ const excludeCommasCompletion = /(\w+|\w+\.|\/)$/;++ // If we are showing the signature on type, we do not need to match on commas+ // After a comma, we just show the signature help and not the completion list+ // This reduces popups and matches the behaviour of VS Code+ const completionMatchBefore = signatureActivateOnTyping+ ? excludeCommasCompletion+ : defaultMatchCompletion;+if (clients.length > 0) {const client =clients.length === 1@@ -285,15 +300,16 @@ export class PythonLanguageAdapter implements LanguageAdapter<{}> {diagnosticsEnabled: lspConfig.diagnostics?.enabled ?? false,sendIncrementalChanges: false,signatureHelpEnabled: true,- signatureActivateOnTyping: false,+ signatureActivateOnTyping,+ signatureHelpOptions: {+ position: "above",+ },keyboardShortcuts: {signatureHelp: hotkeys.getHotkey("cell.signatureHelp").key,goToDefinition: hotkeys.getHotkey("cell.goToDefinition").key,rename: hotkeys.getHotkey("cell.renameSymbol").key,},- // Match completions before the cursor is at the end of a word,- // after a dot, after a slash, after a comma.- completionMatchBefore: /(\w+|\w+\.|\(|\/|,)$/,+ completionMatchBefore,onGoToDefinition: (result) => {Logger.debug("onGoToDefinition", result);if (client.documentUri === result.uri) {diff --git a/frontend/src/core/config/__tests__/config-schema.test.ts b/frontend/src/core/config/__tests__/config-schema.test.tsindex fa2756795a..040e5b883e 100644--- a/frontend/src/core/config/__tests__/config-schema.test.ts+++ b/frontend/src/core/config/__tests__/config-schema.test.ts@@ -56,6 +56,7 @@ test("default UserConfig - empty", () => {"completion": {"activate_on_typing": true,"copilot": false,+ "signature_hint_on_typing": false,},"diagnostics": {},"display": {@@ -124,6 +125,7 @@ test("default UserConfig - one level", () => {"completion": {"activate_on_typing": true,"copilot": false,+ "signature_hint_on_typing": false,},"diagnostics": {},"display": {@@ -198,7 +200,11 @@ test("default UserConfig with additional information", () => {test("resolvedMarimoConfigAtom overrides correctly and does not mutate the original array", () => {const initialUserConfig = {- completion: { activate_on_typing: true, copilot: false },+ completion: {+ activate_on_typing: true,+ copilot: false,+ signature_hint_on_typing: false,+ },save: {autosave: "after_delay",autosave_delay: 1000,@@ -220,7 +226,11 @@ test("resolvedMarimoConfigAtom overrides correctly and does not mutate the origiconst result = store.get(resolvedMarimoConfigAtom);expect(result).toEqual({- completion: { activate_on_typing: true, copilot: "github" },+ completion: {+ activate_on_typing: true,+ copilot: "github",+ signature_hint_on_typing: false,+ },save: {autosave: "after_delay",autosave_delay: 1000,@@ -231,7 +241,11 @@ test("resolvedMarimoConfigAtom overrides correctly and does not mutate the origi});expect(initialUserConfig).toEqual({- completion: { activate_on_typing: true, copilot: false },+ completion: {+ activate_on_typing: true,+ copilot: false,+ signature_hint_on_typing: false,+ },save: {autosave: "after_delay",autosave_delay: 1000,diff --git a/frontend/src/core/config/config-schema.ts b/frontend/src/core/config/config-schema.tsindex 70accf4f3b..8a57d1f94a 100644--- a/frontend/src/core/config/config-schema.ts+++ b/frontend/src/core/config/config-schema.ts@@ -74,6 +74,7 @@ export const UserConfigSchema = zcompletion: z.object({activate_on_typing: z.boolean().prefault(true),+ signature_hint_on_typing: z.boolean().prefault(false),copilot: z.union([z.boolean(), z.enum(["github", "codeium", "custom"])]).prefault(false)diff --git a/frontend/src/css/app/codemirror-completions.css b/frontend/src/css/app/codemirror-completions.cssindex 7e598761f0..303b4080f0 100644--- a/frontend/src/css/app/codemirror-completions.css+++ b/frontend/src/css/app/codemirror-completions.css@@ -266,61 +266,167 @@}.cm-signature-help {- max-width: 700px !important;+ max-width: 550px !important;margin-right: 16px !important;- padding: 10px !important;overflow-y: auto;- max-height: 400px;+ max-height: 330px;+ padding: 0.5rem !important;scrollbar-width: thin;- @apply bg-popover shadow-md border border-border rounded-md text-sm;+ line-height: normal;+ @apply bg-popover shadow-md border border-border rounded-md text-sm py-1 px-2 font-prose;- .cm-signature {- @apply text-xs;+ /* Paragraphs */+ & p {+ padding: 0.4rem 0;+ white-space: pre-wrap;}- .cm-signature-parameter {- @apply text-xs;+ /* Lists */+ & ul,+ & ol,+ & li {+ white-space: initial;}- .cm-signature {- @apply font-mono;+ & ol {+ list-style-type: decimal;+ padding-left: 1.5rem;}- .cm-signature-docs {- @apply text-xs;+ & ul {+ list-style-type: disc;+ padding-left: 1.5rem;}- ul {- @apply list-disc;+ /* Headings */+ & h1,+ & h2 {+ font-weight: 600;+ @apply text-base border-b pb-1 mb-1 text-primary;}- ol {- @apply list-decimal;+ & h3,+ & h4 {+ @apply text-sm font-semibold mt-2 mb-1;}- li {- margin-bottom: 2px;+ /* Definition lists */+ & dt {+ @apply font-bold;+ }++ & dt span {+ @apply font-normal;+ }- @apply pl-2;+ /* Inline code */+ & code {+ @apply border px-1 rounded font-mono bg-[var(--slate-2)] text-xs;}- code:not(:empty) {+ & code:empty {+ display: none;+ }++ /* Code blocks */+ & pre > code {width: 100%;+ display: inline-block;+ @apply p-2 mb-1;+ }++ /* Tables */+ & table {+ @apply text-sm border rounded my-2;+ }++ & table th,+ & table td {+ @apply border p-2;+ }++ & table th {+ @apply bg-[var(--slate-2)];+ }++ & table tr:nth-child(2n) {+ @apply bg-[var(--slate-1)];+ }++ /* Blockquotes */+ & blockquote {white-space: pre-wrap;- @apply bg-[var(--slate-2)] border rounded-sm px-1 font-mono;+ @apply pl-2 ml-2;}- pre > code {+ & blockquote p {+ padding: 0;+ white-space: normal;+ font-weight: initial;+ @apply text-xs font-mono;+ }++ /* Class selectors (higher specificity) */++ /* Signature line styling */+ .cm-signature {+ @apply text-xs p-2 rounded-sm font-mono bg-muted;+ }++ .cm-signature-active-param {+ @apply font-bold text-primary;+ }++ .section {+ line-height: normal;+ }++ .paragraph {+ white-space: initial;+ }++ /* Docutils (Python docstring classes) */+ .docutils p,+ .docutils dd {+ white-space: initial;+ }++ .docutils dd {+ white-space: pre-wrap;+ padding-left: 1rem;+ }++ .docutils.literal {+ @apply bg-[var(--slate-2)] px-1 border rounded-md text-xs font-mono;+ }++ /* Doctest and literal blocks */+ .doctest-block,+ .literal-block {+ white-space: pre-wrap;+ @apply bg-[var(--slate-2)] p-2 rounded text-xs;+ }++ .codehilite code {width: 100%;display: inline-block;white-space: pre-wrap;- @apply bg-[var(--slate-2)] border p-2 rounded-md font-mono text-sm my-2;+ @apply bg-[var(--slate-2)] border p-2 rounded-md font-mono text-xs;}- h1,- h2,- h3,- h4 {- @apply text-sm font-semibold mt-2 mb-1;+ blockquote dl.docutils,+ blockquote .docutils dt {+ padding: 0;+ white-space: normal;+ font-weight: initial;+ @apply text-xs font-mono;}}++.cm-signature-docs {+ color: black !important;+}++.dark .cm-signature-docs {+ color: white !important;+}diff --git a/frontend/src/stories/editor.stories.tsx b/frontend/src/stories/editor.stories.tsxindex 276f081c28..86781e4317 100644--- a/frontend/src/stories/editor.stories.tsx+++ b/frontend/src/stories/editor.stories.tsx@@ -59,11 +59,15 @@ const Editor = (opts: { extensions?: Extension[] }): React.ReactNode => {};export const Primary: Story = {- render: (args, ctx) => (+ render: (_args, ctx) => (<div className="Cell m-20 w-[60%] overflow-hidden"><Editorextensions={basicBundle({- completionConfig: { activate_on_typing: false, copilot: false },+ completionConfig: {+ activate_on_typing: false,+ copilot: false,+ signature_hint_on_typing: false,+ },theme: ctx.globals.theme,hotkeys: new OverridingHotkeyProvider({}),} as unknown as CodeMirrorSetupOpts)}@@ -80,6 +84,7 @@ export const DefaultPython: Story = {python(),copilotBundle({activate_on_typing: true,+ signature_hint_on_typing: false,copilot: false,codeium_api_key: null,}),diff --git a/frontend/src/stories/theme.stories.tsx b/frontend/src/stories/theme.stories.tsxindex a1e7bd03e0..b574d80732 100644--- a/frontend/src/stories/theme.stories.tsx+++ b/frontend/src/stories/theme.stories.tsx@@ -14,6 +14,7 @@ import { OverridingHotkeyProvider } from "../core/hotkeys/hotkeys";const demoConfig: Partial<CodeMirrorSetupOpts> = {completionConfig: {activate_on_typing: false,+ signature_hint_on_typing: false,copilot: false,codeium_api_key: null,},@@ -37,10 +38,10 @@ class ExampleClass:def __init__(self, value):self.value = valueself.data = {}-+def get_value(self):return self.value-+@propertydef data_size(self):return len(self.data)diff --git a/marimo/_config/config.py b/marimo/_config/config.pyindex e7f882c799..f20114161c 100644--- a/marimo/_config/config.py+++ b/marimo/_config/config.py@@ -39,11 +39,13 @@ class CompletionConfig(TypedDict):- `activate_on_typing`: if `False`, completion won't activateuntil the completion hotkey is entered+ - `signature_hint_on_typing`: if `False`, signature hint won't be shown when typing- `copilot`: one of `"github"`, `"codeium"`, or `"custom"`- `codeium_api_key`: the Codeium API key"""activate_on_typing: bool+ signature_hint_on_typing: boolcopilot: Union[bool, Literal["github", "codeium", "custom"]]# Codeium@@ -623,7 +625,11 @@ class PartialMarimoConfig(TypedDict, total=False):DEFAULT_CONFIG: MarimoConfig = {- "completion": {"activate_on_typing": True, "copilot": False},+ "completion": {+ "activate_on_typing": True,+ "signature_hint_on_typing": False,+ "copilot": False,+ },"display": {"theme": "light","code_editor_font_size": 14,diff --git a/marimo/_smoke_tests/docs/docstrings.py b/marimo/_smoke_tests/docs/docstrings.pyindex 26a0d7f80f..e79857f9d2 100644--- a/marimo/_smoke_tests/docs/docstrings.py+++ b/marimo/_smoke_tests/docs/docstrings.py@@ -8,7 +8,7 @@import marimo-__generated_with = "0.15.5"+__generated_with = "0.18.4"app = marimo.App(width="medium")@@ -22,7 +22,9 @@ def _():@app.cell(hide_code=True)def _(mo):- mo.md("""This notebook compares `docstring_to_markdown` to our internal `google_docstring_to_markdown`.""")+ mo.md("""+ This notebook compares `docstring_to_markdown` to our internal `google_docstring_to_markdown`.+ """)returndiff --git a/packages/openapi/api.yaml b/packages/openapi/api.yamlindex beae4d07fe..a39fc11983 100644--- a/packages/openapi/api.yaml+++ b/packages/openapi/api.yaml@@ -662,8 +662,9 @@ components:description: "Configuration for code completion.\n\n A dict with key/value\\ pairs configuring code completion in the marimo\n editor.\n\n **Keys.**\n\\n - `activate_on_typing`: if `False`, completion won't activate\n until\- \ the completion hotkey is entered\n - `copilot`: one of `\"github\"`,\- \ `\"codeium\"`, or `\"custom\"`\n - `codeium_api_key`: the Codeium API\+ \ the completion hotkey is entered\n - `signature_hint_on_typing`: if `False`,\+ \ signature hint won't be shown when typing\n - `copilot`: one of `\"github\"\+ `, `\"codeium\"`, or `\"custom\"`\n - `codeium_api_key`: the Codeium API\\ key"properties:activate_on_typing:@@ -691,9 +692,12 @@ components:anyOf:- type: string- type: 'null'+ signature_hint_on_typing:+ type: booleanrequired:- activate_on_typing- copilot+ - signature_hint_on_typingtitle: CompletionConfigtype: objectCompletionOption:diff --git a/packages/openapi/src/api.ts b/packages/openapi/src/api.tsindex c1a653a9c0..7274a48088 100644--- a/packages/openapi/src/api.ts+++ b/packages/openapi/src/api.ts@@ -3177,6 +3177,7 @@ export interface components {** - `activate_on_typing`: if `False`, completion won't activate* until the completion hotkey is entered+ * - `signature_hint_on_typing`: if `False`, signature hint won't be shown when typing* - `copilot`: one of `"github"`, `"codeium"`, or `"custom"`* - `codeium_api_key`: the Codeium API key*/@@ -3187,6 +3188,7 @@ export interface components {codeium_api_key?: string | null;copilot: boolean | ("codeium" | "custom" | "github");model?: string | null;+ signature_hint_on_typing: boolean;};/** CompletionOption */CompletionOption: {diff --git a/pixi.lock b/pixi.lockindex dea4966659..ef3c3790d4 100644--- a/pixi.lock+++ b/pixi.lock@@ -5,6 +5,8 @@ environments:- url: https://conda.anaconda.org/conda-forge/indexes:- https://pypi.org/simple+ options:+ pypi-prerelease-mode: if-necessary-or-explicitpackages:linux-64:- conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2@@ -106,18 +108,18 @@ environments:- conda: https://conda.anaconda.org/conda-forge/noarch/zipp-3.22.0-pyhd8ed1ab_0.conda- conda: https://conda.anaconda.org/conda-forge/linux-64/zlib-1.3.1-hb9d3cd8_2.conda- conda: https://conda.anaconda.org/conda-forge/linux-64/zstandard-0.23.0-py312h66e93f0_2.conda- - pypi: https://files.pythonhosted.org/packages/8f/d7/9322c609343d929e75e7e5e6255e614fcc67572cfd083959cdef3b7aad79/docutils-0.21.2-py3-none-any.whl+ - pypi: https://files.pythonhosted.org/packages/11/a8/c6a4b901d17399c77cd81fb001ce8961e9f5e04d3daf27e8925cb012e163/docutils-0.22.3-py3-none-any.whl- pypi: https://files.pythonhosted.org/packages/04/96/92447566d16df59b2a776c0fb82dbc4d9e07cd95062562af01e408583fc4/itsdangerous-2.2.0-py3-none-any.whl- pypi: https://files.pythonhosted.org/packages/c0/5a/9cac0c82afec3d09ccd97c8b6502d48f165f9124db81b4bcb90b4af974ee/jedi-0.19.2-py2.py3-none-any.whl- - pypi: https://files.pythonhosted.org/packages/a3/48/f97f0920c20bc522c34f1eaec4c62d7a03c95c37da2dec858f65c8cb4325/loro-1.5.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl- - pypi: https://files.pythonhosted.org/packages/51/3f/afe76f8e2246ffbc867440cbcf90525264df0e658f8a5ca1f872b3f6192a/markdown-3.8-py3-none-any.whl+ - pypi: https://files.pythonhosted.org/packages/b2/70/00dc4246d9f3c69ecbb9bc36d5ad1a359884464a44711c665cb0afb1e9de/loro-1.10.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl+ - pypi: https://files.pythonhosted.org/packages/70/81/54e3ce63502cd085a0c556652a4e1b919c45a446bd1e5300e10c44c8c521/markdown-3.10-py3-none-any.whl- pypi: https://files.pythonhosted.org/packages/5c/a2/488517a43ccf5a4b6b6eca6dd4ede0bd82b043d1539dd6bb908a19f8efd3/msgspec-0.20.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl- - pypi: https://files.pythonhosted.org/packages/50/3b/0e2c535c3e6970cfc5763b67f6cc31accaab35a7aa3e322fb6a12830450f/narwhals-2.6.0-py3-none-any.whl- - pypi: https://files.pythonhosted.org/packages/c6/ac/dac4a63f978e4dcb3c6d3a78c4d8e0192a113d288502a1216950c41b1027/parso-0.8.4-py2.py3-none-any.whl- - pypi: https://files.pythonhosted.org/packages/bf/b9/b0eb3f3cbcb734d930fdf839431606844a825b23eaf9a6ab371edac8162c/psutil-7.0.0-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl- - pypi: https://files.pythonhosted.org/packages/a7/d1/c54e608505776ce4e7966d03358ae635cfd51dff1da6ee421c090dbc797b/pymdown_extensions-10.15-py3-none-any.whl- - pypi: https://files.pythonhosted.org/packages/8b/0c/9d30a4ebeb6db2b25a841afbb80f6ef9a854fc3b41be131d249a977b4959/starlette-0.46.2-py3-none-any.whl- - pypi: https://files.pythonhosted.org/packages/b1/4b/4cef6ce21a2aaca9d852a6e84ef4f135d99fcd74fa75105e2fc0c8308acd/uvicorn-0.34.2-py3-none-any.whl+ - pypi: https://files.pythonhosted.org/packages/87/0d/1861d1599571974b15b025e12b142d8e6b42ad66c8a07a89cb0fc21f1e03/narwhals-2.13.0-py3-none-any.whl+ - pypi: https://files.pythonhosted.org/packages/16/32/f8e3c85d1d5250232a5d3477a2a28cc291968ff175caeadaf3cc19ce0e4a/parso-0.8.5-py2.py3-none-any.whl+ - pypi: https://files.pythonhosted.org/packages/ce/b1/5f49af514f76431ba4eea935b8ad3725cdeb397e9245ab919dbc1d1dc20f/psutil-7.1.3-cp36-abi3-manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_28_x86_64.whl+ - pypi: https://files.pythonhosted.org/packages/fb/35/b763e8fbcd51968329b9adc52d188fc97859f85f2ee15fe9f379987d99c5/pymdown_extensions-10.19.1-py3-none-any.whl+ - pypi: https://files.pythonhosted.org/packages/d9/52/1064f510b141bd54025f9b55105e26d1fa970b9be67ad766380a3c9b74b0/starlette-0.50.0-py3-none-any.whl+ - pypi: https://files.pythonhosted.org/packages/ee/d9/d88e73ca598f4f6ff671fb5fde8a32925c2e08a637303a1d12883c7305fa/uvicorn-0.38.0-py3-none-any.whl- pypi: https://files.pythonhosted.org/packages/14/8f/aa61f528fba38578ec553c145857a181384c72b98156f858ca5c8e82d9d3/websockets-15.0.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl- pypi: ./osx-arm64:@@ -203,18 +205,18 @@ environments:- conda: https://conda.anaconda.org/conda-forge/noarch/zipp-3.22.0-pyhd8ed1ab_0.conda- conda: https://conda.anaconda.org/conda-forge/osx-arm64/zlib-1.3.1-h8359307_2.conda- conda: https://conda.anaconda.org/conda-forge/osx-arm64/zstandard-0.23.0-py312hea69d52_2.conda- - pypi: https://files.pythonhosted.org/packages/8f/d7/9322c609343d929e75e7e5e6255e614fcc67572cfd083959cdef3b7aad79/docutils-0.21.2-py3-none-any.whl+ - pypi: https://files.pythonhosted.org/packages/11/a8/c6a4b901d17399c77cd81fb001ce8961e9f5e04d3daf27e8925cb012e163/docutils-0.22.3-py3-none-any.whl- pypi: https://files.pythonhosted.org/packages/04/96/92447566d16df59b2a776c0fb82dbc4d9e07cd95062562af01e408583fc4/itsdangerous-2.2.0-py3-none-any.whl- pypi: https://files.pythonhosted.org/packages/c0/5a/9cac0c82afec3d09ccd97c8b6502d48f165f9124db81b4bcb90b4af974ee/jedi-0.19.2-py2.py3-none-any.whl- - pypi: https://files.pythonhosted.org/packages/32/ee/7e042a13e93f09c24618dc804f01849735d81740f8b74827124ff7fc8396/loro-1.5.0-cp312-cp312-macosx_11_0_arm64.whl- - pypi: https://files.pythonhosted.org/packages/3f/08/83871f3c50fc983b88547c196d11cf8c3340e37c32d2e9d6152abe2c61f7/Markdown-3.7-py3-none-any.whl+ - pypi: https://files.pythonhosted.org/packages/78/e4/7b614260bf16c5e33c0bea6ac47ab0284efd21f89f2e5e4e15cd93bead40/loro-1.10.3-cp312-cp312-macosx_11_0_arm64.whl+ - pypi: https://files.pythonhosted.org/packages/70/81/54e3ce63502cd085a0c556652a4e1b919c45a446bd1e5300e10c44c8c521/markdown-3.10-py3-none-any.whl- pypi: https://files.pythonhosted.org/packages/7f/ee/af51d090ada641d4b264992a486435ba3ef5b5634bc27e6eb002f71cef7d/msgspec-0.20.0-cp312-cp312-macosx_11_0_arm64.whl- - pypi: https://files.pythonhosted.org/packages/7d/81/1cf7a468ef2f8e88266d5c3e5ab026a045aa76150e6640bfe9c5450a8c11/narwhals-2.3.0-py3-none-any.whl- - pypi: https://files.pythonhosted.org/packages/c6/ac/dac4a63f978e4dcb3c6d3a78c4d8e0192a113d288502a1216950c41b1027/parso-0.8.4-py2.py3-none-any.whl- - pypi: https://files.pythonhosted.org/packages/04/8b/30f930733afe425e3cbfc0e1468a30a18942350c1a8816acfade80c005c4/psutil-7.0.0-cp36-abi3-macosx_11_0_arm64.whl- - pypi: https://files.pythonhosted.org/packages/e4/06/43084e6cbd4b3bc0e80f6be743b2e79fbc6eed8de9ad8c629939fa55d972/pymdown_extensions-10.16.1-py3-none-any.whl- - pypi: https://files.pythonhosted.org/packages/a0/4b/528ccf7a982216885a1ff4908e886b8fb5f19862d1962f56a3fce2435a70/starlette-0.46.1-py3-none-any.whl- - pypi: https://files.pythonhosted.org/packages/61/14/33a3a1352cfa71812a3a21e8c9bfb83f60b0011f5e36f2b1399d51928209/uvicorn-0.34.0-py3-none-any.whl+ - pypi: https://files.pythonhosted.org/packages/87/0d/1861d1599571974b15b025e12b142d8e6b42ad66c8a07a89cb0fc21f1e03/narwhals-2.13.0-py3-none-any.whl+ - pypi: https://files.pythonhosted.org/packages/16/32/f8e3c85d1d5250232a5d3477a2a28cc291968ff175caeadaf3cc19ce0e4a/parso-0.8.5-py2.py3-none-any.whl+ - pypi: https://files.pythonhosted.org/packages/68/3a/9f93cff5c025029a36d9a92fef47220ab4692ee7f2be0fba9f92813d0cb8/psutil-7.1.3-cp36-abi3-macosx_11_0_arm64.whl+ - pypi: https://files.pythonhosted.org/packages/fb/35/b763e8fbcd51968329b9adc52d188fc97859f85f2ee15fe9f379987d99c5/pymdown_extensions-10.19.1-py3-none-any.whl+ - pypi: https://files.pythonhosted.org/packages/d9/52/1064f510b141bd54025f9b55105e26d1fa970b9be67ad766380a3c9b74b0/starlette-0.50.0-py3-none-any.whl+ - pypi: https://files.pythonhosted.org/packages/ee/d9/d88e73ca598f4f6ff671fb5fde8a32925c2e08a637303a1d12883c7305fa/uvicorn-0.38.0-py3-none-any.whl- pypi: https://files.pythonhosted.org/packages/3d/69/1a681dd6f02180916f116894181eab8b2e25b31e484c5d0eae637ec01f7c/websockets-15.0.1-cp312-cp312-macosx_11_0_arm64.whl- pypi: ./packages:@@ -427,10 +429,10 @@ packages:- pkg:pypi/distlib?source=hash-mappingsize: 274151timestamp: 1733238487461-- pypi: https://files.pythonhosted.org/packages/8f/d7/9322c609343d929e75e7e5e6255e614fcc67572cfd083959cdef3b7aad79/docutils-0.21.2-py3-none-any.whl+- pypi: https://files.pythonhosted.org/packages/11/a8/c6a4b901d17399c77cd81fb001ce8961e9f5e04d3daf27e8925cb012e163/docutils-0.22.3-py3-none-any.whlname: docutils- version: 0.21.2- sha256: dafca5b9e384f0e419294eb4d2ff9fa826435bf15f15b7bd45723e8ad76811b2+ version: 0.22.3+ sha256: bd772e4aca73aff037958d44f2be5229ded4c09927fcf8690c577b66234d6cebrequires_python: '>=3.9'- conda: https://conda.anaconda.org/conda-forge/noarch/editables-0.5-pyhd8ed1ab_1.condasha256: 8d4f908e670be360617d418c328213bc46e7100154c3742db085148141712f60@@ -1068,15 +1070,15 @@ packages:purls: []size: 46438timestamp: 1727963202283-- pypi: https://files.pythonhosted.org/packages/32/ee/7e042a13e93f09c24618dc804f01849735d81740f8b74827124ff7fc8396/loro-1.5.0-cp312-cp312-macosx_11_0_arm64.whl+- pypi: https://files.pythonhosted.org/packages/78/e4/7b614260bf16c5e33c0bea6ac47ab0284efd21f89f2e5e4e15cd93bead40/loro-1.10.3-cp312-cp312-macosx_11_0_arm64.whlname: loro- version: 1.5.0- sha256: 3ebb8d76fbd6a204b59c4a2c935b26898e3607942dc5855b7c45d52278987090+ version: 1.10.3+ sha256: 5253b8f436d90412b373c583f22ac9539cfb495bf88f78d4bb41daafef0830b7requires_python: '>=3.8'-- pypi: https://files.pythonhosted.org/packages/a3/48/f97f0920c20bc522c34f1eaec4c62d7a03c95c37da2dec858f65c8cb4325/loro-1.5.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl+- pypi: https://files.pythonhosted.org/packages/b2/70/00dc4246d9f3c69ecbb9bc36d5ad1a359884464a44711c665cb0afb1e9de/loro-1.10.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whlname: loro- version: 1.5.0- sha256: 273680afda0b5f0280a9e3415bd609c129f1a0f29121e943d89855791631638e+ version: 1.10.3+ sha256: e660853617fc29e71bb7b796e6f2c21f7722c215f593a89e95cd4d8d5a32aca0requires_python: '>=3.8'- conda: https://conda.anaconda.org/conda-forge/linux-64/make-4.4.1-hb9d3cd8_2.condasha256: d652c7bd4d3b6f82b0f6d063b0d8df6f54cc47531092d7ff008e780f3261bdda@@ -1101,8 +1103,8 @@ packages:timestamp: 1727801725384- pypi: ./name: marimo- version: 0.18.2- sha256: 5404184c973dc3548bc7a266049ea893740b5d352a24d8606a1800fad7b2e008+ version: 0.18.4+ sha256: fb2108ee97d3535ebb2404fef034bc15f52aa9bc16757ae68d988d8cd4f1f12crequires_dist:- click>=8.0,<9- jedi>=0.18.0@@ -1147,28 +1149,11 @@ packages:- pydantic>2 ; python_full_version >= '3.10' and extra == 'mcp'requires_python: '>=3.10'editable: true-- pypi: https://files.pythonhosted.org/packages/3f/08/83871f3c50fc983b88547c196d11cf8c3340e37c32d2e9d6152abe2c61f7/Markdown-3.7-py3-none-any.whl+- pypi: https://files.pythonhosted.org/packages/70/81/54e3ce63502cd085a0c556652a4e1b919c45a446bd1e5300e10c44c8c521/markdown-3.10-py3-none-any.whlname: markdown- version: '3.7'- sha256: 7eb6df5690b81a1d7942992c97fad2938e956e79df20cbc6186e9c3a77b1c803+ version: '3.10'+ sha256: b5b99d6951e2e4948d939255596523444c0e677c669700b1d17aa4a8a464cb7crequires_dist:- - importlib-metadata>=4.4 ; python_full_version < '3.10'- - mkdocs>=1.5 ; extra == 'docs'- - mkdocs-nature>=0.6 ; extra == 'docs'- - mdx-gh-links>=0.2 ; extra == 'docs'- - mkdocstrings[python] ; extra == 'docs'- - mkdocs-gen-files ; extra == 'docs'- - mkdocs-section-index ; extra == 'docs'- - mkdocs-literate-nav ; extra == 'docs'- - coverage ; extra == 'testing'- - pyyaml ; extra == 'testing'- requires_python: '>=3.8'-- pypi: https://files.pythonhosted.org/packages/51/3f/afe76f8e2246ffbc867440cbcf90525264df0e658f8a5ca1f872b3f6192a/markdown-3.8-py3-none-any.whl- name: markdown- version: '3.8'- sha256: 794a929b79c5af141ef5ab0f2f642d0f7b1872981250230e72682346f7cc90dc- requires_dist:- - importlib-metadata>=4.4 ; python_full_version < '3.10'- coverage ; extra == 'testing'- pyyaml ; extra == 'testing'- mkdocs>=1.6 ; extra == 'docs'@@ -1178,7 +1163,7 @@ packages:- mkdocs-gen-files ; extra == 'docs'- mkdocs-section-index ; extra == 'docs'- mkdocs-literate-nav ; extra == 'docs'- requires_python: '>=3.9'+ requires_python: '>=3.10'- conda: https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-3.0.0-pyhd8ed1ab_1.condasha256: 0fbacdfb31e55964152b24d5567e9a9996e1e7902fb08eb7d91b5fd6ce60803amd5: fee3164ac23dfca50cfcc8b85ddefb81@@ -1231,34 +1216,14 @@ packages:- tomli-w ; extra == 'toml'- pyyaml ; extra == 'yaml'requires_python: '>=3.9'-- pypi: https://files.pythonhosted.org/packages/7d/81/1cf7a468ef2f8e88266d5c3e5ab026a045aa76150e6640bfe9c5450a8c11/narwhals-2.3.0-py3-none-any.whl+- pypi: https://files.pythonhosted.org/packages/87/0d/1861d1599571974b15b025e12b142d8e6b42ad66c8a07a89cb0fc21f1e03/narwhals-2.13.0-py3-none-any.whlname: narwhals- version: 2.3.0- sha256: 5507b1a9a9c2b1c55a627fdf6cf722fef2e23498bd14362a332c8848a311c321+ version: 2.13.0+ sha256: 9b795523c179ca78204e3be53726da374168f906e38de2ff174c2363baaaf481requires_dist:- cudf>=24.10.0 ; extra == 'cudf'- dask[dataframe]>=2024.8 ; extra == 'dask'- - duckdb>=1.0 ; extra == 'duckdb'- - ibis-framework>=6.0.0 ; extra == 'ibis'- - packaging ; extra == 'ibis'- - pyarrow-hotfix ; extra == 'ibis'- - rich ; extra == 'ibis'- - modin ; extra == 'modin'- - pandas>=1.1.3 ; extra == 'pandas'- - polars>=0.20.4 ; extra == 'polars'- - pyarrow>=13.0.0 ; extra == 'pyarrow'- - pyspark>=3.5.0 ; extra == 'pyspark'- - pyspark[connect]>=3.5.0 ; extra == 'pyspark-connect'- - sqlframe>=3.22.0,!=3.39.3 ; extra == 'sqlframe'- requires_python: '>=3.9'-- pypi: https://files.pythonhosted.org/packages/50/3b/0e2c535c3e6970cfc5763b67f6cc31accaab35a7aa3e322fb6a12830450f/narwhals-2.6.0-py3-none-any.whl- name: narwhals- version: 2.6.0- sha256: 3215ea42afb452c6c8527e79cefbe542b674aa08d7e2e99d46b2c9708870e0d4- requires_dist:- - cudf>=24.10.0 ; extra == 'cudf'- - dask[dataframe]>=2024.8 ; extra == 'dask'- - duckdb>=1.0 ; extra == 'duckdb'+ - duckdb>=1.1 ; extra == 'duckdb'- ibis-framework>=6.0.0 ; extra == 'ibis'- packaging ; extra == 'ibis'- pyarrow-hotfix ; extra == 'ibis'@@ -1370,16 +1335,16 @@ packages:- pkg:pypi/packaging?source=compressed-mappingsize: 62477timestamp: 1745345660407-- pypi: https://files.pythonhosted.org/packages/c6/ac/dac4a63f978e4dcb3c6d3a78c4d8e0192a113d288502a1216950c41b1027/parso-0.8.4-py2.py3-none-any.whl+- pypi: https://files.pythonhosted.org/packages/16/32/f8e3c85d1d5250232a5d3477a2a28cc291968ff175caeadaf3cc19ce0e4a/parso-0.8.5-py2.py3-none-any.whlname: parso- version: 0.8.4- sha256: a418670a20291dacd2dddc80c377c5c3791378ee1e8d12bffc35420643d43f18+ version: 0.8.5+ sha256: 646204b5ee239c396d040b90f9e272e9a8017c630092bf59980beb62fd033887requires_dist:+ - pytest ; extra == 'testing'+ - docopt ; extra == 'testing'- flake8==5.0.4 ; extra == 'qa'- mypy==0.971 ; extra == 'qa'- types-setuptools==67.2.0.1 ; extra == 'qa'- - docopt ; extra == 'testing'- - pytest ; extra == 'testing'requires_python: '>=3.6'- conda: https://conda.anaconda.org/conda-forge/noarch/pathspec-0.12.1-pyhd8ed1ab_1.condasha256: 9f64009cdf5b8e529995f18e03665b03f5d07c0b17445b8badef45bde76249ee@@ -1503,16 +1468,18 @@ packages:purls: []size: 6850timestamp: 1742475657138-- pypi: https://files.pythonhosted.org/packages/04/8b/30f930733afe425e3cbfc0e1468a30a18942350c1a8816acfade80c005c4/psutil-7.0.0-cp36-abi3-macosx_11_0_arm64.whl+- pypi: https://files.pythonhosted.org/packages/68/3a/9f93cff5c025029a36d9a92fef47220ab4692ee7f2be0fba9f92813d0cb8/psutil-7.1.3-cp36-abi3-macosx_11_0_arm64.whlname: psutil- version: 7.0.0- sha256: 39db632f6bb862eeccf56660871433e111b6ea58f2caea825571951d4b6aa3da+ version: 7.1.3+ sha256: bc31fa00f1fbc3c3802141eede66f3a2d51d89716a194bf2cd6fc68310a19880requires_dist:- pytest ; extra == 'dev'+ - pytest-instafail ; extra == 'dev'+ - pytest-subtests ; extra == 'dev'- pytest-xdist ; extra == 'dev'- setuptools ; extra == 'dev'- abi3audit ; extra == 'dev'- - black==24.10.0 ; extra == 'dev'+ - black ; extra == 'dev'- check-manifest ; extra == 'dev'- coverage ; extra == 'dev'- packaging ; extra == 'dev'@@ -1527,23 +1494,36 @@ packages:- sphinx-rtd-theme ; extra == 'dev'- toml-sort ; extra == 'dev'- twine ; extra == 'dev'+ - validate-pyproject[all] ; extra == 'dev'- virtualenv ; extra == 'dev'- vulture ; extra == 'dev'- wheel ; extra == 'dev'+ - colorama ; os_name == 'nt' and extra == 'dev'+ - pyreadline ; os_name == 'nt' and extra == 'dev'+ - pywin32 ; os_name == 'nt' and platform_python_implementation != 'PyPy' and extra == 'dev'+ - wheel ; os_name == 'nt' and platform_python_implementation != 'PyPy' and extra == 'dev'+ - wmi ; os_name == 'nt' and platform_python_implementation != 'PyPy' and extra == 'dev'- pytest ; extra == 'test'+ - pytest-instafail ; extra == 'test'+ - pytest-subtests ; extra == 'test'- pytest-xdist ; extra == 'test'- setuptools ; extra == 'test'+ - pywin32 ; os_name == 'nt' and platform_python_implementation != 'PyPy' and extra == 'test'+ - wheel ; os_name == 'nt' and platform_python_implementation != 'PyPy' and extra == 'test'+ - wmi ; os_name == 'nt' and platform_python_implementation != 'PyPy' and extra == 'test'requires_python: '>=3.6'-- pypi: https://files.pythonhosted.org/packages/bf/b9/b0eb3f3cbcb734d930fdf839431606844a825b23eaf9a6ab371edac8162c/psutil-7.0.0-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl+- pypi: https://files.pythonhosted.org/packages/ce/b1/5f49af514f76431ba4eea935b8ad3725cdeb397e9245ab919dbc1d1dc20f/psutil-7.1.3-cp36-abi3-manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_28_x86_64.whlname: psutil- version: 7.0.0- sha256: 4b1388a4f6875d7e2aff5c4ca1cc16c545ed41dd8bb596cefea80111db353a34+ version: 7.1.3+ sha256: 3bb428f9f05c1225a558f53e30ccbad9930b11c3fc206836242de1091d3e7dd3requires_dist:- pytest ; extra == 'dev'+ - pytest-instafail ; extra == 'dev'+ - pytest-subtests ; extra == 'dev'- pytest-xdist ; extra == 'dev'- setuptools ; extra == 'dev'- abi3audit ; extra == 'dev'- - black==24.10.0 ; extra == 'dev'+ - black ; extra == 'dev'- check-manifest ; extra == 'dev'- coverage ; extra == 'dev'- packaging ; extra == 'dev'@@ -1558,12 +1538,23 @@ packages:- sphinx-rtd-theme ; extra == 'dev'- toml-sort ; extra == 'dev'- twine ; extra == 'dev'+ - validate-pyproject[all] ; extra == 'dev'- virtualenv ; extra == 'dev'- vulture ; extra == 'dev'- wheel ; extra == 'dev'+ - colorama ; os_name == 'nt' and extra == 'dev'+ - pyreadline ; os_name == 'nt' and extra == 'dev'+ - pywin32 ; os_name == 'nt' and platform_python_implementation != 'PyPy' and extra == 'dev'+ - wheel ; os_name == 'nt' and platform_python_implementation != 'PyPy' and extra == 'dev'+ - wmi ; os_name == 'nt' and platform_python_implementation != 'PyPy' and extra == 'dev'- pytest ; extra == 'test'+ - pytest-instafail ; extra == 'test'+ - pytest-subtests ; extra == 'test'- pytest-xdist ; extra == 'test'- setuptools ; extra == 'test'+ - pywin32 ; os_name == 'nt' and platform_python_implementation != 'PyPy' and extra == 'test'+ - wheel ; os_name == 'nt' and platform_python_implementation != 'PyPy' and extra == 'test'+ - wmi ; os_name == 'nt' and platform_python_implementation != 'PyPy' and extra == 'test'requires_python: '>=3.6'- conda: https://conda.anaconda.org/conda-forge/noarch/ptyprocess-0.7.0-pyhd8ed1ab_1.condasha256: a7713dfe30faf17508ec359e0bc7e0983f5d94682492469bd462cdaae9c64d83@@ -1598,19 +1589,10 @@ packages:- pkg:pypi/pygments?source=hash-mappingsize: 888600timestamp: 1736243563082-- pypi: https://files.pythonhosted.org/packages/a7/d1/c54e608505776ce4e7966d03358ae635cfd51dff1da6ee421c090dbc797b/pymdown_extensions-10.15-py3-none-any.whl- name: pymdown-extensions- version: '10.15'- sha256: 46e99bb272612b0de3b7e7caf6da8dd5f4ca5212c0b273feb9304e236c484e5f- requires_dist:- - markdown>=3.6- - pyyaml- - pygments>=2.19.1 ; extra == 'extra'- requires_python: '>=3.8'-- pypi: https://files.pythonhosted.org/packages/e4/06/43084e6cbd4b3bc0e80f6be743b2e79fbc6eed8de9ad8c629939fa55d972/pymdown_extensions-10.16.1-py3-none-any.whl+- pypi: https://files.pythonhosted.org/packages/fb/35/b763e8fbcd51968329b9adc52d188fc97859f85f2ee15fe9f379987d99c5/pymdown_extensions-10.19.1-py3-none-any.whlname: pymdown-extensions- version: 10.16.1- sha256: d6ba157a6c03146a7fb122b2b9a121300056384eafeec9c9f9e584adfdb2a32d+ version: 10.19.1+ sha256: e8698a66055b1dc0dca2a7f2c9d0ea6f5faa7834a9c432e3535ab96c0c4e509brequires_dist:- markdown>=3.6- pyyaml@@ -1791,32 +1773,19 @@ packages:- pkg:pypi/sniffio?source=hash-mappingsize: 15019timestamp: 1733244175724-- pypi: https://files.pythonhosted.org/packages/a0/4b/528ccf7a982216885a1ff4908e886b8fb5f19862d1962f56a3fce2435a70/starlette-0.46.1-py3-none-any.whl+- pypi: https://files.pythonhosted.org/packages/d9/52/1064f510b141bd54025f9b55105e26d1fa970b9be67ad766380a3c9b74b0/starlette-0.50.0-py3-none-any.whlname: starlette- version: 0.46.1- sha256: 77c74ed9d2720138b25875133f3a2dae6d854af2ec37dceb56aef370c1d8a227+ version: 0.50.0+ sha256: 9e5391843ec9b6e472eed1365a78c8098cfceb7a74bfd4d6b1c0c0095efb3bcarequires_dist:- anyio>=3.6.2,<5- - typing-extensions>=3.10.0 ; python_full_version < '3.10'+ - typing-extensions>=4.10.0 ; python_full_version < '3.13'- httpx>=0.27.0,<0.29.0 ; extra == 'full'- itsdangerous ; extra == 'full'- jinja2 ; extra == 'full'- python-multipart>=0.0.18 ; extra == 'full'- pyyaml ; extra == 'full'- requires_python: '>=3.9'-- pypi: https://files.pythonhosted.org/packages/8b/0c/9d30a4ebeb6db2b25a841afbb80f6ef9a854fc3b41be131d249a977b4959/starlette-0.46.2-py3-none-any.whl- name: starlette- version: 0.46.2- sha256: 595633ce89f8ffa71a015caed34a5b2dc1c0cdb3f0f1fbd1e69339cf2abeec35- requires_dist:- - anyio>=3.6.2,<5- - typing-extensions>=3.10.0 ; python_full_version < '3.10'- - httpx>=0.27.0,<0.29.0 ; extra == 'full'- - itsdangerous ; extra == 'full'- - jinja2 ; extra == 'full'- - python-multipart>=0.0.18 ; extra == 'full'- - pyyaml ; extra == 'full'- requires_python: '>=3.9'+ requires_python: '>=3.10'- conda: https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-noxft_h4845f30_101.condasha256: e0569c9caa68bf476bead1bed3d79650bb080b532c64a4af7d8ca286c08dea4emd5: d453b98d9c83e71da0741bb0ff4d76bc@@ -1971,26 +1940,10 @@ packages:purls: []size: 12337543timestamp: 1745938010152-- pypi: https://files.pythonhosted.org/packages/61/14/33a3a1352cfa71812a3a21e8c9bfb83f60b0011f5e36f2b1399d51928209/uvicorn-0.34.0-py3-none-any.whl- name: uvicorn- version: 0.34.0- sha256: 023dc038422502fa28a09c7a30bf2b6991512da7dcdb8fd35fe57cfc154126f4- requires_dist:- - click>=7.0- - h11>=0.8- - typing-extensions>=4.0 ; python_full_version < '3.11'- - colorama>=0.4 ; sys_platform == 'win32' and extra == 'standard'- - httptools>=0.6.3 ; extra == 'standard'- - python-dotenv>=0.13 ; extra == 'standard'- - pyyaml>=5.1 ; extra == 'standard'- - uvloop>=0.14.0,!=0.15.0,!=0.15.1 ; platform_python_implementation != 'PyPy' and sys_platform != 'cygwin' and sys_platform != 'win32' and extra == 'standard'- - watchfiles>=0.13 ; extra == 'standard'- - websockets>=10.4 ; extra == 'standard'- requires_python: '>=3.9'-- pypi: https://files.pythonhosted.org/packages/b1/4b/4cef6ce21a2aaca9d852a6e84ef4f135d99fcd74fa75105e2fc0c8308acd/uvicorn-0.34.2-py3-none-any.whl+- pypi: https://files.pythonhosted.org/packages/ee/d9/d88e73ca598f4f6ff671fb5fde8a32925c2e08a637303a1d12883c7305fa/uvicorn-0.38.0-py3-none-any.whlname: uvicorn- version: 0.34.2- sha256: deb49af569084536d269fe0a6d67e3754f104cf03aba7c11c40f01aadf33c403+ version: 0.38.0+ sha256: 48c0afd214ceb59340075b4a052ea1ee91c16fbc2a9b1469cca0e54566977b02requires_dist:- click>=7.0- h11>=0.8@@ -1999,7 +1952,7 @@ packages:- httptools>=0.6.3 ; extra == 'standard'- python-dotenv>=0.13 ; extra == 'standard'- pyyaml>=5.1 ; extra == 'standard'- - uvloop>=0.14.0,!=0.15.0,!=0.15.1 ; platform_python_implementation != 'PyPy' and sys_platform != 'cygwin' and sys_platform != 'win32' and extra == 'standard'+ - uvloop>=0.15.1 ; platform_python_implementation != 'PyPy' and sys_platform != 'cygwin' and sys_platform != 'win32' and extra == 'standard'- watchfiles>=0.13 ; extra == 'standard'- websockets>=10.4 ; extra == 'standard'requires_python: '>=3.9'diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 1a6fd9d7d9..bbf766dfc7 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -140,8 +140,8 @@ importers:specifier: ^0.3.2version: 0.3.2(@codemirror/[email protected])(@codemirror/[email protected])'@marimo-team/codemirror-languageserver':- specifier: ^1.16.0- version: 1.16.0(@codemirror/[email protected])(@codemirror/[email protected])+ specifier: ^1.16.7+ version: 1.16.7(@codemirror/[email protected])(@codemirror/[email protected])'@marimo-team/codemirror-mcp':specifier: ^0.1.5version: 0.1.5(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@modelcontextprotocol/[email protected])@@ -2031,8 +2031,8 @@ packages:'@codemirror/state': ^6'@codemirror/view': ^6- '@marimo-team/[email protected]':- resolution: {integrity: sha512-DIKGvEE/M/eTr+p/F6GjANBwAAv4bByptyNAlUYQHt16bV5CncktwAv3wdYe1LVADxR6ReugCRKCK3RYcaMmWw==}+ '@marimo-team/[email protected]':+ resolution: {integrity: sha512-UxCaxbCFnJZvSZnX3VIsdTiLfisrnkso/myoAN/jnEMAKl2p6jTdEdHk6AG/yPhassSugDeGm0BONS5YCghGow==}peerDependencies:'@codemirror/state': ^6'@codemirror/view': ^6@@ -11983,7 +11983,7 @@ snapshots:'@codemirror/view': 6.38.8diff: 8.0.2dependencies:'@codemirror/autocomplete': 6.20.0'@codemirror/lint': 6.9.2diff --git a/tests/_config/test_config.py b/tests/_config/test_config.pyindex 31b793827b..004af53dad 100644--- a/tests/_config/test_config.py+++ b/tests/_config/test_config.py@@ -26,7 +26,11 @@ def test_configure_partial_keymap() -> None:def test_configure_full() -> None:assert_config(PartialMarimoConfig(- completion={"activate_on_typing": False, "copilot": False},+ completion={+ "activate_on_typing": False,+ "copilot": False,+ "signature_hint_on_typing": False,+ },save={"autosave": "after_delay","autosave_delay": 2,diff --git a/tests/_server/templates/snapshots/export1.txt b/tests/_server/templates/snapshots/export1.txtindex 723bb4b375..4aab0b03ef 100644--- a/tests/_server/templates/snapshots/export1.txt+++ b/tests/_server/templates/snapshots/export1.txt@@ -59,7 +59,7 @@"mode": "read","version": "0.0.0","serverToken": "token",- "config": {"ai": {"models": {"custom_models": [], "displayed_models": []}}, "completion": {"activate_on_typing": true, "copilot": false}, "diagnostics": {"sql_linter": true}, "display": {"cell_output": "below", "code_editor_font_size": 14, "dataframes": "rich", "default_table_max_columns": 50, "default_table_page_size": 10, "default_width": "medium", "reference_highlighting": true, "theme": "light"}, "formatting": {"line_length": 79}, "keymap": {"overrides": {}, "preset": "default"}, "language_servers": {"pylsp": {"enable_flake8": false, "enable_mypy": true, "enable_pydocstyle": false, "enable_pyflakes": false, "enable_pylint": false, "enable_ruff": true, "enabled": false}}, "mcp": {"mcpServers": {}, "presets": []}, "package_management": {"manager": "pixi"}, "runtime": {"auto_instantiate": false, "auto_reload": "off", "default_sql_output": "auto", "on_cell_change": "autorun", "output_max_bytes": 8000000, "reactive_tests": true, "std_stream_max_bytes": 1000000, "watcher_on_save": "lazy"}, "save": {"autosave": "after_delay", "autosave_delay": 1000, "format_on_save": false}, "server": {"browser": "default", "follow_symlink": false}, "snippets": {"custom_paths": [], "include_default_snippets": true}},+ "config": {"ai": {"models": {"custom_models": [], "displayed_models": []}}, "completion": {"activate_on_typing": true, "copilot": false, "signature_hint_on_typing": false}, "diagnostics": {"sql_linter": true}, "display": {"cell_output": "below", "code_editor_font_size": 14, "dataframes": "rich", "default_table_max_columns": 50, "default_table_page_size": 10, "default_width": "medium", "reference_highlighting": true, "theme": "light"}, "formatting": {"line_length": 79}, "keymap": {"overrides": {}, "preset": "default"}, "language_servers": {"pylsp": {"enable_flake8": false, "enable_mypy": true, "enable_pydocstyle": false, "enable_pyflakes": false, "enable_pylint": false, "enable_ruff": true, "enabled": false}}, "mcp": {"mcpServers": {}, "presets": []}, "package_management": {"manager": "pixi"}, "runtime": {"auto_instantiate": false, "auto_reload": "off", "default_sql_output": "auto", "on_cell_change": "autorun", "output_max_bytes": 8000000, "reactive_tests": true, "std_stream_max_bytes": 1000000, "watcher_on_save": "lazy"}, "save": {"autosave": "after_delay", "autosave_delay": 1000, "format_on_save": false}, "server": {"browser": "default", "follow_symlink": false}, "snippets": {"custom_paths": [], "include_default_snippets": true}},"configOverrides": {"formatting": {"line_length": 100}},"appConfig": {"sql_output": "auto", "width": "compact"},"view": {"showAppCode": true},diff --git a/tests/_server/templates/snapshots/export2.txt b/tests/_server/templates/snapshots/export2.txtindex 7c986904a8..e85e87d8b3 100644--- a/tests/_server/templates/snapshots/export2.txt+++ b/tests/_server/templates/snapshots/export2.txt@@ -59,7 +59,7 @@"mode": "read","version": "0.0.0","serverToken": "token",- "config": {"ai": {"models": {"custom_models": [], "displayed_models": []}}, "completion": {"activate_on_typing": true, "copilot": false}, "diagnostics": {"sql_linter": true}, "display": {"cell_output": "below", "code_editor_font_size": 14, "dataframes": "rich", "default_table_max_columns": 50, "default_table_page_size": 10, "default_width": "medium", "reference_highlighting": true, "theme": "light"}, "formatting": {"line_length": 79}, "keymap": {"overrides": {}, "preset": "default"}, "language_servers": {"pylsp": {"enable_flake8": false, "enable_mypy": true, "enable_pydocstyle": false, "enable_pyflakes": false, "enable_pylint": false, "enable_ruff": true, "enabled": false}}, "mcp": {"mcpServers": {}, "presets": []}, "package_management": {"manager": "pixi"}, "runtime": {"auto_instantiate": false, "auto_reload": "off", "default_sql_output": "auto", "on_cell_change": "autorun", "output_max_bytes": 8000000, "reactive_tests": true, "std_stream_max_bytes": 1000000, "watcher_on_save": "lazy"}, "save": {"autosave": "after_delay", "autosave_delay": 1000, "format_on_save": false}, "server": {"browser": "default", "follow_symlink": false}, "snippets": {"custom_paths": [], "include_default_snippets": true}},+ "config": {"ai": {"models": {"custom_models": [], "displayed_models": []}}, "completion": {"activate_on_typing": true, "copilot": false, "signature_hint_on_typing": false}, "diagnostics": {"sql_linter": true}, "display": {"cell_output": "below", "code_editor_font_size": 14, "dataframes": "rich", "default_table_max_columns": 50, "default_table_page_size": 10, "default_width": "medium", "reference_highlighting": true, "theme": "light"}, "formatting": {"line_length": 79}, "keymap": {"overrides": {}, "preset": "default"}, "language_servers": {"pylsp": {"enable_flake8": false, "enable_mypy": true, "enable_pydocstyle": false, "enable_pyflakes": false, "enable_pylint": false, "enable_ruff": true, "enabled": false}}, "mcp": {"mcpServers": {}, "presets": []}, "package_management": {"manager": "pixi"}, "runtime": {"auto_instantiate": false, "auto_reload": "off", "default_sql_output": "auto", "on_cell_change": "autorun", "output_max_bytes": 8000000, "reactive_tests": true, "std_stream_max_bytes": 1000000, "watcher_on_save": "lazy"}, "save": {"autosave": "after_delay", "autosave_delay": 1000, "format_on_save": false}, "server": {"browser": "default", "follow_symlink": false}, "snippets": {"custom_paths": [], "include_default_snippets": true}},"configOverrides": {"formatting": {"line_length": 100}},"appConfig": {"sql_output": "auto", "width": "compact"},"view": {"showAppCode": true},diff --git a/tests/_server/templates/snapshots/export3.txt b/tests/_server/templates/snapshots/export3.txtindex ca2f6bcb74..ad13daaa7b 100644--- a/tests/_server/templates/snapshots/export3.txt+++ b/tests/_server/templates/snapshots/export3.txt@@ -59,7 +59,7 @@"mode": "read","version": "0.0.0","serverToken": "token",- "config": {"ai": {"models": {"custom_models": [], "displayed_models": []}}, "completion": {"activate_on_typing": true, "copilot": false}, "diagnostics": {"sql_linter": true}, "display": {"cell_output": "below", "code_editor_font_size": 14, "dataframes": "rich", "default_table_max_columns": 50, "default_table_page_size": 10, "default_width": "medium", "reference_highlighting": true, "theme": "light"}, "formatting": {"line_length": 79}, "keymap": {"overrides": {}, "preset": "default"}, "language_servers": {"pylsp": {"enable_flake8": false, "enable_mypy": true, "enable_pydocstyle": false, "enable_pyflakes": false, "enable_pylint": false, "enable_ruff": true, "enabled": false}}, "mcp": {"mcpServers": {}, "presets": []}, "package_management": {"manager": "pixi"}, "runtime": {"auto_instantiate": false, "auto_reload": "off", "default_sql_output": "auto", "on_cell_change": "autorun", "output_max_bytes": 8000000, "reactive_tests": true, "std_stream_max_bytes": 1000000, "watcher_on_save": "lazy"}, "save": {"autosave": "after_delay", "autosave_delay": 1000, "format_on_save": false}, "server": {"browser": "default", "follow_symlink": false}, "snippets": {"custom_paths": [], "include_default_snippets": true}},+ "config": {"ai": {"models": {"custom_models": [], "displayed_models": []}}, "completion": {"activate_on_typing": true, "copilot": false, "signature_hint_on_typing": false}, "diagnostics": {"sql_linter": true}, "display": {"cell_output": "below", "code_editor_font_size": 14, "dataframes": "rich", "default_table_max_columns": 50, "default_table_page_size": 10, "default_width": "medium", "reference_highlighting": true, "theme": "light"}, "formatting": {"line_length": 79}, "keymap": {"overrides": {}, "preset": "default"}, "language_servers": {"pylsp": {"enable_flake8": false, "enable_mypy": true, "enable_pydocstyle": false, "enable_pyflakes": false, "enable_pylint": false, "enable_ruff": true, "enabled": false}}, "mcp": {"mcpServers": {}, "presets": []}, "package_management": {"manager": "pixi"}, "runtime": {"auto_instantiate": false, "auto_reload": "off", "default_sql_output": "auto", "on_cell_change": "autorun", "output_max_bytes": 8000000, "reactive_tests": true, "std_stream_max_bytes": 1000000, "watcher_on_save": "lazy"}, "save": {"autosave": "after_delay", "autosave_delay": 1000, "format_on_save": false}, "server": {"browser": "default", "follow_symlink": false}, "snippets": {"custom_paths": [], "include_default_snippets": true}},"configOverrides": {"formatting": {"line_length": 100}},"appConfig": {"sql_output": "auto", "width": "compact"},"view": {"showAppCode": true},diff --git a/tests/_server/templates/snapshots/export4.txt b/tests/_server/templates/snapshots/export4.txtindex be3b6b8bdf..2614f90144 100644--- a/tests/_server/templates/snapshots/export4.txt+++ b/tests/_server/templates/snapshots/export4.txt@@ -59,7 +59,7 @@"mode": "read","version": "0.0.0","serverToken": "token",- "config": {"ai": {"models": {"custom_models": [], "displayed_models": []}}, "completion": {"activate_on_typing": true, "copilot": false}, "diagnostics": {"sql_linter": true}, "display": {"cell_output": "below", "code_editor_font_size": 14, "dataframes": "rich", "default_table_max_columns": 50, "default_table_page_size": 10, "default_width": "medium", "reference_highlighting": true, "theme": "light"}, "formatting": {"line_length": 79}, "keymap": {"overrides": {}, "preset": "default"}, "language_servers": {"pylsp": {"enable_flake8": false, "enable_mypy": true, "enable_pydocstyle": false, "enable_pyflakes": false, "enable_pylint": false, "enable_ruff": true, "enabled": false}}, "mcp": {"mcpServers": {}, "presets": []}, "package_management": {"manager": "pixi"}, "runtime": {"auto_instantiate": false, "auto_reload": "off", "default_sql_output": "auto", "on_cell_change": "autorun", "output_max_bytes": 8000000, "reactive_tests": true, "std_stream_max_bytes": 1000000, "watcher_on_save": "lazy"}, "save": {"autosave": "after_delay", "autosave_delay": 1000, "format_on_save": false}, "server": {"browser": "default", "follow_symlink": false}, "snippets": {"custom_paths": [], "include_default_snippets": true}},+ "config": {"ai": {"models": {"custom_models": [], "displayed_models": []}}, "completion": {"activate_on_typing": true, "copilot": false, "signature_hint_on_typing": false}, "diagnostics": {"sql_linter": true}, "display": {"cell_output": "below", "code_editor_font_size": 14, "dataframes": "rich", "default_table_max_columns": 50, "default_table_page_size": 10, "default_width": "medium", "reference_highlighting": true, "theme": "light"}, "formatting": {"line_length": 79}, "keymap": {"overrides": {}, "preset": "default"}, "language_servers": {"pylsp": {"enable_flake8": false, "enable_mypy": true, "enable_pydocstyle": false, "enable_pyflakes": false, "enable_pylint": false, "enable_ruff": true, "enabled": false}}, "mcp": {"mcpServers": {}, "presets": []}, "package_management": {"manager": "pixi"}, "runtime": {"auto_instantiate": false, "auto_reload": "off", "default_sql_output": "auto", "on_cell_change": "autorun", "output_max_bytes": 8000000, "reactive_tests": true, "std_stream_max_bytes": 1000000, "watcher_on_save": "lazy"}, "save": {"autosave": "after_delay", "autosave_delay": 1000, "format_on_save": false}, "server": {"browser": "default", "follow_symlink": false}, "snippets": {"custom_paths": [], "include_default_snippets": true}},"configOverrides": {"formatting": {"line_length": 100}},"appConfig": {"css_file": "custom.css", "sql_output": "auto", "width": "compact"},"view": {"showAppCode": true},diff --git a/tests/_server/templates/snapshots/export5.txt b/tests/_server/templates/snapshots/export5.txtindex 60b18e75ce..deac19e47a 100644--- a/tests/_server/templates/snapshots/export5.txt+++ b/tests/_server/templates/snapshots/export5.txt@@ -59,7 +59,7 @@"mode": "read","version": "0.0.0","serverToken": "token",- "config": {"ai": {"models": {"custom_models": [], "displayed_models": []}}, "completion": {"activate_on_typing": true, "copilot": false}, "diagnostics": {"sql_linter": true}, "display": {"cell_output": "below", "code_editor_font_size": 14, "dataframes": "rich", "default_table_max_columns": 50, "default_table_page_size": 10, "default_width": "medium", "reference_highlighting": true, "theme": "light"}, "formatting": {"line_length": 79}, "keymap": {"overrides": {}, "preset": "default"}, "language_servers": {"pylsp": {"enable_flake8": false, "enable_mypy": true, "enable_pydocstyle": false, "enable_pyflakes": false, "enable_pylint": false, "enable_ruff": true, "enabled": false}}, "mcp": {"mcpServers": {}, "presets": []}, "package_management": {"manager": "pixi"}, "runtime": {"auto_instantiate": false, "auto_reload": "off", "default_sql_output": "auto", "on_cell_change": "autorun", "output_max_bytes": 8000000, "reactive_tests": true, "std_stream_max_bytes": 1000000, "watcher_on_save": "lazy"}, "save": {"autosave": "after_delay", "autosave_delay": 1000, "format_on_save": false}, "server": {"browser": "default", "follow_symlink": false}, "snippets": {"custom_paths": [], "include_default_snippets": true}},+ "config": {"ai": {"models": {"custom_models": [], "displayed_models": []}}, "completion": {"activate_on_typing": true, "copilot": false, "signature_hint_on_typing": false}, "diagnostics": {"sql_linter": true}, "display": {"cell_output": "below", "code_editor_font_size": 14, "dataframes": "rich", "default_table_max_columns": 50, "default_table_page_size": 10, "default_width": "medium", "reference_highlighting": true, "theme": "light"}, "formatting": {"line_length": 79}, "keymap": {"overrides": {}, "preset": "default"}, "language_servers": {"pylsp": {"enable_flake8": false, "enable_mypy": true, "enable_pydocstyle": false, "enable_pyflakes": false, "enable_pylint": false, "enable_ruff": true, "enabled": false}}, "mcp": {"mcpServers": {}, "presets": []}, "package_management": {"manager": "pixi"}, "runtime": {"auto_instantiate": false, "auto_reload": "off", "default_sql_output": "auto", "on_cell_change": "autorun", "output_max_bytes": 8000000, "reactive_tests": true, "std_stream_max_bytes": 1000000, "watcher_on_save": "lazy"}, "save": {"autosave": "after_delay", "autosave_delay": 1000, "format_on_save": false}, "server": {"browser": "default", "follow_symlink": false}, "snippets": {"custom_paths": [], "include_default_snippets": true}},"configOverrides": {"formatting": {"line_length": 100}},"appConfig": {"app_title": "My App", "html_head_file": "head.html", "sql_output": "auto", "width": "compact"},"view": {"showAppCode": true},diff --git a/tests/_server/templates/snapshots/export6.txt b/tests/_server/templates/snapshots/export6.txtindex aaead29f54..5897b333b5 100644--- a/tests/_server/templates/snapshots/export6.txt+++ b/tests/_server/templates/snapshots/export6.txt@@ -59,7 +59,7 @@"mode": "read","version": "0.0.0","serverToken": "token",- "config": {"ai": {"models": {"custom_models": [], "displayed_models": []}}, "completion": {"activate_on_typing": true, "copilot": false}, "diagnostics": {"sql_linter": true}, "display": {"cell_output": "below", "code_editor_font_size": 14, "custom_css": ["custom1.css", "custom2.css"], "dataframes": "rich", "default_table_max_columns": 50, "default_table_page_size": 10, "default_width": "medium", "reference_highlighting": true, "theme": "light"}, "formatting": {"line_length": 79}, "keymap": {"overrides": {}, "preset": "default"}, "language_servers": {"pylsp": {"enable_flake8": false, "enable_mypy": true, "enable_pydocstyle": false, "enable_pyflakes": false, "enable_pylint": false, "enable_ruff": true, "enabled": false}}, "mcp": {"mcpServers": {}, "presets": []}, "package_management": {"manager": "pixi"}, "runtime": {"auto_instantiate": false, "auto_reload": "off", "default_sql_output": "auto", "on_cell_change": "autorun", "output_max_bytes": 8000000, "reactive_tests": true, "std_stream_max_bytes": 1000000, "watcher_on_save": "lazy"}, "save": {"autosave": "after_delay", "autosave_delay": 1000, "format_on_save": false}, "server": {"browser": "default", "follow_symlink": false}, "snippets": {"custom_paths": [], "include_default_snippets": true}},+ "config": {"ai": {"models": {"custom_models": [], "displayed_models": []}}, "completion": {"activate_on_typing": true, "copilot": false, "signature_hint_on_typing": false}, "diagnostics": {"sql_linter": true}, "display": {"cell_output": "below", "code_editor_font_size": 14, "custom_css": ["custom1.css", "custom2.css"], "dataframes": "rich", "default_table_max_columns": 50, "default_table_page_size": 10, "default_width": "medium", "reference_highlighting": true, "theme": "light"}, "formatting": {"line_length": 79}, "keymap": {"overrides": {}, "preset": "default"}, "language_servers": {"pylsp": {"enable_flake8": false, "enable_mypy": true, "enable_pydocstyle": false, "enable_pyflakes": false, "enable_pylint": false, "enable_ruff": true, "enabled": false}}, "mcp": {"mcpServers": {}, "presets": []}, "package_management": {"manager": "pixi"}, "runtime": {"auto_instantiate": false, "auto_reload": "off", "default_sql_output": "auto", "on_cell_change": "autorun", "output_max_bytes": 8000000, "reactive_tests": true, "std_stream_max_bytes": 1000000, "watcher_on_save": "lazy"}, "save": {"autosave": "after_delay", "autosave_delay": 1000, "format_on_save": false}, "server": {"browser": "default", "follow_symlink": false}, "snippets": {"custom_paths": [], "include_default_snippets": true}},"configOverrides": {"formatting": {"line_length": 100}},"appConfig": {"sql_output": "auto", "width": "compact"},"view": {"showAppCode": true},diff --git a/tests/_server/test_lsp.py b/tests/_server/test_lsp.pyindex 4863558c1b..00238c5ee1 100644--- a/tests/_server/test_lsp.py+++ b/tests/_server/test_lsp.py@@ -268,7 +268,11 @@ def test_composite_server():})completion_config = CompletionConfig(- {"copilot": True, "activate_on_typing": True}+ {+ "copilot": True,+ "activate_on_typing": True,+ "signature_hint_on_typing": False,+ })config_reader = as_reader(completion_config, config)config = config_reader.get_config()@@ -284,7 +288,11 @@ def test_composite_server():# Test with only pylspconfig = LanguageServersConfig({"pylsp": {"enabled": True}})completion_config = CompletionConfig(- {"copilot": False, "activate_on_typing": True}+ {+ "copilot": False,+ "activate_on_typing": True,+ "signature_hint_on_typing": False,+ })config_reader = as_reader(completion_config, config)config = config_reader.get_config()@@ -303,7 +311,11 @@ def test_composite_server():})completion_config = CompletionConfig(- {"copilot": False, "activate_on_typing": True}+ {+ "copilot": False,+ "activate_on_typing": True,+ "signature_hint_on_typing": False,+ })config_reader = as_reader(completion_config, config)config = config_reader.get_config()@@ -323,7 +335,11 @@ def test_composite_server():})completion_config = CompletionConfig(- {"copilot": False, "activate_on_typing": True}+ {+ "copilot": False,+ "activate_on_typing": True,+ "signature_hint_on_typing": False,+ })config_reader = as_reader(completion_config, config)config = config_reader.get_config()@@ -337,7 +353,11 @@ def test_composite_server():# Test with nothing enabledconfig = LanguageServersConfig({"pylsp": {"enabled": False}})completion_config = CompletionConfig(- {"copilot": False, "activate_on_typing": True}+ {+ "copilot": False,+ "activate_on_typing": True,+ "signature_hint_on_typing": False,+ })config_reader = as_reader(completion_config, config)config = config_reader.get_config()@@ -416,7 +436,11 @@ def test_any_lsp_server_running():# Test any_lsp_server_running functionconfig: MarimoConfig = merge_default_config({- "completion": {"copilot": True, "activate_on_typing": True},+ "completion": {+ "copilot": True,+ "activate_on_typing": True,+ "signature_hint_on_typing": False,+ },"language_servers": {"pylsp": {"enabled": False}},})@@ -424,7 +448,11 @@ def test_any_lsp_server_running():config: MarimoConfig = merge_default_config({- "completion": {"copilot": False, "activate_on_typing": True},+ "completion": {+ "copilot": False,+ "activate_on_typing": True,+ "signature_hint_on_typing": False,+ },"language_servers": {"pylsp": {"enabled": True}},})@@ -432,7 +460,11 @@ def test_any_lsp_server_running():config: MarimoConfig = merge_default_config({- "completion": {"copilot": False, "activate_on_typing": True},+ "completion": {+ "copilot": False,+ "activate_on_typing": True,+ "signature_hint_on_typing": False,+ },"language_servers": {"pylsp": {"enabled": False}},})@@ -440,7 +472,23 @@ def test_any_lsp_server_running():config: MarimoConfig = merge_default_config({- "completion": {"copilot": False, "activate_on_typing": True},+ "completion": {+ "copilot": False,+ "activate_on_typing": True,+ "signature_hint_on_typing": False,+ },+ "language_servers": {}, # default is false+ }+ )+ assert any_lsp_server_running(config) is False++ config: MarimoConfig = merge_default_config(+ {+ "completion": {+ "copilot": False,+ "activate_on_typing": True,+ "signature_hint_on_typing": True,+ },"language_servers": {}, # default is false})