compat: Future proof for upstream changed in >0.13.15 (#20)

Author: dmadisetti

_extensions/marimo/_extension.yml

@@ -1,5 +1,5 @@
 title: Quarto Marimo Extension
-version: 0.4.0
+version: 0.4.1
 quarto-required: ">=1.3.0"
 contributes:
   filters:

_extensions/marimo/command.py

@@ -6,13 +6,21 @@
 from textwrap import dedent
 
 try:
-    from marimo._cli.sandbox import PyProjectReader, construct_uv_flags
+    from marimo._cli.sandbox import construct_uv_flags
+    from marimo._utils.inline_script_metadata import PyProjectReader
 except ImportError as e:
-    from marimo import __version__
-    raise ImportError(
-        "Potential version incompatibility quartom-marimo requires marimo "
-        f">=0.13.3. marimo version {__version__} is detected. "
-    ) from e
+    try:
+        from marimo._cli.sandbox import (  # type: ignore[attr-defined, no-redef]
+            PyProjectReader,
+            construct_uv_flags,
+        )
+    except ImportError:
+        from marimo import __version__
+
+        raise ImportError(
+            "Potential version incompatibility quartom-marimo requires marimo "
+            f">=0.13.3. marimo version {__version__} is detected. "
+        ) from e
 
 
 def extract_command(header: str) -> list[str]:

_extensions/marimo/extract.py

@@ -12,11 +12,24 @@
 
 import marimo
 from marimo import MarimoIslandGenerator
-from marimo._cli.convert.markdown import (
-    MARIMO_MD,
-    MarimoParser,
-    SafeWrap,
-)
+
+try:
+    from marimo._ast.app import App
+    from marimo._convert.markdown.markdown import (
+        MARIMO_MD,
+        MarimoMdParser as MarimoParser,
+        SafeWrap as SafeWrapGeneric,
+    )
+
+    SafeWrap = SafeWrapGeneric[App]
+except ImportError:
+    # Fallback for marimo < 0.13.16
+    from marimo._cli.convert.markdown import (  # type: ignore[import, no-redef]
+        MARIMO_MD,
+        MarimoParser,
+        SafeWrap,
+    )
+
 from marimo._islands import MarimoIslandStub
 
 __version__ = "0.0.1"
@@ -196,6 +209,7 @@ def tree_to_pandoc_export(root: Element) -> SafeWrap:
 class MarimoPandocParser(MarimoParser):
     """Parses Markdown to marimo notebook string."""
 
+    # TODO: Could upstream generic for keys- but this is fine.
     output_formats = {  # type: ignore[assignment, misc]
         "marimo-pandoc-export": build_export_with_mime_context(mime_sensitive=False),  # type: ignore[dict-item]
         "marimo-pandoc-export-with-mime": build_export_with_mime_context(
@@ -208,9 +222,9 @@ def convert_from_md_to_pandoc_export(text: str, mime_sensitive: bool) -> dict[st
     if not text:
         return {"header": "", "outputs": []}
     if mime_sensitive:
-        parser = MarimoPandocParser(output_format="marimo-pandoc-export-with-mime")
+        parser = MarimoPandocParser(output_format="marimo-pandoc-export-with-mime")  # type: ignore[arg-type]
     else:
-        parser = MarimoPandocParser(output_format="marimo-pandoc-export")
+        parser = MarimoPandocParser(output_format="marimo-pandoc-export")  # type: ignore[arg-type]
     return parser.convert(text)  # type: ignore[arg-type, return-value]