pytest-revealtype-injector 0.1.1__py3-none-any.whl → 0.2.1__py3-none-any.whl

pytest_revealtype_injector/__init__.py

@@ -1,3 +1,3 @@
 """Pytest plugin for replacing reveal_type() calls inside test functions with static and runtime type checking result comparison, for confirming type annotation validity."""  # noqa: E501
 
-__version__ = "0.1.1"
+__version__ = "0.2.1"

pytest_revealtype_injector/adapter/mypy_.py

@@ -17,6 +17,7 @@ from typing import (
 
 import mypy.api
 import pytest
+import schema as s
 
 from ..models import (
     FilePos,
@@ -124,6 +125,19 @@ class _MypyAdapter(TypeCheckerAdapter):
     id = "mypy"
     typechecker_result = {}
     _type_mesg_re = re.compile(r'^Revealed type is "(?P<type>.+?)"$')
+    _schema = s.Schema({
+        "file": str,
+        "line": int,
+        "column": int,
+        "message": str,
+        "hint": s.Or(str, s.Schema(None)),
+        "code": str,
+        "severity": s.Or(
+            s.Schema("note"),
+            s.Schema("warning"),
+            s.Schema("error"),
+        ),
+    })
 
     @classmethod
     def run_typechecker_on(cls, paths: Iterable[pathlib.Path]) -> None:
@@ -148,8 +162,8 @@ class _MypyAdapter(TypeCheckerAdapter):
         # So-called mypy json output is merely a line-by-line
         # transformation of plain text output into json object
         for line in stdout.splitlines():
-            # TODO Mypy json schema validation
-            diag = cast(_MypyDiagObj, json.loads(line))
+            obj = json.loads(line)
+            diag = cast(_MypyDiagObj, cls._schema.validate(obj))
             filename = pathlib.Path(diag["file"]).name
             pos = FilePos(filename, diag["line"])
             if diag["severity"] != "note":

pytest_revealtype_injector/adapter/pyright_.py

@@ -11,9 +11,13 @@ from collections.abc import (
 from typing import (
     Any,
     ForwardRef,
+    Literal,
+    TypedDict,
+    cast,
 )
 
 import pytest
+import schema as s
 
 from ..models import (
     FilePos,
@@ -27,6 +31,21 @@ _logger = logging.getLogger(__name__)
 _logger.setLevel(logging.INFO)
 
 
+class _PyrightDiagPosition(TypedDict):
+    line: int
+    character: int
+
+class _PyrightDiagRange(TypedDict):
+    start: _PyrightDiagPosition
+    end: _PyrightDiagPosition
+
+class _PyrightDiagItem(TypedDict):
+    file: str
+    severity: Literal["information", "warning", "error"]
+    message: str
+    range: _PyrightDiagRange
+
+
 class _NameCollector(NameCollectorBase):
     # Pyright inferred type results always contain bare names only,
     # so don't need to bother with visit_Attribute()
@@ -47,6 +66,21 @@ class _PyrightAdapter(TypeCheckerAdapter):
     id = "pyright"
     typechecker_result = {}
     _type_mesg_re = re.compile('^Type of "(?P<var>.+?)" is "(?P<type>.+?)"$')
+    # We only care about diagnostic messages that contain type information.
+    # Metadata not specified here.
+    _schema = s.Schema({
+        "file": str,
+        "severity": s.Or(
+            s.Schema("information"),
+            s.Schema("warning"),
+            s.Schema("error"),
+        ),
+        "message": str,
+        "range": {
+            "start": {"line": int, "character": int},
+            "end": {"line": int, "character": int},
+        },
+    })
 
     @classmethod
     def run_typechecker_on(cls, paths: Iterable[pathlib.Path]) -> None:
@@ -67,22 +101,17 @@ class _PyrightAdapter(TypeCheckerAdapter):
         if len(proc.stderr):
             raise TypeCheckerError(proc.stderr.decode(), None, None)
 
-        # TODO Pyright json schema validation
         report = json.loads(proc.stdout)
-        if proc.returncode:
-            for diag in report["generalDiagnostics"]:
-                if diag["severity"] != "error":
-                    continue
-                # Pyright report lineno is 0-based,
-                # OTOH python frame lineno is 1-based
-                lineno = diag["range"]["start"]["line"] + 1
-                filename = pathlib.Path(diag["file"]).name
-                raise TypeCheckerError(diag["message"], filename, lineno)
-        for diag in report["generalDiagnostics"]:
-            if diag["severity"] != "information":
+        for item in report["generalDiagnostics"]:
+            diag = cast(_PyrightDiagItem, cls._schema.validate(item))
+            if diag["severity"] != ("error" if proc.returncode else "information"):
                 continue
+            # Pyright report lineno is 0-based, while
+            # python frame lineno is 1-based
             lineno = diag["range"]["start"]["line"] + 1
             filename = pathlib.Path(diag["file"]).name
+            if proc.returncode:
+                raise TypeCheckerError(diag["message"], filename, lineno)
             if (m := cls._type_mesg_re.match(diag["message"])) is None:
                 continue
             pos = FilePos(filename, lineno)

pytest_revealtype_injector/models.py

@@ -15,6 +15,7 @@ from typing import (
 )
 
 import pytest
+from schema import Schema
 
 
 class FilePos(NamedTuple):
@@ -91,6 +92,7 @@ class TypeCheckerAdapter:
     # {('file.py', 10): ('var_name', 'list[str]'), ...}
     typechecker_result: ClassVar[dict[FilePos, VarType]]
     _type_mesg_re: ClassVar[re.Pattern[str]]
+    _schema: ClassVar[Schema]
 
     @classmethod
     @abc.abstractmethod

{pytest_revealtype_injector-0.1.1.dist-info → pytest_revealtype_injector-0.2.1.dist-info}/METADATA

@@ -1,15 +1,16 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: pytest-revealtype-injector
-Version: 0.1.1
+Version: 0.2.1
 Summary: Pytest plugin for replacing reveal_type() calls inside test functions with static and runtime type checking result comparison, for confirming type annotation validity.
 Project-URL: homepage, https://github.com/abelcheung/pytest-revealtype-injector
 Author-email: Abel Cheung <abelcheung@gmail.com>
-License: MIT
+License-Expression: MIT
+License-File: COPYING
+License-File: COPYING.mit
 Keywords: annotation,dynamic-typing,pytest,reveal_type,static-typing,stub,stubs,type-checking,types,typing
 Classifier: Development Status :: 4 - Beta
 Classifier: Framework :: Pytest
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
@@ -23,9 +24,15 @@ Requires-Python: >=3.10
 Requires-Dist: mypy>=1.11.2
 Requires-Dist: pyright~=1.1
 Requires-Dist: pytest>=7.0
+Requires-Dist: schema==0.7.7
 Requires-Dist: typeguard~=4.3
 Description-Content-Type: text/markdown
 
+![PyPI - Version](https://img.shields.io/pypi/v/pytest-revealtype-injector)
+![GitHub Release Date](https://img.shields.io/github/release-date/abelcheung/pytest-revealtype-injector)
+![Python Version from PEP 621 TOML](https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fgithub.com%2Fabelcheung%2Fpytest-revealtype-injector%2Fraw%2Frefs%2Fheads%2Fmain%2Fpyproject.toml)
+![PyPI - Wheel](https://img.shields.io/pypi/wheel/pytest-revealtype-injector)
+
 `pytest-revealtype-injector` is a `pytest` plugin for replacing [`reveal_type()`](https://docs.python.org/3/library/typing.html#typing.reveal_type) calls inside test functions as something more sophisticated. It does the following tasks in parallel:
 
 - Launch external static type checkers (`pyright` and `mypy`) and store `reveal_type` results.

pytest_revealtype_injector-0.2.1.dist-info/RECORD

@@ -0,0 +1,15 @@
+pytest_revealtype_injector/__init__.py,sha256=QWrBXB4AnDHb7ughEzF0sP-1-dZxmRR45Dw0EiLkCrY,211
+pytest_revealtype_injector/hooks.py,sha256=5V2r19I47xQtCDd8ZAzXlqt3nYaBZ4CaMAyGP6w_Y0k,2414
+pytest_revealtype_injector/main.py,sha256=dBlXcGc2NBcEHp0YX75Bp4Q7KY-t1oxlmPQS6o08U24,4490
+pytest_revealtype_injector/models.py,sha256=XsxUQGdv1U4CFi1bB1VeEojPpiwCZp7uxRIWuTGhIaM,3214
+pytest_revealtype_injector/plugin.py,sha256=fkI6yF0dFVba0jEikIrsRp1NUQd2ohWLq4x2lSvFyH0,211
+pytest_revealtype_injector/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pytest_revealtype_injector/adapter/__init__.py,sha256=wQg3Ply0Xrfe9US_lzgqRgKFE89ZBvDFti6_77X_NKk,339
+pytest_revealtype_injector/adapter/mypy_.py,sha256=5lWExaKWDx_SK2alEsDtjg_vSGLriFgG7E-81TL1bb0,8569
+pytest_revealtype_injector/adapter/pyright_.py,sha256=LGaJcA-HLCE8cxRFCmPQ5TTURud-ZapmdXgoFJXrw78,4755
+pytest_revealtype_injector-0.2.1.dist-info/METADATA,sha256=6dIidtF2B7QYkiFR8ul9FjChh1IW8DTbAKsddamYk3k,4160
+pytest_revealtype_injector-0.2.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pytest_revealtype_injector-0.2.1.dist-info/entry_points.txt,sha256=UfOm7y3WQnOoGV1mgTMb42MI6iBRPIl88FJiAOnt6SY,74
+pytest_revealtype_injector-0.2.1.dist-info/licenses/COPYING,sha256=LSYUX8PcSMvHCkhM5oi07eOrSLV89qdEJ-FVZmbcpNE,355
+pytest_revealtype_injector-0.2.1.dist-info/licenses/COPYING.mit,sha256=IzYEFDIOECyuupg_B3O9FvgjnU9i4JtambpbleoYHdQ,1060
+pytest_revealtype_injector-0.2.1.dist-info/RECORD,,

{pytest_revealtype_injector-0.1.1.dist-info → pytest_revealtype_injector-0.2.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.26.3
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any

pytest_revealtype_injector-0.2.1.dist-info/licenses/COPYING

@@ -0,0 +1,6 @@
+pytest-revealtype-injector is released under MIT license (see COPYING.mit).
+
+Original source code comes from part of types-lxml project, which is
+release under Apache-2.0 license. But as the sole author of all source
+code inside this repository, it is at my own discretion to follow pytest
+license because this project is taking shape as a pytest plugin.

pytest_revealtype_injector-0.1.1.dist-info/licenses/LICENSE → pytest_revealtype_injector-0.2.1.dist-info/licenses/COPYING.mit

@@ -1,4 +1,4 @@
-Copyright (c) 2023-2025 Abel Cheung
+Copyright (c) 2023-2024 Abel Cheung
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -17,13 +17,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
-
----------------------
-
-pytest-revealtype-injector is released under MIT license (see above).
-
-Original source code comes from part of types-lxml project, which is released
-under Apache-2.0 license. But as the sole author of all relevant source code, it
-is at my own discretion to follow pytest license because this project is taking
-form of a pytest plugin.

pytest_revealtype_injector-0.1.1.dist-info/RECORD

@@ -1,14 +0,0 @@
-pytest_revealtype_injector/__init__.py,sha256=-sBG0VW8hqWI1JUSqzgJ6M0nptG5OWWQw9dzjnVpRQ8,211
-pytest_revealtype_injector/hooks.py,sha256=5V2r19I47xQtCDd8ZAzXlqt3nYaBZ4CaMAyGP6w_Y0k,2414
-pytest_revealtype_injector/main.py,sha256=dBlXcGc2NBcEHp0YX75Bp4Q7KY-t1oxlmPQS6o08U24,4490
-pytest_revealtype_injector/models.py,sha256=hWo9Oz2ausmht-QpfMTTiCtdE3980IA2KEuch7mo_jk,3158
-pytest_revealtype_injector/plugin.py,sha256=fkI6yF0dFVba0jEikIrsRp1NUQd2ohWLq4x2lSvFyH0,211
-pytest_revealtype_injector/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pytest_revealtype_injector/adapter/__init__.py,sha256=wQg3Ply0Xrfe9US_lzgqRgKFE89ZBvDFti6_77X_NKk,339
-pytest_revealtype_injector/adapter/mypy_.py,sha256=qXZKppEwPYtCcRVBAvg8cLx2heI673w8cT9VftHNU_c,8237
-pytest_revealtype_injector/adapter/pyright_.py,sha256=SEibrnMa0AAa1M3S4BmwEQ7ZgwQEUttsFOi-GWCrisA,4105
-pytest_revealtype_injector-0.1.1.dist-info/METADATA,sha256=ZNYRvvNfc1Hm5LAPyUvPcJWmqHqdFQxlQwviUovZJAE,3649
-pytest_revealtype_injector-0.1.1.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-pytest_revealtype_injector-0.1.1.dist-info/entry_points.txt,sha256=UfOm7y3WQnOoGV1mgTMb42MI6iBRPIl88FJiAOnt6SY,74
-pytest_revealtype_injector-0.1.1.dist-info/licenses/LICENSE,sha256=nLEPjqH24l4RByIq0dHIFhblIpcxpDrRX7sT3lBNoeM,1420
-pytest_revealtype_injector-0.1.1.dist-info/RECORD,,