nbsync 0.3.8__tar.gz → 0.3.10__tar.gz

{nbsync-0.3.8 → nbsync-0.3.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nbsync
-Version: 0.3.8
+Version: 0.3.10
 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

{nbsync-0.3.8 → nbsync-0.3.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "nbsync"
-version = "0.3.8"
+version = "0.3.10"
 description = "A core library to synchronize Jupyter notebooks and Markdown documents, enabling seamless integration and dynamic content execution"
 readme = "README.md"
 license = { file = "LICENSE" }

{nbsync-0.3.8 → nbsync-0.3.10}/src/nbsync/cell.py

@@ -13,6 +13,23 @@ if TYPE_CHECKING:
     from nbstore.markdown import Image
 
 
+@dataclass
+class Attributes:
+    source: str
+    tabs: str
+    identifier: str
+    result: str
+
+    @classmethod
+    def pop(cls, attrs: dict[str, str]) -> Attributes:
+        return cls(
+            source=attrs.pop("source", ""),
+            tabs=attrs.pop("tabs", ""),
+            identifier=attrs.pop("identifier", ""),
+            result=attrs.pop("result", ""),
+        )
+
+
 @dataclass
 class Cell:
     image: Image
@@ -28,74 +45,83 @@ class Cell:
     """The content of the image."""
 
     def convert(self, *, escape: bool = False) -> str:
-        kind = self.image.attributes.pop("source", "")
-        tabs = self.image.attributes.pop("tabs", "")
-        identifier = self.image.attributes.pop("identifier", "")
-
-        if "/" not in self.mime or not self.content or kind == "source-only":
-            if self.image.source:
-                source = get_source(
-                    self,
-                    include_attrs=True,
-                    include_identifier=bool(identifier),
-                )
-                kind = "only"
-            else:
-                source = ""
-            result, self.image.url = "", ""
+        attrs = Attributes.pop(self.image.attributes)
 
-        elif self.mime.startswith("text/") and isinstance(self.content, str):
-            source = get_source(
-                self,
-                include_attrs=True,
-                include_identifier=bool(identifier),
-            )
+        if include_attrs := self._include_attributes():
             self.image.url = ""
-            result = get_text_markdown(self, escape=escape)
+
+        source = get_source(
+            self,
+            console=attrs.source == "console",
+            include_attrs=include_attrs,
+            include_identifier=bool(attrs.identifier),
+        )
+
+        if not self.content or attrs.source in ["console", "only"]:
+            attrs.source = "only" if self.image.source else ""
+            result = ""
+
+        elif self.mime.startswith("text/") and isinstance(self.content, str):
+            result = get_text_markdown(self, attrs.result, escape=escape)
 
         else:
-            source = get_source(
-                self,
-                include_attrs=False,
-                include_identifier=bool(identifier),
-            )
             result = get_image_markdown(self)
 
-        if markdown := get_markdown(kind, source, result, tabs):
+        if markdown := get_markdown(attrs.source, source, result, attrs.tabs):
             return textwrap.indent(markdown, self.image.indent)
 
         return ""  # no cov
 
+    def _include_attributes(self) -> bool:
+        if "/" not in self.mime or not self.content:
+            return True
+
+        return self.mime.startswith("text/") and isinstance(self.content, str)
+
 
 def get_source(
     cell: Cell,
     *,
+    console: bool = False,
     include_attrs: bool = False,
     include_identifier: bool = False,
 ) -> str:
+    if not (source := cell.image.source):
+        return ""
+
+    if console:
+        output = str(cell.content.rstrip())
+        source = f"{_add_prompt(source)}\n{output}"
+
     attrs = [cell.language]
     if include_attrs:
-        parts = cell.image.iter_parts(exclude_attributes=["result"])
-        attrs.extend(parts)
+        attrs.extend(cell.image.iter_parts())
     attr = " ".join(attrs)
 
-    source = cell.image.source
     if include_identifier:
         source = f"# #{cell.image.identifier}\n{source}"
 
     return f"```{attr}\n{source}\n```"
 
 
-def get_text_markdown(cell: Cell, *, escape: bool = False) -> str:
-    text = str(cell.content.rstrip())
+def _add_prompt(source: str) -> str:
+    lines = []
+    for line in source.splitlines():
+        if not line:
+            lines.append("")
+        elif line.startswith(" "):
+            lines.append(f"... {line}")
+        else:
+            lines.append(f">>> {line}")
+    return "\n".join(lines)
 
-    if result := cell.image.attributes.get("result", ""):
-        if not is_truelike(result):
-            lang = result
-            return f"```{lang}\n{text}\n```"
 
-        if cell.mime == "text/plain":
-            return f"```text\n{text}\n```"
+def get_text_markdown(cell: Cell, result: str, *, escape: bool = False) -> str:
+    text = str(cell.content.rstrip())
+
+    if result:
+        result = "text" if is_truelike(result) else result
+        return f"```{result}\n{text}\n```"
 
     if escape and cell.mime == "text/plain":
         return html.escape(text)
@@ -107,6 +133,10 @@ def get_image_markdown(cell: Cell) -> str:
     msg = f"{cell.image.url}#{cell.image.identifier} [{cell.mime}]"
     logger.debug(f"Converting image: {msg}")
 
+    if "/" not in cell.mime:
+        cell.image.url = ""
+        return ""
+
     ext = cell.mime.split("/")[1].split("+")[0]
     cell.image.url = f"{uuid.uuid4()}.{ext}"