Merge branch 'main' into data_explorer-embed-preview-fix

Author: Haleshot

.github/workflows/test_cli.yaml

@@ -86,6 +86,8 @@ jobs:
             fi
           done
 
+      - name: Run LSP binary
+        run: ./scripts/test-lsp.sh
       - name: Upload wheel
         uses: actions/upload-artifact@v4
         with:

examples/sql/misc/database_explorer.py

@@ -3,19 +3,22 @@
 # dependencies = [
 #     "duckdb==1.1.1",
 #     "marimo",
+#     "numpy==2.2.6",
+#     "pandas==2.2.3",
 #     "polars==1.18.0",
 #     "pyarrow==18.1.0",
+#     "sqlglot==26.19.0",
 # ]
 # ///
 
 import marimo
 
-__generated_with = "0.9.1"
+__generated_with = "0.13.11"
 app = marimo.App(width="full")
 
 
 @app.cell
-def __():
+def _():
     import os
 
     import duckdb
@@ -24,19 +27,19 @@ def __():
 
 
 @app.cell(hide_code=True)
-def __(mo):
+def _(mo):
     mo.md(
         r"""
-        # Database explorer
+    # Database explorer
 
-        This notebook lets you explore the contents of a database. Start by providing a database URL.
-        """
+    This notebook lets you explore the contents of a database. Start by providing a database URL.
+    """
     )
     return
 
 
 @app.cell
-def __(mo, os):
+def _(mo, os):
     database_url = mo.ui.text(
         label="Database URL",
         full_width=True,
@@ -47,9 +50,7 @@ def __(mo, os):
 
 
 @app.cell
-def __(database_url):
-    import duckdb
-
+def _(database_url, duckdb):
     if database_url.value:
         duckdb.sql(
             f"""
@@ -60,23 +61,23 @@ def __(database_url):
                 ATTACH DATABASE '{database_url.value}' AS my_db  (TYPE postgres, READ_ONLY);
             """
         )
-    return duckdb, my_db
+    return (my_db,)
 
 
 @app.cell
-def __(duckdb):
+def _(duckdb):
     duckdb.sql("SHOW DATABASES").show()
     return
 
 
 @app.cell(hide_code=True)
-def __(mo):
+def _(mo):
     mo.md(r"""## Tables""")
     return
 
 
 @app.cell
-def __(mo):
+def _(mo):
     _df = mo.sql(
         f"""
         SHOW ALL TABLES;
@@ -86,13 +87,13 @@ def __(mo):
 
 
 @app.cell(hide_code=True)
-def __(mo):
+def _(mo):
     mo.md(r"""## Other meta table functions""")
     return
 
 
 @app.cell
-def __():
+def _():
     FUNCTIONS = [
         "duckdb_columns()",  # columns
         "duckdb_constraints()",  # constraints
@@ -115,7 +116,7 @@ def __():
 
 
 @app.cell
-def __(FUNCTIONS, mo):
+def _(FUNCTIONS, mo):
     function = mo.ui.dropdown(
         label="Dropdown",
         options=FUNCTIONS,
@@ -126,7 +127,7 @@ def __(FUNCTIONS, mo):
 
 
 @app.cell
-def __(_, function, mo):
+def _(function, mo):
     _df = mo.sql(
         f"""
         SELECT * FROM {function.value} WHERE database_name == 'my_db'
@@ -136,25 +137,25 @@ def __(_, function, mo):
 
 
 @app.cell(hide_code=True)
-def __(mo):
+def _(mo):
     mo.md(r"""## Interact with your tables""")
     return
 
 
 @app.cell
-def __(duckdb, duckdb_tables, mo):
+def _(duckdb, mo):
     tables = duckdb.execute(
         """
     SELECT table_name FROM duckdb_tables() WHERE internal = False;
     """
     ).df()
     table_names = list(tables["table_name"])
     mo.accordion({f"Found {len(table_names)} tables": table_names})
-    return table_names, tables
+    return (table_names,)
 
 
 @app.cell
-def __(mo, table_names):
+def _(mo, table_names):
     mo.stop(not table_names)
     table_select = mo.ui.dropdown(
         label="Table",
@@ -173,14 +174,14 @@ def __(mo, table_names):
 
 
 @app.cell
-def __(mo, table_select):
+def _(mo, table_select):
     mo.stop(not table_select.value)
     table_select_value = table_select.value
     return (table_select_value,)
 
 
 @app.cell
-def __(limit, mo, table_select_value):
+def _(limit, mo, my_db, null, table_select_value):
     selected_table = mo.sql(
         f"""
         select * from my_db.{table_select_value} LIMIT {limit.value};
@@ -190,7 +191,7 @@ def __(limit, mo, table_select_value):
 
 
 @app.cell
-def __(mo, selected_table):
+def _(mo, selected_table):
     mo.ui.data_explorer(selected_table)
     return
 

frontend/src/core/codemirror/copilot/extension.ts

@@ -200,7 +200,7 @@ function getSuggestion(
   state: EditorState,
 ): string {
   if (!response) {
-    logger.error("No response from copilot");
+    logger.debug("No response from copilot");
     return "";
   }
 

frontend/src/plugins/impl/data-explorer/spec.ts

@@ -16,7 +16,12 @@ export function toSpecQuery(spec: ChartSpec): SpecQuery {
   };
 }
 
-function adaptEncodings(encoding: SpecificEncoding): EncodingQuery[] {
+function adaptEncodings(
+  encoding: SpecificEncoding | undefined,
+): EncodingQuery[] {
+  if (!encoding) {
+    return [];
+  }
   return Object.entries(encoding).map(([channel, def]) => {
     return toFieldQuery(def, channel as EncodingChannel);
   });

lsp/index.ts

@@ -6,6 +6,7 @@ import type * as rpc from "@sourcegraph/vscode-ws-jsonrpc";
 import * as rpcServer from "@sourcegraph/vscode-ws-jsonrpc/lib/server";
 import path from "node:path";
 import fs from "node:fs/promises";
+import fsSync from "node:fs";
 
 const LOG_FILE = path.join(
   process.env.XDG_CACHE_HOME || path.join(process.env.HOME || "", ".cache"),
@@ -43,18 +44,28 @@ const Logger = {
 };
 
 // Adapted from https://github.com/wylieconlon/jsonrpc-ws-proxy
+const COPILOT_LSP_PATH = path.join(
+  __dirname,
+  "copilot",
+  "dist",
+  "language-server.js",
+);
+if (!fsSync.existsSync(COPILOT_LSP_PATH)) {
+  Logger.error("Compilation artifact does not exist. Exiting.");
+  process.exit(1);
+}
 
 const argv = parseArgs(process.argv.slice(2));
 
 if (argv.help) {
-  console.log("Usage: index.js --port 3000");
-  process.exit(1);
+  Logger.log("Usage: index.js --port 3000");
+  process.exit(0);
 }
 
 const serverPort: number = Number.parseInt(argv.port) || 3000;
 
 const languageServers: Record<string, string[]> = {
-  copilot: ["node", path.join(__dirname, "language-server.js"), "--stdio"],
+  copilot: ["node", COPILOT_LSP_PATH, "--stdio"],
 };
 
 function toSocket(webSocket: ws): rpc.IWebSocket {
@@ -102,6 +113,15 @@ function toSocket(webSocket: ws): rpc.IWebSocket {
   };
 }
 
+async function verifyCopilotLSP() {
+  if (!fsSync.existsSync(COPILOT_LSP_PATH)) {
+    Logger.error(
+      `Copilot LSP not found at ${COPILOT_LSP_PATH}. Likely a build error or missing dependencies.`,
+    );
+    process.exit(1);
+  }
+}
+
 // Add error handling for WebSocket server creation
 try {
   const wss = new WebSocketServer(
@@ -121,6 +141,8 @@ try {
   wss.on("connection", (client: ws, request: http.IncomingMessage) => {
     Logger.log(`New connection from ${request.socket.remoteAddress}`);
 
+    void verifyCopilotLSP();
+
     let langServer: string[] | undefined;
 
     Object.keys(languageServers).forEach((key) => {

marimo/__init__.py

@@ -84,7 +84,7 @@
     "vstack",
     "watch",
 ]
-__version__ = "0.13.11"
+__version__ = "0.13.12"
 
 import marimo._ai as ai
 import marimo._islands as islands

marimo/_loggers.py

@@ -9,13 +9,22 @@
 from marimo._utils.log_formatter import LogFormatter
 
 # This file manages and creates loggers used throughout marimo.
+#
 # It contains a global log level, which can be updated and all handlers
 # will be updated to use the new level.
+#
 # Our loggers contain two handlers:
 # - A StreamHandler to stdout
 # - A FileHandler to a rotating log file
+#
 # The stream handler is set to the global log level, but the file handler
 # is set to either INFO or DEBUG, depending on the global log level.
+#
+# NB: As is best practice for Python libraries, we do not configure the
+# root logger, and in particular we don't call basicConfig() (which would
+# preclude client of our library from configuring the root logger to their
+# own end).
+# See https://docs.python.org/3/howto/logging.html#configuring-logging-for-a-library
 
 # Global log level for loggers
 _LOG_LEVEL: int = logging.WARNING
@@ -26,15 +35,6 @@
 # Cache of initialized loggers
 _LOGGERS: dict[str, logging.Logger] = {}
 
-# Set basic config to INFO
-# This is so notebooks pick this up automatically
-# when they write:
-# ```
-# import logging
-# logging.info("Hello, world!")
-# ```
-logging.basicConfig(level=logging.INFO)
-
 
 def log_level_string_to_int(level: str) -> int:
     level = level.upper()
@@ -72,6 +72,11 @@ def set_level(level: str | int = logging.WARNING) -> None:
         _LOG_LEVEL = level
 
     for logger in _LOGGERS.values():
+        # We have to set update the logger's level in order
+        # for its handlers level's to be respected.
+        # but it needs to be set to the minimum LOG_LEVEL and INFO
+        # so the file handler can still pick it up
+        logger.setLevel(min(_LOG_LEVEL, logging.INFO))
         for handler in logger.handlers:
             if isinstance(handler, logging.FileHandler):
                 # Don't increase the log level of a file handler
@@ -101,8 +106,10 @@ def get_logger(name: str, level: Optional[int] = None) -> logging.Logger:
     stream_handler.setFormatter(_LOG_FORMATTER)
     if level is None:
         stream_handler.setLevel(_LOG_LEVEL)
+        logger.setLevel(_LOG_LEVEL)
     else:
         stream_handler.setLevel(level)
+        logger.setLevel(level)
 
     logger.addHandler(stream_handler)