marimo-dev 0.2.1__tar.gz → 0.2.3__tar.gz

{marimo_dev-0.2.1 → marimo_dev-0.2.3}/PKG-INFO

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

{marimo_dev-0.2.1 → marimo_dev-0.2.3}/pyproject.toml

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

{marimo_dev-0.2.1 → marimo_dev-0.2.3}/src/marimo_dev/__init__.py

@@ -1,13 +1,12 @@
 """Build and publish python packages from marimo notebooks"""
-__version__ = '0.2.1'
+__version__ = '0.2.3'
 __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
 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
+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",
@@ -16,15 +15,17 @@ __all__ = [
     "Param",
     "build",
     "build_docs",
+    "bundle",
     "clean",
     "cls_sig",
     "exp_type",
     "export_wasm",
+    "extract_import_names",
     "fn_sig",
+    "get_pypi_name",
     "html_preview",
     "inline_doc",
     "is_export",
-    "main",
     "nb_name",
     "nb_path",
     "nuke",
@@ -38,6 +39,7 @@ __all__ = [
     "parse_node",
     "parse_params",
     "parse_ret",
+    "pep723_header",
     "publish",
     "read_config",
     "read_meta",

marimo_dev-0.2.3/src/marimo_dev/build.py

@@ -0,0 +1,98 @@
+from .core import Kind, Param, Node, Config, read_config
+from .read import scan, read_meta
+from .pkg import write_mod, write_init, clean
+from .docs import write_llms
+from pathlib import Path
+import ast, shutil, re
+
+IMPORT_TO_PYPI = {'bs4': 'beautifulsoup4', 'PIL': 'pillow', 'cv2': 'opencv-python', 'sklearn': 'scikit-learn', 'yaml': 'pyyaml'}
+
+def build(
+    root='.',  # root directory containing pyproject.toml
+)->str:        # path to built package
+    "Build a Python package from notebooks."
+    cfg = read_config(root)
+    meta, mods = scan(root)
+    mod_names = [name for name, _ in mods]
+    pkg = Path(root) / cfg.out / meta['name'].replace('-', '_')
+    if pkg.exists(): shutil.rmtree(pkg)
+    pkg.mkdir(parents=True, exist_ok=True)
+    for name, nodes in mods:
+        stripped = re.sub(r'^[a-z]_', '', name)
+        if stripped != 'index' and any(n.kind == Kind.EXP for n in nodes): write_mod(pkg/f'{stripped}.py', nodes, mod_names)
+    write_init(pkg/'__init__.py', meta, mods)
+    all_exp = [n for _, nodes in mods for n in nodes if n.kind == Kind.EXP]
+    if all_exp: write_llms(meta, all_exp)
+    return str(pkg)
+
+def tidy():
+    "Remove cache and temporary files (__pycache__, __marimo__, .pytest_cache, etc)."
+    import shutil
+    for p in Path('.').rglob('__pycache__'): shutil.rmtree(p, ignore_errors=True)
+    for p in Path('.').rglob('__marimo__'): shutil.rmtree(p, ignore_errors=True)
+    for p in Path('.').rglob('.pytest_cache'): shutil.rmtree(p, ignore_errors=True)
+    for p in Path('.').rglob('*.pyc'): p.unlink(missing_ok=True)
+    print("Cleaned cache files")
+
+def nuke():
+    "Remove all build artifacts (dist, docs, src) and cache files."
+    import shutil
+    tidy()
+    for d in ['dist', 'docs', 'src', 'temp']: shutil.rmtree(d, ignore_errors=True)
+    print("Nuked build artifacts")
+
+def get_pypi_name(import_name):
+    "Map import name to PyPI package name."
+    root = import_name.split('.')[0]
+    return IMPORT_TO_PYPI.get(root, root)
+
+def extract_import_names(nodes):
+    "Extract top-level module names from import nodes."
+    names = set()
+    for n in nodes:
+        if n.kind != Kind.IMP: continue
+        tree = ast.parse(n.src)
+        for stmt in ast.walk(tree):
+            if isinstance(stmt, ast.Import):
+                for alias in stmt.names:
+                    names.add(alias.name.split('.')[0])
+            elif isinstance(stmt, ast.ImportFrom) and stmt.module:
+                names.add(stmt.module.split('.')[0])
+    return names
+
+def pep723_header(deps):
+    "Generate PEP 723 inline script metadata."
+    deps_str = ', '.join(f'"{d}"' for d in sorted(deps))
+    return f'# /// script\n# dependencies = [{deps_str}]\n# ///\n'
+
+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.1 → marimo_dev-0.2.3}/src/marimo_dev/read.py

@@ -118,10 +118,29 @@ 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'):
+        # 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
 
 def parse_file(

marimo_dev-0.2.1/src/marimo_dev/build.py

@@ -1,40 +0,0 @@
-from .core import Kind, Param, Node, Config, read_config
-from .read import scan, read_meta
-from .pkg import write_mod, write_init
-from .docs import write_llms
-from pathlib import Path
-import ast, shutil, re
-
-def build(
-    root='.',  # root directory containing pyproject.toml
-)->str:        # path to built package
-    "Build a Python package from notebooks."
-    cfg = read_config(root)
-    meta, mods = scan(root)
-    mod_names = [name for name, _ in mods]
-    pkg = Path(root) / cfg.out / meta['name'].replace('-', '_')
-    if pkg.exists(): shutil.rmtree(pkg)
-    pkg.mkdir(parents=True, exist_ok=True)
-    for name, nodes in mods:
-        stripped = re.sub(r'^[a-z]_', '', name)
-        if stripped != 'index' and any(n.kind == Kind.EXP for n in nodes): write_mod(pkg/f'{stripped}.py', nodes, mod_names)
-    write_init(pkg/'__init__.py', meta, mods)
-    all_exp = [n for _, nodes in mods for n in nodes if n.kind == Kind.EXP]
-    if all_exp: write_llms(meta, all_exp)
-    return str(pkg)
-
-def tidy():
-    "Remove cache and temporary files (__pycache__, __marimo__, .pytest_cache, etc)."
-    import shutil
-    for p in Path('.').rglob('__pycache__'): shutil.rmtree(p, ignore_errors=True)
-    for p in Path('.').rglob('__marimo__'): shutil.rmtree(p, ignore_errors=True)
-    for p in Path('.').rglob('.pytest_cache'): shutil.rmtree(p, ignore_errors=True)
-    for p in Path('.').rglob('*.pyc'): p.unlink(missing_ok=True)
-    print("Cleaned cache files")
-
-def nuke():
-    "Remove all build artifacts (dist, docs, src) and cache files."
-    import shutil
-    tidy()
-    for d in ['dist', 'docs', 'src', 'temp']: shutil.rmtree(d, ignore_errors=True)
-    print("Nuked build artifacts")

marimo_dev-0.2.1/src/marimo_dev/cli.py

@@ -1,21 +0,0 @@
-from .build import build, tidy, nuke
-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()
-    else: print(f"Unknown command: {cmd}"); sys.exit(1)