From fdb6288e25552e8c21a6b263284248bd25ff0066 Mon Sep 17 00:00:00 2001
From: Brook Patten <patten.bp@pg.com>
Date: Sat, 2 May 2026 04:20:38 +0000
Subject: [PATCH] fix

---
 marimo_databricks_connect/app/server.py | 37 +++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/marimo_databricks_connect/app/server.py b/marimo_databricks_connect/app/server.py
index 6ee07a5..f4d0d47 100644
--- a/marimo_databricks_connect/app/server.py
+++ b/marimo_databricks_connect/app/server.py
@@ -140,7 +140,15 @@ def _basename_for(ws_path: str) -> str:
     Databricks notebook paths have no extension; plain workspace files keep
     theirs. Always normalise to ``<name>.py`` so marimo's UI shows it as a
     Python notebook and the dynamic-directory router can find it.
+
+    The returned name is also guarded against shadowing top-level Python
+    packages: marimo's kernel subprocess prepends the notebook's directory
+    to ``sys.path``, so a file called e.g. ``marimo.py`` or ``pyspark.py``
+    would break ``import marimo`` from inside the notebook and crash the
+    kernel before it can connect. We prefix any such name with ``nb_``.
     """
+    import importlib.util
+
     leaf = (ws_path.rsplit("/", 1)[-1] or "notebook").strip()
     leaf = _SLUG_RE.sub("_", leaf).strip("_") or "notebook"
     if leaf.endswith("_py"):
@@ -149,9 +157,38 @@ def _basename_for(ws_path: str) -> str:
         leaf = leaf + ".py"
     if leaf.startswith("_"):
         leaf = "nb" + leaf  # DynamicDirectoryMiddleware skips ``_*.py``
+    stem = leaf[:-3]
+    # Avoid shadowing importable top-level modules (most importantly
+    # ``marimo`` itself, but also ``pyspark``, ``databricks``, ...).
+    try:
+        shadows = importlib.util.find_spec(stem) is not None
+    except (ImportError, ValueError):
+        shadows = False
+    if shadows or stem in _RESERVED_BASENAMES:
+        leaf = f"nb_{leaf}"
     return leaf
 
 
+# Names that aren't necessarily importable in the current process but that
+# the notebook code is virtually guaranteed to import — keep them out of
+# the basename slot regardless of what's installed at app build time.
+_RESERVED_BASENAMES = frozenset(
+    {
+        "marimo",
+        "pyspark",
+        "databricks",
+        "fastapi",
+        "starlette",
+        "uvicorn",
+        "pandas",
+        "numpy",
+        "sklearn",
+        "scipy",
+        "matplotlib",
+    }
+)
+
+
 # ---- per-slug cache layout / metadata sidecar ----------------------------
 #
 # Each cached notebook lives in its own directory: