@marimo-team/islands 0.15.2 → 0.15.4

package/src/core/datasets/__tests__/data-source.test.ts

@@ -258,6 +258,9 @@ describe("add table list", () => {
       {
         name: "table1",
         columns: [],
+        num_columns: 0,
+        num_rows: 0,
+        variable_name: null,
         source: "",
         source_type: "local",
         type: "table",
@@ -286,6 +289,9 @@ describe("add table list", () => {
       {
         name: "table2",
         columns: [],
+        num_columns: 0,
+        num_rows: 0,
+        variable_name: null,
         source: "",
         source_type: "local",
         type: "table",
@@ -303,6 +309,9 @@ describe("add table list", () => {
       {
         name: "table1",
         columns: [],
+        num_columns: 0,
+        num_rows: 0,
+        variable_name: null,
         source: "",
         source_type: "local",
         type: "table",
@@ -323,6 +332,9 @@ describe("add table list", () => {
       {
         name: "table2",
         columns: [],
+        num_columns: 0,
+        num_rows: 0,
+        variable_name: null,
         source: "",
         source_type: "local",
         type: "table",
@@ -387,6 +399,9 @@ describe("add table", () => {
       source: "",
       source_type: "local",
       type: "table",
+      num_columns: 0,
+      num_rows: 0,
+      variable_name: null,
     };
     const newState = addTable(table, {
       engine: "conn1" as ConnectionName,
@@ -410,6 +425,9 @@ describe("add table", () => {
     const table: DataTable = {
       name: "table1",
       columns: [],
+      num_columns: 0,
+      num_rows: 0,
+      variable_name: null,
       source: "",
       source_type: "local",
       type: "table",
@@ -428,6 +446,9 @@ describe("add table", () => {
       source: "new_source",
       source_type: "local",
       type: "table",
+      num_columns: 0,
+      num_rows: 0,
+      variable_name: null,
     };
 
     const updatedState = addTable(updatedTable, sqlTableContext);
@@ -444,6 +465,9 @@ describe("add table", () => {
     const table: DataTable = {
       name: "table2",
       columns: [],
+      num_columns: 0,
+      num_rows: 0,
+      variable_name: null,
       source: "",
       source_type: "local",
       type: "table",

package/src/core/errors/__tests__/errors.test.ts

@@ -34,6 +34,7 @@ describe("getAutoFixes", () => {
       type: "exception",
       exception_type: "NameError",
       msg: "name 'np' is not defined",
+      raising_cell: null,
     };
 
     const fixes = getAutoFixes(error);
@@ -46,6 +47,7 @@ describe("getAutoFixes", () => {
       type: "exception",
       exception_type: "NameError",
       msg: "name 'unknown_module' is not defined",
+      raising_cell: null,
     };
 
     expect(getAutoFixes(error)).toHaveLength(0);

package/src/core/islands/bridge.ts

@@ -155,6 +155,7 @@ export class IslandsPyodideBridge implements RunRequests, EditRequests {
   previewDataSourceConnection = throwNotImplemented;
   openFile = throwNotImplemented;
   sendListFiles = throwNotImplemented;
+  sendSearchFiles = throwNotImplemented;
   sendPdb = throwNotImplemented;
   sendCreateFileOrFolder = throwNotImplemented;
   sendDeleteFileOrFolder = throwNotImplemented;

package/src/core/islands/main.ts

@@ -120,6 +120,7 @@ export async function initialize() {
       case "datasets":
       case "data-source-connections":
       case "secret-keys-result":
+      case "startup-logs":
         // Unsupported
         return;
       case "kernel-ready":

package/src/core/kernel/messages.ts

@@ -2,7 +2,7 @@
 import type { components } from "@marimo-team/marimo-api";
 
 export type schemas = components["schemas"];
-export type DataType = schemas["DataType"];
+export type DataType = schemas["KnownUnions"]["data_type"];
 export const DATA_TYPES = [
   "string",
   "boolean",
@@ -21,7 +21,11 @@ export type Database = schemas["Database"];
 export type DatabaseSchema = schemas["Schema"];
 export type DataSourceConnection = schemas["DataSourceConnection"];
 export type OutputChannel = schemas["CellChannel"];
-export type MarimoError = schemas["Error"];
+export type CellOutput = schemas["CellOutput"];
+export type MarimoError = Extract<
+  CellOutput["data"],
+  Array<{ type: string }>
+>[number];
 export type OutputMessage = schemas["CellOutput"];
 export type CompletionOption = schemas["CompletionResult"]["options"][0];
 export type CompletionResultMessage = OperationMessageData<"completion-result">;
@@ -35,20 +39,22 @@ export type SQLTablePreview = OperationMessageData<"sql-table-preview">;
 export type SQLTableListPreview =
   OperationMessageData<"sql-table-list-preview">;
 export type SecretKeysResult = OperationMessageData<"secret-keys-result">;
+export type StartupLogs = OperationMessageData<"startup-logs">;
+export type MessageOperation = schemas["KnownUnions"]["operation"];
 
-export type OperationMessageType = schemas["MessageOperation"]["name"];
+export type OperationMessageType = MessageOperation["op"];
 export type OperationMessage = {
   [Type in OperationMessageType]: {
     op: Type;
-    data: Omit<Extract<schemas["MessageOperation"], { name: Type }>, "name">;
+    data: Omit<Extract<MessageOperation, { op: Type }>, "op">;
   };
 }[OperationMessageType];
 
 export type CellMessage = OperationMessageData<"cell-op">;
 
 export type OperationMessageData<T extends OperationMessageType> = Omit<
-  Extract<schemas["MessageOperation"], { name: T }>,
-  "name"
+  Extract<MessageOperation, { op: T }>,
+  "op"
 >;
 
 export type Capabilities = OperationMessageData<"kernel-ready">["capabilities"];

package/src/core/layout/layout.ts

@@ -77,11 +77,11 @@ export function getSerializedLayout() {
 
   // Vertical layout has no data, as it is the default.
   if (selectedLayout === "vertical") {
-    return undefined;
+    return null;
   }
 
   if (layoutData === undefined) {
-    return undefined;
+    return null;
   }
 
   const data = layoutData[selectedLayout];
@@ -90,7 +90,7 @@ export function getSerializedLayout() {
   );
   if (plugin === undefined) {
     Logger.error(`Unknown layout type: ${selectedLayout}`);
-    return undefined;
+    return null;
   }
   return {
     type: selectedLayout,

package/src/core/network/requests-network.ts

@@ -235,6 +235,14 @@ export function createNetworkRequests(): EditRequests & RunRequests {
         })
         .then(handleResponse);
     },
+    sendSearchFiles: async (request) => {
+      await waitForConnectionOpen();
+      return getClient()
+        .POST("/api/files/search", {
+          body: request,
+        })
+        .then(handleResponse);
+    },
     sendCreateFileOrFolder: async (request) => {
       await waitForConnectionOpen();
       return getClient()

package/src/core/network/requests-static.ts

@@ -60,6 +60,7 @@ export function createStaticRequests(): EditRequests & RunRequests {
     openFile: throwNotInEditMode,
     getUsageStats: throwNotInEditMode,
     sendListFiles: throwNotInEditMode,
+    sendSearchFiles: throwNotInEditMode,
     sendPdb: throwNotInEditMode,
     sendCreateFileOrFolder: throwNotInEditMode,
     sendDeleteFileOrFolder: throwNotInEditMode,

package/src/core/network/requests-toasting.ts

@@ -38,6 +38,7 @@ export function createErrorToastingRequests(
     openFile: "Failed to open file",
     getUsageStats: "", // No toast
     sendListFiles: "Failed to list files",
+    sendSearchFiles: "Failed to search files",
     sendPdb: "Failed to start debug session",
     sendCreateFileOrFolder: "Failed to create file or folder",
     sendDeleteFileOrFolder: "Failed to delete file or folder",

package/src/core/network/types.ts

@@ -14,7 +14,7 @@ export type CellConfig = schemas["CellConfig"];
  * idle: not running.
  * disabled-transitively: disabled because an ancestor was disabled.
  */
-export type RuntimeState = schemas["RuntimeState"];
+export type RuntimeState = schemas["CellOp"]["status"];
 export type CodeCompletionRequest = schemas["CodeCompletionRequest"];
 export type DeleteCellRequest = schemas["DeleteCellRequest"];
 export type ExecuteMultipleRequest = schemas["ExecuteMultipleRequest"];
@@ -32,6 +32,8 @@ export type FileDetailsResponse = schemas["FileDetailsResponse"];
 export type FileInfo = schemas["FileInfo"];
 export type FileListRequest = schemas["FileListRequest"];
 export type FileListResponse = schemas["FileListResponse"];
+export type FileSearchRequest = schemas["FileSearchRequest"];
+export type FileSearchResponse = schemas["FileSearchResponse"];
 export type FileMoveRequest = schemas["FileMoveRequest"];
 export type FileMoveResponse = schemas["FileMoveResponse"];
 export type FileUpdateRequest = schemas["FileUpdateRequest"];
@@ -144,6 +146,7 @@ export interface EditRequests {
   sendPdb: (request: PdbRequest) => Promise<null>;
   // File explorer requests
   sendListFiles: (request: FileListRequest) => Promise<FileListResponse>;
+  sendSearchFiles: (request: FileSearchRequest) => Promise<FileSearchResponse>;
   sendCreateFileOrFolder: (
     request: FileCreateRequest,
   ) => Promise<FileCreateResponse>;

package/src/core/wasm/bridge.ts

@@ -21,6 +21,7 @@ import type {
   FileDetailsResponse,
   FileListResponse,
   FileMoveResponse,
+  FileSearchResponse,
   FileUpdateResponse,
   FormatResponse,
   RunRequests,
@@ -373,6 +374,14 @@ export class PyodideBridge implements RunRequests, EditRequests {
     return response as FileListResponse;
   };
 
+  sendSearchFiles: EditRequests["sendSearchFiles"] = async (request) => {
+    const response = await this.rpc.proxy.request.bridge({
+      functionName: "search_files",
+      payload: request,
+    });
+    return response as FileSearchResponse;
+  };
+
   sendComponentValues: RunRequests["sendComponentValues"] = async (request) => {
     await this.putControlRequest({
       ...request,
@@ -514,9 +523,16 @@ export class PyodideBridge implements RunRequests, EditRequests {
     return response;
   };
 
-  getDependencyTree = async () => {
+  getDependencyTree: EditRequests["getDependencyTree"] = async () => {
     // WASM doesn't support dependency trees yet
-    return { tree: undefined };
+    return {
+      tree: {
+        dependencies: [],
+        name: "",
+        tags: [],
+        version: null,
+      },
+    };
   };
 
   listSecretKeys: EditRequests["listSecretKeys"] = async (request) => {

package/src/core/wasm/worker/bootstrap.ts

@@ -6,6 +6,7 @@ import type { JsonString } from "@/utils/json/base64";
 import { invariant } from "../../../utils/invariant";
 import { Logger } from "../../../utils/Logger";
 import { WasmFileSystem } from "./fs";
+import { getMarimoWheel } from "./getMarimoWheel";
 import { t } from "./tracer";
 import type { SerializedBridge, WasmController } from "./types";
 
@@ -57,7 +58,8 @@ export class DefaultWasmController implements WasmController {
         // Perf: These get loaded while pyodide is being bootstrapped
         packages: [
           "micropip",
-          "marimo-base",
+          "msgspec",
+          getMarimoWheel(opts.version),
           "Markdown",
           "pymdown-extensions",
           "narwhals",

package/src/core/wasm/worker/getMarimoWheel.ts

@@ -1,15 +1,10 @@
 /* Copyright 2024 Marimo. All rights reserved. */
+
 export function getMarimoWheel(version: string) {
-  if (!version) {
-    return "marimo-base>=0.9.0";
-  }
-  if (version === "local") {
+  if (import.meta.env.DEV && import.meta.env.VITE_MARIMO_VERSION) {
     return `http://localhost:8000/dist/marimo-${
       import.meta.env.VITE_MARIMO_VERSION
     }-py3-none-any.whl`;
   }
-  if (version === "latest") {
-    return "marimo-base";
-  }
-  return `marimo-base==${version}`;
+  return "marimo-base";
 }

package/src/core/wasm/worker/types.ts

@@ -16,6 +16,8 @@ import type {
   FileListResponse,
   FileMoveRequest,
   FileMoveResponse,
+  FileSearchRequest,
+  FileSearchResponse,
   FileUpdateRequest,
   FileUpdateResponse,
   FormatRequest,
@@ -72,6 +74,7 @@ export interface RawBridge {
   save_user_config(request: SaveUserConfigurationRequest): Promise<null>;
   rename_file(request: string): Promise<string>;
   list_files(request: FileListRequest): Promise<FileListResponse>;
+  search_files(request: FileSearchRequest): Promise<FileSearchResponse>;
   file_details(request: { path: string }): Promise<FileDetailsResponse>;
   create_file_or_directory(
     request: FileCreateRequest,

package/src/core/websocket/useMarimoWebSocket.tsx

@@ -79,7 +79,7 @@ export function useMarimoWebSocket(opts: {
   const { setLayoutData } = useLayoutActions();
   const [connection, setConnection] = useAtom(connectionAtom);
   const { addBanner } = useBannersActions();
-  const { addPackageAlert } = useAlertActions();
+  const { addPackageAlert, addStartupLog } = useAlertActions();
   const setKioskMode = useSetAtom(kioskModeAtom);
   const setCapabilities = useSetAtom(capabilitiesAtom);
   const runtimeManager = useRuntimeManager();
@@ -204,6 +204,12 @@ export function useMarimoWebSocket(opts: {
           kind: "installing",
         });
         return;
+      case "startup-logs":
+        addStartupLog({
+          content: msg.data.content,
+          status: msg.data.status,
+        });
+        return;
       case "query-params-append":
         queryParamHandlers.append(msg.data);
         return;

package/src/css/app/Cell.css

@@ -18,8 +18,8 @@
 
   &:focus-visible {
     /* focus-visible outlines the entire cell body in black, but the cell's
-     * body is an irregular shape because of pseudo-elements that extend
-     * its hit-box / hover area. */
+         * body is an irregular shape because of pseudo-elements that extend
+         * its hit-box / hover area. */
     outline: none;
   }
 
@@ -28,16 +28,19 @@
   }
 
   /* Hover z-index is higher than focus-within z-index
-   * This is because you may hover for tooltip docs while
-   * not focused in another cell.
-   */
+     * This is because you may hover for tooltip docs while
+     * not focused in another cell.
+     */
+
   &:hover {
     z-index: 30;
   }
 
   /* Interactive */
+
   &.interactive {
     /* Only restrain output length in edit mode. */
+
     .output-area,
     .console-output-area {
       max-height: 610px;
@@ -45,6 +48,7 @@
     }
 
     /* Special case for particular components */
+
     .output-area:has(> .output > marimo-ui-element > marimo-table) {
       max-height: none;
       overflow: hidden;
@@ -71,14 +75,14 @@
       @apply shadow-lg-solid shadow-shade;
 
       /* a little bit of motion
-      *
-      * Note: we use left/top instead of transform because transform creates a new
-      * stacking context and makes completion tooltip appear below surrounding
-      * cells/outputs. See
-      *
-      * https://stackoverflow.com/questions/20851452/z-index-is-canceled-by-setting-transformrotate,
-      * https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Positioning/Understanding_z_index/The_stacking_context
-      * */
+            *
+            * Note: we use left/top instead of transform because transform creates a new
+            * stacking context and makes completion tooltip appear below surrounding
+            * cells/outputs. See
+            *
+            * https://stackoverflow.com/questions/20851452/z-index-is-canceled-by-setting-transformrotate,
+            * https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Positioning/Understanding_z_index/The_stacking_context
+            * */
       left: -1px;
       top: -1px;
     }
@@ -97,6 +101,7 @@
   }
 
   /* Stale styles for Cell */
+
   &.stale,
   &.disabled.stale {
     .output-area,
@@ -108,6 +113,7 @@
   }
 
   /* Disabled styles for Cell */
+
   &.disabled,
   &.disabled.has-error,
   &.disabled:hover,
@@ -127,6 +133,7 @@
   }
 
   /* Error styles for Cell, less precedence than needs run */
+
   &.has-error,
   &.error-outline {
     outline: 1px solid var(--red-4);
@@ -149,6 +156,7 @@
   }
 
   /* Needs Run */
+
   &.needs-run {
     /* TODO(akshayka): Can give this an outline to make more visible. */
     outline: none;
@@ -174,6 +182,7 @@
   }
 
   /* Focus state */
+
   &.focus-outline {
     transition: all 0.6s;
     border-color: var(--blue-8) !important;
@@ -183,21 +192,28 @@
   }
 
   /* Published - when its just the output */
+
   &.published {
     border: none;
     box-shadow: none;
 
     .output-area {
       /* flow-root interferes with margin collapsing, but appears to be unneeded
-      * when cell outlines are hidden; clear:both is sufficient.
-      *
-      * if developers just use css-grid instead of float, this won't matter.
-      * */
+            * when cell outlines are hidden; clear:both is sufficient.
+            *
+            * if developers just use css-grid instead of float, this won't matter.
+            * */
       display: block;
       padding-top: 0;
       padding-bottom: 0;
       border: none;
       box-shadow: none;
+
+      /*
+                do not restrict the dimensions when outlines are hidden，
+                otherwise text with a scrollbar w/o a container looks weird
+            */
+      overflow: visible;
     }
 
     &:hover {
@@ -211,6 +227,7 @@
   }
 
   /* Borderless styles for Cell */
+
   &.borderless {
     border-color: transparent;
     box-shadow: none;
@@ -220,6 +237,7 @@
     }
 
     /* Apply the original styles */
+
     &:hover {
       border: 1px solid var(--gray-4);
       @apply shadow-sm-solid shadow-shade;
@@ -227,6 +245,7 @@
   }
 
   /* -------------------------- Shoulders/Buttons ---------------------------- */
+
   .shoulder-right {
     display: inline-flex;
     flex-direction: column;
@@ -259,6 +278,7 @@
     }
 
     /* Apply the original styles */
+
     &:hover {
       border: 1px solid var(--gray-4);
       @apply shadow-sm-solid shadow-shade;
@@ -268,6 +288,7 @@
 
 #App.disconnected {
   /* Background determined by disconnected gradient/noise. */
+
   .marimo-cell,
   .console-output-area,
   .cm .cm-gutters,
@@ -278,6 +299,7 @@
   }
 
   /* Hide when disconnected. */
+
   .cell-running-icon,
   .cell-queued-icon,
   .elapsed-time {
@@ -306,6 +328,7 @@
   }
 
   /* expand the hover area left and right */
+
   &::before,
   &::after {
     content: "";
@@ -400,13 +423,11 @@
   padding: 1rem;
 
   /* Prevent floated elements from extending out of the output areas and into
-   * the editor. */
+     * the editor. */
   clear: both;
   display: flow-root;
 
-  /* TODO: Find a way to accommodate large elements, ideally in a way that
-   * doesn't break margin collapse. Setting overflow (eg, overflow: auto)
-   * breaks margin collapse. */
+  overflow: auto;
 }
 
 .marimo-output-stale,

package/src/css/app/codemirror.css

@@ -67,7 +67,7 @@
 /* -- Panels -- */
 
 .cm .cm-panels {
-  background: transparent;
+  background-color: var(--cm-background);
   color: var(--sky-11);
   font-weight: 700;
 
@@ -75,6 +75,10 @@
   margin-right: 30px;
 
   @apply text-xs;
+
+  &.cm-panels-bottom {
+    border-top: 1px solid var(--border);
+  }
 }
 
 /* -- Linting -- */

package/src/css/globals.css

@@ -103,6 +103,9 @@
       hsl(0deg 0% 50% / 60%)
     );
     --base-shadow-opacity: 5%;
+
+    /* Codemirror editor */
+    --cm-background: light-dark(var(--background), #282c34);
   }
 
   .dark,

package/src/css/md.css

@@ -268,7 +268,7 @@ button .prose.prose {
 }
 
 .prose span.critic::after {
-  content: "\ab\00a0";
+  content: "ab\00a0";
   border-left: none;
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;

package/src/plugins/impl/MicrophonePlugin.tsx

@@ -5,7 +5,7 @@ import { z } from "zod";
 import { AudioRecorder } from "@/components/audio/audio-recorder";
 import { useAudioRecorder } from "@/hooks/useAudioRecorder";
 import type { IPlugin, IPluginProps } from "@/plugins/types";
-import { blobToBase64 } from "@/utils/fileToBase64";
+import { blobToString } from "@/utils/fileToBase64";
 import { Labeled } from "./common/labeled";
 
 /**
@@ -33,7 +33,7 @@ const Microphone = ({ setValue, data }: IPluginProps<Value, Data>) => {
   const { start, stop, pauseResume, recordingStatus, recordingTime, allowed } =
     useAudioRecorder({
       onDone: async (file) => {
-        const base64 = await blobToBase64(file);
+        const base64 = await blobToString(file, "base64");
         setValue(base64);
       },
     });

package/src/plugins/impl/chat/ChatPlugin.tsx

@@ -41,6 +41,7 @@ export const ChatPlugin = createPlugin<{ messages: ChatMessage[] }>(
           z.object({
             role: z.enum(["system", "user", "assistant"]),
             content: z.string(),
+            parts: z.array(z.any()),
           }),
         ),
       }),
@@ -56,15 +57,7 @@ export const ChatPlugin = createPlugin<{ messages: ChatMessage[] }>(
             z.object({
               role: z.enum(["system", "user", "assistant"]),
               content: z.string(),
-              attachments: z
-                .array(
-                  z.object({
-                    name: z.string().optional(),
-                    contentType: z.string().optional(),
-                    url: z.string(),
-                  }),
-                )
-                .optional(),
+              parts: z.array(z.any()),
             }),
           ),
           config: z.object({