nbcat 0.12.0__py3-none-any.whl → 0.12.1__py3-none-any.whl

nbcat/__init__.py

@@ -1 +1 @@
-__version__ = "0.12.0"
+__version__ = "0.12.1"

nbcat/main.py

@@ -6,7 +6,6 @@ import argcomplete
 import requests
 from argcomplete.completers import FilesCompleter
 from pydantic import ValidationError
-from rich import box
 from rich.console import Console, Group, RenderableType
 from rich.padding import Padding
 from rich.panel import Panel
@@ -87,10 +86,8 @@ def render_cell(cell: Cell) -> RenderableType:
     def _render_markdown(input: str) -> Markdown:
         return Markdown(input, code_theme="ansi_dark")
 
-    def _render_code(input: str, language: str = "python") -> Panel:
-        return Panel(
-            Syntax(input, language, line_numbers=True, theme="ansi_dark", dedent=True), padding=0
-        )
+    def _render_code(input: str, language: str = "python") -> Syntax:
+        return Syntax(input, language, theme="ansi_dark", padding=(1, 2), dedent=True)
 
     def _render_raw(input: str) -> Text:
         return Text(input)
@@ -116,16 +113,25 @@ def render_cell(cell: Cell) -> RenderableType:
     renderer = RENDERERS.get(cell.cell_type)
     source = renderer(cell.input) if renderer else None
     if source:
-        rows.append(Padding(source, (1, 0)))
+        s_title = f"[green]In [{cell.execution_count}][/]" if cell.execution_count else None
+        if s_title:
+            rows.append(Panel(source, title=s_title, title_align="left"))
+        else:
+            rows.append(Padding(source, (1, 0)))
+
         if not cell.outputs:
-            return source
+            return rows.pop()
 
     for o in cell.outputs:
+        o_title = f"[blue]Out [{o.execution_count}][/]" if o.execution_count else None
         if o.output:
             renderer = RENDERERS.get(o.output.output_type)
             output = renderer(o.output.text) if renderer else None
             if output:
-                rows.append(Panel(output, style="italic", box=box.MINIMAL))
+                if o_title:
+                    rows.append(Panel(output, style="italic", title=o_title, title_align="left"))
+                else:
+                    rows.append(Padding(output, (1, 0), style="italic"))
     return Group(*rows)
 
 
@@ -142,15 +148,7 @@ def print_notebook(nb: Notebook):
 
     for cell in nb.cells:
         rendered = render_cell(cell)
-        if isinstance(rendered, Group):
-            out = Panel(
-                rendered,
-                title=f"[green][{cell.execution_count}][/]" if cell.execution_count else None,
-                title_align="left",
-            )
-        else:
-            out = Padding(rendered, (1, 0))
-        console.print(out)
+        console.print(rendered)
 
 
 def main():

{nbcat-0.12.0.dist-info → nbcat-0.12.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbcat
-Version: 0.12.0
+Version: 0.12.1
 Summary: cat for jupyter notebooks
 Project-URL: Homepage, https://github.com/akopdev/nbcat
 Project-URL: Repository, https://github.com/akopdev/nbcat

{nbcat-0.12.0.dist-info → nbcat-0.12.1.dist-info}/RECORD

@@ -1,13 +1,13 @@
-nbcat/__init__.py,sha256=eHjt9DPsMbptabS2yGx9Yhbyzq5hFSUHXb7zc8Q_8-o,23
+nbcat/__init__.py,sha256=PAuBI8I6F9Yu_86XjI2yaWn8QmCd9ZvK7tkZLWvEg-Q,23
 nbcat/enums.py,sha256=Fn8PIcLl_uY4nQIs1EUvmKTwfhNUIZgmhRFiCSJk9wk,411
 nbcat/exceptions.py,sha256=Ho7LQz9K70VtIMDNtAwuAtGmb-lFKxGxSj7MN3-EpDA,321
 nbcat/image.py,sha256=hGZZK5mtij7ckWAvQwzim3thqGC92pLW5ZU5CYbRv_Q,995
-nbcat/main.py,sha256=vchFzwcvPGmv4pg5AHRaOOsZh83ynmxkTqIKl0z_Sys,5749
+nbcat/main.py,sha256=gZ8mM2louxU8GgB40F7DE7pc7MAidDHatiNjkLUzeug,5839
 nbcat/markdown.py,sha256=GkPNfzBhNLMl89pVcj14U6ytYUVk3yNB0G1zGYRRJ04,2962
 nbcat/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nbcat/schemas.py,sha256=a7GoKgPTHgun199-J-sZq-ahkdQwvyRaCdQVg1gC798,3135
-nbcat-0.12.0.dist-info/METADATA,sha256=QOcOghWxUMkPA986f-xscLwz-YQrbZQPUJQF8P3r4cQ,4164
-nbcat-0.12.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-nbcat-0.12.0.dist-info/entry_points.txt,sha256=io_GRDsecAkYuCZALsjyea3VBq91VCoSznqlZEAJshY,42
-nbcat-0.12.0.dist-info/licenses/LICENSE,sha256=7GjUnahXdd5opdvlpJdb1BisLbiXt2iOFhzIUduhdkE,1072
-nbcat-0.12.0.dist-info/RECORD,,
+nbcat-0.12.1.dist-info/METADATA,sha256=Jq7TL6gCnqsAn_hm5eTHHK-DRGbp3nXn4aq6-w_jv2Y,4164
+nbcat-0.12.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+nbcat-0.12.1.dist-info/entry_points.txt,sha256=io_GRDsecAkYuCZALsjyea3VBq91VCoSznqlZEAJshY,42
+nbcat-0.12.1.dist-info/licenses/LICENSE,sha256=7GjUnahXdd5opdvlpJdb1BisLbiXt2iOFhzIUduhdkE,1072
+nbcat-0.12.1.dist-info/RECORD,,