hybrid.pyi: decorators should return the same type (#164)

* hybrid.pyi: decorators should return the same type

This code triggered warnings:

    class SomeModel(...):
        @hybrid_property
        def stuff(self):
            ...

        @properties.setter
        def stuff(self, value):
            ...

    obj = SomeModel()
    obj.stuff = ...

The same is done in "python/typeshed" repository in "stdlib/builtins.pyi" in class property.

* reformat code

* add hybrid tests

Co-authored-by: Federico Caselli <cfederico87@gmail.com>

Author: hydrargyrum

setup.cfg

@@ -36,7 +36,7 @@ install_requires =
 incremental = True
 strict = True
 warn_unused_ignores = False
-
+show_error_codes = True
 plugins = sqlalchemy.ext.mypy.plugin
 
 

sqlalchemy-stubs/ext/hybrid.pyi

@@ -1,4 +1,5 @@
 from typing import Any
+from typing import Callable
 from typing import Optional
 
 from .. import util as util
@@ -16,7 +17,7 @@ class hybrid_method(interfaces.InspectionAttrInfo):
     def __init__(self, func: Any, expr: Optional[Any] = ...) -> None: ...
     def __get__(self, instance: Any, owner: Any): ...
     expr: Any = ...
-    def expression(self, expr: Any): ...
+    def expression(self, expr: Any) -> hybrid_method: ...
 
 class hybrid_property(interfaces.InspectionAttrInfo):
     is_attribute: bool = ...
@@ -41,12 +42,16 @@ class hybrid_property(interfaces.InspectionAttrInfo):
     def __delete__(self, instance: Any) -> None: ...
     @property
     def overrides(self): ...
-    def getter(self, fget: Any): ...
-    def setter(self, fset: Any): ...
-    def deleter(self, fdel: Any): ...
-    def expression(self, expr: Any): ...
-    def comparator(self, comparator: Any): ...
-    def update_expression(self, meth: Any): ...
+    def getter(self, fget: Callable[[Any], Any]) -> hybrid_property: ...
+    def setter(self, fset: Callable[[Any, Any], None]) -> hybrid_property: ...
+    def deleter(self, fdel: Callable[[Any], None]) -> hybrid_property: ...
+    def expression(self, expr: Callable[[Any], Any]) -> hybrid_property: ...
+    def comparator(
+        self, comparator: Callable[[Any], Any]
+    ) -> hybrid_property: ...
+    def update_expression(
+        self, meth: Callable[[Any, Any], Any]
+    ) -> hybrid_property: ...
 
 class Comparator(interfaces.PropComparator):
     property: Any = ...

sqlalchemy-stubs/sql/operators.pyi

@@ -22,9 +22,9 @@ from typing import Callable
 from typing import Generic
 from typing import NoReturn
 from typing import Optional
+from typing import overload
 from typing import Type
 from typing import TypeVar
-from typing import overload
 from typing import Union
 
 from . import sqltypes

sqlalchemy-stubs/sql/schema.pyi

@@ -29,7 +29,6 @@ from .elements import ClauseElement
 from .elements import ColumnClause
 from .elements import ColumnElement
 from .elements import TextClause
-from .functions import FunctionElement
 from .events import DDLEvents
 from .selectable import TableClause
 from .. import util

test/files/hybrid.py

@@ -0,0 +1,31 @@
+import sqlalchemy as sa
+from sqlalchemy.ext.hybrid import hybrid_property
+from sqlalchemy.orm import registry
+
+R: registry = registry()
+
+
+@R.mapped
+class SomeModel:
+    __tablename__ = "some_model"
+    a = sa.Column(sa.Float, primary_key=True)
+
+    @hybrid_property
+    def hp(self) -> float:
+        return abs(self.a) / 2 if self.a else 0
+
+    @hp.setter  # type:ignore[no-redef]
+    def hp(self, value: float) -> None:
+        self.a = value * 2
+
+    @hp.deleter  # type:ignore[no-redef]
+    def hp(self):
+        self.a = None
+
+    @hp.expression  # type:ignore[no-redef]
+    def hp(cls) -> sa.sql.ClauseElement:
+        return sa.func.abs(cls.a) / 2
+
+
+obj = SomeModel()
+obj.hp