SKY-7801/7802: MCP Foundation + Hybrid Browser Tools (selector + AI intent) (#4660)
This commit is contained in:
Marc Kelechava
261
skyvern/cli/mcp_tools/session.py
Normal file
261
skyvern/cli/mcp_tools/session.py
Normal file
@@ -0,0 +1,261 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Annotated, Any
|
||||
|
||||
from pydantic import Field
|
||||
|
||||
from skyvern.schemas.runs import ProxyLocation
|
||||
|
||||
from ._common import BrowserContext, ErrorCode, Timer, make_error, make_result
|
||||
from ._session import (
|
||||
SessionState,
|
||||
get_current_session,
|
||||
get_skyvern,
|
||||
resolve_browser,
|
||||
set_current_session,
|
||||
)
|
||||
|
||||
|
||||
async def skyvern_session_create(
|
||||
timeout: Annotated[int | None, Field(description="Session timeout in minutes (5-1440)")] = 60,
|
||||
proxy_location: Annotated[str | None, Field(description="Proxy location: RESIDENTIAL, US, etc.")] = None,
|
||||
local: Annotated[bool, Field(description="Launch local browser instead of cloud")] = False,
|
||||
headless: Annotated[bool, Field(description="Run local browser in headless mode")] = False,
|
||||
) -> dict[str, Any]:
|
||||
"""Create a new browser session to start interacting with websites. Creates a cloud browser by default.
|
||||
|
||||
Use local=true for a local Chromium instance.
|
||||
The session persists across tool calls until explicitly closed.
|
||||
"""
|
||||
with Timer() as timer:
|
||||
try:
|
||||
skyvern = get_skyvern()
|
||||
|
||||
if local:
|
||||
browser = await skyvern.launch_local_browser(headless=headless)
|
||||
ctx = BrowserContext(mode="local")
|
||||
set_current_session(SessionState(browser=browser, context=ctx))
|
||||
timer.mark("sdk")
|
||||
return make_result(
|
||||
"skyvern_session_create",
|
||||
browser_context=ctx,
|
||||
data={"local": True, "headless": headless},
|
||||
timing_ms=timer.timing_ms,
|
||||
)
|
||||
|
||||
proxy = ProxyLocation(proxy_location) if proxy_location else None
|
||||
browser = await skyvern.launch_cloud_browser(timeout=timeout, proxy_location=proxy)
|
||||
ctx = BrowserContext(mode="cloud_session", session_id=browser.browser_session_id)
|
||||
set_current_session(SessionState(browser=browser, context=ctx))
|
||||
timer.mark("sdk")
|
||||
|
||||
except ValueError as e:
|
||||
return make_result(
|
||||
"skyvern_session_create",
|
||||
ok=False,
|
||||
timing_ms=timer.timing_ms,
|
||||
error=make_error(
|
||||
ErrorCode.SDK_ERROR,
|
||||
str(e),
|
||||
"Cloud sessions require SKYVERN_API_KEY. Check your environment.",
|
||||
),
|
||||
)
|
||||
except Exception as e:
|
||||
return make_result(
|
||||
"skyvern_session_create",
|
||||
ok=False,
|
||||
timing_ms=timer.timing_ms,
|
||||
error=make_error(ErrorCode.SDK_ERROR, str(e), "Failed to create browser session"),
|
||||
)
|
||||
|
||||
return make_result(
|
||||
"skyvern_session_create",
|
||||
browser_context=ctx,
|
||||
data={
|
||||
"session_id": browser.browser_session_id,
|
||||
"timeout_minutes": timeout,
|
||||
},
|
||||
timing_ms=timer.timing_ms,
|
||||
)
|
||||
|
||||
|
||||
async def skyvern_session_close(
|
||||
session_id: Annotated[str | None, Field(description="Session ID to close (uses current if not specified)")] = None,
|
||||
) -> dict[str, Any]:
|
||||
"""Close a browser session when you're done. Frees cloud resources.
|
||||
|
||||
Closes the specified session or the current active session.
|
||||
"""
|
||||
current = get_current_session()
|
||||
|
||||
with Timer() as timer:
|
||||
try:
|
||||
if session_id:
|
||||
skyvern = get_skyvern()
|
||||
await skyvern.close_browser_session(session_id)
|
||||
if current.context and current.context.session_id == session_id:
|
||||
set_current_session(SessionState())
|
||||
timer.mark("sdk")
|
||||
return make_result(
|
||||
"skyvern_session_close",
|
||||
data={"session_id": session_id, "closed": True},
|
||||
timing_ms=timer.timing_ms,
|
||||
)
|
||||
|
||||
if current.browser is None:
|
||||
return make_result(
|
||||
"skyvern_session_close",
|
||||
ok=False,
|
||||
error=make_error(
|
||||
ErrorCode.NO_ACTIVE_BROWSER,
|
||||
"No active session to close",
|
||||
"Provide a session_id or create a session first",
|
||||
),
|
||||
)
|
||||
|
||||
closed_id = current.context.session_id if current.context else None
|
||||
await current.browser.close()
|
||||
set_current_session(SessionState())
|
||||
timer.mark("sdk")
|
||||
|
||||
except Exception as e:
|
||||
return make_result(
|
||||
"skyvern_session_close",
|
||||
ok=False,
|
||||
timing_ms=timer.timing_ms,
|
||||
error=make_error(ErrorCode.SDK_ERROR, str(e), "Failed to close session"),
|
||||
)
|
||||
|
||||
return make_result(
|
||||
"skyvern_session_close",
|
||||
data={"session_id": closed_id, "closed": True},
|
||||
timing_ms=timer.timing_ms,
|
||||
)
|
||||
|
||||
|
||||
async def skyvern_session_list() -> dict[str, Any]:
|
||||
"""List all active browser sessions. Use to find available sessions to connect to."""
|
||||
with Timer() as timer:
|
||||
try:
|
||||
skyvern = get_skyvern()
|
||||
sessions = await skyvern.get_browser_sessions()
|
||||
timer.mark("sdk")
|
||||
|
||||
session_data = [
|
||||
{
|
||||
"session_id": s.browser_session_id,
|
||||
"status": s.status,
|
||||
"started_at": s.started_at.isoformat() if s.started_at else None,
|
||||
"timeout": s.timeout,
|
||||
"runnable_id": s.runnable_id,
|
||||
"available": s.runnable_id is None and s.browser_address is not None,
|
||||
}
|
||||
for s in sessions
|
||||
]
|
||||
|
||||
except ValueError as e:
|
||||
return make_result(
|
||||
"skyvern_session_list",
|
||||
ok=False,
|
||||
timing_ms=timer.timing_ms,
|
||||
error=make_error(
|
||||
ErrorCode.SDK_ERROR,
|
||||
str(e),
|
||||
"Listing sessions requires SKYVERN_API_KEY",
|
||||
),
|
||||
)
|
||||
except Exception as e:
|
||||
return make_result(
|
||||
"skyvern_session_list",
|
||||
ok=False,
|
||||
timing_ms=timer.timing_ms,
|
||||
error=make_error(ErrorCode.SDK_ERROR, str(e), "Failed to list sessions"),
|
||||
)
|
||||
|
||||
current = get_current_session()
|
||||
current_id = current.context.session_id if current.context else None
|
||||
|
||||
return make_result(
|
||||
"skyvern_session_list",
|
||||
data={
|
||||
"sessions": session_data,
|
||||
"count": len(session_data),
|
||||
"current_session_id": current_id,
|
||||
},
|
||||
timing_ms=timer.timing_ms,
|
||||
)
|
||||
|
||||
|
||||
async def skyvern_session_get(
|
||||
session_id: Annotated[str, "Browser session ID to get details for"],
|
||||
) -> dict[str, Any]:
|
||||
"""Get details about a specific browser session -- status, timeout, availability."""
|
||||
with Timer() as timer:
|
||||
try:
|
||||
skyvern = get_skyvern()
|
||||
session = await skyvern.get_browser_session(session_id)
|
||||
timer.mark("sdk")
|
||||
except Exception as e:
|
||||
return make_result(
|
||||
"skyvern_session_get",
|
||||
ok=False,
|
||||
timing_ms=timer.timing_ms,
|
||||
error=make_error(ErrorCode.BROWSER_NOT_FOUND, str(e), "Check the session ID is correct"),
|
||||
)
|
||||
|
||||
current = get_current_session()
|
||||
is_current = current.context and current.context.session_id == session_id
|
||||
|
||||
return make_result(
|
||||
"skyvern_session_get",
|
||||
browser_context=BrowserContext(mode="cloud_session", session_id=session_id) if is_current else None,
|
||||
data={
|
||||
"session_id": session.browser_session_id,
|
||||
"status": session.status,
|
||||
"started_at": session.started_at.isoformat() if session.started_at else None,
|
||||
"completed_at": session.completed_at.isoformat() if session.completed_at else None,
|
||||
"timeout": session.timeout,
|
||||
"runnable_id": session.runnable_id,
|
||||
"is_current": is_current,
|
||||
},
|
||||
timing_ms=timer.timing_ms,
|
||||
)
|
||||
|
||||
|
||||
async def skyvern_session_connect(
|
||||
session_id: Annotated[str | None, Field(description="Cloud session ID (pbs_...)")] = None,
|
||||
cdp_url: Annotated[str | None, Field(description="CDP WebSocket URL")] = None,
|
||||
) -> dict[str, Any]:
|
||||
"""Connect to an existing browser -- a cloud session by ID or any browser via CDP URL.
|
||||
|
||||
Use this to resume work in a previously created session or attach to an external browser.
|
||||
"""
|
||||
if not session_id and not cdp_url:
|
||||
return make_result(
|
||||
"skyvern_session_connect",
|
||||
ok=False,
|
||||
error=make_error(
|
||||
ErrorCode.INVALID_INPUT,
|
||||
"Must provide session_id or cdp_url",
|
||||
"Specify which browser to connect to",
|
||||
),
|
||||
)
|
||||
|
||||
with Timer() as timer:
|
||||
try:
|
||||
browser, ctx = await resolve_browser(session_id=session_id, cdp_url=cdp_url)
|
||||
timer.mark("sdk")
|
||||
except Exception as e:
|
||||
return make_result(
|
||||
"skyvern_session_connect",
|
||||
ok=False,
|
||||
timing_ms=timer.timing_ms,
|
||||
error=make_error(ErrorCode.BROWSER_NOT_FOUND, str(e), "Check the session ID or CDP URL is valid"),
|
||||
)
|
||||
|
||||
return make_result(
|
||||
"skyvern_session_connect",
|
||||
browser_context=ctx,
|
||||
data={"connected": True},
|
||||
timing_ms=timer.timing_ms,
|
||||
)
|
||||
Reference in New Issue
Block a user