← mined_oracle

rich_2262

failed WRONG_FIX UNSUBMITTED wrong_fix_unsubmitted(None) · None tool calls · 0 s · Textualize/rich

Task input

(not found in data/tasks.jsonl)

Tool calls (0)

#ToolArgumentsResult
No trace captured.

Patch

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,16 @@ 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).
 
+## [12.4.1] - 2022-05-08
+
+### Fixed
+
+- Fix for https://github.com/Textualize/rich/issues/2260
+
+### Changed
+
+- Added a keyline around SVG terminals which is visible on dark backgrounds
+
 ## [12.4.0] - 2022-05-07
 
 ### Changed
@@ -1730,7 +1740,8 @@ Major version bump for a breaking change to `Text.stylize signature`, which corr
 
 - First official release, API still to be stabilized
 
-[unreleased]: https://github.com/willmcgugan/rich/compare/v12.4.0...HEAD
+[unreleased]: https://github.com/willmcgugan/rich/compare/v12.4.1...HEAD
+[12.4.1]: https://github.com/willmcgugan/rich/compare/v12.4.0...v12.4.1
 [12.4.0]: https://github.com/willmcgugan/rich/compare/v12.3.0...v12.4.0
 [12.3.0]: https://github.com/willmcgugan/rich/compare/v12.2.0...v12.3.0
 [12.2.0]: https://github.com/willmcgugan/rich/compare/v12.1.0...v12.2.0
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,7 +2,7 @@
 name = "rich"
 homepage = "https://github.com/willmcgugan/rich"
 documentation = "https://rich.readthedocs.io/en/latest/"
-version = "12.4.0"
+version = "12.4.1"
 description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal"
 authors = ["Will McGugan <willmcgugan@gmail.com>"]
 license = "MIT"
--- a/rich/_export_format.py
+++ b/rich/_export_format.py
@@ -21,6 +21,7 @@ body {{
 
 CONSOLE_SVG_FORMAT = """\
 <svg class="rich-terminal" viewBox="0 0 {width} {height}" xmlns="http://www.w3.org/2000/svg">
+    <!-- Generated with Rich https://www.textualize.io -->
     <style>
 
     @font-face {{
@@ -43,13 +44,13 @@ CONSOLE_SVG_FORMAT = """\
     .{unique_id}-matrix {{
         font-family: Fira Code, monospace;
         font-size: {char_height}px;
-        font-variant: east-asian-width-values;
         line-height: {line_height}px;
+        font-variant-east-asian: full-width;
     }}
 
     .{unique_id}-title {{
         font-size: 18px;
-        opacity: 0.8;
+
         font-weight: bold;
         font-family: arial;
     }}
--- a/rich/console.py
+++ b/rich/console.py
@@ -2252,12 +2252,12 @@ class Console:
             css_rules = []
             color = (
                 _theme.foreground_color
-                if style.color is None
+                if (style.color is None or style.color.is_default)
                 else style.color.get_truecolor(_theme)
             )
             bgcolor = (
                 _theme.background_color
-                if style.bgcolor is None
+                if (style.bgcolor is None or style.bgcolor.is_default)
                 else style.bgcolor.get_truecolor(_theme)
             )
             if style.reverse:
@@ -2365,7 +2365,8 @@ class Console:
                         else style.color.get_truecolor(_theme).hex
                     )
                 else:
-                    has_background = style.bgcolor is not None
+                    bgcolor = style.bgcolor
+                    has_background = bgcolor is not None and not bgcolor.is_default
                     background = (
                         _theme.background_color.hex
                         if style.bgcolor is None
@@ -2407,12 +2408,15 @@ class Console:
         chrome = make_tag(
             "rect",
             fill=_theme.background_color.hex,
+            stroke="rgba(255,255,255,0.35)",
+            stroke_width="1",
             x=margin_left,
             y=margin_top,
             width=terminal_width,
             height=terminal_height,
             rx=12,
         )
+
         title_color = _theme.foreground_color.hex
         if title:
             chrome += make_tag(
--- a/rich/terminal_theme.py
+++ b/rich/terminal_theme.py
@@ -127,5 +127,27 @@ NIGHT_OWLISH = TerminalTheme(
     ],
 )
 
-
-SVG_EXPORT_THEME = DIMMED_MONOKAI
+SVG_EXPORT_THEME = TerminalTheme(
+    (41, 41, 41),
+    (197, 200, 198),
+    [
+        (75, 78, 85),
+        (204, 85, 90),
+        (152, 168, 75),
+        (208, 179, 68),
+        (96, 138, 177),
+        (152, 114, 159),
+        (104, 160, 179),
+        (197, 200, 198),
+        (154, 155, 153),
+    ],
+    [
+        (255, 38, 39),
+        (0, 130, 61),
+        (208, 132, 66),
+        (25, 132, 233),
+        (255, 44, 122),
+        (57, 130, 128),
+        (253, 253, 197),
+    ],
+)

Test output

show
...................F
=================================== FAILURES ===================================
_______________________________ test_print_json ________________________________

    def test_print_json():
        console = Console(file=io.StringIO(), color_system="truecolor")
        console.print_json('[false, true, null, "foo"]', indent=4)
        result = console.file.getvalue()
        print(repr(result))
        expected = '\x1b[1m[\x1b[0m\n    \x1b[3;91mfalse\x1b[0m,\n    \x1b[3;92mtrue\x1b[0m,\n    \x1b[3;35mnull\x1b[0m,\n    \x1b[32m"foo"\x1b[0m\n\x1b[1m]\x1b[0m\n'
>       assert result == expected
E       AssertionError: assert '\x1b[1m[\x1b...[1m]\x1b[0m\n' == '\x1b[1m[\x1b...[1m]\x1b[0m\n'
E         
E           [
E         -     false,
E         ?        ---
E         +     false,
E         -     true,
E         ?        ---...
E         
E         ...Full output truncated (7 lines hidden), use '-vv' to show

tests/test_console.py:205: AssertionError
----------------------------- Captured stdout call -----------------------------
'\x1b[1m[\x1b[0m\n    \x1b[3mfalse\x1b[0m,\n    \x1b[3mtrue\x1b[0m,\n    \x1b[3mnull\x1b[0m,\n    "foo"\n\x1b[1m]\x1b[0m\n'
!!!!!!!!!!!!!!!!!!!!!!!!!! stopping after 1 failures !!!!!!!!!!!!!!!!!!!!!!!!!!!
1 failed, 19 passed in 0.18s