Skip to content

AutoGPT is the vision of accessible AI for everyone, to use and to build on. Our mission is to provide the tools, so that you can focus on what matters.

fix(backend): use the right client for worker timezone and store checks (#15250)

Nicholas Tindle0e97c58115a6
diff --git a/autogpt_platform/backend/backend/check_store_data.py b/autogpt_platform/backend/backend/check_store_data.py
index c17393a6d4..f5ac918e20 100644
--- a/autogpt_platform/backend/backend/check_store_data.py
+++ b/autogpt_platform/backend/backend/check_store_data.py
@@ -95,7 +95,7 @@ async def check_store_data(db):
LIMIT 10;
"""
- store_agents = await query_raw_with_schema(query)
+ store_agents = await query_raw_with_schema(query, client=db)
print(f"Total store agents in view: {len(store_agents)}")
if store_agents:
@@ -117,7 +117,7 @@ async def check_store_data(db):
WHERE "submissionStatus" = 'APPROVED'
"""
- result = await query_raw_with_schema(query)
+ result = await query_raw_with_schema(query, client=db)
approved_count = result[0]["count"] if result else 0
print(f"Approved store listing versions: {approved_count}")
@@ -128,7 +128,7 @@ async def check_store_data(db):
WHERE "hasApprovedVersion" = true AND "isDeleted" = false
"""
- result = await query_raw_with_schema(query)
+ result = await query_raw_with_schema(query, client=db)
has_approved_count = result[0]["count"] if result else 0
print(f"Store listings with approved versions: {has_approved_count}")
@@ -139,7 +139,7 @@ async def check_store_data(db):
FROM {schema_prefix}"AgentGraphExecution"
"""
- result = await query_raw_with_schema(query)
+ result = await query_raw_with_schema(query, client=db)
if result:
print("\nAgent Graph Executions:")
print(f" Unique agents with executions: {result[0]['unique_agents']}")
diff --git a/autogpt_platform/backend/backend/check_store_data_test.py b/autogpt_platform/backend/backend/check_store_data_test.py
new file mode 100644
index 0000000000..f88432b6f5
--- /dev/null
+++ b/autogpt_platform/backend/backend/check_store_data_test.py
@@ -0,0 +1,36 @@
+from unittest.mock import AsyncMock
+
+import pytest
+from prisma import Prisma
+from prisma.errors import ClientNotConnectedError
+
+from backend.check_store_data import check_store_data
+from backend.data.db import prisma
+
+
+async def test_raw_store_queries_use_the_supplied_client(mocker) -> None:
+ client = Prisma()
+ mocker.patch.object(
+ type(client.storelisting), "find_many", new=AsyncMock(return_value=[])
+ )
+ mocker.patch.object(
+ type(client.storelistingversion), "find_many", new=AsyncMock(return_value=[])
+ )
+ mocker.patch.object(
+ type(client.storelistingreview), "find_many", new=AsyncMock(return_value=[])
+ )
+ assert client is not prisma
+
+ async def query_raw(queried_client: Prisma, *args, **kwargs):
+ if queried_client is not client:
+ raise ClientNotConnectedError()
+ return []
+
+ query = mocker.patch.object(
+ Prisma, "query_raw", autospec=True, side_effect=query_raw
+ )
+
+ await check_store_data(client)
+
+ assert query.await_count == 4
diff --git a/autogpt_platform/backend/backend/integrations/microsoft_365_copilot/service.py b/autogpt_platform/backend/backend/integrations/microsoft_365_copilot/service.py
index f76b1d4dd2..078af3f363 100644
--- a/autogpt_platform/backend/backend/integrations/microsoft_365_copilot/service.py
+++ b/autogpt_platform/backend/backend/integrations/microsoft_365_copilot/service.py
@@ -25,8 +25,8 @@ from backend.copilot.response_model import (
)
from backend.copilot.service import strip_user_context_tags
from backend.copilot.token_tracking import persist_and_record_usage
+from backend.data.db_accessors import user_db
from backend.data.model import OAuth2Credentials
-from backend.data.user import get_user_by_id
from backend.integrations.credential_lease import CredentialLease
from backend.integrations.oauth.microsoft_365_copilot import (
Microsoft365CopilotDeviceAuthHandler,
@@ -90,7 +90,7 @@ async def _get_timezone(user_id: str | None) -> str:
if not user_id:
return "UTC"
try:
- user = await get_user_by_id(user_id)
+ user = await user_db().get_user_by_id(user_id)
except Exception:
logger.warning("Could not load user timezone for Microsoft 365 Copilot")
return "UTC"
diff --git a/autogpt_platform/backend/backend/integrations/microsoft_365_copilot/service_test.py b/autogpt_platform/backend/backend/integrations/microsoft_365_copilot/service_test.py
index 7777f2d726..9bd5510707 100644
--- a/autogpt_platform/backend/backend/integrations/microsoft_365_copilot/service_test.py
+++ b/autogpt_platform/backend/backend/integrations/microsoft_365_copilot/service_test.py
@@ -91,8 +91,12 @@ async def test_service_streams_and_persists_graph_conversation(mocker) -> None:
mocker.patch.object(service, "Microsoft365CopilotClient", _FakeClient)
mocker.patch.object(
service,
- "get_user_by_id",
- new=AsyncMock(return_value=SimpleNamespace(timezone="America/Chicago")),
+ "user_db",
+ return_value=SimpleNamespace(
+ get_user_by_id=AsyncMock(
+ return_value=SimpleNamespace(timezone="America/Chicago")
+ )
+ ),
)
events = [
@@ -159,8 +163,10 @@ async def test_service_deduplicates_against_original_persisted_user_text(
mocker.patch.object(service, "Microsoft365CopilotClient", _FakeClient)
mocker.patch.object(
service,
- "get_user_by_id",
- new=AsyncMock(return_value=SimpleNamespace(timezone="UTC")),
+ "user_db",
+ return_value=SimpleNamespace(
+ get_user_by_id=AsyncMock(return_value=SimpleNamespace(timezone="UTC"))
+ ),
)
_ = [
@@ -217,8 +223,10 @@ async def test_service_replaces_an_expired_graph_conversation(mocker) -> None:
)
mocker.patch.object(
service,
- "get_user_by_id",
- new=AsyncMock(return_value=SimpleNamespace(timezone="UTC")),
+ "user_db",
+ return_value=SimpleNamespace(
+ get_user_by_id=AsyncMock(return_value=SimpleNamespace(timezone="UTC"))
+ ),
)
events = [
@@ -258,8 +266,10 @@ async def test_service_closes_stream_after_midstream_failure(mocker) -> None:
mocker.patch.object(service, "Microsoft365CopilotClient", _MidStreamFailureClient)
mocker.patch.object(
service,
- "get_user_by_id",
- new=AsyncMock(return_value=SimpleNamespace(timezone="UTC")),
+ "user_db",
+ return_value=SimpleNamespace(
+ get_user_by_id=AsyncMock(return_value=SimpleNamespace(timezone="UTC"))
+ ),
)
events = [
diff --git a/autogpt_platform/backend/backend/integrations/microsoft_365_copilot/service_timezone_test.py b/autogpt_platform/backend/backend/integrations/microsoft_365_copilot/service_timezone_test.py
new file mode 100644
index 0000000000..84d86229c5
--- /dev/null
+++ b/autogpt_platform/backend/backend/integrations/microsoft_365_copilot/service_timezone_test.py
@@ -0,0 +1,43 @@
+from types import SimpleNamespace
+from unittest.mock import AsyncMock, MagicMock
+
+import pytest
+from prisma.errors import ClientNotConnectedError
+
+from backend.data import user as user_module
+from backend.data.db_manager import DatabaseManagerAsyncClient
+from backend.integrations.microsoft_365_copilot import service
+
+
+async def test_timezone_uses_rpc_when_prisma_is_disconnected(mocker) -> None:
+ client = MagicMock(spec=DatabaseManagerAsyncClient)
+ client.get_user_by_id = AsyncMock(
+ return_value=SimpleNamespace(timezone="America/Chicago")
+ )
+ mocker.patch("backend.data.db.is_connected", return_value=False)
+ mocker.patch(
+ "backend.util.clients.get_database_manager_async_client", return_value=client
+ )
+ redis = MagicMock()
+ redis.get.return_value = None
+ mocker.patch("backend.util.cache._get_redis", return_value=redis)
+ local_query = mocker.patch.object(
+ type(user_module.prisma.user),
+ "find_unique",
+ new=AsyncMock(side_effect=ClientNotConnectedError()),
+ )
+
+ assert (
+ await service._get_timezone("worker-timezone-regression") == "America/Chicago"
+ )
+ client.get_user_by_id.assert_awaited_once_with("worker-timezone-regression")
+ local_query.assert_not_awaited()
+
+
+async def test_timezone_without_user_needs_no_database(mocker) -> None:
+ rpc = mocker.patch("backend.util.clients.get_database_manager_async_client")
+
+ assert await service._get_timezone(None) == "UTC"
+ rpc.assert_not_called()