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

Jon/allow block scripts to be fetched with status (#3469)

Browse Source
This commit is contained in:
Jonathan Dobson
2025-09-18 17:57:23 -04:00
committed by GitHub
parent f73de59d6c
commit f283958a52
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
skyvern/forge/sdk/db/client.py
View File

@@ -107,7 +107,7 @@ from skyvern.forge.sdk.workflow.models.workflow import (
WorkflowRunStatus, WorkflowRunStatus,
) )
from skyvern.schemas.runs import ProxyLocation, RunEngine, RunType from skyvern.schemas.runs import ProxyLocation, RunEngine, RunType
from skyvern.schemas.scripts import Script, ScriptBlock, ScriptFile from skyvern.schemas.scripts import Script, ScriptBlock, ScriptFile, ScriptStatus
from skyvern.schemas.steps import AgentStepOutput from skyvern.schemas.steps import AgentStepOutput
from skyvern.schemas.workflows import BlockStatus, BlockType, WorkflowStatus from skyvern.schemas.workflows import BlockStatus, BlockType, WorkflowStatus
from skyvern.webeye.actions.actions import Action from skyvern.webeye.actions.actions import Action
@@ -4088,6 +4088,7 @@ class AgentDB:
workflow_permanent_id: str, workflow_permanent_id: str,
cache_key_value: str, cache_key_value: str,
cache_key: str | None = None, cache_key: str | None = None,
statuses: list[ScriptStatus] | None = None,
) -> list[Script]: ) -> list[Script]:
"""Get latest script versions linked to a workflow by a specific cache_key_value.""" """Get latest script versions linked to a workflow by a specific cache_key_value."""
try: try:
@@ -4104,6 +4105,9 @@ class AgentDB:
if cache_key is not None: if cache_key is not None:
ws_script_ids_subquery = ws_script_ids_subquery.where(WorkflowScriptModel.cache_key == cache_key) ws_script_ids_subquery = ws_script_ids_subquery.where(WorkflowScriptModel.cache_key == cache_key)
if statuses is not None and len(statuses) > 0:
ws_script_ids_subquery = ws_script_ids_subquery.where(WorkflowScriptModel.status.in_(statuses))
# Latest version per script_id within the org and not deleted # Latest version per script_id within the org and not deleted
latest_versions_subquery = ( latest_versions_subquery = (
select( select(

2
skyvern/forge/sdk/routes/scripts.py
View File

@@ -295,12 +295,14 @@ async def get_workflow_script_blocks(
raise HTTPException(status_code=404, detail="Workflow not found") raise HTTPException(status_code=404, detail="Workflow not found")
cache_key = block_script_request.cache_key or workflow.cache_key or "" cache_key = block_script_request.cache_key or workflow.cache_key or ""
status = block_script_request.status
scripts = await app.DATABASE.get_workflow_scripts_by_cache_key_value( scripts = await app.DATABASE.get_workflow_scripts_by_cache_key_value(
organization_id=current_org.organization_id, organization_id=current_org.organization_id,
workflow_permanent_id=workflow_permanent_id, workflow_permanent_id=workflow_permanent_id,
cache_key_value=cache_key_value, cache_key_value=cache_key_value,
cache_key=cache_key, cache_key=cache_key,
statuses=[status] if status else None,
) )
if not scripts: if not scripts:

1
skyvern/schemas/scripts.py
View File

@@ -154,6 +154,7 @@ class ScriptBlocksResponse(BaseModel):
class ScriptBlocksRequest(BaseModel): class ScriptBlocksRequest(BaseModel):
cache_key_value: str cache_key_value: str
cache_key: str | None = None cache_key: str | None = None
status: ScriptStatus | None = None
class ScriptStatus(StrEnum): class ScriptStatus(StrEnum):