Flask-SQLAlchemy: Make model query non-generic

stubs/Flask-SQLAlchemy/flask_sqlalchemy/model.pyi

@@ -1,12 +1,11 @@
+from _typeshed import Self
 from re import Pattern
-from typing import Any, Generic, TypeVar
+from typing import Any
 
 from sqlalchemy import Table
 from sqlalchemy.ext.declarative import DeclarativeMeta
 from sqlalchemy.orm import Query
 
-_ModelT = TypeVar("_ModelT")
-
 def should_set_tablename(cls: type) -> bool: ...
 
 camelcase_re: Pattern[str]
@@ -22,6 +21,14 @@ class BindMetaMixin(type):
 
 class DefaultMeta(NameMetaMixin, BindMetaMixin, DeclarativeMeta): ...
 
-class Model(Generic[_ModelT]):
-    query_class: type[Query[_ModelT]] | None
-    query: Query[_ModelT] | None
+class Model:
+    # These aren't actually properties at runtime, but we treat them as such so we can use `self` types
+    # without using typing.Self
+    @property
+    def query_class(self: Self) -> type[Query[Self]] | None: ...
+    @query_class.setter
+    def query_class(self: Self, value: type[Query[Self]] | None) -> None: ...
+    @property
+    def query(self: Self) -> Query[Self] | None: ...
+    @query.setter
+    def query(self: Self, value: Query[Self] | None) -> None: ...