Implement new `pie` and `pie-light` styles #1238

isidentical · 2021-12-10T11:34:46Z

Resolves #1237.

Demos:

codecov-commenter · 2021-12-16T16:09:24Z

Codecov Report

Merging #1238 (6afcf21) into master (4d7d6b6) will decrease coverage by 0.88%.
The diff coverage is 93.71%.

@@            Coverage Diff             @@
##           master    #1238      +/-   ##
==========================================
- Coverage   97.28%   96.40%   -0.89%     
==========================================
  Files          67       82      +15     
  Lines        4235     5560    +1325     
==========================================
+ Hits         4120     5360    +1240     
- Misses        115      200      +85

Impacted Files	Coverage Δ
tests/test_binary.py	`100.00% <ø> (ø)`
httpie/compat.py	`31.11% <27.90%> (-68.89%)`	⬇️
httpie/output/lexers/http.py	`52.00% <52.00%> (ø)`
tests/conftest.py	`77.14% <58.33%> (-9.82%)`	⬇️
tests/test_ssl.py	`91.01% <66.66%> (-3.93%)`	⬇️
httpie/output/formatters/colors.py	`89.13% <76.74%> (-4.45%)`	⬇️
httpie/manager/__main__.py	`82.35% <82.35%> (ø)`
httpie/models.py	`94.73% <83.33%> (-2.64%)`	⬇️
httpie/manager/plugins.py	`93.87% <92.66%> (ø)`
httpie/manager/core.py	`92.85% <92.85%> (ø)`
... and 57 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e30ec6b...6afcf21. Read the comment docs.

isidentical · 2021-12-17T15:06:31Z

httpie/output/formatters/colors.py

+def make_styles(name, raw_styles):
+    for mode, shade in [
+        ('light', '700'),
+        ('universal', '600'),
+        ('dark', '500')
+    ]:
+        yield type(
+            name.format(mode=mode.title()),
+            (pygments.style.Style,),
+            {
+                'styles': format_style(raw_styles, shade)
+            }
+        )


We probably should use a more robust methodology in the future (for -100 -200 -300 etc). Something like this

for shade in range(100, 800, 100): name = SHADE_NAMES.get(shade, f"pie-{shade}") for style_type, style_map in [("Header", HEADER_COLORS), ("Body", BODY_COLORS)]: create_styles()

though I plan to omit this for this release, and implement this after this gets merged (if there are no objections).

jkbrzt

Good stuff 💅 A few remaining tweaks.

docs/README.md

CHANGELOG.md

docs/README.md

jkbrzt · 2021-12-17T15:18:59Z

httpie/output/formatters/colors.py

+def make_styles(name, raw_styles):
+    for mode, shade in [
+        ('light', '700'),
+        ('universal', '600'),
+        ('dark', '500')
+    ]:
+        yield type(
+            name.format(mode=mode.title()),
+            (pygments.style.Style,),
+            {
+                'styles': format_style(raw_styles, shade)
+            }
+        )


jkbrzt · 2021-12-17T15:19:58Z

httpie/output/formatters/colors.py

+def format_style(raw_styles, shade):
+    def get_shade(part):
+        if part not in COLOR_PALETTE:
+            return part
+
+        color_code = COLOR_PALETTE[part]
+        if isinstance(color_code, dict) and shade in color_code:
+            return color_code[shade]
+        else:
+            return color_code
+
+    def format_value(value):
+        return " ".join(
+            get_shade(part)
+            for part in value.split()
+        )
+
+    return {
+        key: format_value(value)
+        for key, value in raw_styles.items()
+    }
+
+
+def make_styles(name, raw_styles):
+    for mode, shade in [
+        ('light', '700'),
+        ('universal', '600'),
+        ('dark', '500')
+    ]:
+        yield type(
+            name.format(mode=mode.title()),
+            (pygments.style.Style,),
+            {
+                'styles': format_style(raw_styles, shade)
+            }
+        )


These are tied to the Pie themes, so I’d either reflect that in their names or move them to palette.

jkbrzt · 2021-12-17T15:20:27Z

httpie/output/ui/palette.py

@@ -0,0 +1,138 @@
+# Copy the brand palette
+
+COLOR_PALETTE = {


PIE_COLOR_PALETTE

Do we need this prefix? I assumed these were going to be the default colors we use after this PR (e.g on progress bars, on regular colored outputs etc.)

Good question. I thought we’d always re-use the effective --style even for the UI, because if I use the terminal scheme, for example, then I’d like to see those colors everywhere. In that case, giving it the PIE_ prefix would make sense.

I especially put this into a separate package, httpie.output.ui, since I plan to (at least feel like) this is going to be the place where we would manage our rich UI (progress bars, themes, highlighting, console, etc.), and those probably will use this theme. If you feel strong about it, I can add the PIE_ prefix though but personally I'd find this very compelling (since the fully qualified name of this is httpie.output.ui.COLOR_PLAETTE, so it is not something arbitrary).

OK. Although we should discuss this:

I thought we’d always re-use the effective --style even for the UI, because if I use the terminal scheme, for example, then I’d like to see those colors everywhere.

jkbrzt · 2021-12-17T15:21:52Z

httpie/output/formatters/colors.py

+PIE_STYLES = {
+    'pie',
+    'pie-light',
+    'pie-dark'
+}


Looks like an enum/constants candidate (we refer to it from multiple places). Maybe it could also go to palette.

Co-authored-by: Jakub Roztocil <jakub@roztocil.co>

isidentical force-pushed the unify-colors branch from 79a2d92 to 4476968 Compare December 16, 2021 11:43

Implement new pie and pie-light styles

3933ea9

isidentical force-pushed the unify-colors branch from 4476968 to 3933ea9 Compare December 16, 2021 16:09

isidentical force-pushed the unify-colors branch 3 times, most recently from 94690e3 to d1ad5ac Compare December 16, 2021 16:38

Change some pallete

4aab904

isidentical force-pushed the unify-colors branch 2 times, most recently from 5681651 to c77621a Compare December 17, 2021 10:11

Integrate the color palette

87ac7d8

isidentical force-pushed the unify-colors branch from c77621a to 87ac7d8 Compare December 17, 2021 10:50

isidentical added 2 commits December 17, 2021 17:21

some docs

65cf35a

some docs

56bf02e

isidentical commented Dec 17, 2021

View reviewed changes

jkbrzt requested changes Dec 17, 2021

View reviewed changes

Rework on code generation

6afcf21

isidentical force-pushed the unify-colors branch 3 times, most recently from 40e853c to cd5de1a Compare December 17, 2021 16:47

Apply suggestions from code review

2287a08

Co-authored-by: Jakub Roztocil <jakub@roztocil.co>

isidentical force-pushed the unify-colors branch from cd5de1a to 2287a08 Compare December 17, 2021 16:48

jkbrzt merged commit 8dc6c0d into httpie:master Dec 19, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement new `pie` and `pie-light` styles #1238

Implement new `pie` and `pie-light` styles #1238

isidentical commented Dec 10, 2021

codecov-commenter commented Dec 16, 2021 •

edited

isidentical Dec 17, 2021

jkbrzt Dec 17, 2021

jkbrzt left a comment

jkbrzt Dec 17, 2021

jkbrzt Dec 17, 2021

jkbrzt Dec 17, 2021

isidentical Dec 17, 2021

jkbrzt Dec 17, 2021

isidentical Dec 17, 2021

jkbrzt Dec 19, 2021

jkbrzt Dec 17, 2021

Implement new pie and pie-light styles #1238

Implement new pie and pie-light styles #1238

Conversation

isidentical commented Dec 10, 2021

codecov-commenter commented Dec 16, 2021 • edited

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jkbrzt left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Implement new `pie` and `pie-light` styles #1238

Implement new `pie` and `pie-light` styles #1238

codecov-commenter commented Dec 16, 2021 •

edited