vodorod/Dorod-Sky
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

stop using page.click and page.locator in action handler (#426)

Browse Source
This commit is contained in:
LawyZheng
2024-06-06 11:04:04 +08:00
committed by GitHub
parent aedb26b06b
commit b4e95d29ce
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
skyvern/webeye/actions/handler.py
View File

@@ -517,6 +517,7 @@ async def handle_select_option_action(
exc_info=True, exc_info=True,
action=action, action=action,
xpath=xpath, xpath=xpath,
frame=frame,
) )
else: else:
LOG.warning( LOG.warning(
@@ -524,22 +525,20 @@ async def handle_select_option_action(
exc_info=True, exc_info=True,
action=action, action=action,
xpath=xpath, xpath=xpath,
frame=frame,
) )
return [ActionFailure(e)] return [ActionFailure(e)]
try: try:
# This means the supplied index was for the select element, not a reference to the xpath dict # This means the supplied index was for the select element, not a reference to the xpath dict
await page.click( await locator.click(
f"xpath={xpath}",
timeout=SettingsManager.get_settings().BROWSER_ACTION_TIMEOUT_MS, timeout=SettingsManager.get_settings().BROWSER_ACTION_TIMEOUT_MS,
) )
await page.select_option( await locator.select_option(
xpath,
index=action.option.index, index=action.option.index,
timeout=SettingsManager.get_settings().BROWSER_ACTION_TIMEOUT_MS, timeout=SettingsManager.get_settings().BROWSER_ACTION_TIMEOUT_MS,
) )
await page.click( await locator.click(
f"xpath={xpath}",
timeout=SettingsManager.get_settings().BROWSER_ACTION_TIMEOUT_MS, timeout=SettingsManager.get_settings().BROWSER_ACTION_TIMEOUT_MS,
) )
return [ActionSuccess()] return [ActionSuccess()]
@@ -710,8 +709,8 @@ async def chain_click(
:param xpath: xpath of the element to click :param xpath: xpath of the element to click
""" """
javascript_triggered = await is_javascript_triggered(scraped_page, page, frame, xpath) javascript_triggered = await is_javascript_triggered(scraped_page, page, frame, xpath)
locator = resolve_locator(scraped_page, page, frame, xpath)
try: try:
locator = resolve_locator(scraped_page, page, frame, xpath)
await locator.click(timeout=timeout) await locator.click(timeout=timeout)
LOG.info("Chain click: main element click succeeded", action=action, xpath=xpath) LOG.info("Chain click: main element click succeeded", action=action, xpath=xpath)
@@ -727,13 +726,13 @@ async def chain_click(
javascript_triggered=javascript_triggered, javascript_triggered=javascript_triggered,
) )
] ]
if await is_input_element(page.locator(xpath)): if await is_input_element(locator):
LOG.info( LOG.info(
"Chain click: it's an input element. going to try sibling click", "Chain click: it's an input element. going to try sibling click",
action=action, action=action,
xpath=xpath, xpath=xpath,
) )
sibling_action_result = await click_sibling_of_input(page.locator(xpath), timeout=timeout) sibling_action_result = await click_sibling_of_input(locator, timeout=timeout)
action_results.append(sibling_action_result) action_results.append(sibling_action_result)
if type(sibling_action_result) == ActionSuccess: if type(sibling_action_result) == ActionSuccess:
return action_results return action_results