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): move DatabaseError to backend.util.exceptions for better layer separation (#11177)
Zamil Majdyb7ae2c2fd223
diff --git a/autogpt_platform/backend/backend/data/execution.py b/autogpt_platform/backend/backend/data/execution.pyindex a097737706..6c40e55a31 100644--- a/autogpt_platform/backend/backend/data/execution.py+++ b/autogpt_platform/backend/backend/data/execution.py@@ -38,8 +38,8 @@ from prisma.types import (from pydantic import BaseModel, ConfigDict, JsonValue, ValidationErrorfrom pydantic.fields import Field-from backend.server.v2.store.exceptions import DatabaseErrorfrom backend.util import type as type_utils+from backend.util.exceptions import DatabaseErrorfrom backend.util.json import SafeJsonfrom backend.util.models import Paginationfrom backend.util.retry import func_retrydiff --git a/autogpt_platform/backend/backend/data/generate_data.py b/autogpt_platform/backend/backend/data/generate_data.pyindex edaa2772c8..234b5d18d4 100644--- a/autogpt_platform/backend/backend/data/generate_data.py+++ b/autogpt_platform/backend/backend/data/generate_data.py@@ -7,7 +7,7 @@ from prisma.enums import AgentExecutionStatusfrom backend.data.execution import get_graph_executionsfrom backend.data.graph import get_graph_metadatafrom backend.data.model import UserExecutionSummaryStats-from backend.server.v2.store.exceptions import DatabaseError+from backend.util.exceptions import DatabaseErrorfrom backend.util.logging import TruncatedLoggerlogger = TruncatedLogger(logging.getLogger(__name__), prefix="[SummaryData]")diff --git a/autogpt_platform/backend/backend/data/notifications.py b/autogpt_platform/backend/backend/data/notifications.pyindex fb13c62ca0..0b80acba62 100644--- a/autogpt_platform/backend/backend/data/notifications.py+++ b/autogpt_platform/backend/backend/data/notifications.py@@ -15,7 +15,7 @@ from prisma.types import (# from backend.notifications.models import NotificationEventfrom pydantic import BaseModel, ConfigDict, EmailStr, Field, field_validator-from backend.server.v2.store.exceptions import DatabaseError+from backend.util.exceptions import DatabaseErrorfrom backend.util.json import SafeJsonfrom backend.util.logging import TruncatedLoggerdiff --git a/autogpt_platform/backend/backend/data/user.py b/autogpt_platform/backend/backend/data/user.pyindex 9f3467b68f..5234e28d95 100644--- a/autogpt_platform/backend/backend/data/user.py+++ b/autogpt_platform/backend/backend/data/user.py@@ -16,8 +16,8 @@ from prisma.types import JsonFilter, UserCreateInput, UserUpdateInputfrom backend.data.db import prismafrom backend.data.model import User, UserIntegrations, UserMetadatafrom backend.data.notifications import NotificationPreference, NotificationPreferenceDTO-from backend.server.v2.store.exceptions import DatabaseErrorfrom backend.util.encryption import JSONCryptor+from backend.util.exceptions import DatabaseErrorfrom backend.util.json import SafeJsonfrom backend.util.settings import Settingsdiff --git a/autogpt_platform/backend/backend/server/v2/library/db.py b/autogpt_platform/backend/backend/server/v2/library/db.pyindex 61ecd6305c..6e9082492a 100644--- a/autogpt_platform/backend/backend/server/v2/library/db.py+++ b/autogpt_platform/backend/backend/server/v2/library/db.py@@ -20,7 +20,7 @@ from backend.data.includes import AGENT_PRESET_INCLUDE, library_agent_includefrom backend.data.model import CredentialsMetaInputfrom backend.integrations.creds_manager import IntegrationCredentialsManagerfrom backend.integrations.webhooks.graph_lifecycle_hooks import on_graph_activate-from backend.util.exceptions import NotFoundError+from backend.util.exceptions import DatabaseError, NotFoundErrorfrom backend.util.json import SafeJsonfrom backend.util.models import Paginationfrom backend.util.settings import Config@@ -61,11 +61,11 @@ async def list_library_agents(if page < 1 or page_size < 1:logger.warning(f"Invalid pagination: page={page}, page_size={page_size}")- raise store_exceptions.DatabaseError("Invalid pagination input")+ raise DatabaseError("Invalid pagination input")if search_term and len(search_term.strip()) > 100:logger.warning(f"Search term too long: {repr(search_term)}")- raise store_exceptions.DatabaseError("Search term is too long")+ raise DatabaseError("Search term is too long")where_clause: prisma.types.LibraryAgentWhereInput = {"userId": user_id,@@ -143,7 +143,7 @@ async def list_library_agents(except prisma.errors.PrismaError as e:logger.error(f"Database error fetching library agents: {e}")- raise store_exceptions.DatabaseError("Failed to fetch library agents") from e+ raise DatabaseError("Failed to fetch library agents") from easync def list_favorite_library_agents(@@ -172,7 +172,7 @@ async def list_favorite_library_agents(if page < 1 or page_size < 1:logger.warning(f"Invalid pagination: page={page}, page_size={page_size}")- raise store_exceptions.DatabaseError("Invalid pagination input")+ raise DatabaseError("Invalid pagination input")where_clause: prisma.types.LibraryAgentWhereInput = {"userId": user_id,@@ -229,9 +229,7 @@ async def list_favorite_library_agents(except prisma.errors.PrismaError as e:logger.error(f"Database error fetching favorite library agents: {e}")- raise store_exceptions.DatabaseError(- "Failed to fetch favorite library agents"- ) from e+ raise DatabaseError("Failed to fetch favorite library agents") from easync def get_library_agent(id: str, user_id: str) -> library_model.LibraryAgent:@@ -273,7 +271,7 @@ async def get_library_agent(id: str, user_id: str) -> library_model.LibraryAgentexcept prisma.errors.PrismaError as e:logger.error(f"Database error fetching library agent: {e}")- raise store_exceptions.DatabaseError("Failed to fetch library agent") from e+ raise DatabaseError("Failed to fetch library agent") from easync def get_library_agent_by_store_version_id(@@ -338,7 +336,7 @@ async def get_library_agent_by_graph_id(return library_model.LibraryAgent.from_db(agent, sub_graphs=sub_graphs)except prisma.errors.PrismaError as e:logger.error(f"Database error fetching library agent by graph ID: {e}")- raise store_exceptions.DatabaseError("Failed to fetch library agent") from e+ raise DatabaseError("Failed to fetch library agent") from easync def add_generated_agent_image(@@ -479,9 +477,7 @@ async def update_agent_version_in_library()except prisma.errors.PrismaError as e:logger.error(f"Database error updating agent version in library: {e}")- raise store_exceptions.DatabaseError(- "Failed to update agent version in library"- ) from e+ raise DatabaseError("Failed to update agent version in library") from easync def update_library_agent(@@ -544,7 +540,7 @@ async def update_library_agent()except prisma.errors.PrismaError as e:logger.error(f"Database error updating library agent: {str(e)}")- raise store_exceptions.DatabaseError("Failed to update library agent") from e+ raise DatabaseError("Failed to update library agent") from easync def delete_library_agent(@@ -572,7 +568,7 @@ async def delete_library_agent_by_graph_id(graph_id: str, user_id: str) -> None:)except prisma.errors.PrismaError as e:logger.error(f"Database error deleting library agent: {e}")- raise store_exceptions.DatabaseError("Failed to delete library agent") from e+ raise DatabaseError("Failed to delete library agent") from easync def add_store_agent_to_library(@@ -663,7 +659,7 @@ async def add_store_agent_to_library(raiseexcept prisma.errors.PrismaError as e:logger.error(f"Database error adding agent to library: {e}")- raise store_exceptions.DatabaseError("Failed to add agent to library") from e+ raise DatabaseError("Failed to add agent to library") from e##############################################@@ -697,7 +693,7 @@ async def list_presets(logger.warning("Invalid pagination input: page=%d, page_size=%d", page, page_size)- raise store_exceptions.DatabaseError("Invalid pagination parameters")+ raise DatabaseError("Invalid pagination parameters")query_filter: prisma.types.AgentPresetWhereInput = {"userId": user_id,@@ -733,7 +729,7 @@ async def list_presets(except prisma.errors.PrismaError as e:logger.error(f"Database error getting presets: {e}")- raise store_exceptions.DatabaseError("Failed to fetch presets") from e+ raise DatabaseError("Failed to fetch presets") from easync def get_preset(@@ -763,7 +759,7 @@ async def get_preset(return library_model.LibraryAgentPreset.from_db(preset)except prisma.errors.PrismaError as e:logger.error(f"Database error getting preset: {e}")- raise store_exceptions.DatabaseError("Failed to fetch preset") from e+ raise DatabaseError("Failed to fetch preset") from easync def create_preset(@@ -813,7 +809,7 @@ async def create_preset(return library_model.LibraryAgentPreset.from_db(new_preset)except prisma.errors.PrismaError as e:logger.error(f"Database error creating preset: {e}")- raise store_exceptions.DatabaseError("Failed to create preset") from e+ raise DatabaseError("Failed to create preset") from easync def create_preset_from_graph_execution(@@ -951,7 +947,7 @@ async def update_preset(return library_model.LibraryAgentPreset.from_db(updated)except prisma.errors.PrismaError as e:logger.error(f"Database error updating preset: {e}")- raise store_exceptions.DatabaseError("Failed to update preset") from e+ raise DatabaseError("Failed to update preset") from easync def set_preset_webhook(@@ -997,7 +993,7 @@ async def delete_preset(user_id: str, preset_id: str) -> None:)except prisma.errors.PrismaError as e:logger.error(f"Database error deleting preset: {e}")- raise store_exceptions.DatabaseError("Failed to delete preset") from e+ raise DatabaseError("Failed to delete preset") from easync def fork_library_agent(@@ -1025,7 +1021,7 @@ async def fork_library_agent(# TODO: once we have open/closed sourced agents this needs to be enabled ~kcze# + update library/agents/[id]/page.tsx agent actions# if not original_agent.can_access_graph:- # raise store_exceptions.DatabaseError(+ # raise DatabaseError(# f"User {user_id} cannot access library agent graph {library_agent_id}"# )@@ -1039,4 +1035,4 @@ async def fork_library_agent(return (await create_library_agent(new_graph, user_id))[0]except prisma.errors.PrismaError as e:logger.error(f"Database error cloning library agent: {e}")- raise store_exceptions.DatabaseError("Failed to fork library agent") from e+ raise DatabaseError("Failed to fork library agent") from ediff --git a/autogpt_platform/backend/backend/server/v2/library/routes/agents.py b/autogpt_platform/backend/backend/server/v2/library/routes/agents.pyindex 3c2c8b71f7..1bdf255ce5 100644--- a/autogpt_platform/backend/backend/server/v2/library/routes/agents.py+++ b/autogpt_platform/backend/backend/server/v2/library/routes/agents.py@@ -8,7 +8,7 @@ from fastapi.responses import Responseimport backend.server.v2.library.db as library_dbimport backend.server.v2.library.model as library_modelimport backend.server.v2.store.exceptions as store_exceptions-from backend.util.exceptions import NotFoundError+from backend.util.exceptions import DatabaseError, NotFoundErrorlogger = logging.getLogger(__name__)@@ -221,7 +221,7 @@ async def add_marketplace_agent_to_library("to add to library")raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(e))- except store_exceptions.DatabaseError as e:+ except DatabaseError as e:logger.error(f"Database error while adding agent to library: {e}", e)raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,@@ -275,7 +275,7 @@ async def update_library_agent(status_code=status.HTTP_404_NOT_FOUND,detail=str(e),) from e- except store_exceptions.DatabaseError as e:+ except DatabaseError as e:logger.error(f"Database error while updating library agent: {e}")raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,diff --git a/autogpt_platform/backend/backend/server/v2/store/db.py b/autogpt_platform/backend/backend/server/v2/store/db.pyindex 84e63b36ac..7e3e78aa77 100644--- a/autogpt_platform/backend/backend/server/v2/store/db.py+++ b/autogpt_platform/backend/backend/server/v2/store/db.py@@ -25,6 +25,7 @@ from backend.data.notifications import (NotificationEventModel,)from backend.notifications.notifications import queue_notification_async+from backend.util.exceptions import DatabaseErrorfrom backend.util.settings import Settingslogger = logging.getLogger(__name__)@@ -141,9 +142,7 @@ async def get_store_agents()except Exception as e:logger.error(f"Error getting store agents: {e}")- raise backend.server.v2.store.exceptions.DatabaseError(- "Failed to fetch store agents"- ) from e+ raise DatabaseError("Failed to fetch store agents") from e# TODO: commenting this out as we concerned about potential db load issues# finally:# if search_term:@@ -254,9 +253,7 @@ async def get_store_agent_details(raiseexcept Exception as e:logger.error(f"Error getting store agent details: {e}")- raise backend.server.v2.store.exceptions.DatabaseError(- "Failed to fetch agent details"- ) from e+ raise DatabaseError("Failed to fetch agent details") from easync def get_available_graph(store_listing_version_id: str) -> GraphMeta:@@ -283,9 +280,7 @@ async def get_available_graph(store_listing_version_id: str) -> GraphMeta:except Exception as e:logger.error(f"Error getting agent: {e}")- raise backend.server.v2.store.exceptions.DatabaseError(- "Failed to fetch agent"- ) from e+ raise DatabaseError("Failed to fetch agent") from easync def get_store_agent_by_version_id(@@ -325,9 +320,7 @@ async def get_store_agent_by_version_id(raiseexcept Exception as e:logger.error(f"Error getting store agent details: {e}")- raise backend.server.v2.store.exceptions.DatabaseError(- "Failed to fetch agent details"- ) from e+ raise DatabaseError("Failed to fetch agent details") from easync def get_store_creators(@@ -353,9 +346,7 @@ async def get_store_creators(# Sanitize and validate search query by escaping special characterssanitized_query = search_query.strip()if not sanitized_query or len(sanitized_query) > 100: # Reasonable length limit- raise backend.server.v2.store.exceptions.DatabaseError(- "Invalid search query"- )+ raise DatabaseError("Invalid search query")# Escape special SQL characterssanitized_query = (@@ -381,11 +372,9 @@ async def get_store_creators(try:# Validate pagination parametersif not isinstance(page, int) or page < 1:- raise backend.server.v2.store.exceptions.DatabaseError(- "Invalid page number"- )+ raise DatabaseError("Invalid page number")if not isinstance(page_size, int) or page_size < 1 or page_size > 100:- raise backend.server.v2.store.exceptions.DatabaseError("Invalid page size")+ raise DatabaseError("Invalid page size")# Get total count for pagination using sanitized where clausetotal = await prisma.models.Creator.prisma().count(@@ -440,9 +429,7 @@ async def get_store_creators()except Exception as e:logger.error(f"Error getting store creators: {e}")- raise backend.server.v2.store.exceptions.DatabaseError(- "Failed to fetch store creators"- ) from e+ raise DatabaseError("Failed to fetch store creators") from easync def get_store_creator_details(@@ -477,9 +464,7 @@ async def get_store_creator_details(raiseexcept Exception as e:logger.error(f"Error getting store creator details: {e}")- raise backend.server.v2.store.exceptions.DatabaseError(- "Failed to fetch creator details"- ) from e+ raise DatabaseError("Failed to fetch creator details") from easync def get_store_submissions(@@ -754,7 +739,7 @@ async def create_store_submission() from excelse:# Reraise as a generic database error for other unique violations- raise backend.server.v2.store.exceptions.DatabaseError(+ raise DatabaseError(f"Unique constraint violated (not slug): {error_str}") from excexcept (@@ -764,9 +749,7 @@ async def create_store_submission(raiseexcept prisma.errors.PrismaError as e:logger.error(f"Database error creating store submission: {e}")- raise backend.server.v2.store.exceptions.DatabaseError(- "Failed to create store submission"- ) from e+ raise DatabaseError("Failed to create store submission") from easync def edit_store_submission(@@ -887,9 +870,7 @@ async def edit_store_submission()if not updated_version:- raise backend.server.v2.store.exceptions.DatabaseError(- "Failed to update store listing version"- )+ raise DatabaseError("Failed to update store listing version")return backend.server.v2.store.model.StoreSubmission(agent_id=current_version.agentGraphId,agent_version=current_version.agentGraphVersion,@@ -925,9 +906,7 @@ async def edit_store_submission(raiseexcept prisma.errors.PrismaError as e:logger.error(f"Database error editing store submission: {e}")- raise backend.server.v2.store.exceptions.DatabaseError(- "Failed to edit store submission"- ) from e+ raise DatabaseError("Failed to edit store submission") from easync def create_store_version(@@ -1042,9 +1021,7 @@ async def create_store_version()except prisma.errors.PrismaError as e:- raise backend.server.v2.store.exceptions.DatabaseError(- "Failed to create new store version"- ) from e+ raise DatabaseError("Failed to create new store version") from easync def create_store_review(@@ -1084,9 +1061,7 @@ async def create_store_review(except prisma.errors.PrismaError as e:logger.error(f"Database error creating store review: {e}")- raise backend.server.v2.store.exceptions.DatabaseError(- "Failed to create store review"- ) from e+ raise DatabaseError("Failed to create store review") from easync def get_user_profile(@@ -1110,9 +1085,7 @@ async def get_user_profile()except Exception as e:logger.error(f"Error getting user profile: {e}")- raise backend.server.v2.store.exceptions.DatabaseError(- "Failed to get user profile"- ) from e+ raise DatabaseError("Failed to get user profile") from easync def update_profile(@@ -1149,7 +1122,7 @@ async def update_profile(logger.error(f"Unauthorized update attempt for profile {existing_profile.id} by user {user_id}")- raise backend.server.v2.store.exceptions.DatabaseError(+ raise DatabaseError(f"Unauthorized update attempt for profile {existing_profile.id} by user {user_id}")@@ -1174,9 +1147,7 @@ async def update_profile()if updated_profile is None:logger.error(f"Failed to update profile for user {user_id}")- raise backend.server.v2.store.exceptions.DatabaseError(- "Failed to update profile"- )+ raise DatabaseError("Failed to update profile")return backend.server.v2.store.model.CreatorDetails(name=updated_profile.name,@@ -1191,9 +1162,7 @@ async def update_profile(except prisma.errors.PrismaError as e:logger.error(f"Database error updating profile: {e}")- raise backend.server.v2.store.exceptions.DatabaseError(- "Failed to update profile"- ) from e+ raise DatabaseError("Failed to update profile") from easync def get_my_agents(@@ -1261,9 +1230,7 @@ async def get_my_agents()except Exception as e:logger.error(f"Error getting my agents: {e}")- raise backend.server.v2.store.exceptions.DatabaseError(- "Failed to fetch my agents"- ) from e+ raise DatabaseError("Failed to fetch my agents") from easync def get_agent(store_listing_version_id: str) -> GraphModel:@@ -1525,7 +1492,7 @@ async def review_store_submission()if not submission:- raise backend.server.v2.store.exceptions.DatabaseError(+ raise DatabaseError(f"Failed to update store listing version {store_listing_version_id}")@@ -1640,9 +1607,7 @@ async def review_store_submission(except Exception as e:logger.error(f"Could not create store submission review: {e}")- raise backend.server.v2.store.exceptions.DatabaseError(- "Failed to create store submission review"- ) from e+ raise DatabaseError("Failed to create store submission review") from easync def get_admin_listings_with_versions(diff --git a/autogpt_platform/backend/backend/server/v2/store/exceptions.py b/autogpt_platform/backend/backend/server/v2/store/exceptions.pyindex abada5ab8c..1e9b4ac051 100644--- a/autogpt_platform/backend/backend/server/v2/store/exceptions.py+++ b/autogpt_platform/backend/backend/server/v2/store/exceptions.py@@ -75,12 +75,6 @@ class ListingExistsError(StoreError):pass-class DatabaseError(StoreError):- """Raised when there is an error interacting with the database"""-- pass--class ProfileNotFoundError(NotFoundError):"""Raised when a profile is not found"""diff --git a/autogpt_platform/backend/backend/util/exceptions.py b/autogpt_platform/backend/backend/util/exceptions.pyindex def98f544b..892f14470a 100644--- a/autogpt_platform/backend/backend/util/exceptions.py+++ b/autogpt_platform/backend/backend/util/exceptions.py@@ -86,3 +86,9 @@ class GraphValidationError(ValueError):for node_id, errors in self.node_errors.items()])+++class DatabaseError(Exception):+ """Raised when there is an error interacting with the database"""++ pass