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

set a DEFAULT_TEXT_PROMPT_LLM_KEY if TextPromptBlock.llm_key is not passed to backend (#1280)

Browse Source
This commit is contained in:
Shuchang Zheng
2024-11-27 16:41:52 -08:00
committed by GitHub
parent eec7e7c40c
commit a8dfc51b5a
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
skyvern/forge/sdk/workflow/models/block.py
View File

@@ -765,10 +765,13 @@ async def user_code():
return self.build_block_result(success=True, output_parameter_value=result, status=BlockStatus.completed) return self.build_block_result(success=True, output_parameter_value=result, status=BlockStatus.completed)
DEFAULT_TEXT_PROMPT_LLM_KEY = settings.SECONDARY_LLM_KEY or settings.LLM_KEY
class TextPromptBlock(Block): class TextPromptBlock(Block):
block_type: Literal[BlockType.TEXT_PROMPT] = BlockType.TEXT_PROMPT block_type: Literal[BlockType.TEXT_PROMPT] = BlockType.TEXT_PROMPT
llm_key: str llm_key: str = DEFAULT_TEXT_PROMPT_LLM_KEY
prompt: str prompt: str
parameters: list[PARAMETER_TYPE] = [] parameters: list[PARAMETER_TYPE] = []
json_schema: dict[str, Any] | None = None json_schema: dict[str, Any] | None = None

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

@@ -3,6 +3,7 @@ from typing import Annotated, Any, Literal
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from skyvern.config import settings
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
@@ -154,6 +155,9 @@ class CodeBlockYAML(BlockYAML):
parameter_keys: list[str] | None = None parameter_keys: list[str] | None = None
DEFAULT_TEXT_PROMPT_LLM_KEY = settings.SECONDARY_LLM_KEY or settings.LLM_KEY
class TextPromptBlockYAML(BlockYAML): class TextPromptBlockYAML(BlockYAML):
# There is a mypy bug with Literal. Without the type: ignore, mypy will raise an error: # There is a mypy bug with Literal. Without the type: ignore, mypy will raise an error:
# Parameter 1 of Literal[...] cannot be of type "Any" # Parameter 1 of Literal[...] cannot be of type "Any"
@@ -161,7 +165,7 @@ class TextPromptBlockYAML(BlockYAML):
# to infer the type of the parameter_type attribute. # to infer the type of the parameter_type attribute.
block_type: Literal[BlockType.TEXT_PROMPT] = BlockType.TEXT_PROMPT # type: ignore block_type: Literal[BlockType.TEXT_PROMPT] = BlockType.TEXT_PROMPT # type: ignore
llm_key: str llm_key: str = DEFAULT_TEXT_PROMPT_LLM_KEY
prompt: str prompt: str
parameter_keys: list[str] | None = None parameter_keys: list[str] | None = None
json_schema: dict[str, Any] | None = None json_schema: dict[str, Any] | None = None