nbcat 0.9.4__py3-none-any.whl → 0.9.6__py3-none-any.whl

nbcat/__init__.py

@@ -1 +1 @@
-__version__ = "0.9.4"
+__version__ = "0.9.6"

nbcat/enums.py

@@ -14,3 +14,10 @@ class OutputType(str, Enum):
     EXECUTE_RESULT = "execute_result"
     ERROR = "error"
     PYOUT = "pyout"
+
+
+class OutputCellType(str, Enum):
+    PLAIN = "plain"
+    HTML = "html"
+    IMAGE = "image"
+    JSON = "json"

nbcat/main.py

@@ -9,19 +9,20 @@ from argcomplete.completers import FilesCompleter
 from pydantic import ValidationError
 from rich import box
 from rich.console import Console, RenderableType
-from rich.markdown import Markdown
 from rich.panel import Panel
+from rich.pretty import Pretty
 from rich.syntax import Syntax
 from rich.table import Table
 from rich.text import Text
 
 from . import __version__
-from .enums import CellType
+from .enums import CellType, OutputCellType
 from .exceptions import (
     InvalidNotebookFormatError,
     NotebookNotFoundError,
     UnsupportedNotebookTypeError,
 )
+from .markdown import Markdown
 from .schemas import Cell, Notebook
 
 console = Console()
@@ -92,18 +93,28 @@ def render_cell(cell: Cell) -> list[tuple[Union[str, None], RenderableType]]:
     def _render_raw(input: str) -> Text:
         return Text(input)
 
+    def _render_image(input: str) -> None:
+        return None
+
+    def _render_json(input: str) -> Pretty:
+        return Pretty(input)
+
     RENDERERS = {
         CellType.MARKDOWN: _render_markdown,
         CellType.CODE: _render_code,
         CellType.RAW: _render_raw,
         CellType.HEADING: _render_markdown,
+        OutputCellType.PLAIN: _render_raw,
+        OutputCellType.HTML: _render_markdown,
+        OutputCellType.IMAGE: _render_image,
+        OutputCellType.JSON: _render_json,
     }
 
     rows: list[tuple[Union[str, None], RenderableType]] = []
     renderer = RENDERERS.get(cell.cell_type)
     source = renderer(cell.input) if renderer else None
     if source:
-        label = f"[green][{cell.execution_count}][/]:" if cell.execution_count else None
+        label = f"[green][{cell.execution_count}][/]" if cell.execution_count else None
         rows.append(
             (
                 label,
@@ -113,13 +124,16 @@ def render_cell(cell: Cell) -> list[tuple[Union[str, None], RenderableType]]:
 
     for o in cell.outputs:
         if o.output:
-            label = f"[blue][{o.execution_count}][/]:" if o.execution_count else None
-            rows.append(
-                (
-                    label,
-                    o.output,
+            renderer = RENDERERS.get(o.output.output_type)
+            output = renderer(o.output.text) if renderer else None
+            if output:
+                label = f"[blue][{o.execution_count}][/]" if o.execution_count else None
+                rows.append(
+                    (
+                        label,
+                        output,
+                    )
                 )
-            )
     return rows
 
 

nbcat/markdown.py

@@ -0,0 +1,51 @@
+# In an ideal world, this code shouldn't exist. However, for reasons unknown to me,
+# `rich` decided to format markdown headers in a way that makes them unusable
+# in the terminal: they are centered and wrapped in a Panel, which causes them to
+# blend in with the rest of the content. It takes me time to understand what I'm
+# looking at.
+#
+# Instead, I override the default implementation by adding colors and preserving
+# the original formatting, so that the headers remain recognizable even on
+# black-and-white screens.
+
+from __future__ import annotations
+
+from typing import ClassVar
+
+from rich import markdown as md
+from rich.console import Console, ConsoleOptions, RenderResult
+from rich.text import Text
+
+
+class Heading(md.Heading):
+    """A heading."""
+
+    def __rich_console__(self, console: Console, options: ConsoleOptions) -> RenderResult:
+        styles = {
+            "h1": "bold cyan",
+            "h2": "bold magenta",
+            "h3": "bold yellow",
+        }
+        indent = int(self.tag.strip("h"))
+        yield Text(f"{'#' * indent} {self.text}", style=styles.get(self.tag, "dim white"))
+
+
+class Markdown(md.Markdown):
+    elements: ClassVar[dict[str, type[md.MarkdownElement]]] = {
+        "paragraph_open": md.Paragraph,
+        "heading_open": Heading,
+        "fence": md.CodeBlock,
+        "code_block": md.CodeBlock,
+        "blockquote_open": md.BlockQuote,
+        "hr": md.HorizontalRule,
+        "bullet_list_open": md.ListElement,
+        "ordered_list_open": md.ListElement,
+        "list_item_open": md.ListItem,
+        "image": md.ImageItem,
+        "table_open": md.TableElement,
+        "tbody_open": md.TableBodyElement,
+        "thead_open": md.TableHeaderElement,
+        "tr_open": md.TableRowElement,
+        "td_open": md.TableDataElement,
+        "th_open": md.TableDataElement,
+    }

nbcat/schemas.py

@@ -2,7 +2,7 @@ from typing import Any, Union
 
 from pydantic import BaseModel, computed_field, model_validator
 
-from .enums import CellType, OutputType
+from .enums import CellType, OutputCellType, OutputType
 from .exceptions import InvalidNotebookFormatError
 
 
@@ -11,15 +11,19 @@ class BaseOutput(BaseModel):
     execution_count: Union[int, None] = None
 
 
+class CellOutput(BaseModel):
+    output_type: OutputCellType
+    text: str
+
+
 class StreamOutput(BaseOutput):
     text: Union[list[str], str]
 
     @computed_field
     @property
-    def output(self) -> str:
-        if isinstance(self.text, list):
-            return "".join(self.text)
-        return self.text
+    def output(self) -> CellOutput:
+        text = "".join(self.text) if isinstance(self.text, list) else self.text
+        return CellOutput(output_type=OutputCellType.PLAIN, text=text)
 
 
 class DisplayDataOutput(BaseOutput):
@@ -27,9 +31,18 @@ class DisplayDataOutput(BaseOutput):
 
     @computed_field
     @property
-    def output(self) -> str:
-        # TODO: add support for rich display outputs
-        return ""
+    def output(self) -> Union[CellOutput, None]:
+        data_type_map = {
+            "text/html": OutputCellType.HTML,
+            "text/png": OutputCellType.IMAGE,
+            "text/plain": OutputCellType.PLAIN,
+            "application/vnd.raw.v1+json": OutputCellType.JSON,
+        }
+        for data_type, output_type in data_type_map.items():
+            data = self.data.get(data_type)
+            if data:
+                text = "".join(data) if isinstance(data, list) else str(data)
+                return CellOutput(output_type=output_type, text=text)
 
 
 class ErrorOutput(BaseOutput):
@@ -39,8 +52,8 @@ class ErrorOutput(BaseOutput):
 
     @computed_field
     @property
-    def output(self) -> str:
-        return "\n".join(self.traceback)
+    def output(self) -> CellOutput:
+        return CellOutput(output_type=OutputCellType.PLAIN, text="\n".join(self.traceback))
 
 
 class PyoutDataOutput(BaseOutput):
@@ -48,8 +61,8 @@ class PyoutDataOutput(BaseOutput):
 
     @computed_field
     @property
-    def output(self) -> str:
-        return "\n".join(self.text)
+    def output(self) -> CellOutput:
+        return CellOutput(output_type=OutputCellType.PLAIN, text="\n".join(self.text))
 
 
 class Cell(BaseModel):

{nbcat-0.9.4.dist-info → nbcat-0.9.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbcat
-Version: 0.9.4
+Version: 0.9.6
 Summary: cat for jupyter notebooks
 Project-URL: Homepage, https://github.com/akopdev/nbcat
 Project-URL: Repository, https://github.com/akopdev/nbcat
@@ -41,17 +41,31 @@ Requires-Dist: pytest-responses; extra == 'dev'
 Requires-Dist: ruff; extra == 'dev'
 Description-Content-Type: text/markdown
 
-# 📦 nbcat
+# nbcat
 
-`nbcat` lets you preview Jupyter notebooks directly in your terminal. Think of it as `cat`, but for `.ipynb` files.
+`nbcat` let you preview Jupyter notebooks directly in your terminal. Think of it as `cat`, but for `.ipynb` files.
 
-## 🚀 Features
+<p align="center">
+  <a href="docs/screenshot.png" target="blank"><img src="docs/screenshot.png" width="400" /></a>
+</p>
 
-- Fast and lightweight with minimal external dependencies
+## Features
+
+- Very fast and lightweight with minimal dependencies
 - Preview remote notebooks without downloading them
-- Supports for all Jupyter notebook versions - including legacy formats 
+- Supports for all Jupyter notebook versions, including old legacy formats
+
+## Motivation
+
+The idea of previewing notebooks in a terminal is not new - there have been many previous attempts to achieve it.  
+However, most are either slow and overengineered with a ton of half-working features, or they're outdated and incompatible with modern Python.
+
+I was looking for a simple tool that let me quickly render Jupyter notebooks without switching context from my terminal window or installing a ton of dependencies.  
+
+Please note, that `nbcat` doesn't aim to replace JupyterLab. If you need a full-featured terminal experience, I recommend checking out [euporie](https://euporie.readthedocs.io/) instead.
+
 
-## 📦 Installation
+## Installation
 
 From the command line using pip:
 
@@ -59,7 +73,7 @@ From the command line using pip:
 pip install nbcat
 ```
 
-## 🛠️ Quickstart
+## Quickstart
 
 ```bash
 $ nbcat notebook.ipynb
@@ -77,7 +91,7 @@ Example use case with `fzf` command that lists all `.ipynb` files and uses `nbca
 find . -type f -name "*.ipynb" | fzf --preview 'nbcat {}'
 ```
 
-## 🧪 Testing & Development
+## Testing & Development
 
 Run the tests:
 
@@ -91,15 +105,15 @@ Check code quality:
 make format lint
 ```
 
-## 🙌 Contributing
+## Contributing
 
 Contributions are welcome! Please open an issue or [pull request](https://github.com/akopdev/nbcat/pulls).
 
-## 📄 License
+## License
 
 Distributed under the MIT License. See [`LICENSE`](./LICENSE) for more information.
 
-## 🔗 Useful Links
+## Useful Links
 
 - 📘 Documentation: _coming soon_
 - 🐛 Issues: [GitHub Issues](https://github.com/akopdev/nbcat/issues)

nbcat-0.9.6.dist-info/RECORD

@@ -0,0 +1,12 @@
+nbcat/__init__.py,sha256=IgVHjr-TeioZYLJSkvpT80LLGi6U3ONzR1cfYfd5XNQ,22
+nbcat/enums.py,sha256=Fn8PIcLl_uY4nQIs1EUvmKTwfhNUIZgmhRFiCSJk9wk,411
+nbcat/exceptions.py,sha256=Ho7LQz9K70VtIMDNtAwuAtGmb-lFKxGxSj7MN3-EpDA,321
+nbcat/main.py,sha256=7RYjHvWmKWoD9LFI1dopKvp_wvqWa2Rk9AYZ_RsrIaw,5805
+nbcat/markdown.py,sha256=K6yL9rY3uTxMPsRIJnxqNHmCX2Qc-f3my8eiHxTLfic,1835
+nbcat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nbcat/schemas.py,sha256=fjSbdXa4pHKRV1Z-vUESkYZywkojanCvSu8s7rc9Xkw,3134
+nbcat-0.9.6.dist-info/METADATA,sha256=v-8f9HAlHG2t-Mw36CZAIGcMRTeCWiyt0BzZMlS164w,4082
+nbcat-0.9.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+nbcat-0.9.6.dist-info/entry_points.txt,sha256=io_GRDsecAkYuCZALsjyea3VBq91VCoSznqlZEAJshY,42
+nbcat-0.9.6.dist-info/licenses/LICENSE,sha256=7GjUnahXdd5opdvlpJdb1BisLbiXt2iOFhzIUduhdkE,1072
+nbcat-0.9.6.dist-info/RECORD,,

nbcat-0.9.4.dist-info/RECORD

@@ -1,11 +0,0 @@
-nbcat/__init__.py,sha256=e56AvHfJCtG2ZwwINqsxINVbehWdKxMYgIDbjd7P-II,22
-nbcat/enums.py,sha256=ZsuOwYLF0D4PVwSkS74LwoXY0y0DkeBToLBWnmiS97Y,300
-nbcat/exceptions.py,sha256=Ho7LQz9K70VtIMDNtAwuAtGmb-lFKxGxSj7MN3-EpDA,321
-nbcat/main.py,sha256=02qOCh4I4kXpoIgZCRYztiY5QPDw7FkAbC4smjl1Sxc,5273
-nbcat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nbcat/schemas.py,sha256=miVL0GDHIqXaFxz_cd9qn7cSZvIjZYK8TTY9YsfkuXs,2407
-nbcat-0.9.4.dist-info/METADATA,sha256=VkAsyObzS8n5gT7qzA7Gxertoz863ZWENfqgaz3EGu0,3375
-nbcat-0.9.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-nbcat-0.9.4.dist-info/entry_points.txt,sha256=io_GRDsecAkYuCZALsjyea3VBq91VCoSznqlZEAJshY,42
-nbcat-0.9.4.dist-info/licenses/LICENSE,sha256=7GjUnahXdd5opdvlpJdb1BisLbiXt2iOFhzIUduhdkE,1072
-nbcat-0.9.4.dist-info/RECORD,,