refactor: make MethodRegistry generic on Call

midas/checker/frames/frame_methods.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import ast
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Callable, Optional
+from typing import TYPE_CHECKING, Optional
 
 import midas.ast.python as p
 from midas.ast.location import Location
@@ -34,14 +34,7 @@ class Call:
     keywords: dict[str, TypedExpr]
 
 
-class FrameMethodRegistry(MethodRegistry):
+class FrameMethodRegistry(MethodRegistry[Call]):
-    def call(self, method: str, call: Call) -> Type:
-        func: Optional[Callable[..., Type]] = self._methods.get(method)
-        if func is None:
-            self.reporter.warning(call.location, f"Unknown method {method}")
-            return UnknownType()
-        return func(self, call)
-
     @method("add", "__add__")
     def add(self, call: Call) -> Type:
         # TODO: support add with scalar, sequence, Series, dict

midas/checker/frames/utils.py

@@ -1,12 +1,22 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Callable
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    Generic,
+    Optional,
+    Protocol,
+    Self,
+    TypeVar,
+)
 
 import midas.ast.python as p
+from midas.ast.location import Location
 from midas.checker.dispatcher import CallDispatcher
 from midas.checker.registry import TypesRegistry
 from midas.checker.reporter import FileReporter
-from midas.checker.types import Type
+from midas.checker.types import Type, UnknownType
 from midas.generator.collector import AssertionCollector
 
 if TYPE_CHECKING:
@@ -43,7 +53,15 @@ class _MethodRegistryMeta(type):
         return new_class
 
 
-class MethodRegistry(metaclass=_MethodRegistryMeta):
+class HasLocation(Protocol):
+    @property
+    def location(self) -> Location: ...
+
+
+T = TypeVar("T", bound=HasLocation)
+
+
+class MethodRegistry(Generic[T], metaclass=_MethodRegistryMeta):
     def __init__(self, typer: PythonTyper) -> None:
         self.typer: PythonTyper = typer
 
@@ -62,3 +80,10 @@ class MethodRegistry(metaclass=_MethodRegistryMeta):
     @property
     def assertions(self) -> AssertionCollector:
         return self.typer.assertions
+
+    def call(self, method: str, call: T) -> Type:
+        func: Optional[Callable[[Self, T], Type]] = self._methods.get(method)
+        if func is None:
+            self.reporter.warning(call.location, f"Unknown method {method}")
+            return UnknownType()
+        return func(self, call)