Merge pull request #19 from eNcacz/master

Update to CDP r953906

Author: P4X-ng

generator/generate.py

@@ -108,7 +108,7 @@ def generate_command(module: types.ModuleType, module_name: str,
 
     # Copy docstring.
     if fn.__doc__:
-        doc = "    '''" + fn.__doc__ + "'''\n"
+        doc = "    r'''" + fn.__doc__ + "'''\n"
     else:
         doc = ''
 

generator/test_generate.py

@@ -12,7 +12,7 @@ async def query_selector(
                 node_id: NodeId,
                 selector: str
             ) -> NodeId:
-            '''
+            r'''
             Executes ``querySelector`` on a given node.
 
             :param node_id: Id of the node to query upon.
@@ -29,7 +29,7 @@ async def query_selector(
 def test_accessibility_disable():
     expected = dedent("""\
         async def disable() -> None:
-            '''
+            r'''
             Disables the accessibility domain.
             '''
             session = get_session_context('accessibility.disable')
@@ -48,7 +48,7 @@ async def get_partial_ax_tree(
                 object_id: typing.Optional[cdp.runtime.RemoteObjectId] = None,
                 fetch_relatives: typing.Optional[bool] = None
             ) -> typing.List[AXNode]:
-            '''
+            r'''
             Fetches the accessibility node and partial accessibility tree for this DOM node, if it exists.
 
             **EXPERIMENTAL**
@@ -64,4 +64,4 @@ async def get_partial_ax_tree(
     """)
 
     assert expected == generate_command(cdp.accessibility, 'accessibility',
-        cdp.accessibility.get_partial_ax_tree)
+        cdp.accessibility.get_partial_ax_tree)

tests/test_trio_cdp.py

@@ -47,6 +47,7 @@ async def handler(request):
                         'title': 'New Tab',
                         'url': 'about:newtab',
                         'attached': False,
+                        'canAccessOpener': False,
                     }],
                 }
             }

trio_cdp/generated/__init__.py

@@ -5,7 +5,6 @@
 
 from . import accessibility
 from . import animation
-from . import application_cache
 from . import audits
 from . import background_service
 from . import browser
@@ -21,6 +20,7 @@
 from . import dom_snapshot
 from . import dom_storage
 from . import emulation
+from . import event_breakpoints
 from . import fetch
 from . import headless_experimental
 from . import heap_profiler
@@ -30,11 +30,13 @@
 from . import io
 from . import layer_tree
 from . import log
+from . import media
 from . import memory
 from . import network
 from . import overlay
 from . import page
 from . import performance
+from . import performance_timeline
 from . import profiler
 from . import runtime
 from . import schema

trio_cdp/generated/accessibility.py

@@ -19,37 +19,84 @@
     AXValueNativeSourceType,
     AXValueSource,
     AXValueSourceType,
-    AXValueType
+    AXValueType,
+    LoadComplete,
+    NodesUpdated
 )
 
 
 async def disable() -> None:
-    '''
+    r'''
     Disables the accessibility domain.
     '''
     session = get_session_context('accessibility.disable')
     return await session.execute(cdp.accessibility.disable())
 
 
 async def enable() -> None:
-    '''
+    r'''
     Enables the accessibility domain which causes ``AXNodeId``'s to remain consistent between method calls.
     This turns on accessibility for the page, which can impact performance until accessibility is disabled.
     '''
     session = get_session_context('accessibility.enable')
     return await session.execute(cdp.accessibility.enable())
 
 
-async def get_full_ax_tree() -> typing.List[AXNode]:
+async def get_ax_node_and_ancestors(
+        node_id: typing.Optional[cdp.dom.NodeId] = None,
+        backend_node_id: typing.Optional[cdp.dom.BackendNodeId] = None,
+        object_id: typing.Optional[cdp.runtime.RemoteObjectId] = None
+    ) -> typing.List[AXNode]:
+    r'''
+    Fetches a node and all ancestors up to and including the root.
+    Requires ``enable()`` to have been called previously.
+
+    **EXPERIMENTAL**
+
+    :param node_id: *(Optional)* Identifier of the node to get.
+    :param backend_node_id: *(Optional)* Identifier of the backend node to get.
+    :param object_id: *(Optional)* JavaScript object id of the node wrapper to get.
+    :returns: 
     '''
-    Fetches the entire accessibility tree
+    session = get_session_context('accessibility.get_ax_node_and_ancestors')
+    return await session.execute(cdp.accessibility.get_ax_node_and_ancestors(node_id, backend_node_id, object_id))
+
+
+async def get_child_ax_nodes(
+        id_: AXNodeId,
+        frame_id: typing.Optional[cdp.page.FrameId] = None
+    ) -> typing.List[AXNode]:
+    r'''
+    Fetches a particular accessibility node by AXNodeId.
+    Requires ``enable()`` to have been called previously.
+
+    **EXPERIMENTAL**
+
+    :param id_:
+    :param frame_id: *(Optional)* The frame in whose document the node resides. If omitted, the root frame is used.
+    :returns: 
+    '''
+    session = get_session_context('accessibility.get_child_ax_nodes')
+    return await session.execute(cdp.accessibility.get_child_ax_nodes(id_, frame_id))
+
+
+async def get_full_ax_tree(
+        depth: typing.Optional[int] = None,
+        max_depth: typing.Optional[int] = None,
+        frame_id: typing.Optional[cdp.page.FrameId] = None
+    ) -> typing.List[AXNode]:
+    r'''
+    Fetches the entire accessibility tree for the root Document
 
     **EXPERIMENTAL**
 
+    :param depth: *(Optional)* The maximum depth at which descendants of the root node should be retrieved. If omitted, the full tree is returned.
+    :param max_depth: **(DEPRECATED)** *(Optional)* Deprecated. This parameter has been renamed to ```depth```. If depth is not provided, max_depth will be used.
+    :param frame_id: *(Optional)* The frame for whose document the AX tree should be retrieved. If omited, the root frame is used.
     :returns: 
     '''
     session = get_session_context('accessibility.get_full_ax_tree')
-    return await session.execute(cdp.accessibility.get_full_ax_tree())
+    return await session.execute(cdp.accessibility.get_full_ax_tree(depth, max_depth, frame_id))
 
 
 async def get_partial_ax_tree(
@@ -58,7 +105,7 @@ async def get_partial_ax_tree(
         object_id: typing.Optional[cdp.runtime.RemoteObjectId] = None,
         fetch_relatives: typing.Optional[bool] = None
     ) -> typing.List[AXNode]:
-    '''
+    r'''
     Fetches the accessibility node and partial accessibility tree for this DOM node, if it exists.
 
     **EXPERIMENTAL**
@@ -71,3 +118,46 @@ async def get_partial_ax_tree(
     '''
     session = get_session_context('accessibility.get_partial_ax_tree')
     return await session.execute(cdp.accessibility.get_partial_ax_tree(node_id, backend_node_id, object_id, fetch_relatives))
+
+
+async def get_root_ax_node(
+        frame_id: typing.Optional[cdp.page.FrameId] = None
+    ) -> AXNode:
+    r'''
+    Fetches the root node.
+    Requires ``enable()`` to have been called previously.
+
+    **EXPERIMENTAL**
+
+    :param frame_id: *(Optional)* The frame in whose document the node resides. If omitted, the root frame is used.
+    :returns: 
+    '''
+    session = get_session_context('accessibility.get_root_ax_node')
+    return await session.execute(cdp.accessibility.get_root_ax_node(frame_id))
+
+
+async def query_ax_tree(
+        node_id: typing.Optional[cdp.dom.NodeId] = None,
+        backend_node_id: typing.Optional[cdp.dom.BackendNodeId] = None,
+        object_id: typing.Optional[cdp.runtime.RemoteObjectId] = None,
+        accessible_name: typing.Optional[str] = None,
+        role: typing.Optional[str] = None
+    ) -> typing.List[AXNode]:
+    r'''
+    Query a DOM node's accessibility subtree for accessible name and role.
+    This command computes the name and role for all nodes in the subtree, including those that are
+    ignored for accessibility, and returns those that mactch the specified name and role. If no DOM
+    node is specified, or the DOM node does not exist, the command returns an error. If neither
+    ``accessibleName`` or ``role`` is specified, it returns all the accessibility nodes in the subtree.
+
+    **EXPERIMENTAL**
+
+    :param node_id: *(Optional)* Identifier of the node for the root to query.
+    :param backend_node_id: *(Optional)* Identifier of the backend node for the root to query.
+    :param object_id: *(Optional)* JavaScript object id of the node wrapper for the root to query.
+    :param accessible_name: *(Optional)* Find nodes with this computed name.
+    :param role: *(Optional)* Find nodes with this computed role.
+    :returns: A list of ``Accessibility.AXNode`` matching the specified attributes, including nodes that are ignored for accessibility.
+    '''
+    session = get_session_context('accessibility.query_ax_tree')
+    return await session.execute(cdp.accessibility.query_ax_tree(node_id, backend_node_id, object_id, accessible_name, role))

trio_cdp/generated/animation.py

@@ -21,15 +21,15 @@
 
 
 async def disable() -> None:
-    '''
+    r'''
     Disables animation domain notifications.
     '''
     session = get_session_context('animation.disable')
     return await session.execute(cdp.animation.disable())
 
 
 async def enable() -> None:
-    '''
+    r'''
     Enables animation domain notifications.
     '''
     session = get_session_context('animation.enable')
@@ -39,7 +39,7 @@ async def enable() -> None:
 async def get_current_time(
         id_: str
     ) -> float:
-    '''
+    r'''
     Returns the current time of the an animation.
 
     :param id_: Id of animation.
@@ -50,7 +50,7 @@ async def get_current_time(
 
 
 async def get_playback_rate() -> float:
-    '''
+    r'''
     Gets the playback rate of the document timeline.
 
     :returns: Playback rate for animations on page.
@@ -62,7 +62,7 @@ async def get_playback_rate() -> float:
 async def release_animations(
         animations: typing.List[str]
     ) -> None:
-    '''
+    r'''
     Releases a set of animations to no longer be manipulated.
 
     :param animations: List of animation ids to seek.
@@ -74,7 +74,7 @@ async def release_animations(
 async def resolve_animation(
         animation_id: str
     ) -> cdp.runtime.RemoteObject:
-    '''
+    r'''
     Gets the remote object of the Animation.
 
     :param animation_id: Animation id.
@@ -88,7 +88,7 @@ async def seek_animations(
         animations: typing.List[str],
         current_time: float
     ) -> None:
-    '''
+    r'''
     Seek a set of animations to a particular time within each animation.
 
     :param animations: List of animation ids to seek.
@@ -102,7 +102,7 @@ async def set_paused(
         animations: typing.List[str],
         paused: bool
     ) -> None:
-    '''
+    r'''
     Sets the paused state of a set of animations.
 
     :param animations: Animations to set the pause state of.
@@ -115,7 +115,7 @@ async def set_paused(
 async def set_playback_rate(
         playback_rate: float
     ) -> None:
-    '''
+    r'''
     Sets the playback rate of the document timeline.
 
     :param playback_rate: Playback rate for animations on page
@@ -129,7 +129,7 @@ async def set_timing(
         duration: float,
         delay: float
     ) -> None:
-    '''
+    r'''
     Sets the timing of an animation node.
 
     :param animation_id: Animation id.