✨ finish matcher process

nonebot/processor/utils.py

@@ -1,8 +1,9 @@
 import inspect
 from typing import Any, Dict, Type, Tuple, Union, Callable
+from typing_extensions import GenericAlias, get_args, get_origin  # type: ignore
 
-from pydantic.typing import (ForwardRef, get_args, get_origin,
-                             evaluate_forwardref)
+from loguru import logger
+from pydantic.typing import ForwardRef, evaluate_forwardref
 
 
 def get_typed_signature(call: Callable[..., Any]) -> inspect.Signature:
@@ -25,7 +26,13 @@ def get_typed_annotation(param: inspect.Parameter, globalns: Dict[str,
     annotation = param.annotation
     if isinstance(annotation, str):
         annotation = ForwardRef(annotation)
-        annotation = evaluate_forwardref(annotation, globalns, globalns)
+        try:
+            annotation = evaluate_forwardref(annotation, globalns, globalns)
+        except Exception as e:
+            logger.opt(colors=True, exception=e).warning(
+                f"Unknown ForwardRef[\"{param.annotation}\"] for parameter {param.name}"
+            )
+            return inspect.Parameter.empty
     return annotation
 
 
@@ -33,13 +40,16 @@ def generic_check_issubclass(
         cls: Any, class_or_tuple: Union[Type[Any], Tuple[Type[Any],
                                                          ...]]) -> bool:
     try:
-        return isinstance(cls, type) and issubclass(cls, class_or_tuple)
+        return issubclass(cls, class_or_tuple)
     except TypeError:
         if get_origin(cls) is Union:
             for type_ in get_args(cls):
                 if not generic_check_issubclass(type_, class_or_tuple):
                     return False
             return True
+        elif isinstance(cls, GenericAlias):
+            origin = get_origin(cls)
+            return bool(origin and issubclass(origin, class_or_tuple))
         raise