Skip to content

Automate browser based workflows with AI

revert: drop pool_timeout/pool_recycle and roll DB pool sizes back to pre-#10903 (#6099)

Shuchang Zheng06bed88db5c2
diff --git a/skyvern/config.py b/skyvern/config.py
index eeac71099..d5c4ca903 100644
--- a/skyvern/config.py
+++ b/skyvern/config.py
@@ -119,10 +119,8 @@ class Settings(BaseSettings):
DATABASE_REPLICA_STRING: str | None = None
DATABASE_STATEMENT_TIMEOUT_MS: int = 60000
DISABLE_CONNECTION_POOL: bool = False
- DATABASE_POOL_SIZE: int = 20
- DATABASE_POOL_MAX_OVERFLOW: int = 20
- DATABASE_POOL_TIMEOUT: int = 10
- DATABASE_POOL_RECYCLE: int = 1800
+ DATABASE_POOL_SIZE: int = 5
+ DATABASE_POOL_MAX_OVERFLOW: int = 10
PROMPT_ACTION_HISTORY_WINDOW: int = 1
TASK_RESPONSE_ACTION_SCREENSHOT_COUNT: int = 3
diff --git a/skyvern/forge/sdk/db/agent_db.py b/skyvern/forge/sdk/db/agent_db.py
index 3084d8d77..bc644954b 100644
--- a/skyvern/forge/sdk/db/agent_db.py
+++ b/skyvern/forge/sdk/db/agent_db.py
@@ -104,8 +104,6 @@ def _build_engine(database_string: str) -> AsyncEngine:
pool_pre_ping=True,
pool_size=settings.DATABASE_POOL_SIZE,
max_overflow=settings.DATABASE_POOL_MAX_OVERFLOW,
- pool_timeout=settings.DATABASE_POOL_TIMEOUT,
- pool_recycle=settings.DATABASE_POOL_RECYCLE,
)
diff --git a/tests/unit/forge/sdk/db/test_db_engine_config.py b/tests/unit/forge/sdk/db/test_db_engine_config.py
deleted file mode 100644
index 27773c180..000000000
--- a/tests/unit/forge/sdk/db/test_db_engine_config.py
+++ /dev/null
@@ -1,60 +0,0 @@
-from unittest.mock import MagicMock, patch
-
-import pytest
-from sqlalchemy.ext.asyncio import AsyncEngine
-
-from skyvern.forge.sdk.db import agent_db
-
-
-def _fake_engine() -> AsyncEngine:
- engine = MagicMock(spec=AsyncEngine)
- engine.dialect = MagicMock()
- engine.dialect.name = "postgresql"
- engine.pool = MagicMock()
- return engine
-
-
-def _call_build_engine(url: str = "postgresql+psycopg://user:pass@host/db") -> dict:
- captured: dict = {}
-
- def _capture(_url: str, **kwargs: object) -> AsyncEngine:
- captured.update(kwargs)
- return _fake_engine()
-
- with patch("skyvern.forge.sdk.db.agent_db.create_async_engine", side_effect=_capture):
- agent_db._build_engine(url)
-
- return captured
-
-
-def test_pool_timeout_forwarded_to_queue_pool(monkeypatch: pytest.MonkeyPatch) -> None:
- import skyvern.config
-
- monkeypatch.setattr(skyvern.config.settings, "DISABLE_CONNECTION_POOL", False)
- monkeypatch.setattr(skyvern.config.settings, "DATABASE_POOL_TIMEOUT", 7)
-
- captured = _call_build_engine()
-
- assert captured.get("pool_timeout") == 7
-
-
-def test_pool_recycle_forwarded_to_queue_pool(monkeypatch: pytest.MonkeyPatch) -> None:
- import skyvern.config
-
- monkeypatch.setattr(skyvern.config.settings, "DISABLE_CONNECTION_POOL", False)
- monkeypatch.setattr(skyvern.config.settings, "DATABASE_POOL_RECYCLE", 900)
-
- captured = _call_build_engine()
-
- assert captured.get("pool_recycle") == 900
-
-
-def test_null_pool_path_does_not_forward_queue_pool_params(monkeypatch: pytest.MonkeyPatch) -> None:
- import skyvern.config
-
- monkeypatch.setattr(skyvern.config.settings, "DISABLE_CONNECTION_POOL", True)
-
- captured = _call_build_engine()
-
- assert "pool_timeout" not in captured
- assert "pool_recycle" not in captured