From 7e5f5d6a41ec6d4eb740ee2e2191f4bf987b2827 Mon Sep 17 00:00:00 2001 From: LawyZheng Date: Thu, 21 Nov 2024 15:38:04 +0800 Subject: [PATCH] use orignal action type (#1229) --- skyvern/forge/sdk/db/enums.py | 7 ------- skyvern/forge/sdk/workflow/models/yaml.py | 2 +- skyvern/forge/sdk/workflow/service.py | 11 ++++++----- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/skyvern/forge/sdk/db/enums.py b/skyvern/forge/sdk/db/enums.py index c521012d..79327f0d 100644 --- a/skyvern/forge/sdk/db/enums.py +++ b/skyvern/forge/sdk/db/enums.py @@ -12,10 +12,3 @@ class TaskPromptTemplate(StrEnum): SingleInputAction = "single-input-action" SingleUploadAction = "single-upload-action" SingleSelectAction = "single-select-action" - - -class ActionType(StrEnum): - Click = "CLICK" - InputText = "INPUT_TEXT" - UploadFile = "UPLOAD_FILE" - SelectOption = "SELECT_OPTION" diff --git a/skyvern/forge/sdk/workflow/models/yaml.py b/skyvern/forge/sdk/workflow/models/yaml.py index 8baea2b3..5dc4dcd0 100644 --- a/skyvern/forge/sdk/workflow/models/yaml.py +++ b/skyvern/forge/sdk/workflow/models/yaml.py @@ -3,10 +3,10 @@ from typing import Annotated, Any, Literal from pydantic import BaseModel, Field -from skyvern.forge.sdk.db.enums import ActionType from skyvern.forge.sdk.schemas.tasks import ProxyLocation from skyvern.forge.sdk.workflow.models.block import BlockType, FileType from skyvern.forge.sdk.workflow.models.parameter import ParameterType, WorkflowParameterType +from skyvern.webeye.actions.actions import ActionType class ParameterYAML(BaseModel, abc.ABC): diff --git a/skyvern/forge/sdk/workflow/service.py b/skyvern/forge/sdk/workflow/service.py index 02bf57f3..51fa82e2 100644 --- a/skyvern/forge/sdk/workflow/service.py +++ b/skyvern/forge/sdk/workflow/service.py @@ -18,7 +18,7 @@ from skyvern.forge.sdk.artifact.models import ArtifactType from skyvern.forge.sdk.core import skyvern_context from skyvern.forge.sdk.core.security import generate_skyvern_signature from skyvern.forge.sdk.core.skyvern_context import SkyvernContext -from skyvern.forge.sdk.db.enums import ActionType, TaskPromptTemplate +from skyvern.forge.sdk.db.enums import TaskPromptTemplate from skyvern.forge.sdk.models import Organization, Step from skyvern.forge.sdk.schemas.tasks import ProxyLocation, Task from skyvern.forge.sdk.workflow.exceptions import ( @@ -64,6 +64,7 @@ from skyvern.forge.sdk.workflow.models.workflow import ( WorkflowRunStatusResponse, ) from skyvern.forge.sdk.workflow.models.yaml import BLOCK_YAML_TYPES, ForLoopBlockYAML, WorkflowCreateYAMLRequest +from skyvern.webeye.actions.actions import ActionType from skyvern.webeye.browser_factory import BrowserState LOG = structlog.get_logger() @@ -1366,13 +1367,13 @@ class WorkflowService: else [] ) prompt_template = "" - if block_yaml.action_type == ActionType.Click: + if block_yaml.action_type == ActionType.CLICK: prompt_template = TaskPromptTemplate.SingleClickAction - elif block_yaml.action_type == ActionType.InputText: + elif block_yaml.action_type == ActionType.INPUT_TEXT: prompt_template = TaskPromptTemplate.SingleInputAction - elif block_yaml.action_type == ActionType.UploadFile: + elif block_yaml.action_type == ActionType.UPLOAD_FILE: prompt_template = TaskPromptTemplate.SingleUploadAction - elif block_yaml.action_type == ActionType.SelectOption: + elif block_yaml.action_type == ActionType.SELECT_OPTION: prompt_template = TaskPromptTemplate.SingleSelectAction if not prompt_template: