-
-
Notifications
You must be signed in to change notification settings - Fork 582
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[DRAFT] #708 - Make pretty formatter output prettier #712
[DRAFT] #708 - Make pretty formatter output prettier #712
Conversation
Unicode box characters, true JSON output, (slightly) more space between each error, etc.
…8-prettier-pretty
This comment has been minimized.
This comment has been minimized.
Awesome thanks! I will take a closer look at this (possibly after you get to the tests) but just to save you from one wrong turn -- the "use JSON" desire I had should only apply to the CLI, not to general formatting of the exception -- in other words, we can't change it within e.g. We have some options there. The least coupled is to just construct a custom way to format the errors within the CLI (using all the attributes present on a But yeah want to save you from that otherwise you'll find you have to change lots of tests (and then find out later that I didn't mean that :D). But yeah thanks for all you've done already! Seems like we're on the way here... |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Only use JSON formatting for exception messages when explicitly requested.
Cool. Yes, think you're getting to the same place I was describing -- I'd probably want it to just be a private helper function, so consider something like:
and then in the CLI you'd use |
This comment has been minimized.
This comment has been minimized.
Sounds reasonable!
Maybe this helps?:
(In theory you can replace |
As clarified in PR, not all exception output needs to use valid JSON. Add a message formatter method to the exception class and pass in a formatter lambda/function when needed. Updated tests with the new expected output format.
Codecov Report
@@ Coverage Diff @@
## master #712 +/- ##
==========================================
+ Coverage 96.02% 96.04% +0.02%
==========================================
Files 17 17
Lines 2664 2681 +17
Branches 310 310
==========================================
+ Hits 2558 2575 +17
Misses 87 87
Partials 19 19
Continue to review full report at Codecov.
|
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Hey! Sorry, I haven't really gotten a chance to look at the error you were hitting -- let me know though if you're still having difficulty -- replacing ljust with just the manual calculation sounds fine to me, but if it continues to be an issue I can have a look (maybe tomorrow) |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Will have a look at this in a few hours I hope -- but are you sure this passes locally for you? It certainly fails here. From glancing at the diff, it seems like you probably want native strings (i.e. no Will have some more specific guidance after having a look. And thanks for the work so far it's much appreciated! |
This comment has been minimized.
This comment has been minimized.
These are not needed, as I expected. They may even contribute to the "buffer interface" errors.
From one version of Python to another, the "type" that appears in brackets may be of differing lengths. (E.g., `JSONDecodeError` in Python 3, but `ValueError` in Python 2.) That would make the length of the Unicode bar different under each version of Python. When these tests were corrected to work under Python 2, they wouldn't work under Python 3 and vice versa. Therefore, it's simpler to break the single assertions into two shorter ones that use very little of the bar characters.
…8-prettier-pretty % Conflicts: % jsonschema/cli.py Nice to see removal of Py2 support.
This comment has been minimized.
This comment has been minimized.
The CI failures are python-hyper/hyperlink#133 which is being resolved one way or another (either upstream or if not quickly then I'll shove a fix in here somehow) |
sorry, to be clearer about what I mean there, since maybe that was too short -- that function doesn't use anything relevant to an instance, or to the class itself, so it should just be a global function, completely unattached to the class (and then you won't need neither |
This comment has been minimized.
This comment has been minimized.
Generally I'd just leave it right alongside |
As per code review discussion.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Resolved conflicts: * jsonschema/cli.py * jsonschema/exceptions.py * jsonschema/tests/test_cli.py
All CI checks except coverage passed. Automated coverage check isn't something I know much about, but I'd like to learn. According to the raw logs of the check, it looks like a configuration file for running the check is missing. Is that right? I saw a coverage report from closer to the time I opened this PR. There have been several changes to my code since then, so it's probably out of date. Is there any value to using that report? I'm unsure how to interpret the report anyway. 🙈 Edit: I see that although the comment from the coverage report is 10 days old, the report itself is current. I'll look up the coverage documentation and try to understand what the report is telling us. |
The failure there is codecov.io (which is the free service for hosting those reports) being flaky, likely nothing you did/changed. I just re-ran the job, it's unfortunately common for it to barf. Let's see if it passes this time. |
Yes, they ran this time. The only failure was to hit the 100% coverage target. Looks like there's an overall slight increase in coverage. Does this satisfy your requirements for merging, or would you like me to look into increasing coverage for code I added? |
Yeah don't mind the coverage being confused not sure why codecov.io has begun to do that as well recently but you're fine there -- will give this another review I hope later today! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Awesome! Left a few minor comments but think we're almost there! Appreciated.
pinstance = pprint.pformat(self.instance, width=72) | ||
pschema = formatter(self.schema) | ||
|
||
pinstance = pformat(self.instance, width=72) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We're only using the formatter for the schema, not the instance here, so there's going to be inconsistency in the output.
Can we add a test that covers the instance too and then fix this to make sure the formatter is used for both?
"""\ | ||
===[{type}]===({path})=== | ||
def _message_line(self, path, type, header=False): | ||
begin_char, end_char = self._MESSAGE_CORNER_CHARS if header \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Minor style: jsonschema follows PEP8 / generally avoids using backslashes for continuation. Can you switch these to use parentheses instead?
Though, I think this will be a lot clearer if we split it into _header_line
and _non_header_line
-- can you give that a shot? It should remove a bunch of the conditional behavior here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I usually don't like backslashes, either. I got in the habit of using it because my coworkers do like them. I'll change this code.
In case it helps, I added a pre-commit config for you/others so you should be able to fix some of the style comments here by just running pre-commit (which will e.g. restore the import order). |
* origin/master: Remove docformatter, it's too unwieldy. Minor doc formatting. Sigh, this appears to be a regex, not exact match, so it was ignoring everything. Update pre-commit hooks. And two last ones... Remove the rest of the notebooks.ai related resources. Remove demo links from README file Move the latest validator CLI test to where it must go now. Simplify the schemas in the tests for CLI validator detection. add test case Delete the failed test case Fix the bug of processing arguments[validator] in parse_args use correct format check globally renames message and function better handling for Python 3.6 fix formatting error skip tests on python 3.6 unskip tests Temporarily skip the tests that will be unskipped by python-jsonschema#722. Squashed 'json/' changes from 86f52b87..fce9e9b3 Validate IP addresses using the ipaddress module. Skip more tests for python-jsonschema#686. Squashed 'json/' changes from ea415537..86f52b87 improve date parsing Bump the version in the notebooks.io requirements. pre-commit setup. Trailing whitespace Kill Py2 in the sphinx role. isorted. Unbreak non-format-setuptools-extra-installed jsonschema. Run CI against all setuptools extras separately. Pick a format checker that has no external dep now that fqdn exists. regenerated the requirements.txt Modify the code based on review comments fix bug about hostname by import fqdn
Co-authored-by: Julian Berman <Julian@GrayVines.com>
What is the definition of the order of imports preferred for this project? I often use IntelliJ IDEA's reformatting feature. In addition to cleaning up lines of code, it reorganizes imports. Off the top of my head, I think the order is something like sections of core Python modules, third-party modules, and project modules, each section alphabetized. |
It's exactly that in fact :), just actually alphabetized (some tools, e.g. |
544f7c3d Merge pull request #712 from otto-ifak/main 9dad3ebe Add tests for enum with array of bool 589a0858 Merge pull request #706 from marksparkza/unevaluated-before-ref 64d5cab9 Merge pull request #710 from spacether/patch-1 418cdbd6 Removes idea folder e0a9e066 Updates all other tests to mention grapheme/graphemes 69136952 Update minLength.json 4a2c61e8 Test unevaluatedItems|Properties before $ref git-subtree-dir: json git-subtree-split: 544f7c3df93b69f84f587b345f2835c380e43226
Fixes #708.
This makes the pretty output look better by making error header and footer lines equal lengths and to use Unicode characters in them. It also shows schema JSON in error messages as valid JSON, not Python data structure representations. (Mostly a difference in quote marks used for strings.)
For the error messages, I wanted to continue using the strings with
str.format()
. However, I couldn't find a clean way of using the left justification and padding that's available in the formatting micro-language. If the technique I used isn't satisfactory, I can try for another approach.To get the schema instance to display as true JSON, I thought encoding the schema back to JSON was the best approach. Using newline with the separator and sorting keys seems to give close to the same output format as
pprint.pformat()
. The difference is that it ends up being a little prettier, because there are always line breaks, but in my testing,pprint
only broke the lines when the schema was longer than 72 characters. I didn't test extensively, so I don't know how well thejson.dumps()
technique compares withpprint
for lines that longer than 72 characters and aren't easily broken.Please feel free to be critical with the code review. I'm very much open to updating my changes to fit with the style of the project.