nbsync 0.3.11__py3-none-any.whl → 0.4.1__py3-none-any.whl

nbsync/markdown.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import shlex
 import textwrap
 from typing import TYPE_CHECKING, TypeAlias
 
@@ -40,14 +41,19 @@ def _convert_code_block_attrs(code_block: CodeBlock) -> CodeBlock | Image:
     if exec_ != "1" or not code_block.classes:
         return code_block
 
-    if code_block.classes[0] != "python":
+    if code_block.classes[0] == "python":
+        classes = code_block.classes[1:]
+    elif code_block.classes[0] == "console":
+        classes = code_block.classes
+    else:
         return code_block
 
     del code_block.attributes["exec"]
+
     return Image(
         code_block.indent,
         "",
-        code_block.classes[1:],
+        classes,
         code_block.attributes,
         code_block.source,
         url=".md",
@@ -62,7 +68,7 @@ def convert_image(image: Image, index: int | None = None) -> Iterator[Element]:
             raise ValueError(msg)
 
         image.identifier = image.identifier or f"image-nbsync-{index}"
-        yield CodeBlock("", image.identifier, [], {}, image.source, image.url)
+        yield create_code_block(image)
         yield image
 
     elif image.identifier:
@@ -72,6 +78,29 @@ def convert_image(image: Image, index: int | None = None) -> Iterator[Element]:
         yield image.text
 
 
+def create_code_block(image: Image) -> CodeBlock:
+    if "console" in image.classes:
+        source = create_subprocess_source(image.source)
+    else:
+        source = image.source
+
+    return CodeBlock("", image.identifier, [], {}, source, image.url)
+
+
+def create_subprocess_source(source: str) -> str:
+    """Create a Python source that runs the command in subprocess."""
+    args = shlex.split(source)
+    if not args:
+        return ""
+
+    if args[0] in ["$", "#", ">"]:
+        args = args[1:]
+
+    return textwrap.dedent(f"""\
+    import subprocess
+    print(subprocess.check_output({args}, text=True).rstrip())""")
+
+
 SUPPORTED_EXTENSIONS = (".ipynb", ".md", ".py")
 
 

nbsync/notebook.py

@@ -7,8 +7,6 @@ from typing import TYPE_CHECKING
 
 import nbstore.notebook
 
-from nbsync import logger
-
 if TYPE_CHECKING:
     from nbformat import NotebookNode
 
@@ -42,12 +40,8 @@ class Notebook:
         return nbstore.notebook.equals(self.nb, other.nb)
 
     def execute(self) -> float:
-        try:
-            start_time = time.perf_counter()
-            nbstore.notebook.execute(self.nb)
-            end_time = time.perf_counter()
-            self.execution_needed = False
-            return end_time - start_time
-        except ModuleNotFoundError as e:  # no cov
-            logger.warning(e.msg)
-            return 0
+        start_time = time.perf_counter()
+        nbstore.notebook.execute(self.nb)
+        end_time = time.perf_counter()
+        self.execution_needed = False
+        return end_time - start_time

nbsync/sync.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import re
 import textwrap
 from dataclasses import dataclass, field
-from pathlib import Path
 from typing import TYPE_CHECKING
 
 import nbformat
@@ -41,19 +40,29 @@ class Synchronizer:
             if url not in self.notebooks or not self.notebooks[url].equals(notebook):
                 self.notebooks[url] = notebook
 
-    def execute(self) -> None:
+    def execute(self, src_uri: str | None = None) -> None:
         for url, notebook in self.notebooks.items():
             if not notebook.execution_needed:
                 continue
 
-            path = ".md" if url == ".md" else self.store.find_path(url)
-            logger.info(f"Executing notebook: {path}")
-            if elapsed := notebook.execute():
-                logger.info(f"{Path(path).name!r} executed in {elapsed:.2f} seconds")
+            path = src_uri or ".md" if url == ".md" else self.store.find_path(url)
 
-    def convert(self, text: str) -> Iterator[str | Cell]:
+            try:
+                elapsed = notebook.execute()
+            except Exception as e:  # noqa: BLE001
+                if src_uri and src_uri != path:
+                    msg = f"Error reading page {src_uri!r}: "
+                else:
+                    msg = ""
+                msg = f"{msg}Error executing notebook {path!r}: {e}"
+                logger.error(msg)
+                raise SystemExit(1) from None
+            else:
+                logger.info(f"{path!r} executed in {elapsed:.2f} seconds")
+
+    def convert(self, text: str, src_uri: str | None = None) -> Iterator[str | Cell]:
         elems = list(self.parse(text))
-        self.execute()
+        self.execute(src_uri)
 
         for elem in elems:
             if isinstance(elem, str):
@@ -101,6 +110,10 @@ def convert(
                 return ""
 
             nb = notebooks[elem.url].nb
+
+            if "console" in elem.classes:
+                return convert_console(elem, nb)
+
             return convert_image(elem, nb)
 
         return convert_code_block(elem)
@@ -121,6 +134,24 @@ def convert_image(image: Image, nb: NotebookNode) -> Cell:
     return Cell(image, get_language(nb), *mime_content)
 
 
+def remove_ansi(text: str) -> str:
+    return re.sub(r"\x1B\[[0-?]*[ -/]*[@-~]", "", text)
+
+
+def convert_console(image: Image, nb: NotebookNode) -> str:
+    result = image.attributes.get("result", "bash")
+    if result == "1":
+        result = "bash"
+
+    source = image.attributes.get("source", None)
+    source = f"{image.source}\n" if is_truelike(source) else ""
+
+    _, content = get_mime_content(nb, image.identifier)
+    if isinstance(content, str):
+        content = remove_ansi(content)
+    return f"```{result}\n{source}{content}```"
+
+
 def convert_code_block(code_block: CodeBlock) -> str:
     source = code_block.attributes.pop("source", None)
     if not is_truelike(source):

{nbsync-0.3.11.dist-info → nbsync-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nbsync
-Version: 0.3.11
+Version: 0.4.1
 Summary: A core library to synchronize Jupyter notebooks and Markdown documents, enabling seamless integration and dynamic content execution
 Keywords: jupyter,notebook,documentation,markdown,python,visualization,dynamic-execution,real-time-sync
 Author: daizutabi
@@ -38,7 +38,9 @@ Classifier: Topic :: Software Development :: Documentation
 Classifier: Topic :: Text Processing :: Markup :: Markdown
 Requires-Dist: nbstore>=0.5.2
 Requires-Python: >=3.10
+Project-URL: Changelog, https://github.com/daizutabi/nbsync/releases
 Project-URL: Documentation, https://daizutabi.github.io/nbsync/
+Project-URL: Homepage, https://daizutabi.github.io/nbsync/
 Project-URL: Issues, https://github.com/daizutabi/nbsync/issues
 Project-URL: Source, https://github.com/daizutabi/nbsync
 Description-Content-Type: text/markdown

nbsync-0.4.1.dist-info/RECORD

@@ -0,0 +1,10 @@
+nbsync/__init__.py,sha256=3NuWx9D0LcBnXjEKrC-uypNDOz8rLWXI7mIjdN9xSeE,126
+nbsync/cell.py,sha256=58RkBXzcYajMJzFbUBfdtxXScfkl642B-dckel5-5ZA,4909
+nbsync/logger.py,sha256=4nXvoy5_5Xd2uXCiT_0u1LqOI6L5ZgV4PFCCmy3leVM,759
+nbsync/markdown.py,sha256=2jIyKL-jSjIw3pPsCDIoyYL3MuHAhV9MjfuXa7zh0XA,4549
+nbsync/notebook.py,sha256=XA7Z7nlIZzSMD5UNfkf5EeKe22t5M9P6R7-EHVJtU2s,1284
+nbsync/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nbsync/sync.py,sha256=HR2-LHOoA8m5E2ffflXvApTMF-VxAtgiEUgobA3EThs,5051
+nbsync-0.4.1.dist-info/WHEEL,sha256=5w2T7AS2mz1-rW9CNagNYWRCaB0iQqBMYLwKdlgiR4Q,78
+nbsync-0.4.1.dist-info/METADATA,sha256=EVirwM5CtKEODeT7tdVuLwAYtYCvdF98hlC8brwc_ws,7232
+nbsync-0.4.1.dist-info/RECORD,,

{nbsync-0.3.11.dist-info → nbsync-0.4.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.8.13
+Generator: uv 0.9.7
 Root-Is-Purelib: true
 Tag: py3-none-any

nbsync-0.3.11.dist-info/RECORD

@@ -1,10 +0,0 @@
-nbsync/__init__.py,sha256=3NuWx9D0LcBnXjEKrC-uypNDOz8rLWXI7mIjdN9xSeE,126
-nbsync/cell.py,sha256=58RkBXzcYajMJzFbUBfdtxXScfkl642B-dckel5-5ZA,4909
-nbsync/logger.py,sha256=4nXvoy5_5Xd2uXCiT_0u1LqOI6L5ZgV4PFCCmy3leVM,759
-nbsync/markdown.py,sha256=6jDaDtCEkDLsukInF0EnauJ2pUki6nVswjyu3Zg2AUE,3832
-nbsync/notebook.py,sha256=4F3V1KDHfJnIR5ZSb1xWdN9JGiC6mWUVimXXK1BFsbc,1450
-nbsync/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nbsync/sync.py,sha256=x7fsWjfKiQbenXXx9v9BYtfpx7pcmAlHj3Fo9PoHGnI,4034
-nbsync-0.3.11.dist-info/WHEEL,sha256=4n27za1eEkOnA7dNjN6C5-O2rUiw6iapszm14Uj-Qmk,79
-nbsync-0.3.11.dist-info/METADATA,sha256=BSEoL2e5Tciq1-GhQIobEdgkGKi7gaMPzQG_VB3Ftak,7105
-nbsync-0.3.11.dist-info/RECORD,,