diff --git a/evaluation/core/__init__.py b/evaluation/core/__init__.py index 6d977e56..03b3a627 100644 --- a/evaluation/core/__init__.py +++ b/evaluation/core/__init__.py @@ -12,7 +12,7 @@ from pydantic import BaseModel from skyvern.forge import app from skyvern.forge.prompts import prompt_engine from skyvern.forge.sdk.api.files import create_folder_if_not_exist -from skyvern.forge.sdk.schemas.observers import ObserverTask, ObserverTaskRequest +from skyvern.forge.sdk.schemas.task_v2 import ObserverTask, ObserverTaskRequest from skyvern.forge.sdk.schemas.tasks import ProxyLocation, TaskRequest, TaskResponse, TaskStatus from skyvern.forge.sdk.workflow.models.workflow import WorkflowRequestBody, WorkflowRunStatus, WorkflowRunStatusResponse diff --git a/evaluation/script/create_webvoyager_observer.py b/evaluation/script/create_webvoyager_observer.py index fde08fc2..f17db51f 100644 --- a/evaluation/script/create_webvoyager_observer.py +++ b/evaluation/script/create_webvoyager_observer.py @@ -9,7 +9,7 @@ from evaluation.core import Evaluator, SkyvernClient from evaluation.core.utils import load_webvoyager_case_from_json from skyvern.forge import app from skyvern.forge.prompts import prompt_engine -from skyvern.forge.sdk.schemas.observers import ObserverTaskRequest +from skyvern.forge.sdk.schemas.task_v2 import ObserverTaskRequest async def create_observer_cruise( diff --git a/skyvern/agent/local.py b/skyvern/agent/local.py index badb87b8..dcb929d3 100644 --- a/skyvern/agent/local.py +++ b/skyvern/agent/local.py @@ -6,8 +6,8 @@ from skyvern.forge import app from skyvern.forge.sdk.core import security, skyvern_context from skyvern.forge.sdk.core.skyvern_context import SkyvernContext from skyvern.forge.sdk.db.enums import OrganizationAuthTokenType -from skyvern.forge.sdk.schemas.observers import ObserverTask, ObserverTaskRequest, ObserverTaskStatus from skyvern.forge.sdk.schemas.organizations import Organization +from skyvern.forge.sdk.schemas.task_v2 import ObserverTask, ObserverTaskRequest, ObserverTaskStatus from skyvern.forge.sdk.schemas.tasks import CreateTaskResponse, Task, TaskRequest, TaskResponse, TaskStatus from skyvern.forge.sdk.services import task_v2_service from skyvern.forge.sdk.services.org_auth_token_service import API_KEY_LIFETIME diff --git a/skyvern/forge/sdk/api/llm/api_handler_factory.py b/skyvern/forge/sdk/api/llm/api_handler_factory.py index 12e4325f..8207e1c0 100644 --- a/skyvern/forge/sdk/api/llm/api_handler_factory.py +++ b/skyvern/forge/sdk/api/llm/api_handler_factory.py @@ -23,7 +23,7 @@ from skyvern.forge.sdk.artifact.models import ArtifactType from skyvern.forge.sdk.core import skyvern_context from skyvern.forge.sdk.models import Step from skyvern.forge.sdk.schemas.ai_suggestions import AISuggestion -from skyvern.forge.sdk.schemas.observers import ObserverTask, ObserverThought +from skyvern.forge.sdk.schemas.task_v2 import ObserverTask, ObserverThought LOG = structlog.get_logger() diff --git a/skyvern/forge/sdk/api/llm/models.py b/skyvern/forge/sdk/api/llm/models.py index 19b2abf7..ac407b10 100644 --- a/skyvern/forge/sdk/api/llm/models.py +++ b/skyvern/forge/sdk/api/llm/models.py @@ -5,7 +5,7 @@ from litellm import AllowedFailsPolicy from skyvern.forge.sdk.models import Step from skyvern.forge.sdk.schemas.ai_suggestions import AISuggestion -from skyvern.forge.sdk.schemas.observers import ObserverTask, ObserverThought +from skyvern.forge.sdk.schemas.task_v2 import ObserverTask, ObserverThought from skyvern.forge.sdk.settings_manager import SettingsManager diff --git a/skyvern/forge/sdk/artifact/manager.py b/skyvern/forge/sdk/artifact/manager.py index a90c0fd0..223b0335 100644 --- a/skyvern/forge/sdk/artifact/manager.py +++ b/skyvern/forge/sdk/artifact/manager.py @@ -9,7 +9,7 @@ from skyvern.forge.sdk.artifact.models import Artifact, ArtifactType, LogEntityT from skyvern.forge.sdk.db.id import generate_artifact_id from skyvern.forge.sdk.models import Step from skyvern.forge.sdk.schemas.ai_suggestions import AISuggestion -from skyvern.forge.sdk.schemas.observers import ObserverTask, ObserverThought +from skyvern.forge.sdk.schemas.task_v2 import ObserverTask, ObserverThought from skyvern.forge.sdk.schemas.workflow_runs import WorkflowRunBlock LOG = structlog.get_logger(__name__) diff --git a/skyvern/forge/sdk/artifact/storage/base.py b/skyvern/forge/sdk/artifact/storage/base.py index 103b1fa0..7c01cbe6 100644 --- a/skyvern/forge/sdk/artifact/storage/base.py +++ b/skyvern/forge/sdk/artifact/storage/base.py @@ -3,7 +3,7 @@ from abc import ABC, abstractmethod from skyvern.forge.sdk.artifact.models import Artifact, ArtifactType, LogEntityType from skyvern.forge.sdk.models import Step from skyvern.forge.sdk.schemas.ai_suggestions import AISuggestion -from skyvern.forge.sdk.schemas.observers import ObserverTask, ObserverThought +from skyvern.forge.sdk.schemas.task_v2 import ObserverTask, ObserverThought from skyvern.forge.sdk.schemas.workflow_runs import WorkflowRunBlock # TODO: This should be a part of the ArtifactType model diff --git a/skyvern/forge/sdk/artifact/storage/local.py b/skyvern/forge/sdk/artifact/storage/local.py index 035d0587..f9f0358d 100644 --- a/skyvern/forge/sdk/artifact/storage/local.py +++ b/skyvern/forge/sdk/artifact/storage/local.py @@ -11,7 +11,7 @@ from skyvern.forge.sdk.artifact.models import Artifact, ArtifactType, LogEntityT from skyvern.forge.sdk.artifact.storage.base import FILE_EXTENTSION_MAP, BaseStorage from skyvern.forge.sdk.models import Step from skyvern.forge.sdk.schemas.ai_suggestions import AISuggestion -from skyvern.forge.sdk.schemas.observers import ObserverTask, ObserverThought +from skyvern.forge.sdk.schemas.task_v2 import ObserverTask, ObserverThought from skyvern.forge.sdk.schemas.workflow_runs import WorkflowRunBlock LOG = structlog.get_logger() diff --git a/skyvern/forge/sdk/artifact/storage/s3.py b/skyvern/forge/sdk/artifact/storage/s3.py index 21ab740d..1a5987cf 100644 --- a/skyvern/forge/sdk/artifact/storage/s3.py +++ b/skyvern/forge/sdk/artifact/storage/s3.py @@ -16,7 +16,7 @@ from skyvern.forge.sdk.artifact.models import Artifact, ArtifactType, LogEntityT from skyvern.forge.sdk.artifact.storage.base import FILE_EXTENTSION_MAP, BaseStorage from skyvern.forge.sdk.models import Step from skyvern.forge.sdk.schemas.ai_suggestions import AISuggestion -from skyvern.forge.sdk.schemas.observers import ObserverTask, ObserverThought +from skyvern.forge.sdk.schemas.task_v2 import ObserverTask, ObserverThought from skyvern.forge.sdk.schemas.workflow_runs import WorkflowRunBlock diff --git a/skyvern/forge/sdk/db/client.py b/skyvern/forge/sdk/db/client.py index 78bc0016..3128044c 100644 --- a/skyvern/forge/sdk/db/client.py +++ b/skyvern/forge/sdk/db/client.py @@ -63,12 +63,12 @@ from skyvern.forge.sdk.log_artifacts import save_workflow_run_logs from skyvern.forge.sdk.models import Step, StepStatus from skyvern.forge.sdk.schemas.ai_suggestions import AISuggestion from skyvern.forge.sdk.schemas.credentials import Credential, CredentialType -from skyvern.forge.sdk.schemas.observers import ObserverTask, ObserverTaskStatus, ObserverThought, ObserverThoughtType from skyvern.forge.sdk.schemas.organization_bitwarden_collections import OrganizationBitwardenCollection from skyvern.forge.sdk.schemas.organizations import Organization, OrganizationAuthToken from skyvern.forge.sdk.schemas.persistent_browser_sessions import PersistentBrowserSession from skyvern.forge.sdk.schemas.task_generations import TaskGeneration from skyvern.forge.sdk.schemas.task_runs import TaskRun, TaskRunType +from skyvern.forge.sdk.schemas.task_v2 import ObserverTask, ObserverTaskStatus, ObserverThought, ObserverThoughtType from skyvern.forge.sdk.schemas.tasks import OrderBy, ProxyLocation, SortDirection, Task, TaskStatus from skyvern.forge.sdk.schemas.totp_codes import TOTPCode from skyvern.forge.sdk.schemas.workflow_runs import WorkflowRunBlock diff --git a/skyvern/forge/sdk/db/models.py b/skyvern/forge/sdk/db/models.py index 8882dc2b..f2b914be 100644 --- a/skyvern/forge/sdk/db/models.py +++ b/skyvern/forge/sdk/db/models.py @@ -47,7 +47,7 @@ from skyvern.forge.sdk.db.id import ( generate_workflow_run_block_id, generate_workflow_run_id, ) -from skyvern.forge.sdk.schemas.observers import ObserverThoughtType +from skyvern.forge.sdk.schemas.task_v2 import ObserverThoughtType class Base(AsyncAttrs, DeclarativeBase): diff --git a/skyvern/forge/sdk/executor/async_executor.py b/skyvern/forge/sdk/executor/async_executor.py index 4d848a80..cc60d499 100644 --- a/skyvern/forge/sdk/executor/async_executor.py +++ b/skyvern/forge/sdk/executor/async_executor.py @@ -7,7 +7,7 @@ from skyvern.exceptions import OrganizationNotFound from skyvern.forge import app from skyvern.forge.sdk.core import skyvern_context from skyvern.forge.sdk.core.skyvern_context import SkyvernContext -from skyvern.forge.sdk.schemas.observers import ObserverTaskStatus +from skyvern.forge.sdk.schemas.task_v2 import ObserverTaskStatus from skyvern.forge.sdk.schemas.tasks import TaskStatus from skyvern.forge.sdk.services import task_v2_service from skyvern.forge.sdk.workflow.models.workflow import WorkflowRunStatus diff --git a/skyvern/forge/sdk/routes/agent_protocol.py b/skyvern/forge/sdk/routes/agent_protocol.py index 23cc5321..440a59a9 100644 --- a/skyvern/forge/sdk/routes/agent_protocol.py +++ b/skyvern/forge/sdk/routes/agent_protocol.py @@ -39,7 +39,6 @@ from skyvern.forge.sdk.db.enums import OrganizationAuthTokenType from skyvern.forge.sdk.executor.factory import AsyncExecutorFactory from skyvern.forge.sdk.models import Step from skyvern.forge.sdk.schemas.ai_suggestions import AISuggestionBase, AISuggestionRequest -from skyvern.forge.sdk.schemas.observers import ObserverTaskRequest from skyvern.forge.sdk.schemas.organizations import ( GetOrganizationAPIKeysResponse, GetOrganizationsResponse, @@ -48,6 +47,7 @@ from skyvern.forge.sdk.schemas.organizations import ( ) from skyvern.forge.sdk.schemas.task_generations import GenerateTaskRequest, TaskGeneration, TaskGenerationBase from skyvern.forge.sdk.schemas.task_runs import TaskRunType +from skyvern.forge.sdk.schemas.task_v2 import ObserverTaskRequest from skyvern.forge.sdk.schemas.tasks import ( CreateTaskResponse, OrderBy, diff --git a/skyvern/forge/sdk/schemas/observers.py b/skyvern/forge/sdk/schemas/task_v2.py similarity index 100% rename from skyvern/forge/sdk/schemas/observers.py rename to skyvern/forge/sdk/schemas/task_v2.py diff --git a/skyvern/forge/sdk/schemas/workflow_runs.py b/skyvern/forge/sdk/schemas/workflow_runs.py index 4bbd5a66..1122b68a 100644 --- a/skyvern/forge/sdk/schemas/workflow_runs.py +++ b/skyvern/forge/sdk/schemas/workflow_runs.py @@ -6,7 +6,7 @@ from typing import Any from pydantic import BaseModel -from skyvern.forge.sdk.schemas.observers import ObserverThought +from skyvern.forge.sdk.schemas.task_v2 import ObserverThought from skyvern.forge.sdk.workflow.models.block import BlockType from skyvern.webeye.actions.actions import Action diff --git a/skyvern/forge/sdk/services/task_v2_service.py b/skyvern/forge/sdk/services/task_v2_service.py index ea4a940c..0cc7ccf2 100644 --- a/skyvern/forge/sdk/services/task_v2_service.py +++ b/skyvern/forge/sdk/services/task_v2_service.py @@ -17,15 +17,15 @@ from skyvern.forge.sdk.core.hashing import generate_url_hash from skyvern.forge.sdk.core.security import generate_skyvern_webhook_headers from skyvern.forge.sdk.core.skyvern_context import SkyvernContext from skyvern.forge.sdk.db.enums import OrganizationAuthTokenType -from skyvern.forge.sdk.schemas.observers import ( +from skyvern.forge.sdk.schemas.organizations import Organization +from skyvern.forge.sdk.schemas.task_runs import TaskRunType +from skyvern.forge.sdk.schemas.task_v2 import ( ObserverMetadata, ObserverTask, ObserverTaskStatus, ObserverThoughtScenario, ObserverThoughtType, ) -from skyvern.forge.sdk.schemas.organizations import Organization -from skyvern.forge.sdk.schemas.task_runs import TaskRunType from skyvern.forge.sdk.schemas.tasks import ProxyLocation from skyvern.forge.sdk.schemas.workflow_runs import WorkflowRunTimeline, WorkflowRunTimelineType from skyvern.forge.sdk.workflow.models.block import ( diff --git a/skyvern/forge/sdk/workflow/models/block.py b/skyvern/forge/sdk/workflow/models/block.py index 7ddb4589..356e6ce3 100644 --- a/skyvern/forge/sdk/workflow/models/block.py +++ b/skyvern/forge/sdk/workflow/models/block.py @@ -49,7 +49,7 @@ from skyvern.forge.sdk.api.llm.api_handler_factory import LLMAPIHandlerFactory from skyvern.forge.sdk.artifact.models import ArtifactType from skyvern.forge.sdk.core.validators import prepend_scheme_and_validate_url from skyvern.forge.sdk.db.enums import TaskType -from skyvern.forge.sdk.schemas.observers import ObserverTaskStatus +from skyvern.forge.sdk.schemas.task_v2 import ObserverTaskStatus from skyvern.forge.sdk.schemas.tasks import Task, TaskOutput, TaskStatus from skyvern.forge.sdk.workflow.context_manager import BlockMetadata, WorkflowRunContext from skyvern.forge.sdk.workflow.exceptions import ( diff --git a/skyvern/forge/sdk/workflow/models/workflow.py b/skyvern/forge/sdk/workflow/models/workflow.py index 31ce84c9..daaae59c 100644 --- a/skyvern/forge/sdk/workflow/models/workflow.py +++ b/skyvern/forge/sdk/workflow/models/workflow.py @@ -5,7 +5,7 @@ from typing import Any, List from pydantic import BaseModel, field_validator from skyvern.forge.sdk.core.validators import validate_url -from skyvern.forge.sdk.schemas.observers import ObserverTask +from skyvern.forge.sdk.schemas.task_v2 import ObserverTask from skyvern.forge.sdk.schemas.tasks import ProxyLocation from skyvern.forge.sdk.workflow.exceptions import WorkflowDefinitionHasDuplicateBlockLabels from skyvern.forge.sdk.workflow.models.block import BlockTypeVar