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

[Backend] Fix - Task V2 conversion changes to make new proxy city/state feature work (#4153)

Browse Source
This commit is contained in:
Marc Kelechava
2025-12-01 16:08:36 -08:00
committed by GitHub
parent 342629002a
commit acce1c869d
3 changed files with 54 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,6 +66,7 @@ from skyvern.forge.sdk.db.utils import (
convert_to_script_file,
convert_to_step,
convert_to_task,
convert_to_task_v2,
convert_to_workflow,
convert_to_workflow_parameter,
convert_to_workflow_run,
@@ -3524,7 +3525,7 @@ class AgentDB:
.filter_by(organization_id=organization_id)
)
).first():
return TaskV2.model_validate(task_v2)
return convert_to_task_v2(task_v2, debug_enabled=self.debug_enabled)
return None
async def delete_thoughts(self, task_v2_id: str, organization_id: str | None = None) -> None:
@@ -3551,7 +3552,7 @@ class AgentDB:
.filter_by(workflow_run_id=workflow_run_id)
)
).first():
return TaskV2.model_validate(task_v2)
return convert_to_task_v2(task_v2, debug_enabled=self.debug_enabled)
return None
async def get_thought(self, thought_id: str, organization_id: str | None = None) -> Thought | None:
@@ -3628,7 +3629,7 @@ class AgentDB:
session.add(new_task_v2)
await session.commit()
await session.refresh(new_task_v2)
return TaskV2.model_validate(new_task_v2)
return convert_to_task_v2(new_task_v2, debug_enabled=self.debug_enabled)
async def create_thought(
self,
@@ -3784,7 +3785,7 @@ class AgentDB:
task_v2.webhook_failure_reason = webhook_failure_reason
await session.commit()
await session.refresh(task_v2)
return TaskV2.model_validate(task_v2)
return convert_to_task_v2(task_v2, debug_enabled=self.debug_enabled)
raise NotFoundError(f"TaskV2 {task_v2_id} not found")
async def create_workflow_run_block(

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

@@ -20,6 +20,7 @@ from skyvern.forge.sdk.db.models import (
ScriptModel,
StepModel,
TaskModel,
TaskV2Model,
WorkflowModel,
WorkflowParameterModel,
WorkflowRunBlockModel,
@@ -36,6 +37,7 @@ from skyvern.forge.sdk.schemas.organizations import (
Organization,
OrganizationAuthToken,
)
from skyvern.forge.sdk.schemas.task_v2 import TaskV2
from skyvern.forge.sdk.schemas.tasks import Task, TaskStatus
from skyvern.forge.sdk.schemas.workflow_runs import WorkflowRunBlock
from skyvern.forge.sdk.workflow.models.parameter import (
@@ -204,6 +206,15 @@ def convert_to_task(task_obj: TaskModel, debug_enabled: bool = False, workflow_p
return task
def convert_to_task_v2(task_v2_model: TaskV2Model, debug_enabled: bool = False) -> TaskV2:
if debug_enabled:
LOG.debug("Converting TaskV2Model to TaskV2", observer_cruise_id=task_v2_model.observer_cruise_id)
task_v2_data = {column.name: getattr(task_v2_model, column.name) for column in TaskV2Model.__table__.columns}
# Deserialize proxy_location FIRST (string → GeoTarget), otherwise model_validate will fail for city/state proxy selections
task_v2_data["proxy_location"] = _deserialize_proxy_location(task_v2_model.proxy_location)
return TaskV2.model_validate(task_v2_data)
def convert_to_step(step_model: StepModel, debug_enabled: bool = False) -> Step:
if debug_enabled:
LOG.debug("Converting StepModel to Step", step_id=step_model.step_id)