Automate browser based workflows with AI
Python aiapiautomationbrowserbrowser-automationcomputergptllmplaywrightpowerautomatepuppeteerpythonrpaseleniumvisionworkflow
migrate Organization data model from skyvern/forge/sdk/models.py to skyvern/forge/sdk/schemas/organizations.py (#1343)
Shuchang Zheng759187354633
diff --git a/scripts/create_api_key.py b/scripts/create_api_key.pyindex 17eafb6de..783ada993 100644--- a/scripts/create_api_key.py+++ b/scripts/create_api_key.py@@ -5,7 +5,7 @@ import typerfrom skyvern.forge.app import DATABASEfrom skyvern.forge.sdk.core import security-from skyvern.forge.sdk.models import OrganizationAuthToken, OrganizationAuthTokenType+from skyvern.forge.sdk.schemas.organizations import OrganizationAuthToken, OrganizationAuthTokenTypeAPI_KEY_LIFETIME = timedelta(weeks=5200)diff --git a/skyvern/forge/agent.py b/skyvern/forge/agent.pyindex 2da5b0a65..aa9d5c5b0 100644--- a/skyvern/forge/agent.py+++ b/skyvern/forge/agent.py@@ -50,7 +50,8 @@ from skyvern.forge.sdk.core import skyvern_contextfrom skyvern.forge.sdk.core.security import generate_skyvern_signaturefrom skyvern.forge.sdk.core.validators import prepend_scheme_and_validate_urlfrom skyvern.forge.sdk.db.enums import TaskType-from skyvern.forge.sdk.models import Organization, Step, StepStatus+from skyvern.forge.sdk.models import Step, StepStatus+from skyvern.forge.sdk.schemas.organizations import Organizationfrom skyvern.forge.sdk.schemas.tasks import Task, TaskRequest, TaskResponse, TaskStatusfrom skyvern.forge.sdk.workflow.context_manager import WorkflowRunContextfrom skyvern.forge.sdk.workflow.models.block import ActionBlock, BaseTaskBlock, ValidationBlockdiff --git a/skyvern/forge/agent_functions.py b/skyvern/forge/agent_functions.pyindex 0b7a329a4..5e2f1e1d0 100644--- a/skyvern/forge/agent_functions.py+++ b/skyvern/forge/agent_functions.py@@ -14,7 +14,8 @@ from skyvern.forge import appfrom skyvern.forge.async_operations import AsyncOperationfrom skyvern.forge.prompts import prompt_enginefrom skyvern.forge.sdk.api.llm.exceptions import LLMProviderError-from skyvern.forge.sdk.models import Organization, Step, StepStatus+from skyvern.forge.sdk.models import Step, StepStatus+from skyvern.forge.sdk.schemas.organizations import Organizationfrom skyvern.forge.sdk.schemas.tasks import Task, TaskStatusfrom skyvern.webeye.browser_factory import BrowserStatefrom skyvern.webeye.scraper.scraper import ELEMENT_NODE_ATTRIBUTES, CleanupElementTreeFunc, json_to_htmldiff --git a/skyvern/forge/app.py b/skyvern/forge/app.pyindex 630aa700d..49f5e45a3 100644--- a/skyvern/forge/app.py+++ b/skyvern/forge/app.py@@ -11,7 +11,7 @@ from skyvern.forge.sdk.artifact.storage.s3 import S3Storagefrom skyvern.forge.sdk.cache.factory import CacheFactoryfrom skyvern.forge.sdk.db.client import AgentDBfrom skyvern.forge.sdk.experimentation.providers import BaseExperimentationProvider, NoOpExperimentationProvider-from skyvern.forge.sdk.models import Organization+from skyvern.forge.sdk.schemas.organizations import Organizationfrom skyvern.forge.sdk.settings_manager import SettingsManagerfrom skyvern.forge.sdk.workflow.context_manager import WorkflowContextManagerfrom skyvern.forge.sdk.workflow.service import WorkflowServicediff --git a/skyvern/forge/sdk/core/permissions/permission_checkers.py b/skyvern/forge/sdk/core/permissions/permission_checkers.pyindex 2049ee3ad..01b9a7481 100644--- a/skyvern/forge/sdk/core/permissions/permission_checkers.py+++ b/skyvern/forge/sdk/core/permissions/permission_checkers.py@@ -1,6 +1,6 @@import abc-from skyvern.forge.sdk.models import Organization+from skyvern.forge.sdk.schemas.organizations import Organizationclass PermissionChecker(abc.ABC):diff --git a/skyvern/forge/sdk/db/client.py b/skyvern/forge/sdk/db/client.pyindex 7cad9dce7..7d4dfeed3 100644--- a/skyvern/forge/sdk/db/client.py+++ b/skyvern/forge/sdk/db/client.py@@ -49,7 +49,8 @@ from skyvern.forge.sdk.db.utils import (convert_to_workflow_run_output_parameter,convert_to_workflow_run_parameter,)-from skyvern.forge.sdk.models import Organization, OrganizationAuthToken, Step, StepStatus+from skyvern.forge.sdk.models import Step, StepStatus+from skyvern.forge.sdk.schemas.organizations import Organization, OrganizationAuthTokenfrom skyvern.forge.sdk.schemas.task_generations import TaskGenerationfrom skyvern.forge.sdk.schemas.tasks import OrderBy, ProxyLocation, SortDirection, Task, TaskStatusfrom skyvern.forge.sdk.schemas.totp_codes import TOTPCodediff --git a/skyvern/forge/sdk/db/utils.py b/skyvern/forge/sdk/db/utils.pyindex 7c11c26ed..4e182e295 100644--- a/skyvern/forge/sdk/db/utils.py+++ b/skyvern/forge/sdk/db/utils.py@@ -22,7 +22,8 @@ from skyvern.forge.sdk.db.models import (WorkflowRunOutputParameterModel,WorkflowRunParameterModel,)-from skyvern.forge.sdk.models import Organization, OrganizationAuthToken, Step, StepStatus+from skyvern.forge.sdk.models import Step, StepStatus+from skyvern.forge.sdk.schemas.organizations import Organization, OrganizationAuthTokenfrom skyvern.forge.sdk.schemas.tasks import ProxyLocation, Task, TaskStatusfrom skyvern.forge.sdk.workflow.models.parameter import (AWSSecretParameter,diff --git a/skyvern/forge/sdk/models.py b/skyvern/forge/sdk/models.pyindex e40b0fcc6..642ad08f9 100644--- a/skyvern/forge/sdk/models.py+++ b/skyvern/forge/sdk/models.py@@ -3,9 +3,8 @@ from __future__ import annotationsfrom datetime import datetimefrom enum import StrEnum-from pydantic import BaseModel, ConfigDict+from pydantic import BaseModel-from skyvern.forge.sdk.db.enums import OrganizationAuthTokenTypefrom skyvern.webeye.actions.actions import ActionTypefrom skyvern.webeye.actions.models import AgentStepOutput@@ -130,32 +129,6 @@ class Step(BaseModel):return False-class Organization(BaseModel):- model_config = ConfigDict(from_attributes=True)-- organization_id: str- organization_name: str- webhook_callback_url: str | None = None- max_steps_per_run: int | None = None- max_retries_per_step: int | None = None- domain: str | None = None- bw_organization_id: str | None = None- bw_collection_ids: list[str] | None = None-- created_at: datetime- modified_at: datetime---class OrganizationAuthToken(BaseModel):- id: str- organization_id: str- token_type: OrganizationAuthTokenType- token: str- valid: bool- created_at: datetime- modified_at: datetime--class TokenPayload(BaseModel):sub: strexp: intdiff --git a/skyvern/forge/sdk/routes/agent_protocol.py b/skyvern/forge/sdk/routes/agent_protocol.pyindex db37a2d36..a5981274c 100644--- a/skyvern/forge/sdk/routes/agent_protocol.py+++ b/skyvern/forge/sdk/routes/agent_protocol.py@@ -34,10 +34,11 @@ from skyvern.forge.sdk.core.permissions.permission_checker_factory import Permisfrom skyvern.forge.sdk.core.security import generate_skyvern_signaturefrom skyvern.forge.sdk.db.enums import OrganizationAuthTokenTypefrom skyvern.forge.sdk.executor.factory import AsyncExecutorFactory-from skyvern.forge.sdk.models import Organization, Step+from skyvern.forge.sdk.models import Stepfrom skyvern.forge.sdk.schemas.organizations import (GetOrganizationAPIKeysResponse,GetOrganizationsResponse,+ Organization,OrganizationUpdate,)from skyvern.forge.sdk.schemas.task_generations import GenerateTaskRequest, TaskGeneration, TaskGenerationBasediff --git a/skyvern/forge/sdk/schemas/organizations.py b/skyvern/forge/sdk/schemas/organizations.pyindex 8d145d5b4..2b4494248 100644--- a/skyvern/forge/sdk/schemas/organizations.py+++ b/skyvern/forge/sdk/schemas/organizations.py@@ -1,6 +1,34 @@-from pydantic import BaseModel+from datetime import datetime-from skyvern.forge.sdk.models import Organization, OrganizationAuthToken+from pydantic import BaseModel, ConfigDict++from skyvern.forge.sdk.db.enums import OrganizationAuthTokenType+++class Organization(BaseModel):+ model_config = ConfigDict(from_attributes=True)++ organization_id: str+ organization_name: str+ webhook_callback_url: str | None = None+ max_steps_per_run: int | None = None+ max_retries_per_step: int | None = None+ domain: str | None = None+ bw_organization_id: str | None = None+ bw_collection_ids: list[str] | None = None++ created_at: datetime+ modified_at: datetime+++class OrganizationAuthToken(BaseModel):+ id: str+ organization_id: str+ token_type: OrganizationAuthTokenType+ token: str+ valid: bool+ created_at: datetime+ modified_at: datetimeclass GetOrganizationsResponse(BaseModel):diff --git a/skyvern/forge/sdk/services/org_auth_service.py b/skyvern/forge/sdk/services/org_auth_service.pyindex 1eda1a7ea..edd57d4e7 100644--- a/skyvern/forge/sdk/services/org_auth_service.py+++ b/skyvern/forge/sdk/services/org_auth_service.py@@ -12,7 +12,8 @@ from skyvern.config import settingsfrom skyvern.forge import appfrom skyvern.forge.sdk.core import skyvern_contextfrom skyvern.forge.sdk.db.client import AgentDB-from skyvern.forge.sdk.models import Organization, OrganizationAuthTokenType, TokenPayload+from skyvern.forge.sdk.models import TokenPayload+from skyvern.forge.sdk.schemas.organizations import Organization, OrganizationAuthTokenTypeAUTHENTICATION_TTL = 60 * 60 # one hourCACHE_SIZE = 128diff --git a/skyvern/forge/sdk/services/org_auth_token_service.py b/skyvern/forge/sdk/services/org_auth_token_service.pyindex f7faab181..ad05b331d 100644--- a/skyvern/forge/sdk/services/org_auth_token_service.py+++ b/skyvern/forge/sdk/services/org_auth_token_service.py@@ -4,7 +4,7 @@ import structlogfrom skyvern.forge.app import DATABASEfrom skyvern.forge.sdk.core import security-from skyvern.forge.sdk.models import OrganizationAuthToken, OrganizationAuthTokenType+from skyvern.forge.sdk.schemas.organizations import OrganizationAuthToken, OrganizationAuthTokenTypeLOG = structlog.get_logger()API_KEY_LIFETIME = timedelta(weeks=5200)diff --git a/skyvern/forge/sdk/workflow/context_manager.py b/skyvern/forge/sdk/workflow/context_manager.pyindex 5c0429724..cf19e3eb3 100644--- a/skyvern/forge/sdk/workflow/context_manager.py+++ b/skyvern/forge/sdk/workflow/context_manager.py@@ -5,7 +5,7 @@ import structlogfrom skyvern.exceptions import BitwardenBaseError, WorkflowRunContextNotInitializedfrom skyvern.forge.sdk.api.aws import AsyncAWSClient-from skyvern.forge.sdk.models import Organization+from skyvern.forge.sdk.schemas.organizations import Organizationfrom skyvern.forge.sdk.schemas.tasks import TaskStatusfrom skyvern.forge.sdk.services.bitwarden import BitwardenConstants, BitwardenServicefrom skyvern.forge.sdk.workflow.exceptions import OutputParameterKeyCollisionErrordiff --git a/skyvern/forge/sdk/workflow/service.py b/skyvern/forge/sdk/workflow/service.pyindex c407f19dd..7575a28a9 100644--- a/skyvern/forge/sdk/workflow/service.py+++ b/skyvern/forge/sdk/workflow/service.py@@ -22,7 +22,8 @@ from skyvern.forge.sdk.core import skyvern_contextfrom skyvern.forge.sdk.core.security import generate_skyvern_signaturefrom skyvern.forge.sdk.core.skyvern_context import SkyvernContextfrom skyvern.forge.sdk.db.enums import TaskType-from skyvern.forge.sdk.models import Organization, Step+from skyvern.forge.sdk.models import Step+from skyvern.forge.sdk.schemas.organizations import Organizationfrom skyvern.forge.sdk.schemas.tasks import ProxyLocation, Taskfrom skyvern.forge.sdk.workflow.exceptions import (ContextParameterSourceNotDefined,