Accept object-shaped Mod domain params

Author: pirate

python/modcdp/client/ModCDPClient.py

@@ -102,27 +102,30 @@ def __init__(self, client: "ModCDPClient") -> None:
 
     def evaluate(
         self,
-        *,
-        expression: str,
         params: Mapping[str, Any] | None = None,
+        *,
+        expression: str | None = None,
+        evaluate_params: Mapping[str, Any] | None = None,
         cdpSessionId: str | None = None,
     ) -> AwaitableDict | AwaitableValue:
-        payload: dict[str, Any] = {"expression": expression}
-        if params is not None:
-            payload["params"] = dict(params)
+        payload: dict[str, Any] = dict(params or {})
+        if expression is not None:
+            payload["expression"] = expression
+        if evaluate_params is not None:
+            payload["params"] = dict(evaluate_params)
         if cdpSessionId is not None:
             payload["cdpSessionId"] = cdpSessionId
         return self._client._send_command("Mod.evaluate", payload)
 
     def addCustomCommand(
         self,
-        name: str,
+        name: str | Mapping[str, Any],
         *,
         params_schema: Any | None = None,
         result_schema: Any | None = None,
         expression: str | None = None,
     ) -> AwaitableDict | AwaitableValue:
-        payload: dict[str, Any] = {"name": name}
+        payload: dict[str, Any] = dict(name) if isinstance(name, Mapping) else {"name": name}
         if params_schema is not None:
             payload["params_schema"] = params_schema
         if result_schema is not None:
@@ -131,20 +134,30 @@ def addCustomCommand(
             payload["expression"] = expression
         return self._client._send_command("Mod.addCustomCommand", payload)
 
-    def addCustomEvent(self, name: str, *, event_schema: Any | None = None) -> AwaitableDict | AwaitableValue:
-        payload: dict[str, Any] = {"name": name}
+    def addCustomEvent(
+        self,
+        name: str | Mapping[str, Any],
+        *,
+        event_schema: Any | None = None,
+    ) -> AwaitableDict | AwaitableValue:
+        payload: dict[str, Any] = dict(name) if isinstance(name, Mapping) else {"name": name}
         if event_schema is not None:
             payload["event_schema"] = event_schema
         return self._client._send_command("Mod.addCustomEvent", payload)
 
     def addMiddleware(
         self,
+        params: Mapping[str, Any] | None = None,
         *,
-        phase: str,
-        expression: str,
+        phase: str | None = None,
+        expression: str | None = None,
         name: str | None = None,
     ) -> AwaitableDict | AwaitableValue:
-        payload: dict[str, Any] = {"phase": phase, "expression": expression}
+        payload: dict[str, Any] = dict(params or {})
+        if phase is not None:
+            payload["phase"] = phase
+        if expression is not None:
+            payload["expression"] = expression
         if name is not None:
             payload["name"] = name
         return self._client._send_command("Mod.addMiddleware", payload)

python/tests/test_ModCDPClientRoutedDefaultOverrides.py

@@ -120,8 +120,19 @@ def test_service_worker_routed_standard_cdp_commands_and_events_can_be_transform
             self.assertTrue(raw_target_infos)
             self.assertFalse(any("tabId" in target_info for target_info in raw_target_infos))
 
-            cdp.Mod.addCustomCommand("Custom.tabIdFromTargetId", expression=TAB_ID_FROM_TARGET_ID_COMMAND)
-            cdp.Mod.addMiddleware(name="*", phase="response", expression=ADD_TAB_ID_MIDDLEWARE)
+            cdp.Mod.addCustomCommand(
+                {
+                    "name": "Custom.tabIdFromTargetId",
+                    "expression": TAB_ID_FROM_TARGET_ID_COMMAND,
+                }
+            )
+            cdp.Mod.addMiddleware(
+                {
+                    "name": "*",
+                    "phase": "response",
+                    "expression": ADD_TAB_ID_MIDDLEWARE,
+                }
+            )
             middleware_targets = cdp.send("Target.getTargets")
             self.assertTrue(
                 any(
@@ -130,8 +141,19 @@ def test_service_worker_routed_standard_cdp_commands_and_events_can_be_transform
                 )
             )
 
-            cdp.Mod.addMiddleware(name="*", phase="event", expression=ADD_TAB_ID_MIDDLEWARE)
-            cdp.Mod.addCustomCommand("Target.getTargets", expression=GET_TARGETS_OVERRIDE)
+            cdp.Mod.addMiddleware(
+                {
+                    "name": "*",
+                    "phase": "event",
+                    "expression": ADD_TAB_ID_MIDDLEWARE,
+                }
+            )
+            cdp.Mod.addCustomCommand(
+                {
+                    "name": "Target.getTargets",
+                    "expression": GET_TARGETS_OVERRIDE,
+                }
+            )
 
             enriched_targets = cdp.send("Target.getTargets")
             enriched_target_infos = target_infos_from_result(enriched_targets)
@@ -154,7 +176,7 @@ def test_service_worker_routed_standard_cdp_commands_and_events_can_be_transform
             self.assertTrue(any(root.get("kind") == "document" for root in roots.values()))
             self.assertTrue(any(context.get("world") == "piercer" for context in contexts.values()))
 
-            cdp.Mod.addCustomEvent("Target.targetCreated")
+            cdp.Mod.addCustomEvent({"name": "Target.targetCreated"})
             transformed_events: Queue[dict] = Queue()
 
             def on_target_created(params):