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

refactor select option logic (#3408)

Browse Source
This commit is contained in:
LawyZheng
2025-09-11 13:10:02 +08:00
committed by GitHub
parent f582f84c95
commit a5c25b5f7f
1 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ from skyvern.exceptions import (
FailedToFetchSecret, FailedToFetchSecret,
FailToClick, FailToClick,
FailToSelectByIndex, FailToSelectByIndex,
FailToSelectByLabel,
FailToSelectByValue, FailToSelectByValue,
IllegitComplete, IllegitComplete,
ImaginaryFileUrl, ImaginaryFileUrl,
@@ -3446,20 +3447,6 @@ async def normal_select(
index: int | None = json_response.get("index") index: int | None = json_response.get("index")
value: str | None = json_response.get("value") value: str | None = json_response.get("value")
try:
await locator.click(
timeout=settings.BROWSER_ACTION_TIMEOUT_MS,
)
except Exception as e:
LOG.info(
"Failed to click before select action",
exc_info=True,
action=action,
locator=locator,
)
action_result.append(ActionFailure(e))
return action_result
if not is_success and value is not None: if not is_success and value is not None:
try: try:
# click by value (if it matches) # click by value (if it matches)
@@ -3478,6 +3465,24 @@ async def normal_select(
locator=locator, locator=locator,
) )
if not is_success and value is not None:
try:
# click by label (if it matches)
await locator.select_option(
label=value,
timeout=settings.BROWSER_ACTION_TIMEOUT_MS,
)
is_success = True
action_result.append(ActionSuccess())
except Exception:
action_result.append(ActionFailure(FailToSelectByLabel(action.element_id)))
LOG.info(
"Failed to take select action by label",
exc_info=True,
action=action,
locator=locator,
)
if not is_success and index is not None: if not is_success and index is not None:
if index >= len(skyvern_element.get_options()): if index >= len(skyvern_element.get_options()):
action_result.append(ActionFailure(OptionIndexOutOfBound(action.element_id))) action_result.append(ActionFailure(OptionIndexOutOfBound(action.element_id)))
@@ -3504,20 +3509,6 @@ async def normal_select(
locator=locator, locator=locator,
) )
try:
await locator.click(
timeout=settings.BROWSER_ACTION_TIMEOUT_MS,
)
except Exception as e:
LOG.info(
"Failed to click after select action",
exc_info=True,
action=action,
locator=locator,
)
action_result.append(ActionFailure(e))
return action_result
if len(action_result) == 0: if len(action_result) == 0:
action_result.append(ActionFailure(EmptySelect(element_id=action.element_id))) action_result.append(ActionFailure(EmptySelect(element_id=action.element_id)))