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

migrate generate_script -> run_with (BE) (#3550)

Browse Source
This commit is contained in:
Jonathan Dobson
2025-09-29 15:14:15 -04:00
committed by GitHub
parent e04f81fcda
commit 2a3cc647a5
10 changed files with 63 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1396,7 +1396,7 @@ class AgentDB:
version: int | None = None,
is_saved_task: bool = False,
status: WorkflowStatus = WorkflowStatus.published,
generate_script: bool = False,
run_with: str | None = None,
ai_fallback: bool = False,
cache_key: str | None = None,
run_sequentially: bool = False,
@@ -1418,7 +1418,7 @@ class AgentDB:
model=model,
is_saved_task=is_saved_task,
status=status,
generate_script=generate_script,
run_with=run_with,
ai_fallback=ai_fallback,
cache_key=cache_key,
run_sequentially=run_sequentially,
@@ -1625,7 +1625,7 @@ class AgentDB:
description: str | None = None,
workflow_definition: dict[str, Any] | None = None,
version: int | None = None,
generate_script: bool | None = None,
run_with: str | None = None,
cache_key: str | None = None,
) -> Workflow:
try:
@@ -1644,8 +1644,8 @@ class AgentDB:
workflow.workflow_definition = workflow_definition
if version is not None:
workflow.version = version
if generate_script is not None:
workflow.generate_script = generate_script
if run_with is not None:
workflow.run_with = run_with
if cache_key is not None:
workflow.cache_key = cache_key
await session.commit()
@@ -2795,7 +2795,7 @@ class AgentDB:
max_screenshot_scrolling_times: int | None = None,
extra_http_headers: dict[str, str] | None = None,
browser_address: str | None = None,
generate_script: bool = False,
run_with: str | None = None,
) -> TaskV2:
async with self.Session() as session:
new_task_v2 = TaskV2Model(
@@ -2815,7 +2815,7 @@ class AgentDB:
max_screenshot_scrolling_times=max_screenshot_scrolling_times,
extra_http_headers=extra_http_headers,
browser_address=browser_address,
generate_script=generate_script,
run_with=run_with,
)
session.add(new_task_v2)
await session.commit()

4
skyvern/forge/sdk/db/models.py
View File

@@ -245,6 +245,7 @@ class WorkflowModel(Base):
model = Column(JSON, nullable=True)
status = Column(String, nullable=False, default="published")
generate_script = Column(Boolean, default=False, nullable=False)
run_with = Column(String, nullable=True) # 'agent' or 'code'
ai_fallback = Column(Boolean, default=False, nullable=False)
cache_key = Column(String, nullable=True)
run_sequentially = Column(Boolean, nullable=True)
@@ -704,7 +705,8 @@ class TaskV2Model(Base):
max_screenshot_scrolling_times = Column(Integer, nullable=True)
extra_http_headers = Column(JSON, nullable=True)
browser_address = Column(String, nullable=True)
generate_script = Column(Boolean, nullable=False, default=False)
generate_script = Column(Boolean, default=False, nullable=False)
run_with = Column(String, nullable=True) # 'agent' or 'code'
queued_at = Column(DateTime, nullable=True)
started_at = Column(DateTime, nullable=True)

2
skyvern/forge/sdk/db/utils.py
View File

@@ -280,7 +280,7 @@ def convert_to_workflow(workflow_model: WorkflowModel, debug_enabled: bool = Fal
deleted_at=workflow_model.deleted_at,
status=WorkflowStatus(workflow_model.status),
extra_http_headers=workflow_model.extra_http_headers,
generate_script=workflow_model.generate_script,
run_with=workflow_model.run_with,
ai_fallback=workflow_model.ai_fallback,
cache_key=workflow_model.cache_key,
run_sequentially=workflow_model.run_sequentially,

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

@@ -567,7 +567,7 @@ async def create_workflow_from_prompt(
extra_http_headers=data.extra_http_headers,
max_iterations=x_max_iterations_override,
max_steps=x_max_steps_override,
generate_script=data.generate_script,
run_with=data.run_with,
ai_fallback=data.ai_fallback,
)
except Exception as e:

4
skyvern/forge/sdk/schemas/task_v2.py
View File

@@ -52,7 +52,7 @@ class TaskV2(BaseModel):
max_screenshot_scrolls: int | None = Field(default=None, alias="max_screenshot_scrolling_times")
extra_http_headers: dict[str, str] | None = None
browser_address: str | None = None
generate_script: bool = False
run_with: str | None = None
created_at: datetime
modified_at: datetime
@@ -156,7 +156,7 @@ class TaskV2Request(BaseModel):
max_screenshot_scrolls: int | None = None
extra_http_headers: dict[str, str] | None = None
browser_address: str | None = None
generate_script: bool = False
run_with: str | None = None
ai_fallback: bool = False
@field_validator("url", "webhook_callback_url", "totp_verification_url")

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

@@ -77,7 +77,7 @@ class Workflow(BaseModel):
status: WorkflowStatus = WorkflowStatus.published
max_screenshot_scrolls: int | None = None
extra_http_headers: dict[str, str] | None = None
generate_script: bool = False
run_with: str | None = None
ai_fallback: bool = False
cache_key: str | None = None
run_sequentially: bool | None = None

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

@@ -635,7 +635,7 @@ class WorkflowService:
is_saved_task: bool = False,
status: WorkflowStatus = WorkflowStatus.published,
extra_http_headers: dict[str, str] | None = None,
generate_script: bool = False,
run_with: str | None = None,
cache_key: str | None = None,
ai_fallback: bool | None = None,
run_sequentially: bool = False,
@@ -658,7 +658,7 @@ class WorkflowService:
is_saved_task=is_saved_task,
status=status,
extra_http_headers=extra_http_headers,
generate_script=generate_script,
run_with=run_with,
cache_key=cache_key,
ai_fallback=False if ai_fallback is None else ai_fallback,
run_sequentially=run_sequentially,
@@ -677,7 +677,7 @@ class WorkflowService:
extra_http_headers: dict[str, str] | None = None,
max_iterations: int | None = None,
max_steps: int | None = None,
generate_script: bool = True,
run_with: str | None = None,
ai_fallback: bool = True,
) -> Workflow:
metadata_prompt = prompt_engine.load_prompt(
@@ -720,7 +720,7 @@ class WorkflowService:
totp_identifier=totp_identifier,
max_screenshot_scrolling_times=max_screenshot_scrolling_times,
extra_http_headers=extra_http_headers,
generate_script=generate_script,
run_with=run_with,
ai_fallback=ai_fallback,
)
@@ -1776,7 +1776,7 @@ class WorkflowService:
version=existing_version + 1,
is_saved_task=request.is_saved_task,
status=request.status,
generate_script=request.generate_script,
run_with=request.run_with,
cache_key=request.cache_key,
ai_fallback=request.ai_fallback,
run_sequentially=request.run_sequentially,
@@ -1798,7 +1798,7 @@ class WorkflowService:
extra_http_headers=request.extra_http_headers,
is_saved_task=request.is_saved_task,
status=request.status,
generate_script=request.generate_script,
run_with=request.run_with,
cache_key=request.cache_key,
ai_fallback=request.ai_fallback,
run_sequentially=request.run_sequentially,
@@ -2417,7 +2417,7 @@ class WorkflowService:
proxy_location: ProxyLocation | None = None,
max_screenshot_scrolling_times: int | None = None,
extra_http_headers: dict[str, str] | None = None,
generate_script: bool = False,
run_with: str | None = None,
status: WorkflowStatus = WorkflowStatus.published,
) -> Workflow:
"""
@@ -2434,7 +2434,7 @@ class WorkflowService:
status=status,
max_screenshot_scrolls=max_screenshot_scrolling_times,
extra_http_headers=extra_http_headers,
generate_script=generate_script,
run_with=run_with,
)
return await app.WORKFLOW_SERVICE.create_workflow_from_request(
organization=organization,
@@ -2600,8 +2600,6 @@ class WorkflowService:
) -> bool:
if workflow_run.run_with == "code":
return True
if workflow_run.run_with == "agent":
return False
if workflow.generate_script:
if workflow.run_with == "code":
return True
return False

2
skyvern/schemas/workflows.py
View File

@@ -514,7 +514,7 @@ class WorkflowCreateYAMLRequest(BaseModel):
max_screenshot_scrolls: int | None = None
extra_http_headers: dict[str, str] | None = None
status: WorkflowStatus = WorkflowStatus.published
generate_script: bool = False
run_with: str | None = None
ai_fallback: bool = False
cache_key: str | None = None
run_sequentially: bool = False

13
skyvern/services/task_v2_service.py
View File

@@ -154,7 +154,7 @@ async def initialize_task_v2(
totp_identifier: str | None = None,
totp_verification_url: str | None = None,
webhook_callback_url: str | None = None,
publish_workflow: bool = False,
publish_workflow: bool = True,
parent_workflow_run_id: str | None = None,
extracted_information_schema: dict | list | str | None = None,
error_code_mapping: dict | None = None,
@@ -164,11 +164,8 @@ async def initialize_task_v2(
browser_session_id: str | None = None,
extra_http_headers: dict[str, str] | None = None,
browser_address: str | None = None,
generate_script: bool = False,
run_with: str | None = None,
) -> TaskV2:
if generate_script:
publish_workflow = True
task_v2 = await app.DATABASE.create_task_v2(
prompt=user_prompt,
organization_id=organization.organization_id,
@@ -182,7 +179,7 @@ async def initialize_task_v2(
max_screenshot_scrolling_times=max_screenshot_scrolling_times,
extra_http_headers=extra_http_headers,
browser_address=browser_address,
generate_script=generate_script,
run_with=run_with,
)
# set task_v2_id in context
context = skyvern_context.current()
@@ -229,7 +226,7 @@ async def initialize_task_v2(
status=workflow_status,
max_screenshot_scrolling_times=max_screenshot_scrolling_times,
extra_http_headers=extra_http_headers,
generate_script=generate_script,
run_with=run_with,
)
workflow_run = await app.WORKFLOW_SERVICE.setup_workflow_run(
request_id=None,
@@ -901,7 +898,7 @@ async def run_task_v2_helper(
context=context,
screenshots=completion_screenshots,
)
if task_v2.generate_script:
if task_v2.run_with == "code": # TODO(jdo): not sure about this one...
await app.WORKFLOW_SERVICE.generate_script_if_needed(
workflow=workflow,
workflow_run=workflow_run,