🎨 *mostly* type safe

See #55

Co-authored-by: Elaina <[email protected]>

pyproject.toml

@@ -115,3 +115,11 @@ exclude_lines = [
     # Don't complain overload method / functions
     "@(typing\\.)?overload"
 ]
+
+[tool.pyright]
+ignore = [
+    "docs/**",
+    "**/site-packages/**/*.py",
+    "**/test*/**/*.py",
+    "**/adapter/**"
+]

src/graia/ariadne/__init__.py

@@ -29,8 +29,10 @@ def get_running(type: Type[T] = Ariadne) -> T:
     from .context import context_map
 
     if type in {Adapter, Ariadne, Broadcast, AbstractEventLoop}:
-        if val := context_map.get(type.__name__).get(None):
-            return val
+        if ctx := context_map.get(type.__name__):
+            if val := ctx.get(None):
+                return val
     for ariadne_inst in Ariadne.running:
         if type in ariadne_inst.info:
-            return ariadne_inst.info[type]
+            return ariadne_inst.info[type]  # type: ignore
+    raise ValueError(f"{type.__name__} is not running")

src/graia/ariadne/adapter/__init__.py

@@ -1,6 +1,7 @@
 """Ariadne 的适配器"""
 import abc
 import asyncio
+import contextlib
 from asyncio import Queue, Task
 from typing import Any, Dict, FrozenSet, Optional, Union
 
@@ -42,7 +43,7 @@ async def call_api(
         action: str,
         method: CallMethod,
         data: Optional[Union[Dict[str, Any], str, FormData]] = None,
-    ) -> Union[dict, list]:
+    ) -> Dict[Any, Any]:
         """调用 API
 
         Args:
@@ -51,7 +52,7 @@ async def call_api(
             data (Optional[Union[Dict[str, Any], str, FormData]], optional): 调用数据. Defaults to None.
 
         Returns:
-            Union[dict, list]: API 返回的数据, 为 json 兼容格式
+            dict: API 返回的数据, 为 json 兼容格式
         """
         ...
 
@@ -86,8 +87,7 @@ def build_event(self, data: dict) -> MiraiEvent:
             logger.error("An event is not recognized! Please report with your log to help us diagnose.")
             raise ValueError(f"Unable to find event: {event_type}", data)
         data = {k: v for k, v in data.items() if k != "type"}
-        event = event_class.parse_obj(data)
-        return event
+        return event_class.parse_obj(data)
 
     @abc.abstractmethod
     async def fetch_cycle(self):
@@ -118,7 +118,7 @@ def build_event(self, data: dict) -> MiraiEvent:
         return event
 
 
-try:
+with contextlib.suppress(ImportError):
     from .reverse import (  # noqa: F401, E402
         ComposeReverseWebsocketAdapter as ComposeReverseWebsocketAdapter,
     )
@@ -129,5 +129,3 @@ def build_event(self, data: dict) -> MiraiEvent:
     from .reverse import (  # noqa: F401, E402
         ReverseWebsocketAdapter as ReverseWebsocketAdapter,
     )
-except ImportError:
-    pass