Automate browser based workflows with AI
Python aiapiautomationbrowserbrowser-automationcomputergptllmplaywrightpowerautomatepuppeteerpythonrpaseleniumvisionworkflow
fix(tasks): cancel-button gating, webhook-replay runId, google-oauth valid flag (#7953)
Shuchang Zheng248e1d1e0cea
diff --git a/skyvern-frontend/src/api/types.ts b/skyvern-frontend/src/api/types.tsindex 233d36b5d..88bc5e25a 100644--- a/skyvern-frontend/src/api/types.ts+++ b/skyvern-frontend/src/api/types.ts@@ -180,6 +180,7 @@ export type TaskApiResponse = {screenshot_url: string | null;recording_url: string | null;recording_archived?: boolean;+ browser_console_log_url?: string | null;failure_reason: string | null;failure_category: Array<FailureCategory> | null;webhook_failure_reason: string | null;diff --git a/skyvern-frontend/src/routes/tasks/create/CreateNewTaskFormPage.tsx b/skyvern-frontend/src/routes/tasks/create/CreateNewTaskFormPage.tsxindex 095c7e07f..558e2d629 100644--- a/skyvern-frontend/src/routes/tasks/create/CreateNewTaskFormPage.tsx+++ b/skyvern-frontend/src/routes/tasks/create/CreateNewTaskFormPage.tsx@@ -33,8 +33,8 @@ function CreateNewTaskFormPage() {}if (template === "from-prompt") {- const data = location.state?.data as TaskGenerationApiResponse;- if (!data.url) {+ const data = location.state?.data as TaskGenerationApiResponse | undefined;+ if (!data || !data.url) {return <div>Something went wrong, please try again</div>; // this should never happen}return (diff --git a/skyvern-frontend/src/routes/tasks/detail/StepInfo.tsx b/skyvern-frontend/src/routes/tasks/detail/StepInfo.tsxdeleted file mode 100644index 7bc7b27f2..000000000--- a/skyvern-frontend/src/routes/tasks/detail/StepInfo.tsx+++ /dev/null@@ -1,45 +0,0 @@-import { StepApiResponse } from "@/api/types";-import { StatusBadge } from "@/components/StatusBadge";-import { Label } from "@/components/ui/label";-import { Skeleton } from "@/components/ui/skeleton";-import { basicLocalTimeFormat, basicTimeFormat } from "@/util/timeFormat";--type Props = {- isFetching: boolean;- stepProps?: StepApiResponse;-};--function StepInfo({ isFetching, stepProps }: Props) {- return (- <div className="flex flex-col gap-4 p-4">- <div className="flex items-center">- <Label className="w-24">Step ID:</Label>- {isFetching ? (- <Skeleton className="h-4 w-40" />- ) : (- <span>{stepProps?.step_id}</span>- )}- </div>- <div className="flex items-center">- <Label className="w-24">Status:</Label>- {isFetching ? (- <Skeleton className="h-4 w-40" />- ) : stepProps ? (- <StatusBadge status={stepProps.status} />- ) : null}- </div>- <div className="flex items-center">- <Label className="w-24">Created At:</Label>- {isFetching ? (- <Skeleton className="h-4 w-40" />- ) : stepProps ? (- <span title={basicTimeFormat(stepProps.created_at)}>- {basicLocalTimeFormat(stepProps.created_at)}- </span>- ) : null}- </div>- </div>- );-}--export { StepInfo };diff --git a/skyvern-frontend/src/routes/tasks/detail/TaskDetails.tsx b/skyvern-frontend/src/routes/tasks/detail/TaskDetails.tsxindex f653870fa..a90a6820d 100644--- a/skyvern-frontend/src/routes/tasks/detail/TaskDetails.tsx+++ b/skyvern-frontend/src/routes/tasks/detail/TaskDetails.tsx@@ -36,7 +36,7 @@ import { buildTaskRunPayload } from "@/util/taskRunPayload";import { PlayIcon, ReloadIcon } from "@radix-ui/react-icons";import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";import { Link, Outlet } from "react-router-dom";-import { statusIsFinalized } from "../types";+import { statusIsCancellable, statusIsFinalized } from "../types";import { MAX_STEPS_DEFAULT } from "../constants";import { useTaskQuery } from "./hooks/useTaskQuery";import { useFirstParam } from "@/hooks/useFirstParam";@@ -170,8 +170,7 @@ function TaskDetails() {</div>) : null;- const taskIsRunningOrQueued =- task?.status === Status.Running || task?.status === Status.Queued;+ const taskIsCancellable = task ? statusIsCancellable(task) : false;const taskHasTerminalState = task && statusIsFinalized(task);@@ -205,6 +204,22 @@ function TaskDetails() {</div>) : null;+ const browserConsoleLog = task?.browser_console_log_url ? (+ <div className="space-y-1">+ <Label>Browser Console Log</Label>+ <div>+ <a+ href={task.browser_console_log_url}+ target="_blank"+ rel="noopener noreferrer"+ className="text-sm underline underline-offset-4"+ >+ Download console log+ </a>+ </div>+ </div>+ ) : null;+return (<div className="flex flex-col gap-8"><header className="space-y-3">@@ -268,13 +283,13 @@ function TaskDetails() {onTestWebhook={() => setReplayOpen(true)}/><WebhookReplayDialog- runId={task?.workflow_run_id ?? ""}+ runId={task?.workflow_run_id ?? task?.task_id ?? ""}disabled={taskIsLoading || !taskHasTerminalState}open={replayOpen}onOpenChange={setReplayOpen}hideTrigger/>- {taskIsRunningOrQueued && (+ {taskIsCancellable && (<Dialog><DialogTrigger asChild><Button variant="destructive">Cancel</Button>@@ -345,6 +360,7 @@ function TaskDetails() {{extractedInformation}{failureReason}{webhookFailureReason}+ {browserConsoleLog}</>)}<SwitchBarNavigationdiff --git a/skyvern-frontend/src/routes/tasks/detail/TaskRecording.tsx b/skyvern-frontend/src/routes/tasks/detail/TaskRecording.tsxindex 1cb90f0bc..1ae28b432 100644--- a/skyvern-frontend/src/routes/tasks/detail/TaskRecording.tsx+++ b/skyvern-frontend/src/routes/tasks/detail/TaskRecording.tsx@@ -42,6 +42,16 @@ function TaskRecording() {return <div>Error loading recording</div>;}+ if (recordingData?.archived) {+ return (+ <div className="text-muted-foreground">+ This recording has been archived. To request restoration, please contact+ {/* TODO: add a "Request Restore" button */}+ </div>+ );+ }+if (recordingData?.url) {return (<ArtifactVideo@@ -53,16 +63,6 @@ function TaskRecording() {);}- if (recordingData?.archived) {- return (- <div className="text-muted-foreground">- This recording has been archived. To request restoration, please contact- {/* TODO: add a "Request Restore" button */}- </div>- );- }-return <div>No recording available for this task</div>;}diff --git a/skyvern-frontend/src/routes/tasks/list/TaskHistory.tsx b/skyvern-frontend/src/routes/tasks/list/TaskHistory.tsxindex 0b838fb9a..becd25f94 100644--- a/skyvern-frontend/src/routes/tasks/list/TaskHistory.tsx+++ b/skyvern-frontend/src/routes/tasks/list/TaskHistory.tsx@@ -145,7 +145,14 @@ function TaskHistory() {<div className="flex gap-2"><StatusFilterDropdownvalues={statusFilters}- onChange={setStatusFilters}+ onChange={(values) => {+ setStatusFilters(values);+ if (page !== 1) {+ const params = new URLSearchParams(searchParams);+ params.set("page", "1");+ setSearchParams(params, { replace: true });+ }+ }}/><Button variant="secondary" onClick={handleExport}><DownloadIcon className="mr-2" />diff --git a/skyvern/forge/sdk/schemas/google_oauth.py b/skyvern/forge/sdk/schemas/google_oauth.pyindex 56d359102..62fd01aa7 100644--- a/skyvern/forge/sdk/schemas/google_oauth.py+++ b/skyvern/forge/sdk/schemas/google_oauth.py@@ -1,7 +1,9 @@from datetime import datetimefrom typing import Literal-from pydantic import BaseModel, Field, field_validator+from pydantic import BaseModel, Field, computed_field, field_validator++STATE_ACTIVE = "active"class GoogleOAuthClientConfig(BaseModel):@@ -81,6 +83,11 @@ class GoogleOAuthCredentialBase(BaseModel):created_at: datetimemodified_at: datetime+ @computed_field # type: ignore[prop-decorator]+ @property+ def valid(self) -> bool:+ return self.state == STATE_ACTIVE+class GoogleOAuthCredentialResponse(BaseModel):credential: GoogleOAuthCredentialBase