feat: cythonize inspect signature

kszucs · Aug 7, 2024 · 3c1d0fe · 3c1d0fe
1 parent 49549bf
commit 3c1d0fe
Show file tree

Hide file tree

Showing 6 changed files with 633 additions and 49 deletions.
diff --git a/build.py b/build.py
@@ -25,6 +25,10 @@
             "koerce.patterns",
             ["koerce/patterns.py"],
         ),
+        Extension(
+            "koerce.utils",
+            ["koerce/utils.py"],
+        ),
     ],
     build_dir=BUILD_DIR,
     # generate anannotated .html output files.
@@ -41,7 +45,7 @@
         # "annotation_typing": False
     },
     # always rebuild, even if files untouched
-    force=True,
+    force=False,
     # emit_linenums=True
 )
 

diff --git a/koerce/patterns.py b/koerce/patterns.py
@@ -3,7 +3,6 @@
 import importlib
 from collections.abc import Callable, Mapping, Sequence
 from enum import Enum
-from inspect import Parameter
 from types import UnionType
 from typing import (
     Annotated,
@@ -18,6 +17,7 @@
 import cython
 from typing_extensions import GenericMeta, get_original_bases
 
+# TODO(kszucs): would be nice to cimport Signature and Builder
 from .builders import Builder, Deferred, Variable, builder
 from .utils import (
     RewindableIterator,
@@ -27,6 +27,8 @@
     get_type_hints,
     get_type_origin,
     get_type_params,
+    EMPTY,
+    Parameter
 )
 
 
@@ -209,17 +211,17 @@ def from_callable(
             args = {}
         elif isinstance(args, (list, tuple)):
             # create a mapping of parameter name to pattern
-            args = dict(zip(sig.parameters.keys(), args))
+            args = {param.name: arg for param, arg in zip(sig.parameters, args)}
         elif not isinstance(args, dict):
             raise TypeError(f"patterns must be a list or dict, got {type(args)}")
 
         retpat: Pattern
         argpat: Pattern
         argpats: dict[str, Pattern] = {}
-        for param in sig.parameters.values():
+        for param in sig.parameters:
             name: str = param.name
-            kind = param.kind
-            default = param.default
+            kind: int = param.kind
+            default = param.default_
             typehint = typehints.get(name)
 
             if name in args:
@@ -233,7 +235,7 @@ def from_callable(
                 argpat = TupleOf(argpat)
             elif kind is Parameter.VAR_KEYWORD:
                 argpat = DictOf(_any, argpat)
-            elif default is not Parameter.empty:
+            elif default is not EMPTY:
                 argpat = Option(argpat, default=default)
 
             argpats[name] = argpat
@@ -1615,12 +1617,12 @@ def match(self, value, ctx: Context):
         has_varargs: bool = False
         positional: list = []
         required_positional: list = []
-        for p in sig.parameters.values():
+        for p in sig.parameters:
             if p.kind in (Parameter.POSITIONAL_ONLY, Parameter.POSITIONAL_OR_KEYWORD):
                 positional.append(p)
-                if p.default is Parameter.empty:
+                if p.default_ is EMPTY:
                     required_positional.append(p)
-            elif p.kind is Parameter.KEYWORD_ONLY and p.default is Parameter.empty:
+            elif p.kind is Parameter.KEYWORD_ONLY and p.default_ is EMPTY:
                 raise TypeError(
                     "Callable has mandatory keyword-only arguments which cannot be specified"
                 )

diff --git a/koerce/sugar.py b/koerce/sugar.py
@@ -174,10 +174,9 @@ def annotated(_1=None, _2=None, _3=None, **kwargs):
     def wrapped(*args, **kwargs):
         # 0. Bind the arguments to the signature
         bound = sig.bind(*args, **kwargs)
-        bound.apply_defaults()
 
         # 1. Validate the passed arguments
-        values = argpats.apply(bound.arguments)
+        values = argpats.apply(bound)
         if values is NoMatch:
             raise ValidationError()
 

diff --git a/koerce/tests/test_sugar.py b/koerce/tests/test_sugar.py
@@ -39,11 +39,10 @@ def test(a: int, b: int, c: int = 1): ...
 
     sig = Signature.from_callable(test)
     bound = sig.bind(2, 3)
-    bound.apply_defaults()
 
-    assert bound.arguments == {"a": 2, "b": 3, "c": 1}
+    assert bound == {"a": 2, "b": 3, "c": 1}
 
-    args, kwargs = sig.unbind(bound.arguments)
+    args, kwargs = sig.unbind(bound)
     assert args == (2, 3, 1)
     assert kwargs == {}
 
@@ -53,17 +52,15 @@ def test(a: int, b: int, *args: int): ...
 
     sig = Signature.from_callable(test)
     bound = sig.bind(2, 3)
-    bound.apply_defaults()
 
-    assert bound.arguments == {"a": 2, "b": 3, "args": ()}
-    args, kwargs = sig.unbind(bound.arguments)
+    assert bound == {"a": 2, "b": 3, "args": ()}
+    args, kwargs = sig.unbind(bound)
     assert args == (2, 3)
     assert kwargs == {}
 
     bound = sig.bind(2, 3, 4, 5)
-    bound.apply_defaults()
-    assert bound.arguments == {"a": 2, "b": 3, "args": (4, 5)}
-    args, kwargs = sig.unbind(bound.arguments)
+    assert bound == {"a": 2, "b": 3, "args": (4, 5)}
+    args, kwargs = sig.unbind(bound)
     assert args == (2, 3, 4, 5)
     assert kwargs == {}
 
@@ -73,18 +70,16 @@ def test(a: int, b: int, /, c: int = 1): ...
 
     sig = Signature.from_callable(test)
     bound = sig.bind(2, 3)
-    bound.apply_defaults()
-    assert bound.arguments == {"a": 2, "b": 3, "c": 1}
+    assert bound == {"a": 2, "b": 3, "c": 1}
 
-    args, kwargs = sig.unbind(bound.arguments)
+    args, kwargs = sig.unbind(bound)
     assert args == (2, 3, 1)
     assert kwargs == {}
 
     bound = sig.bind(2, 3, 4)
-    bound.apply_defaults()
-    assert bound.arguments == {"a": 2, "b": 3, "c": 4}
+    assert bound == {"a": 2, "b": 3, "c": 4}
 
-    args, kwargs = sig.unbind(bound.arguments)
+    args, kwargs = sig.unbind(bound)
     assert args == (2, 3, 4)
     assert kwargs == {}
 
@@ -94,10 +89,9 @@ def test(a: int, b: int, *, c: float, d: float = 0.0): ...
 
     sig = Signature.from_callable(test)
     bound = sig.bind(2, 3, c=4.0)
-    bound.apply_defaults()
-    assert bound.arguments == {"a": 2, "b": 3, "c": 4.0, "d": 0.0}
+    assert bound == {"a": 2, "b": 3, "c": 4.0, "d": 0.0}
 
-    args, kwargs = sig.unbind(bound.arguments)
+    args, kwargs = sig.unbind(bound)
     assert args == (2, 3)
     assert kwargs == {"c": 4.0, "d": 0.0}
 
@@ -107,11 +101,10 @@ def func(a, b, c=1): ...
 
     sig = Signature.from_callable(func)
     bound = sig.bind(1, 2)
-    bound.apply_defaults()
 
-    assert bound.arguments == {"a": 1, "b": 2, "c": 1}
+    assert bound == {"a": 1, "b": 2, "c": 1}
 
-    args, kwargs = sig.unbind(bound.arguments)
+    args, kwargs = sig.unbind(bound)
     assert args == (1, 2, 1)
     assert kwargs == {}
 
@@ -123,10 +116,9 @@ def func(a, b, c, *args, e=None):
 
     sig = Signature.from_callable(func)
     bound = sig.bind(1, 2, 3, *d, e=4)
-    bound.apply_defaults()
-    assert bound.arguments == {"a": 1, "b": 2, "c": 3, "args": d, "e": 4}
+    assert bound == {"a": 1, "b": 2, "c": 3, "args": d, "e": 4}
 
-    args, kwargs = sig.unbind(bound.arguments)
+    args, kwargs = sig.unbind(bound)
     assert args == (1, 2, 3, *d)
     assert kwargs == {"e": 4}
 
@@ -254,7 +246,7 @@ def test(a, b, c):
         return a, b, c
 
     assert test(1, 2, 3) == (1, 2, 3)
-    assert test.__signature__.parameters.keys() == {"a", "b", "c"}
+    assert [p.name for p in test.__signature__.parameters] == ["a", "b", "c"]
 
 
 # def test_annotated_function_without_decoration(snapshot):