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

use orignal action type (#1229)

Browse Source
This commit is contained in:
LawyZheng
2024-11-21 15:38:04 +08:00
committed by GitHub
parent 3f209404f7
commit 7e5f5d6a41
3 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
skyvern/forge/sdk/db/enums.py
View File

@@ -12,10 +12,3 @@ class TaskPromptTemplate(StrEnum):
SingleInputAction = "single-input-action" SingleInputAction = "single-input-action"
SingleUploadAction = "single-upload-action" SingleUploadAction = "single-upload-action"
SingleSelectAction = "single-select-action" SingleSelectAction = "single-select-action"
class ActionType(StrEnum):
Click = "CLICK"
InputText = "INPUT_TEXT"
UploadFile = "UPLOAD_FILE"
SelectOption = "SELECT_OPTION"

2
skyvern/forge/sdk/workflow/models/yaml.py
View File

@@ -3,10 +3,10 @@ from typing import Annotated, Any, Literal
from pydantic import BaseModel, Field 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.schemas.tasks import ProxyLocation
from skyvern.forge.sdk.workflow.models.block import BlockType, FileType from skyvern.forge.sdk.workflow.models.block import BlockType, FileType
from skyvern.forge.sdk.workflow.models.parameter import ParameterType, WorkflowParameterType from skyvern.forge.sdk.workflow.models.parameter import ParameterType, WorkflowParameterType
from skyvern.webeye.actions.actions import ActionType
class ParameterYAML(BaseModel, abc.ABC): class ParameterYAML(BaseModel, abc.ABC):

11
skyvern/forge/sdk/workflow/service.py
View File

@@ -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 import skyvern_context
from skyvern.forge.sdk.core.security import generate_skyvern_signature from skyvern.forge.sdk.core.security import generate_skyvern_signature
from skyvern.forge.sdk.core.skyvern_context import SkyvernContext 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.models import Organization, Step
from skyvern.forge.sdk.schemas.tasks import ProxyLocation, Task from skyvern.forge.sdk.schemas.tasks import ProxyLocation, Task
from skyvern.forge.sdk.workflow.exceptions import ( from skyvern.forge.sdk.workflow.exceptions import (
@@ -64,6 +64,7 @@ from skyvern.forge.sdk.workflow.models.workflow import (
WorkflowRunStatusResponse, WorkflowRunStatusResponse,
) )
from skyvern.forge.sdk.workflow.models.yaml import BLOCK_YAML_TYPES, ForLoopBlockYAML, WorkflowCreateYAMLRequest 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 from skyvern.webeye.browser_factory import BrowserState
LOG = structlog.get_logger() LOG = structlog.get_logger()
@@ -1366,13 +1367,13 @@ class WorkflowService:
else [] else []
) )
prompt_template = "" prompt_template = ""
if block_yaml.action_type == ActionType.Click: if block_yaml.action_type == ActionType.CLICK:
prompt_template = TaskPromptTemplate.SingleClickAction prompt_template = TaskPromptTemplate.SingleClickAction
elif block_yaml.action_type == ActionType.InputText: elif block_yaml.action_type == ActionType.INPUT_TEXT:
prompt_template = TaskPromptTemplate.SingleInputAction prompt_template = TaskPromptTemplate.SingleInputAction
elif block_yaml.action_type == ActionType.UploadFile: elif block_yaml.action_type == ActionType.UPLOAD_FILE:
prompt_template = TaskPromptTemplate.SingleUploadAction prompt_template = TaskPromptTemplate.SingleUploadAction
elif block_yaml.action_type == ActionType.SelectOption: elif block_yaml.action_type == ActionType.SELECT_OPTION:
prompt_template = TaskPromptTemplate.SingleSelectAction prompt_template = TaskPromptTemplate.SingleSelectAction
if not prompt_template: if not prompt_template: