Clean up HAR option serialization

Author: agg23

playwright/_impl/_browser.py

@@ -158,13 +158,11 @@ async def new_context(
         channel = await self._channel.send("newContext", params)
         context = cast(BrowserContext, from_channel(channel))
         await context._initialize_har_from_options(
-            {
-                "recordHarPath": recordHarPath,
-                "recordHarContent": recordHarContent,
-                "recordHarOmitContent": recordHarOmitContent,
-                "recordHarUrlFilter": recordHarUrlFilter,
-                "recordHarMode": recordHarMode,
-            }
+            record_har_content=recordHarContent,
+            record_har_mode=recordHarMode,
+            record_har_omit_content=recordHarOmitContent,
+            record_har_path=recordHarPath,
+            record_har_url_filter=recordHarUrlFilter,
         )
         return context
 

playwright/_impl/_browser_context.py

@@ -302,24 +302,32 @@ def pages(self) -> List[Page]:
     def browser(self) -> Optional["Browser"]:
         return self._browser
 
-    async def _initialize_har_from_options(self, options: Dict) -> None:
-        record_har_path = options.get("recordHarPath")
+    async def _initialize_har_from_options(
+        self,
+        record_har_path: Optional[Union[Path, str]],
+        record_har_content: Optional[HarContentPolicy],
+        record_har_omit_content: Optional[bool],
+        record_har_url_filter: Optional[Union[Pattern[str], str]],
+        record_har_mode: Optional[HarMode],
+    ) -> None:
         if not record_har_path:
             return
         record_har_path = str(record_har_path)
         if len(record_har_path) == 0:
             return
-        default_policy = "attach" if record_har_path.endswith(".zip") else "embed"
-        content_policy = options.get(
-            "recordHarContent",
-            "omit" if options["recordHarOmitContent"] is True else default_policy,
+        # Forcibly list type to satisfy mypy
+        default_policy: HarContentPolicy = (
+            "attach" if record_har_path.endswith(".zip") else "embed"
+        )
+        content_policy: HarContentPolicy = record_har_content or (
+            "omit" if record_har_omit_content is True else default_policy
         )
         await self._record_into_har(
             har=record_har_path,
             page=None,
-            url=options["recordHarUrlFilter"],
+            url=record_har_url_filter,
             update_content=content_policy,
-            update_mode=options.get("recordHarMode", "full"),
+            update_mode=(record_har_mode or "full"),
         )
 
     async def new_page(self) -> Page:

playwright/_impl/_browser_type.py

@@ -170,20 +170,11 @@ async def launch_persistent_context(
         )
         context = cast(BrowserContext, from_channel(result["context"]))
         await context._initialize_har_from_options(
-            {
-                "recordHarContent": recordHarContent,
-                "recordHarMode": recordHarMode,
-                "recordHarOmitContent": recordHarOmitContent,
-                "recordHarPath": recordHarPath,
-                "recordHarUrlFilter": (
-                    recordHarUrlFilter if isinstance(recordHarUrlFilter, str) else None
-                ),
-                "recordHarUrlFilterRegex": (
-                    recordHarUrlFilter
-                    if isinstance(recordHarUrlFilter, Pattern)
-                    else None
-                ),
-            }
+            record_har_content=recordHarContent,
+            record_har_mode=recordHarMode,
+            record_har_omit_content=recordHarOmitContent,
+            record_har_path=recordHarPath,
+            record_har_url_filter=recordHarUrlFilter,
         )
         return context
 
@@ -338,6 +329,13 @@ async def _prepare_browser_context_params(self, params: Dict) -> None:
         params["selectorEngines"] = self._playwright.selectors._selectorEngines
         params["testIdAttributeName"] = self._playwright.selectors._testIdAttributeName
 
+        # Remove HAR options
+        params.pop("recordHarPath", None)
+        params.pop("recordHarOmitContent", None)
+        params.pop("recordHarUrlFilter", None)
+        params.pop("recordHarMode", None)
+        params.pop("recordHarContent", None)
+
 
 def normalize_launch_params(params: Dict) -> None:
     if "env" in params: