faster pretty

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [5.1.2] - 2020-08-10
+
+### Fixed
+
+- Further optimized pretty printing ~5X.
+
 ## [5.1.1] - 2020-08-09
 
 ### Fixed

rich/cells.py

@@ -17,6 +17,7 @@ def cell_len(text: str, _cache: Dict[str, int] = LRUCache(1024 * 4)) -> int:
     cached_result = _cache.get(text, None)
     if cached_result is not None:
         return cached_result
+
     _get_size = get_character_cell_size
     total_size = sum(_get_size(character) for character in text)
     if len(text) <= 64:

rich/pretty.py

@@ -103,20 +103,18 @@ class _Line:
 
     parts: List[str] = field(default_factory=list)
     _cell_len: int = 0
+    _space: bool = False
 
     def append(self, text: str) -> None:
         """Add text to line."""
         # Efficiently keep track of cell length
         self.parts.append(text)
         self._cell_len += cell_len(text)
+        self._space = text.endswith(" ")
 
     @property
     def cell_len(self) -> int:
-        return (
-            self._cell_len
-            if self.parts and not self.parts[-1].endswith(" ")
-            else self._cell_len - 1
-        )
+        return self._cell_len - 1 if self._space else self._cell_len
 
     @property
     def text(self) -> str:
@@ -176,18 +174,21 @@ def to_repr_text(node: Any) -> str:
 
     def traverse(node: Any, level: int = 0) -> None:
         """Walk the data structure."""
+
         nonlocal line_break
         append_line = lines.append
 
         def append_text(text: str) -> None:
+            nonlocal max_width
             nonlocal line_break
             line = lines[-1]
             line.append(text)
             if max_width is not None and line.cell_len > max_width:
                 if line_break is not None and len(lines) <= line_break:
-                    return
-                line_break = len(lines)
-                raise MaxLineReached(level)
+                    max_width = None
+                else:
+                    line_break = len(lines)
+                    raise MaxLineReached(level)
 
         node_id = id(node)
         if node_id in visited_set:
@@ -209,8 +210,7 @@ def append_text(text: str) -> None:
                         if expanded:
                             append_line(_Line())
                             append_text(indent * (level + 1))
-                        append_text(to_repr_text(key))
-                        append_text(": ")
+                        append_text(f"{to_repr_text(key)}: ")
                         traverse(value, level + 1)
                         if not last:
                             append_text(", ")
@@ -223,7 +223,7 @@ def append_text(text: str) -> None:
                         if not last:
                             append_text(", ")
                 if expanded:
-                    lines.append(_Line())
+                    append_line(_Line())
                     append_text(f"{indent * level}{brace_close}")
                 else:
                     append_text(brace_close)

tools/profile_pretty.py

@@ -0,0 +1,22 @@
+import json
+import io
+from time import time
+from rich.console import Console
+from rich.pretty import Pretty
+
+
+
+console = Console(file=io.StringIO(), color_system="truecolor", width=100)
+
+with open("cats.json") as fh:
+    cats = json.load(fh)
+
+
+start = time()
+pretty = Pretty(cats)
+console.print(pretty)
+taken = (time() - start) * 1000
+
+
+print(console.file.getvalue())
+print(f"{taken:.1f}")

tools/stress_test_pretty.py

@@ -1,12 +1,12 @@
 from rich.console import Console
+from rich.panel import Panel
 from rich.pretty import Pretty
 
 DATA = {
     "foo": [1, 2, 3, (1, 2, 3), {4, 5, 6, (7, 8, 9)}, "Hello, World"],
-    "bar": [None, False, True],
+    "bar": [None, (False, True)] * 2,
 }
-
 console = Console()
-for w in range(100):
-    console.print(DATA, width=w)
+for w in range(130):
+    console.print(Panel(Pretty(DATA), width=w))