phase 9

Author: Irving Popovetsky

docs/UPGRADE_PLAN.md

@@ -1335,7 +1335,10 @@ Same change: replace `asyncio.coroutine()` with type check.
 
 ---
 
-## Phase 9: Testing (Day 6-7)
+## Phase 9: Testing (Day 6-7) ✅ COMPLETE
+
+> **Status**: Completed January 4, 2026
+> **Result**: All linting passed, 57/57 tests passing, bot starts successfully
 
 ### 9.1 Install Dependencies
 

pybot/__main__.py

@@ -4,9 +4,9 @@
 import sentry_sdk
 import yaml
 from sentry_sdk.integrations.aiohttp import AioHttpIntegration
+
 from pybot._vendor.sirbot import SirBot
 from pybot._vendor.sirbot.plugins.slack import SlackPlugin
-
 from pybot.endpoints import handle_health_check
 from pybot.endpoints.slack.utils import HOST, PORT, slack_configs
 
@@ -20,9 +20,7 @@
         with open(
             os.path.join(os.path.dirname(os.path.realpath(__file__)), "../logging.yml")
         ) as log_configfile:
-            logging.config.dictConfig(
-                yaml.load(log_configfile.read(), Loader=yaml.SafeLoader)
-            )
+            logging.config.dictConfig(yaml.load(log_configfile.read(), Loader=yaml.SafeLoader))
     except Exception as e:
         logging.basicConfig(level=logging.DEBUG)
         logger.exception(e)

pybot/_vendor/sirbot/__init__.py

@@ -2,6 +2,7 @@
 Vendored sirbot library for Python 3.12+
 Original: https://github.com/pyslackers/sir-bot-a-lot-2
 """
+
 from pybot._vendor.sirbot.bot import SirBot
 
 __all__ = ["SirBot"]

pybot/_vendor/sirbot/plugins/slack/__init__.py

@@ -1,4 +1,5 @@
 """Slack plugin for sirbot."""
+
 from pybot._vendor.sirbot.plugins.slack.plugin import SlackPlugin
 
 __all__ = ["SlackPlugin"]

pybot/_vendor/sirbot/plugins/slack/endpoints.py

@@ -4,11 +4,15 @@
 import aiohttp.web
 from aiohttp.web import Response
 
-from pybot._vendor.slack.events import Event
-from pybot._vendor.slack.sansio import validate_request_signature
 from pybot._vendor.slack.actions import Action
 from pybot._vendor.slack.commands import Command
-from pybot._vendor.slack.exceptions import InvalidTimestamp, FailedVerification, InvalidSlackSignature
+from pybot._vendor.slack.events import Event
+from pybot._vendor.slack.exceptions import (
+    FailedVerification,
+    InvalidSlackSignature,
+    InvalidTimestamp,
+)
+from pybot._vendor.slack.sansio import validate_request_signature
 
 LOG = logging.getLogger(__name__)
 

pybot/_vendor/sirbot/plugins/slack/plugin.py

@@ -5,12 +5,13 @@
 import asyncio
 import logging
 import os
-from typing import Any, Callable, Coroutine
+from collections.abc import Callable, Coroutine
+from typing import Any
 
 from pybot._vendor.slack import methods
-from pybot._vendor.slack.events import EventRouter, MessageRouter
 from pybot._vendor.slack.actions import Router as ActionRouter
 from pybot._vendor.slack.commands import Router as CommandRouter
+from pybot._vendor.slack.events import EventRouter, MessageRouter
 from pybot._vendor.slack.io.aiohttp import SlackAPI
 
 from . import endpoints
@@ -124,9 +125,7 @@ def on_message(
         handler = _ensure_async(handler)
 
         if admin and not self.admins:
-            LOG.warning(
-                "Slack admin IDs are not set. Admin-limited endpoints will not work."
-            )
+            LOG.warning("Slack admin IDs are not set. Admin-limited endpoints will not work.")
 
         configuration = {"mention": mention, "admin": admin, "wait": wait}
         self.routers["message"].register(
@@ -155,9 +154,7 @@ def on_block(
         """Register handler for a block_actions type action."""
         handler = _ensure_async(handler)
         configuration = {"wait": wait}
-        self.routers["action"].register_block_action(
-            block_id, (handler, configuration), action_id
-        )
+        self.routers["action"].register_block_action(block_id, (handler, configuration), action_id)
 
     def on_dialog_submission(
         self,
@@ -168,14 +165,10 @@ def on_dialog_submission(
         """Register handler for a dialog_submission type action."""
         handler = _ensure_async(handler)
         configuration = {"wait": wait}
-        self.routers["action"].register_dialog_submission(
-            callback_id, (handler, configuration)
-        )
+        self.routers["action"].register_dialog_submission(callback_id, (handler, configuration))
 
     async def find_bot_id(self, app: Any) -> None:
-        rep = await self.api.query(
-            url=methods.USERS_INFO, data={"user": self.bot_user_id}
-        )
+        rep = await self.api.query(url=methods.USERS_INFO, data={"user": self.bot_user_id})
         self.bot_id = rep["user"]["profile"]["bot_id"]
         LOG.warning(
             '`SLACK_BOT_ID` not set. For a faster start time set it to: "%s"',

pybot/_vendor/slack/__init__.py

@@ -3,6 +3,7 @@
 Original: https://github.com/pyslackers/slack-sansio
 """
 
-from pybot._vendor.slack.methods import Methods as methods, HOOK_URL, ROOT_URL
+from pybot._vendor.slack.methods import HOOK_URL, ROOT_URL
+from pybot._vendor.slack.methods import Methods as methods
 
 __all__ = ["methods", "HOOK_URL", "ROOT_URL"]

pybot/_vendor/slack/actions.py

@@ -1,9 +1,9 @@
 import json
-import typing
 import logging
-from typing import Any, Dict, Iterator, Optional
+import typing
 from collections import defaultdict
-from collections.abc import MutableMapping
+from collections.abc import Iterator, MutableMapping
+from typing import Any
 
 from . import exceptions
 
@@ -26,20 +26,16 @@ class Action(MutableMapping):
     def __init__(
         self,
         raw_action: typing.MutableMapping,
-        verification_token: Optional[str] = None,
-        team_id: Optional[str] = None,
+        verification_token: str | None = None,
+        team_id: str | None = None,
     ) -> None:
         self.action = raw_action
 
         if verification_token and self.action["token"] != verification_token:
-            raise exceptions.FailedVerification(
-                self.action["token"], self.action["team"]["id"]
-            )
+            raise exceptions.FailedVerification(self.action["token"], self.action["team"]["id"])
 
         if team_id and self.action["team"]["id"] != team_id:
-            raise exceptions.FailedVerification(
-                self.action["token"], self.action["team"]["id"]
-            )
+            raise exceptions.FailedVerification(self.action["token"], self.action["team"]["id"])
 
     def __getitem__(self, item):
         return self.action[item]
@@ -63,8 +59,8 @@ def __repr__(self):
     def from_http(
         cls,
         payload: typing.MutableMapping,
-        verification_token: Optional[str] = None,
-        team_id: Optional[str] = None,
+        verification_token: str | None = None,
+        team_id: str | None = None,
     ) -> "Action":
         action = json.loads(payload["payload"])
         return cls(action, verification_token=verification_token, team_id=team_id)
@@ -77,7 +73,7 @@ class Router:
     """
 
     def __init__(self):
-        self._routes: Dict[str, Dict] = defaultdict(dict)
+        self._routes: dict[str, dict] = defaultdict(dict)
 
     def register(self, callback_id: str, handler: Any, name: str = "*") -> None:
         """
@@ -98,9 +94,7 @@ def register(self, callback_id: str, handler: Any, name: str = "*") -> None:
 
         self._routes[callback_id][name].append(handler)
 
-    def register_interactive_message(
-        self, callback_id: str, handler: Any, name: str = "*"
-    ) -> None:
+    def register_interactive_message(self, callback_id: str, handler: Any, name: str = "*") -> None:
         """
         Register a new handler for a specific :class:`slack.actions.Action` `callback_id`.
         Optional routing based on the action name too.
@@ -118,9 +112,7 @@ def register_interactive_message(
         """
         self.register(callback_id, handler, name)
 
-    def register_block_action(
-        self, block_id: str, handler: Any, action_id: str = "*"
-    ) -> None:
+    def register_block_action(self, block_id: str, handler: Any, action_id: str = "*") -> None:
         """
         Register a new handler for a block-based :class:`slack.actions.Action`.
         Internally uses the base `register` method for actual registration.
@@ -158,9 +150,7 @@ def dispatch(self, action: Action) -> Any:
             handler
         """
         if "callback_id" in action:
-            LOG.debug(
-                "Dispatching action %s, %s", action["type"], action["callback_id"]
-            )
+            LOG.debug("Dispatching action %s, %s", action["type"], action["callback_id"])
         else:
             LOG.debug(
                 "Dispatching action %s, %s",

pybot/_vendor/slack/commands.py

@@ -1,8 +1,8 @@
-import typing
 import logging
-from typing import Any, Dict, Iterator, Optional
+import typing
 from collections import defaultdict
-from collections.abc import MutableMapping
+from collections.abc import Iterator, MutableMapping
+from typing import Any
 
 from . import exceptions
 
@@ -24,20 +24,16 @@ class Command(MutableMapping):
     def __init__(
         self,
         raw_command: typing.MutableMapping,
-        verification_token: Optional[str] = None,
-        team_id: Optional[str] = None,
+        verification_token: str | None = None,
+        team_id: str | None = None,
     ) -> None:
         self.command = raw_command
 
         if verification_token and self.command["token"] != verification_token:
-            raise exceptions.FailedVerification(
-                self.command["token"], self.command["team_id"]
-            )
+            raise exceptions.FailedVerification(self.command["token"], self.command["team_id"])
 
         if team_id and self.command["team_id"] != team_id:
-            raise exceptions.FailedVerification(
-                self.command["token"], self.command["team_id"]
-            )
+            raise exceptions.FailedVerification(self.command["token"], self.command["team_id"])
 
     def __getitem__(self, item):
         return self.command[item]
@@ -66,7 +62,7 @@ class Router:
     """
 
     def __init__(self):
-        self._routes: Dict[str, list] = defaultdict(list)
+        self._routes: dict[str, list] = defaultdict(list)
 
     def register(self, command: str, handler: Any):
         """

pybot/_vendor/slack/events.py

@@ -1,11 +1,11 @@
-import re
 import copy
+import itertools
 import json
 import logging
-import itertools
-from typing import Any, Dict, Iterator, Optional
+import re
 from collections import defaultdict
-from collections.abc import MutableMapping
+from collections.abc import Iterator, MutableMapping
+from typing import Any
 
 from . import exceptions
 
@@ -21,9 +21,7 @@ class Event(MutableMapping):
                   (see `slack event API documentation <https://api.slack.com/events-api#receiving_events>`_)
     """
 
-    def __init__(
-        self, raw_event: MutableMapping, metadata: Optional[MutableMapping] = None
-    ) -> None:
+    def __init__(self, raw_event: MutableMapping, metadata: MutableMapping | None = None) -> None:
         self.event = raw_event
         self.metadata = metadata
 
@@ -77,8 +75,8 @@ def from_rtm(cls, raw_event: MutableMapping) -> "Event":
     def from_http(
         cls,
         raw_body: MutableMapping,
-        verification_token: Optional[str] = None,
-        team_id: Optional[str] = None,
+        verification_token: str | None = None,
+        team_id: str | None = None,
     ) -> "Event":
         """
         Create an event with data coming from the HTTP Event API.
@@ -116,8 +114,8 @@ class Message(Event):
 
     def __init__(
         self,
-        msg: Optional[MutableMapping] = None,
-        metadata: Optional[MutableMapping] = None,
+        msg: MutableMapping | None = None,
+        metadata: MutableMapping | None = None,
     ) -> None:
         if not msg:
             msg = {}
@@ -126,7 +124,7 @@ def __init__(
     def __repr__(self) -> str:
         return "Slack Message: " + str(self.event)
 
-    def response(self, in_thread: Optional[bool] = None) -> "Message":
+    def response(self, in_thread: bool | None = None) -> "Message":
         """
         Create a response message.
 
@@ -143,9 +141,7 @@ def response(self, in_thread: Optional[bool] = None) -> "Message":
 
         if in_thread:
             if "message" in self:
-                data["thread_ts"] = (
-                    self["message"].get("thread_ts") or self["message"]["ts"]
-                )
+                data["thread_ts"] = self["message"].get("thread_ts") or self["message"]["ts"]
             else:
                 data["thread_ts"] = self.get("thread_ts") or self["ts"]
         elif in_thread is None:
@@ -180,7 +176,7 @@ class EventRouter:
     """
 
     def __init__(self):
-        self._routes: Dict[str, Dict] = defaultdict(dict)
+        self._routes: dict[str, dict] = defaultdict(dict)
 
     def register(self, event_type: str, handler: Any, **detail: Any) -> None:
         """
@@ -223,9 +219,7 @@ def dispatch(self, event: Event) -> Iterator[Any]:
         """
         LOG.debug('Dispatching event "%s"', event.get("type"))
         if event["type"] in self._routes:
-            for detail_key, detail_values in self._routes.get(
-                event["type"], {}
-            ).items():
+            for detail_key, detail_values in self._routes.get(event["type"], {}).items():
                 event_value = event.get(detail_key, "*")
                 yield from detail_values.get(event_value, [])
         else:
@@ -242,15 +236,15 @@ class MessageRouter:
     """
 
     def __init__(self):
-        self._routes: Dict[str, Dict] = defaultdict(dict)
+        self._routes: dict[str, dict] = defaultdict(dict)
 
     def register(
         self,
         pattern: str,
         handler: Any,
         flags: int = 0,
         channel: str = "*",
-        subtype: Optional[str] = None,
+        subtype: str | None = None,
     ) -> None:
         """
         Register a new handler for a specific :class:`slack.events.Message`.