🧑‍💻 Dev: 迁移使用 uv 管理项目依赖 (#3607)

nonebot/internal/matcher/manager.py

@@ -54,6 +54,11 @@ class MatcherManager(MutableMapping[int, list[type["Matcher"]]]):
     @overload
     def get(self, key: int) -> Optional[list[type["Matcher"]]]: ...
 
+    @overload
+    def get(
+        self, key: int, default: list[type["Matcher"]]
+    ) -> list[type["Matcher"]]: ...
+
     @overload
     def get(self, key: int, default: T) -> Union[list[type["Matcher"]], T]: ...
 

nonebot/message.py

@@ -132,14 +132,16 @@ def run_postprocessor(func: T_RunPostProcessor) -> T_RunPostProcessor:
     return func
 
 
-def _handle_ignored_exception(msg: str) -> Callable[[BaseExceptionGroup], None]:
+def _handle_ignored_exception(
+    msg: str,
+) -> Callable[[BaseExceptionGroup[IgnoredException]], None]:
     def _handle(exc_group: BaseExceptionGroup[IgnoredException]) -> None:
         logger.opt(colors=True).info(msg)
 
     return _handle
 
 
-def _handle_exception(msg: str) -> Callable[[BaseExceptionGroup], None]:
+def _handle_exception(msg: str) -> Callable[[BaseExceptionGroup[Exception]], None]:
     def _handle(exc_group: BaseExceptionGroup[Exception]) -> None:
         for exc in flatten_exception_group(exc_group):
             logger.opt(colors=True, exception=exc).error(msg)

nonebot/utils.py

@@ -97,7 +97,18 @@ def generic_check_issubclass(
       则会检查其 `__bound__` 或 `__constraints__`
       是否是 class_or_tuple 中一个类型的子类或 None。
     """
-    if not type_has_args(cls):
+    # if the target is a TypeVar, we check it first
+    if isinstance(cls, TypeVar):
+        if cls.__constraints__:
+            return all(
+                is_none_type(type_) or generic_check_issubclass(type_, class_or_tuple)
+                for type_ in cls.__constraints__
+            )
+        elif cls.__bound__:
+            return generic_check_issubclass(cls.__bound__, class_or_tuple)
+        return False
+    # elif the target is not a generic type, we check it directly
+    elif not type_has_args(cls):
         with contextlib.suppress(TypeError):
             return issubclass(cls, class_or_tuple)
 
@@ -119,14 +130,6 @@ def generic_check_issubclass(
             return issubclass(origin, class_or_tuple)
         except TypeError:
             return False
-    elif isinstance(cls, TypeVar):
-        if cls.__constraints__:
-            return all(
-                is_none_type(type_) or generic_check_issubclass(type_, class_or_tuple)
-                for type_ in cls.__constraints__
-            )
-        elif cls.__bound__:
-            return generic_check_issubclass(cls.__bound__, class_or_tuple)
     return False