Fix: jigsawstack.web.ai_scrape params:

1. Types are updated to match with js lib, and source truth @jigsawstack/scrape.ts zod schema.
2. Updated type casting to Dict[Any, Any]

Author: Khurdhula-Harshavardhan

jigsawstack/web.py

@@ -1,5 +1,6 @@
-from typing import Any, Dict, List, cast, Union
-from typing_extensions import NotRequired, TypedDict, Optional
+from typing import Any, Dict, List, Union, Optional, cast, Literal
+from typing_extensions import NotRequired, TypedDict
+
 from .request import Request, RequestConfig
 from .async_request import AsyncRequest, AsyncRequestConfig
 from ._config import ClientConfig
@@ -14,6 +15,9 @@
 from .helpers import build_path
 
 
+#
+# DNS
+#
 class DNSParams(TypedDict):
     domain: str
     type: NotRequired[str]
@@ -34,6 +38,9 @@ class DNSResponse(TypedDict):
     authority: List
 
 
+#
+# HTML to Any
+#
 class HTMLToAnyParams(TypedDict):
     html: str
     url: str
@@ -58,56 +65,117 @@ class HTMLToAnyResponse(TypedDict):
     html: str
 
 
+#
+# BYO Proxy
+#
+class CookieParameter(TypedDict):
+    name: str
+    value: str
+    url: NotRequired[str]
+    domain: NotRequired[str]
+    path: NotRequired[str]
+    secure: NotRequired[bool]
+    httpOnly: NotRequired[bool]
+    sameSite: NotRequired[Literal["Strict", "Lax", "None"]]
+    expires: NotRequired[bool]
+    priority: NotRequired[str]
+    sameParty: NotRequired[bool]
+
+
+class GotoOptions(TypedDict):
+    timeout: int
+    wait_until: str
+
+
+class WaitFor(TypedDict):
+    mode: str
+    value: Union[str, int]
+
+
+class AdvanceConfig(TypedDict):
+    console: bool
+    network: bool
+    cookies: bool
+
+
 class BYOProxyAuth(TypedDict):
     username: str
     password: str
 
 
 class BYOProxy(TypedDict):
     server: str
-    auth: BYOProxyAuth
+    auth: NotRequired[BYOProxyAuth]
+
 
 class BaseAIScrapeParams(TypedDict):
     url: str
-    advance_config: NotRequired[object]
+    root_element_selectors: NotRequired[str]
+    page_position: NotRequired[int]
+    http_headers: NotRequired[Dict[str, Any]]
+    reject_request_pattern: NotRequired[List[str]]
+    goto_options: NotRequired[GotoOptions]
+    wait_for: NotRequired[WaitFor]
+    advance_config: NotRequired[AdvanceConfig]
     size_preset: NotRequired[str]
     is_mobile: NotRequired[bool]
     scale: NotRequired[int]
     width: NotRequired[int]
     height: NotRequired[int]
+    cookies: NotRequired[List[CookieParameter]]
     force_rotate_proxy: NotRequired[bool]
-    reject_request_pattern: NotRequired[List[str]]
-    http_headers: NotRequired[object]
-    goto_options: NotRequired[object]
-    wait_for: NotRequired[object]
-    cookies: NotRequired[object]
+    byo_proxy: NotRequired[BYOProxy]
+
+
+class AIScrapeParamsWithSelector(BaseAIScrapeParams):
+    selectors: List[str]
+    element_prompts: NotRequired[List[str]]
+
 
 class AIScrapeParamsWithPrompts(BaseAIScrapeParams):
-    selector: Optional[List[str]]
+    selectors: NotRequired[List[str]]
     element_prompts: List[str]
 
-class AIScrapeParamsWithSelector(BaseAIScrapeParams):
-    selector: List[str]
-    element_prompts: Optional[List[str]]
 
 AIScrapeParams = Union[AIScrapeParamsWithSelector, AIScrapeParamsWithPrompts]
 
-class LinkData(TypedDict):
-    type: str  # "a" or "img"
-    href: Optional[str]
+
+class Attribute(TypedDict):
+    name: str
+    value: str
+
+
+class Result(TypedDict):
+    html: str
+    text: str
+    attributes: List[Attribute]
+
+
+class DataItem(TypedDict):
+    key: str
+    selectors: str
+    results: List[Result]
+
+
+class Link(TypedDict):
+    href: str
     text: Optional[str]
+    type: Literal["a", "img"]
 
 
 class AIScrapeResponse(TypedDict):
     success: bool
-    data: List[Dict[str, Any]]
-    selectors: List[str]
-    context: Dict[str, List[str]]
-    link: List[LinkData]
+    data: List[DataItem]
     page_position: int
     page_position_length: int
+    context: Dict[str, List[str]]
+    selectors: Dict[str, List[str]]
+    link: List[Link]
 
 
+#
+# Web Client
+#
 class Web(ClientConfig):
 
     config: RequestConfig
@@ -130,7 +198,7 @@ def ai_scrape(self, params: AIScrapeParams) -> AIScrapeResponse:
         resp = Request(
             config=self.config,
             path=path,
-            params=cast(AIScrapeParams, params),
+            params=cast(Dict[Any, Any], params),
             verb="post",
         ).perform_with_content()
         return resp
@@ -177,6 +245,9 @@ def search_suggestions(
         return s.suggestions(params)
 
 
+#
+# Async Web Client
+#
 class AsyncWeb(ClientConfig):
 
     config: AsyncRequestConfig
@@ -204,7 +275,6 @@ async def ai_scrape(self, params: AIScrapeParams) -> AIScrapeResponse:
         ).perform_with_content()
         return resp
 
-
     async def html_to_any(self, params: HTMLToAnyParams) -> Any:
         path = "/web/html_to_any"
         resp = await AsyncRequest(