Merge SkyvernSdk and Skyvern extending Fern client (#3987)

Co-authored-by: Shuchang Zheng <wintonzheng0325@gmail.com>

skyvern/cli/mcp.py

@@ -6,19 +6,42 @@ from dotenv import load_dotenv
 from rich.panel import Panel
 from rich.prompt import Confirm, Prompt
 
-from skyvern.config import settings
 from skyvern.forge import app
+from skyvern.forge.sdk.core import security
 from skyvern.forge.sdk.db.enums import OrganizationAuthTokenType
-from skyvern.library import Skyvern
+from skyvern.forge.sdk.schemas.organizations import Organization
+from skyvern.forge.sdk.services.local_org_auth_token_service import SKYVERN_LOCAL_DOMAIN, SKYVERN_LOCAL_ORG
+from skyvern.forge.sdk.services.org_auth_token_service import API_KEY_LIFETIME
 from skyvern.utils import detect_os, get_windows_appdata_roaming
 from skyvern.utils.env_paths import resolve_backend_env_path
 
 from .console import console
 
 
+async def get_or_create_local_organization() -> Organization:
+    organization = await app.DATABASE.get_organization_by_domain(SKYVERN_LOCAL_DOMAIN)
+    if not organization:
+        organization = await app.DATABASE.create_organization(
+            organization_name=SKYVERN_LOCAL_ORG,
+            domain=SKYVERN_LOCAL_DOMAIN,
+            max_steps_per_run=10,
+            max_retries_per_step=3,
+        )
+        api_key = security.create_access_token(
+            organization.organization_id,
+            expires_delta=API_KEY_LIFETIME,
+        )
+        # generate OrganizationAutoToken
+        await app.DATABASE.create_org_auth_token(
+            organization_id=organization.organization_id,
+            token=api_key,
+            token_type=OrganizationAuthTokenType.api,
+        )
+    return organization
+
+
 async def setup_local_organization() -> str:
-    skyvern_agent = Skyvern(base_url=settings.SKYVERN_BASE_URL, api_key=settings.SKYVERN_API_KEY)
-    organization = await skyvern_agent.get_organization()
+    organization = await get_or_create_local_organization()
     org_auth_token = await app.DATABASE.get_valid_org_auth_token(
         organization_id=organization.organization_id,
         token_type=OrganizationAuthTokenType.api.value,

skyvern/cli/run_commands.py

@@ -16,6 +16,7 @@ from rich.prompt import Confirm
 
 from skyvern.cli.console import console
 from skyvern.cli.utils import start_services
+from skyvern.client import SkyvernEnvironment
 from skyvern.config import settings
 from skyvern.forge.sdk.core import skyvern_context
 from skyvern.forge.sdk.forge_log import setup_logger
@@ -45,6 +46,7 @@ async def skyvern_run_task(prompt: str, url: str) -> dict[str, Any]:
         url: The starting URL of the website where the task should be performed
     """
     skyvern_agent = Skyvern(
+        environment=SkyvernEnvironment.CLOUD,
         base_url=settings.SKYVERN_BASE_URL,
         api_key=settings.SKYVERN_API_KEY,
     )