phase 8

Author: Irving Popovetsky

docs/UPGRADE_PLAN.md

@@ -1272,7 +1272,10 @@ ENTRYPOINT ["python3", "-m", "pybot"]
 
 ---
 
-## Phase 8: Fix Plugin Files (Day 5-6)
+## Phase 8: Fix Plugin Files (Day 5-6) ✅ COMPLETE
+
+> **Status**: Completed January 4, 2026
+> **Result**: Both custom plugins modernized - removed asyncio.coroutine(), added type hints
 
 ### 8.1 Update pybot/plugins/api/plugin.py
 

pybot/plugins/airtable/plugin.py

@@ -2,12 +2,25 @@
 import logging
 import os
 from collections import defaultdict
+from typing import Any, Callable, Coroutine
 
 from pybot.plugins.airtable import endpoints
 from pybot.plugins.airtable.api import AirtableAPI
 
 logger = logging.getLogger(__name__)
 
+# Type alias for async handlers
+AsyncHandler = Callable[..., Coroutine[Any, Any, Any]]
+
+
+def _ensure_async(handler: Callable) -> AsyncHandler:
+    """Ensure handler is an async function."""
+    if not asyncio.iscoroutinefunction(handler):
+        raise TypeError(
+            f"Handler {handler.__name__} must be an async function (defined with 'async def')"
+        )
+    return handler
+
 
 class AirtablePlugin:
     __name__ = "airtable"
@@ -21,7 +34,13 @@ def __init__(self):
 
         self.routers = {"request": RequestRouter()}
 
-    def load(self, sirbot, api_key=None, base_key=None, verify=None):
+    def load(
+        self,
+        sirbot: Any,
+        api_key: str | None = None,
+        base_key: str | None = None,
+        verify: str | None = None
+    ) -> None:
         self.session = sirbot.http_session
         self.api_key = api_key or os.environ.get("AIRTABLE_API_KEY", "")
         self.base_key = base_key or os.environ.get("AIRTABLE_BASE_KEY", "")
@@ -31,9 +50,8 @@ def load(self, sirbot, api_key=None, base_key=None, verify=None):
 
         sirbot.router.add_route("POST", "/airtable/request", endpoints.incoming_request)
 
-    def on_request(self, request, handler, **kwargs):
-        if not asyncio.iscoroutinefunction(handler):
-            handler = asyncio.coroutine(handler)
+    def on_request(self, request: str, handler: AsyncHandler, **kwargs: Any) -> None:
+        handler = _ensure_async(handler)
         options = {**kwargs, "wait": False}
         self.routers["request"].register(request, (handler, options))
 

pybot/plugins/api/plugin.py

@@ -1,11 +1,24 @@
 import asyncio
 import logging
 from collections import defaultdict
+from typing import Any, Callable, Coroutine
 
 from pybot.plugins.api import endpoints
 
 logger = logging.getLogger(__name__)
 
+# Type alias for async handlers
+AsyncHandler = Callable[..., Coroutine[Any, Any, Any]]
+
+
+def _ensure_async(handler: Callable) -> AsyncHandler:
+    """Ensure handler is an async function."""
+    if not asyncio.iscoroutinefunction(handler):
+        raise TypeError(
+            f"Handler {handler.__name__} must be an async function (defined with 'async def')"
+        )
+    return handler
+
 
 class APIPlugin:
     __name__ = "api"
@@ -14,7 +27,7 @@ def __init__(self):
         self.session = None
         self.routers = {"slack": SlackAPIRequestRouter()}
 
-    def load(self, sirbot):
+    def load(self, sirbot: Any) -> None:
         self.session = sirbot.http_session
 
         sirbot.router.add_route(
@@ -24,9 +37,8 @@ def load(self, sirbot):
             "POST", "/pybot/api/v1/slack/{resource}", endpoints.slack_api
         )
 
-    def on_get(self, request, handler, **kwargs):
-        if not asyncio.iscoroutinefunction(handler):
-            handler = asyncio.coroutine(handler)
+    def on_get(self, request: str, handler: AsyncHandler, **kwargs: Any) -> None:
+        handler = _ensure_async(handler)
         options = {**kwargs, "wait": False}
         self.routers["slack"].register(request, (handler, options))