Fix typing issues

Author: AdrienVannson

betterproto2/src/betterproto2/__init__.py

@@ -1,6 +1,14 @@
 from __future__ import annotations
 
-__all__ = ["__version__", "check_compiler_version", "classproperty", "unwrap", "MessagePool", "validators"]
+__all__ = [
+    "__version__",
+    "check_compiler_version",
+    "classproperty",
+    "staticproperty",
+    "unwrap",
+    "MessagePool",
+    "validators",
+]
 
 import dataclasses
 import enum as builtin_enum
@@ -36,7 +44,7 @@
 from .casing import camel_case, safe_snake_case, snake_case
 from .enum_ import Enum as Enum
 from .grpc.grpclib_client import ServiceStub as ServiceStub
-from .utils import classproperty
+from .utils import classproperty, staticproperty
 
 if TYPE_CHECKING:
     from _typeshed import SupportsRead, SupportsWrite
@@ -1015,7 +1023,7 @@ def parse(cls, data: bytes) -> Self:
 
     # For compatibility with other libraries.
     @classmethod
-    def FromString(cls: type[T], data: bytes) -> T:
+    def FromString(cls: type[T], s: bytes) -> T:
         """
         Parse the binary encoded Protobuf into this message instance. This
         returns the instance itself and is therefore assignable and chainable.
@@ -1035,7 +1043,7 @@ def FromString(cls: type[T], data: bytes) -> T:
         :class:`Message`
             The initialized message.
         """
-        return cls.parse(data)
+        return cls.parse(s)
 
     def to_dict(
         self,

betterproto2/src/betterproto2/_types.py

@@ -1,7 +1,4 @@
-from typing import (
-    TYPE_CHECKING,
-    TypeVar,
-)
+from typing import TYPE_CHECKING, TypeVar
 
 if TYPE_CHECKING:
     from grpclib._typing import IProtoMessage  # type: ignore[reportPrivateImportUsage]

betterproto2/src/betterproto2/utils.py

@@ -18,6 +18,14 @@ def __get__(self, instance: Any, type: TT_co) -> T_co:
 T = TypeVar("T")
 
 
+class staticproperty(Generic[T]):  # Should be applied after @staticmethod
+    def __init__(self, fget: Callable[[], T]) -> None:
+        self.fget = fget
+
+    def __get__(self, instance: Any, owner: type[Any]) -> T:
+        return self.fget()
+
+
 def unwrap(x: T | None) -> T:
     """
     Unwraps an optional value, returning the value if it exists, or raises a ValueError if the value is None.