marimo-dev 0.2.2__tar.gz → 0.2.4__tar.gz

{marimo_dev-0.2.2 → marimo_dev-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: marimo-dev
-Version: 0.2.2
+Version: 0.2.4
 Summary: Build and publish python packages from marimo notebooks
 Author: Deufel
 Author-email: Deufel <MDeufel13@gmail.com>

{marimo_dev-0.2.2 → marimo_dev-0.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "marimo-dev"
-version = "0.2.2"
+version = "0.2.4"
 description = "Build and publish python packages from marimo notebooks"
 readme = "README.md"
 requires-python = ">=3.12"

{marimo_dev-0.2.2 → marimo_dev-0.2.4}/src/marimo_dev/__init__.py

@@ -1,5 +1,5 @@
 """Build and publish python packages from marimo notebooks"""
-__version__ = '0.2.2'
+__version__ = '0.2.4'
 __author__ = 'Deufel'
 from .core import Config, read_config, Kind, Param, Node
 from .read import inline_doc, parse_params, parse_hash_pipe, parse_class_params, parse_class_methods, parse_ret, src_with_decs, is_export, parse_import, parse_const, parse_export, parse_node, parse_file, read_meta, nb_name, scan
@@ -7,6 +7,7 @@ from .pkg import clean, write, write_mod, rewrite_imports, write_init
 from .docs import cls_sig, fn_sig, sig, write_llms, exp_type, render_param, nb_path, render_node, render_module_page, build_docs, export_wasm, write_nojekyll, html_preview, render_index_page, Icon
 from .build import build, tidy, nuke, get_pypi_name, extract_import_names, pep723_header, bundle
 from .publish import publish
+from .cli import main
 __all__ = [
     "Config",
     "Icon",
@@ -26,6 +27,7 @@ __all__ = [
     "html_preview",
     "inline_doc",
     "is_export",
+    "main",
     "nb_name",
     "nb_path",
     "nuke",

{marimo_dev-0.2.2 → marimo_dev-0.2.4}/src/marimo_dev/build.py

@@ -69,30 +69,30 @@ def bundle(root='.', name=None):
     "Bundle all notebooks into a single Python file with PEP 723 dependencies."
     cfg = read_config(root)
     meta, mods = scan(root)
-    
+
     # Collect all nodes
     all_nodes = [n for _, nodes in mods for n in nodes]
-    
+
     # Extract dependencies
     import_names = extract_import_names(all_nodes)
     # Filter out stdlib and local modules
     mod_names = [m for m, _ in mods]
     external = {get_pypi_name(n) for n in import_names if n not in mod_names}
-    
+
     # Build output
     header = pep723_header(external)
     imports = '\n'.join(n.src for n in all_nodes if n.kind == Kind.IMP)
     consts = '\n'.join(n.src for n in all_nodes if n.kind == Kind.CONST)
     exports = '\n\n'.join(clean(n.src) for n in all_nodes if n.kind == Kind.EXP)
-    
+
     content = '\n\n'.join(p for p in [header, imports, consts, exports] if p.strip())
-    
+
     # Determine output path
     if name:
         out_path = Path(root) / name
     else:
         out_path = Path(root) / cfg.out / meta['name'] / '__init__.py'
-    
+
     out_path.parent.mkdir(parents=True, exist_ok=True)
     out_path.write_text(content)
     return f"Bundled to {out_path}"

marimo_dev-0.2.4/src/marimo_dev/cli.py

@@ -0,0 +1,25 @@
+from .build import build, tidy, nuke, bundle
+from .publish import publish
+from .docs import build_docs
+import sys, subprocess
+from pathlib import Path
+
+def main():
+    if len(sys.argv) < 2: print("Usage: md [build|publish|docs|tidy|nuke]"); sys.exit(1)
+    cmd = sys.argv[1]
+    if cmd == 'build':
+        print(f"Built package at: {build()}")
+        print(build_docs())
+    elif cmd == 'publish':
+        test = '--test' in sys.argv or '-t' in sys.argv
+        target = "TestPyPI" if test else "PyPI"
+        if input(f"Publish to {target}? [y/N] ").lower() != 'y': print("Aborted"); sys.exit(0)
+        publish(test=test)
+    elif cmd == 'docs': build_docs()
+    elif cmd == 'tidy': tidy()
+    elif cmd == 'nuke': nuke()
+    elif cmd == 'bundle':
+        name = sys.argv[2] if len(sys.argv) > 2 else None
+        print(bundle(name=name))
+
+    else: print(f"Unknown command: {cmd}"); sys.exit(1)

{marimo_dev-0.2.2 → marimo_dev-0.2.4}/src/marimo_dev/docs.py

@@ -167,18 +167,14 @@ def build_docs(
         (docs_path / f"{mod_name}.html").write_text(to_xml(render_module_page(mod_name, mod_nodes, mod_names, meta, root)))
     return f"Generated index + {len(mods)} module pages in {docs_path}"
 
-cfg = read_config(root)
-
-nbs_dir = Path(root) / cfg.nbs
-
-wasm_dir = Path(root) / cfg.docs / 'wasm'
-
-wasm_dir.mkdir(parents=True, exist_ok=True)
-
-for f in nbs_dir.glob('*.py'):
-    name = nb_name(f, root)
-    if name:
-        os.system(f'marimo export html-wasm {f} -o {wasm_dir}/{name} --mode edit')
+def export_wasm(root='.'):
+    cfg = read_config(root)
+    nbs_dir = Path(root) / cfg.nbs
+    wasm_dir = Path(root) / cfg.docs / 'wasm'
+    wasm_dir.mkdir(parents=True, exist_ok=True)
+    for f in nbs_dir.glob('*.py'):
+        name = nb_name(f, root)
+        if name: os.system(f"marimo export html-wasm {f} -o {wasm_dir}/{name} --mode edit")
 
 def write_nojekyll(root='.'):
     cfg = read_config(root)

{marimo_dev-0.2.2 → marimo_dev-0.2.4}/src/marimo_dev/read.py

@@ -118,21 +118,28 @@ def parse_node(
 ):             # yields Node objects for imports, constants, and exports
     "Extract importable nodes from an AST node."
     ls = src.splitlines()
-    
+
     # Handle setup cells
     if isinstance(n, ast.With):
         for s in n.body:
             if (node := parse_import(s, ls)): yield node
             if (node := parse_const(s, ls)): yield node
-    
+                
     # Handle export-named cells (e.g. def export(): or def export_main():)
     if isinstance(n, ast.FunctionDef) and n.name.startswith('export'):
-        body = [s for s in n.body if not isinstance(s, ast.Return)]
-        if body:
-            src = '\n\n'.join(ast.unparse(s) for s in body)
-            yield Node(Kind.EXP, n.name, src)
-            return
-    
+        # Check it's decorated with @app.cell, not @app.function
+        is_cell = any(
+            (isinstance(d, ast.Attribute) and d.attr == 'cell') or
+            (isinstance(d, ast.Name) and d.id == 'cell')
+            for d in n.decorator_list
+        )
+        if is_cell:
+            body = [s for s in n.body if not isinstance(s, ast.Return)]
+            if body:
+                src = '\n\n'.join(ast.unparse(s) for s in body)
+                yield Node(Kind.EXP, n.name, src)
+                return
+
     # Handle decorated exports
     if (node := parse_export(n, ls, cfg)): yield node