pytest-revealtype-injector 0.2.1__py3-none-any.whl → 0.2.3__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.2.1"
+__version__ = "0.2.3"

pytest_revealtype_injector/adapter/mypy_.py

@@ -1,7 +1,6 @@
 import ast
 import importlib
 import json
-import logging
 import pathlib
 import re
 from collections.abc import (
@@ -19,6 +18,7 @@ import mypy.api
 import pytest
 import schema as s
 
+from ..log import get_logger
 from ..models import (
     FilePos,
     NameCollectorBase,
@@ -27,8 +27,7 @@ from ..models import (
     VarType,
 )
 
-_logger = logging.getLogger(__name__)
-_logger.setLevel(logging.INFO)
+_logger = get_logger()
 
 
 class _MypyDiagObj(TypedDict):
@@ -68,7 +67,9 @@ class _NameCollector(NameCollectorBase):
         _ = self.visit(node.value)
 
         if resolved := getattr(self.collected[prefix], name, False):
-            self.collected[ast.unparse(node)] = resolved
+            code = ast.unparse(node)
+            self.collected[code] = resolved
+            _logger.debug(f"Mypy NameCollector resolved '{code}' as {resolved}")
             return node
 
         # For class defined in local scope, mypy just prepends test
@@ -101,10 +102,13 @@ class _NameCollector(NameCollectorBase):
             pass
         else:
             self.collected[name] = mod
+            _logger.debug(f"Mypy NameCollector resolved '{name}' as {mod}")
             return node
 
         if hasattr(self.collected["typing"], name):
-            self.collected[name] = getattr(self.collected["typing"], name)
+            obj = getattr(self.collected["typing"], name)
+            self.collected[name] = obj
+            _logger.debug(f"Mypy NameCollector resolved '{name}' as {obj}")
             return node
 
         raise NameError(f'Cannot resolve "{name}"')
@@ -162,6 +166,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():
+            if len(line) <= 2 or line[0] != "{":
+                continue
             obj = json.loads(line)
             diag = cast(_MypyDiagObj, cls._schema.validate(obj))
             filename = pathlib.Path(diag["file"]).name
@@ -210,7 +216,6 @@ class _MypyAdapter(TypeCheckerAdapter):
 
     @classmethod
     def set_config_file(cls, config: pytest.Config) -> None:
-        # Mypy doesn't have a default config file
         if (path_str := config.option.revealtype_mypy_config) is None:
             _logger.info("Using default mypy configuration")
             return

pytest_revealtype_injector/adapter/pyright_.py

@@ -1,6 +1,5 @@
 import ast
 import json
-import logging
 import pathlib
 import re
 import shutil
@@ -13,12 +12,14 @@ from typing import (
     ForwardRef,
     Literal,
     TypedDict,
+    TypeVar,
     cast,
 )
 
 import pytest
 import schema as s
 
+from ..log import get_logger
 from ..models import (
     FilePos,
     NameCollectorBase,
@@ -27,18 +28,19 @@ from ..models import (
     VarType,
 )
 
-_logger = logging.getLogger(__name__)
-_logger.setLevel(logging.INFO)
+_logger = get_logger()
 
 
 class _PyrightDiagPosition(TypedDict):
     line: int
     character: int
 
+
 class _PyrightDiagRange(TypedDict):
     start: _PyrightDiagPosition
     end: _PyrightDiagPosition
 
+
 class _PyrightDiagItem(TypedDict):
     file: str
     severity: Literal["information", "warning", "error"]
@@ -47,6 +49,13 @@ class _PyrightDiagItem(TypedDict):
 
 
 class _NameCollector(NameCollectorBase):
+    # Pre-register common used bare names from typing
+    collected = NameCollectorBase.collected | {
+        k: v
+        for k, v in NameCollectorBase.collected["typing"].__dict__.items()
+        if k[0].isupper() and not isinstance(v, TypeVar)
+    }
+
     # Pyright inferred type results always contain bare names only,
     # so don't need to bother with visit_Attribute()
     def visit_Name(self, node: ast.Name) -> ast.Name:
@@ -55,9 +64,12 @@ class _NameCollector(NameCollectorBase):
             eval(name, self._globalns, self._localns | self.collected)
         except NameError:
             for m in ("typing", "typing_extensions"):
-                if hasattr(self.collected[m], name):
-                    self.collected[name] = getattr(self.collected[m], name)
-                    return node
+                if not hasattr(self.collected[m], name):
+                    continue
+                obj = getattr(self.collected[m], name)
+                self.collected[name] = obj
+                _logger.debug(f"Pyright NameCollector resolved '{name}' as {obj}")
+                return node
             raise
         return node
 

pytest_revealtype_injector/hooks.py

@@ -1,15 +1,13 @@
 from __future__ import annotations
 
 import inspect
-import logging
 
 import pytest
 
-from . import adapter
+from . import adapter, log
 from .main import revealtype_injector
 
-_logger = logging.getLogger(__name__)
-_logger.setLevel(logging.INFO)
+_logger = log.get_logger()
 
 
 def pytest_pyfunc_call(pyfuncitem: pytest.Function) -> None:
@@ -65,6 +63,7 @@ def pytest_addoption(parser: pytest.Parser) -> None:
 
 
 def pytest_configure(config: pytest.Config) -> None:
+    _logger.setLevel(config.get_verbosity(config.VERBOSITY_TEST_CASES))
     # Forget config stash, it can't store collection of unserialized objects
     for adp in adapter.discovery():
         if config.option.revealtype_disable_adapter == adp.id:

pytest_revealtype_injector/log.py

@@ -0,0 +1,19 @@
+import logging
+
+LOGGER_NAME = "revealtype-injector"
+
+_logger = logging.getLogger(LOGGER_NAME)
+
+# Mapping of pytest.Config.VERBOSITY_TEST_CASES to logging levels
+_verbosity_map = {
+    0: logging.WARNING,
+    1: logging.INFO,
+    2: logging.DEBUG,
+}
+
+def get_logger() -> logging.Logger:
+    return _logger
+
+
+def set_verbosity(verbosity: int) -> None:
+    _logger.setLevel(_verbosity_map.get(verbosity, logging.DEBUG))

pytest_revealtype_injector/main.py

@@ -1,6 +1,5 @@
 import ast
 import inspect
-import logging
 import pathlib
 import sys
 from typing import (
@@ -15,7 +14,7 @@ from typeguard import (
     check_type_internal,
 )
 
-from . import adapter
+from . import adapter, log
 from .models import (
     FilePos,
     TypeCheckerError,
@@ -24,8 +23,7 @@ from .models import (
 
 _T = TypeVar("_T")
 
-_logger = logging.getLogger(__name__)
-_logger.setLevel(logging.WARN)
+_logger = log.get_logger()
 
 
 class RevealTypeExtractor(ast.NodeVisitor):
@@ -42,8 +40,15 @@ class RevealTypeExtractor(ast.NodeVisitor):
 
 
 def _get_var_name(frame: inspect.Traceback) -> str | None:
+    filename = pathlib.Path(frame.filename)
+    if not filename.exists():
+        _logger.warning(
+            f"Stack frame points to file '{filename}' "
+            "which doesn't exist on local system."
+        )
     ctxt, idx = frame.code_context, frame.index
-    assert ctxt is not None and idx is not None
+    assert ctxt is not None
+    assert idx is not None
     code = ctxt[idx].strip()
 
     walker = RevealTypeExtractor()
@@ -51,7 +56,9 @@ def _get_var_name(frame: inspect.Traceback) -> str | None:
     # as much restriction on test code as 'eval' mode does.
     walker.visit(ast.parse(code, mode="eval"))
     assert walker.target is not None
-    return ast.get_source_segment(code, walker.target)
+    result = ast.get_source_segment(code, walker.target)
+    _logger.debug(f"Extraction OK: {code=}, {result=}")
+    return result
 
 
 def revealtype_injector(var: _T) -> _T:
@@ -119,22 +126,21 @@ def revealtype_injector(var: _T) -> _T:
             adp.typechecker_result[pos] = VarType(var_name, tc_result.type)
 
         ref = tc_result.type
+        walker = adp.create_collector(globalns, localns)
         try:
-            _ = eval(ref.__forward_arg__, globalns, localns)
+            _ = eval(ref.__forward_arg__, globalns, localns | walker.collected)
         except (TypeError, NameError):
             ref_ast = ast.parse(ref.__forward_arg__, mode="eval")
-            walker = adp.create_collector(globalns, localns)
             new_ast = walker.visit(ref_ast)
             if walker.modified:
                 ref = ForwardRef(ast.unparse(new_ast))
-            memo = TypeCheckMemo(globalns, localns | walker.collected)
-        else:
-            memo = TypeCheckMemo(globalns, localns)
+        memo = TypeCheckMemo(globalns, localns | walker.collected)
 
         try:
             check_type_internal(var, ref, memo)
         except TypeCheckError as e:
-            e.args = (f"({adp.id}) " + e.args[0],) + e.args[1:]
+            # Only args[0] contains message
+            e.args = (e.args[0] + f" (from {adp.id})",) + e.args[1:]
             raise
 
     return var

pytest_revealtype_injector/models.py

@@ -47,6 +47,12 @@ class TypeCheckerError(Exception):
 
 
 class NameCollectorBase(ast.NodeTransformer):
+    # typing_extensions guaranteed to be present,
+    # as a dependency of typeguard
+    collected: dict[str, Any] = {
+        m: importlib.import_module(m)
+        for m in ("builtins", "typing", "typing_extensions")
+    }
     def __init__(
         self,
         globalns: dict[str, Any],
@@ -56,12 +62,7 @@ class NameCollectorBase(ast.NodeTransformer):
         self._globalns = globalns
         self._localns = localns
         self.modified: bool = False
-        # typing_extensions guaranteed to be present,
-        # as a dependency of typeguard
-        self.collected: dict[str, Any] = {
-            m: importlib.import_module(m)
-            for m in ("builtins", "typing", "typing_extensions")
-        }
+        self.collected = type(self).collected.copy()
 
     def visit_Subscript(self, node: ast.Subscript) -> ast.expr:
         node.value = cast("ast.expr", self.visit(node.value))

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-revealtype-injector
-Version: 0.2.1
+Version: 0.2.3
 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>
@@ -84,6 +84,31 @@ def test_something():
 
 2. `reveal_type()` calls have to stay in a single line, without anything else. This limitation comes from using [`eval` mode in AST parsing](https://docs.python.org/3/library/ast.html#ast.Expression).
 
+## Logging
+
+This plugin uses standard [`logging`](https://docs.python.org/3/library/logging.html) internally. `pytest -v` can be used to reveal `INFO` and `DEBUG` logs. Given following example:
+
+```python
+def test_superfluous(self) -> None:
+    x: list[str] = ['a', 'b', 'c', 1]  # type: ignore  # pyright: ignore
+    reveal_type(x)
+```
+
+Something like this will be shown as test result:
+
+```
+...
+    raise TypeCheckError(f"is not an instance of {qualified_name(origin_type)}")
+E   typeguard.TypeCheckError: item 3 is not an instance of str (from pyright)
+------------------------------------------------------------- Captured log call -------------------------------------------------------------
+INFO     revealtype-injector:hooks.py:26 Replaced reveal_type() from global import with <function revealtype_injector at 0x00000238DB923D00>
+DEBUG    revealtype-injector:main.py:60 Extraction OK: code='reveal_type(x)', result='x'
+========================================================== short test summary info ==========================================================
+FAILED tests/runtime/test_attrib.py::TestAttrib::test_superfluous - typeguard.TypeCheckError: item 3 is not an instance of str (from pyright)
+============================================================= 1 failed in 3.38s =============================================================
+```
+
+
 ## History
 
 This pytest plugin starts its life as part of testsuite related utilities within [`types-lxml`](https://github.com/abelcheung/types-lxml). As `lxml` is a `cython` project and probably never incorporate inline python annotation in future, there is need to compare runtime result to static type checker output for discrepancy. As time goes by, it starts to make sense to manage as an independent project.

pytest_revealtype_injector-0.2.3.dist-info/RECORD

@@ -0,0 +1,16 @@
+pytest_revealtype_injector/__init__.py,sha256=I8FXkeB3TED-tbJ3KWZ60nazA1c8pSsF_10q0NGof-I,211
+pytest_revealtype_injector/hooks.py,sha256=cj1iXJJrVtqylXvvdLfjZ61HGBt5wsGBUe-iAgu9WiU,2434
+pytest_revealtype_injector/log.py,sha256=U9IvsoZzhFQcdFmVtuSmt2OTYxxFuIP5o321dyE4hiA,417
+pytest_revealtype_injector/main.py,sha256=ZNb_hDeuEIWDC_eSCLmXXfGCarHF1lsXIOE_BWL-940,4731
+pytest_revealtype_injector/models.py,sha256=FKYznMaNP9a4_AUN3vMdRQBvQUkbdCYTYjDccgdrV6w,3238
+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=q-stxOY2bffTAm2SoHiCAb7VA_f9jXc4UxlyimXV-RY,8840
+pytest_revealtype_injector/adapter/pyright_.py,sha256=Um_HiYDehffci2l9DYXvOfxHNEVuKQsQ9MOsO5mXal4,5126
+pytest_revealtype_injector-0.2.3.dist-info/METADATA,sha256=zrqkK8CDEbkQi2yI1rCnRAf41QAsPkgNIx-dV9UzBvU,5520
+pytest_revealtype_injector-0.2.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pytest_revealtype_injector-0.2.3.dist-info/entry_points.txt,sha256=UfOm7y3WQnOoGV1mgTMb42MI6iBRPIl88FJiAOnt6SY,74
+pytest_revealtype_injector-0.2.3.dist-info/licenses/COPYING,sha256=LSYUX8PcSMvHCkhM5oi07eOrSLV89qdEJ-FVZmbcpNE,355
+pytest_revealtype_injector-0.2.3.dist-info/licenses/COPYING.mit,sha256=IzYEFDIOECyuupg_B3O9FvgjnU9i4JtambpbleoYHdQ,1060
+pytest_revealtype_injector-0.2.3.dist-info/RECORD,,

pytest_revealtype_injector-0.2.1.dist-info/RECORD

@@ -1,15 +0,0 @@
-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,,