Skip to content
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

Add Error format support, and JSON output option #11396

Merged
merged 48 commits into from
May 10, 2024
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
393820c
Add -O/--output CLI option
tusharsadhwani Oct 24, 2021
282bd28
Initial formatter setup
tusharsadhwani Oct 25, 2021
ccda5b0
Make error_formatter an optional argument
tusharsadhwani Oct 27, 2021
c849a77
Fix type annotation
tusharsadhwani Oct 27, 2021
fd2feab
Fix whitespace
tusharsadhwani Oct 27, 2021
b188001
Remove whitespace
tusharsadhwani Oct 27, 2021
51c1acc
Merge branch 'master' of https://github.com/tusharsadhwani/mypy into …
tusharsadhwani Oct 27, 2021
9177dab
Merge branch 'python:master' into output-json
tushar-deepsource Jan 19, 2022
bc5ceac
Add hint property to errors
tushar-deepsource Jan 19, 2022
9d29ab0
Fix lint issues
tusharsadhwani Jan 19, 2022
bd6d48d
Merge branch 'master' into output-json
tusharsadhwani Feb 22, 2023
ba8d17f
Fix import and typing issues
tusharsadhwani Feb 22, 2023
a2bc04d
Fix error tuple signature
tusharsadhwani Feb 22, 2023
35974e4
Import Optional
tusharsadhwani Feb 23, 2023
1e5ec91
Run black
tusharsadhwani Feb 23, 2023
723219f
Run black on another file
tusharsadhwani Feb 23, 2023
2228c0a
Run isort
tusharsadhwani Feb 23, 2023
33d81b0
Run isort on build.py
tusharsadhwani Feb 23, 2023
63001ea
Merge branch 'master' into output-json
tusharsadhwani Apr 19, 2023
d27be7e
Merge branch 'master' into output-json
tusharsadhwani Apr 20, 2023
efe5c5d
Merge branch 'master' into output-json
tusharsadhwani Apr 27, 2023
1872ae6
Add tests for json output
tusharsadhwani Apr 27, 2023
3abc9cb
Suggestions from code review, and negative test
tusharsadhwani Apr 27, 2023
6c9ab11
Add default value of None
tusharsadhwani Apr 27, 2023
627ed8e
Default output to None in options as well
tusharsadhwani Apr 27, 2023
e425cbe
Fix failing tests
tusharsadhwani Apr 27, 2023
47f1b07
improve docstring
tusharsadhwani Apr 27, 2023
e00ad4a
type cast
tusharsadhwani Apr 27, 2023
c1fb6a2
Another explicit type cast
tusharsadhwani Apr 27, 2023
aafe3aa
remove unused import
tusharsadhwani Apr 27, 2023
fae3215
create formatter object
tusharsadhwani Apr 27, 2023
89ad1d3
Add custom end to end test
tusharsadhwani Apr 27, 2023
7a3f736
unused import
tusharsadhwani Apr 27, 2023
6d46f75
trailing whitespace
tusharsadhwani Apr 27, 2023
e71a372
try fixing windows
tusharsadhwani Apr 28, 2023
8cca203
fix windows separator issue
tusharsadhwani Apr 28, 2023
79e16a8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 28, 2023
8bf4890
unused import
tusharsadhwani Apr 28, 2023
5899f26
Merge branch 'master' into output-json
tusharsadhwani Apr 28, 2023
880b8f3
Merge branch 'master' into output-json
tusharsadhwani May 5, 2023
0aafadf
Pass error tuples to format_messages
tusharsadhwani May 10, 2023
4cab249
Merge branch 'master' into output-json
tusharsadhwani May 10, 2023
7fe71c3
Merge branch 'master' into output-json
tusharsadhwani May 13, 2023
ad8f1d6
Merge branch 'master' into output-json
tusharsadhwani May 9, 2024
e2fd45e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 9, 2024
4b03c5c
ruff lints
tusharsadhwani May 9, 2024
e0e6896
address comments
tusharsadhwani May 10, 2024
a0dc6d1
use severity
tusharsadhwani May 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion mypy/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
Mapping,
NamedTuple,
NoReturn,
Optional,
Sequence,
TextIO,
TypeVar,
Expand All @@ -46,6 +47,7 @@

import mypy.semanal_main
from mypy.checker import TypeChecker
from mypy.error_formatter import ErrorFormatter, JSONFormatter
from mypy.errors import CompileError, ErrorInfo, Errors, report_internal_error
from mypy.indirection import TypeIndirectionVisitor
from mypy.messages import MessageBuilder
Expand Down Expand Up @@ -255,6 +257,7 @@ def _build(
plugin=plugin,
plugins_snapshot=snapshot,
errors=errors,
error_formatter=JSONFormatter() if options.output == "json" else None,
flush_errors=flush_errors,
fscache=fscache,
stdout=stdout,
Expand Down Expand Up @@ -606,6 +609,7 @@ def __init__(
fscache: FileSystemCache,
stdout: TextIO,
stderr: TextIO,
error_formatter: Optional["ErrorFormatter"] = None,
) -> None:
self.stats: dict[str, Any] = {} # Values are ints or floats
self.stdout = stdout
Expand All @@ -614,6 +618,7 @@ def __init__(
self.data_dir = data_dir
self.errors = errors
self.errors.set_ignore_prefix(ignore_prefix)
self.error_formatter = error_formatter
self.search_paths = search_paths
self.source_set = source_set
self.reports = reports
Expand Down Expand Up @@ -3437,7 +3442,8 @@ def process_stale_scc(graph: Graph, scc: list[str], manager: BuildManager) -> No
for id in stale:
graph[id].transitive_error = True
for id in stale:
manager.flush_errors(manager.errors.file_messages(graph[id].xpath), False)
errors = manager.errors.file_messages(graph[id].xpath, formatter=manager.error_formatter)
manager.flush_errors(errors, False)
graph[id].write_cache()
graph[id].mark_as_rechecked()

Expand Down
28 changes: 28 additions & 0 deletions mypy/error_formatter.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import json
from abc import ABC, abstractmethod
from typing import TYPE_CHECKING

if TYPE_CHECKING:
from mypy.errors import MypyError


class ErrorFormatter(ABC):
"""Defines how errors are formatted before being printed."""

@abstractmethod
def report_error(self, error: "MypyError") -> str:
raise NotImplementedError


class JSONFormatter(ErrorFormatter):
def report_error(self, error: "MypyError") -> str:
return json.dumps(
{
"file": error.file_path,
"line": error.line,
"column": error.column,
"message": error.message,
"hint": error.hint,
"code": None if error.errorcode is None else error.errorcode.code,
}
)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This module should define a dictionary str -> ErrorFormatter that can be used in build.py.

68 changes: 66 additions & 2 deletions mypy/errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from typing_extensions import Final, Literal, TypeAlias as _TypeAlias

from mypy import errorcodes as codes
from mypy.error_formatter import ErrorFormatter
from mypy.errorcodes import IMPORT, ErrorCode
from mypy.message_registry import ErrorMessage
from mypy.options import Options
Expand Down Expand Up @@ -837,19 +838,29 @@ def format_messages(
a.append(" " * (DEFAULT_SOURCE_OFFSET + column) + marker)
return a

def file_messages(self, path: str) -> list[str]:
def file_messages(self, path: str, formatter: Optional[ErrorFormatter] = None) -> list[str]:
"""Return a string list of new error messages from a given file.

Use a form suitable for displaying to the user.
"""
if path not in self.error_info_map:
return []

error_info = self.error_info_map[path]
if formatter is not None:
error_info = [info for info in error_info if not info.hidden]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's not duplicate this and instead pass error_tuples into format_messages

error_tuples = self.render_messages(self.sort_messages(error_info))
error_tuples = self.remove_duplicates(error_tuples)

errors = create_errors(error_tuples)
return [formatter.report_error(err) for err in errors]

self.flushed_files.add(path)
source_lines = None
if self.options.pretty:
assert self.read_source
source_lines = self.read_source(path)
return self.format_messages(self.error_info_map[path], source_lines)
return self.format_messages(error_info, source_lines)

def new_messages(self) -> list[str]:
"""Return a string list of new error messages.
Expand Down Expand Up @@ -1187,3 +1198,56 @@ def report_internal_error(
# Exit. The caller has nothing more to say.
# We use exit code 2 to signal that this is no ordinary error.
raise SystemExit(2)


class MypyError:
def __init__(
self,
file_path: str,
line: int,
column: int,
message: str,
hint: str,
errorcode: Optional[ErrorCode],
) -> None:
self.file_path = file_path
self.line = line
self.column = column
self.message = message
self.hint = hint
self.errorcode = errorcode


# (file_path, line, column)
_ErrorLocation = Tuple[str, int, int]


def create_errors(error_tuples: list[ErrorTuple]) -> list[MypyError]:
errors: list[MypyError] = []
latest_error_at_location: dict[_ErrorLocation, MypyError] = {}

for error_tuple in error_tuples:
file_path, line, column, _, _, severity, message, _, errorcode = error_tuple
if file_path is None:
continue

assert severity in ("error", "note")
if severity == "note":
error_location = (file_path, line, column)
error = latest_error_at_location.get(error_location)
if error is None:
# No error tuple found for this hint. Ignoring it
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not instead generate a MypyError with some field that lets us indicate that this is a note?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed.

continue

if error.hint == "":
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we make hint into a list of strings instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's often that a single hint is wrapped into multiple lines. For internal representaiton we can keep it as a list of strings but for the user I think it makes most sense to display it as a single string.

error.hint = message
else:
error.hint += "\n" + message

else:
error = MypyError(file_path, line, column, message, "", errorcode)
errors.append(error)
error_location = (file_path, line, column)
latest_error_at_location[error_location] = error

return errors
4 changes: 4 additions & 0 deletions mypy/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,10 @@ def add_invertible_flag(
stdout=stdout,
)

general_group.add_argument(
"-O", "--output", metavar="FORMAT", help="Set a custom output format"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should have fixed choices list. So that it will error on typo, instead of silently defaulting to standard formatting.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

)

config_group = parser.add_argument_group(
title="Config file",
description="Use a config file instead of command line arguments. "
Expand Down
3 changes: 2 additions & 1 deletion mypy/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,9 @@ def __init__(self) -> None:

self.disable_bytearray_promotion = False
self.disable_memoryview_promotion = False

self.force_uppercase_builtins = False
# Sets output format
self.output = ""
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would None be a better default?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup.


def use_lowercase_names(self) -> bool:
if self.python_version >= (3, 9):
Expand Down