[py] Use generated Bidi files instead of hand curated ones (#17266)

---------

Co-authored-by: Corey Goldberg <1113081+cgoldberg@users.noreply.github.com>

Author: AutomatedTester

.gitignore

@@ -67,6 +67,7 @@ __pycache__
 .tox
 *.pyc
 dist/
+py/selenium/webdriver/common/bidi/
 py/selenium/webdriver/common/devtools/**/*
 !py/selenium/webdriver/common/devtools/util.py
 py/selenium/webdriver/common/linux/

py/BUILD.bazel

@@ -262,8 +262,10 @@ py_library(
 # BiDi protocol support
 py_library(
     name = "bidi",
-    srcs = glob(["selenium/webdriver/common/bidi/**/*.py"]),
-    data = [":mutation-listener"],
+    srcs = [":create-bidi-src"],
+    data = [
+        ":mutation-listener",
+    ],
     imports = ["."],
     visibility = ["//visibility:public"],
     deps = [
@@ -617,7 +619,7 @@ generate_devtools_latest(
     browser_versions = BROWSER_VERSIONS,
 )
 
-# Pilot BiDi code generation from CDDL specification
+# Generate BiDi source files from CDDL specification
 generate_bidi(
     name = "create-bidi-src",
     cddl_file = "//common/bidi/spec:all.cddl",

py/generate_bidi.py

@@ -1699,9 +1699,12 @@ def main(
 
     logger.info(f"Parsed {len(modules)} modules")
 
-    # Clean up existing generated files
+    # Clean up existing generated files.
+    # Keep static helper modules that are staged by Bazel (for example cdp.py)
+    # as part of create-bidi-src.extra_srcs.
+    preserved_python_files = {"py.typed", "cdp.py"}
     for file_path in output_path.glob("*.py"):
-        if file_path.name != "py.typed" and not file_path.name.startswith("_"):
+        if file_path.name not in preserved_python_files and not file_path.name.startswith("_"):
             file_path.unlink()
             logger.debug(f"Removed: {file_path}")
 

py/private/bidi_enhancements_manifest.py

@@ -1087,24 +1087,37 @@ def continue_request(self, **kwargs):
         self._conn.execute(_cb("network.removeIntercept", {"intercept": intercept_id}))
         if intercept_id in self.intercepts:
             self.intercepts.remove(intercept_id)''',
+            '''    def _canonical_request_handler_event(self, event):
+        """Map public request-handler aliases to supported event keys."""
+        event_aliases = {
+            "auth_required": "auth_required",
+            "before_request": "before_request",
+            "before_request_sent": "before_request",
+        }
+        canonical_event = event_aliases.get(event)
+        if canonical_event is None:
+            available_events = ", ".join(sorted(event_aliases))
+            raise ValueError(
+                f"Unsupported request handler event '{event}'. Available events: {available_events}"
+            )
+        return canonical_event''',
             '''    def add_request_handler(self, event, callback, url_patterns=None):
         """Add a handler for network requests at the specified phase.
 
         Args:
-            event: Event name, e.g. ``"before_request"``.
+            event: Event name, e.g. ``"before_request"`` or ``"before_request_sent"``.
             callback: Callable receiving a :class:`Request` instance.
             url_patterns: optional list of URL pattern dicts to filter.
 
         Returns:
             callback_id int for later removal via remove_request_handler.
         """
+        canonical_event = self._canonical_request_handler_event(event)
         phase_map = {
             "before_request": "beforeRequestSent",
-            "before_request_sent": "beforeRequestSent",
-            "response_started": "responseStarted",
             "auth_required": "authRequired",
         }
-        phase = phase_map.get(event, "beforeRequestSent")
+        phase = phase_map[canonical_event]
         intercept_result = self._add_intercept(phases=[phase], url_patterns=url_patterns)
         intercept_id = intercept_result.get("intercept") if intercept_result else None
 
@@ -1117,7 +1130,7 @@ def _request_callback(params):
             request = Request(self._conn, raw)
             callback(request)
 
-        callback_id = self.add_event_handler(event, _request_callback)
+        callback_id = self.add_event_handler(canonical_event, _request_callback)
         if intercept_id:
             self._handler_intercepts[callback_id] = intercept_id
         return callback_id''',
@@ -1128,7 +1141,8 @@ def _request_callback(params):
             event: The event name used when adding the handler.
             callback_id: The int returned by add_request_handler.
         """
-        self.remove_event_handler(event, callback_id)
+        canonical_event = self._canonical_request_handler_event(event)
+        self.remove_event_handler(canonical_event, callback_id)
         intercept_id = self._handler_intercepts.pop(callback_id, None)
         if intercept_id:
             self._remove_intercept(intercept_id)''',

py/private/cdp.py

@@ -451,7 +451,13 @@ async def _reader_task(self):
             try:
                 data = json.loads(message)
             except json.JSONDecodeError:
-                raise BrowserError({"code": -32700, "message": "Client received invalid JSON", "data": message})
+                raise BrowserError(
+                    {
+                        "code": -32700,
+                        "message": "Client received invalid JSON",
+                        "data": message,
+                    }
+                )
             logger.debug("Received message %r", data)
             if "sessionId" in data:
                 session_id = devtools.target.SessionID(data["sessionId"])