Skip to content

Automate browser based workflows with AI

fix: Lazy-init AWS client to avoid ProfileNotFound crash at import time (#4941)

Andrew Neilson16fbba44d63e
diff --git a/skyvern/forge/agent.py b/skyvern/forge/agent.py
index 49be7e3c0..f1ccc1dae 100644
--- a/skyvern/forge/agent.py
+++ b/skyvern/forge/agent.py
@@ -67,7 +67,7 @@ from skyvern.exceptions import (
from skyvern.forge import app
from skyvern.forge.async_operations import AgentPhase, AsyncOperationPool
from skyvern.forge.prompts import prompt_engine
-from skyvern.forge.sdk.api.aws import aws_client
+from skyvern.forge.sdk.api.aws import get_aws_client
from skyvern.forge.sdk.api.files import (
get_path_for_workflow_download_directory,
list_downloading_files_in_directory,
@@ -552,7 +552,7 @@ class ForgeAgent:
files_to_rename = list(set(list_files_after) - set(list_files_before))
for file in files_to_rename:
if file.startswith("s3://"):
- file_data = await aws_client.download_file(file, log_exception=False)
+ file_data = await get_aws_client().download_file(file, log_exception=False)
if not file_data:
continue
file = file.split("/")[-1] # Extract filename from the end of S3 URI
diff --git a/skyvern/forge/sdk/api/aws.py b/skyvern/forge/sdk/api/aws.py
index 151db580d..8d16f8457 100644
--- a/skyvern/forge/sdk/api/aws.py
+++ b/skyvern/forge/sdk/api/aws.py
@@ -522,4 +522,11 @@ def tag_set_to_dict(tag_set: list[dict[str, str]]) -> dict[str, str]:
return {tag["Key"]: tag["Value"] for tag in tag_set}
-aws_client = AsyncAWSClient()
+_aws_client: AsyncAWSClient | None = None
+
+
+def get_aws_client() -> AsyncAWSClient:
+ global _aws_client
+ if _aws_client is None:
+ _aws_client = AsyncAWSClient()
+ return _aws_client
diff --git a/skyvern/forge/sdk/services/bitwarden.py b/skyvern/forge/sdk/services/bitwarden.py
index 9f4cccf00..2a42bc9a9 100644
--- a/skyvern/forge/sdk/services/bitwarden.py
+++ b/skyvern/forge/sdk/services/bitwarden.py
@@ -23,7 +23,7 @@ from skyvern.exceptions import (
BitwardenSyncError,
BitwardenUnlockError,
)
-from skyvern.forge.sdk.api.aws import aws_client
+from skyvern.forge.sdk.api.aws import get_aws_client
from skyvern.forge.sdk.core.aiohttp_helper import aiohttp_delete, aiohttp_get_json, aiohttp_post
from skyvern.forge.sdk.schemas.credentials import (
CredentialItem,
@@ -902,7 +902,8 @@ class BitwardenService:
async def _get_skyvern_auth_master_password() -> str:
master_password = settings.SKYVERN_AUTH_BITWARDEN_MASTER_PASSWORD
if not master_password:
- master_password = await aws_client.get_secret(BitwardenConstants.SKYVERN_AUTH_BITWARDEN_MASTER_PASSWORD)
+ secret_key = BitwardenConstants.SKYVERN_AUTH_BITWARDEN_MASTER_PASSWORD
+ master_password = await get_aws_client().get_secret(secret_key)
if not master_password:
raise BitwardenSecretError("Skyvern auth master password is not set")
return master_password
@@ -911,7 +912,8 @@ class BitwardenService:
async def _get_skyvern_auth_organization_id() -> str:
bw_organization_id = settings.SKYVERN_AUTH_BITWARDEN_ORGANIZATION_ID
if not bw_organization_id:
- bw_organization_id = await aws_client.get_secret(BitwardenConstants.SKYVERN_AUTH_BITWARDEN_ORGANIZATION_ID)
+ secret_key = BitwardenConstants.SKYVERN_AUTH_BITWARDEN_ORGANIZATION_ID
+ bw_organization_id = await get_aws_client().get_secret(secret_key)
if not bw_organization_id:
raise BitwardenSecretError("Skyvern auth organization ID is not set")
return bw_organization_id
@@ -920,7 +922,8 @@ class BitwardenService:
async def _get_skyvern_auth_client_id() -> str:
client_id = settings.SKYVERN_AUTH_BITWARDEN_CLIENT_ID
if not client_id:
- client_id = await aws_client.get_secret(BitwardenConstants.SKYVERN_AUTH_BITWARDEN_CLIENT_ID)
+ secret_key = BitwardenConstants.SKYVERN_AUTH_BITWARDEN_CLIENT_ID
+ client_id = await get_aws_client().get_secret(secret_key)
if not client_id:
raise BitwardenSecretError("Skyvern auth client ID is not set")
return client_id
@@ -929,7 +932,8 @@ class BitwardenService:
async def _get_skyvern_auth_client_secret() -> str:
client_secret = settings.SKYVERN_AUTH_BITWARDEN_CLIENT_SECRET
if not client_secret:
- client_secret = await aws_client.get_secret(BitwardenConstants.SKYVERN_AUTH_BITWARDEN_CLIENT_SECRET)
+ secret_key = BitwardenConstants.SKYVERN_AUTH_BITWARDEN_CLIENT_SECRET
+ client_secret = await get_aws_client().get_secret(secret_key)
if not client_secret:
raise BitwardenSecretError("Skyvern auth client secret is not set")
return client_secret