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): migrate all query_raw calls to query_raw_with_schema for proper schema handling (#11462)
Zamil Majdyff5dd7a5b4de
diff --git a/autogpt_platform/backend/backend/check_db.py b/autogpt_platform/backend/backend/check_db.pyindex 591c519f84..7e1c3ee14f 100644--- a/autogpt_platform/backend/backend/check_db.py+++ b/autogpt_platform/backend/backend/check_db.py@@ -5,6 +5,8 @@ from datetime import datetimefrom faker import Fakerfrom prisma import Prisma+from backend.data.db import query_raw_with_schema+faker = Faker()@@ -15,9 +17,9 @@ async def check_cron_job(db):try:# Check if pg_cron extension exists- extension_check = await db.query_raw("CREATE EXTENSION pg_cron;")+ extension_check = await query_raw_with_schema("CREATE EXTENSION pg_cron;")print(extension_check)- extension_check = await db.query_raw(+ extension_check = await query_raw_with_schema("SELECT COUNT(*) as count FROM pg_extension WHERE extname = 'pg_cron'")if extension_check[0]["count"] == 0:@@ -25,7 +27,7 @@ async def check_cron_job(db):return False# Check if the refresh job exists- job_check = await db.query_raw(+ job_check = await query_raw_with_schema("""SELECT jobname, schedule, commandFROM cron.job@@ -55,33 +57,33 @@ async def get_materialized_view_counts(db):print("-" * 40)# Get counts from mv_agent_run_counts- agent_runs = await db.query_raw(+ agent_runs = await query_raw_with_schema("""SELECT COUNT(*) as total_agents,SUM(run_count) as total_runs,MAX(run_count) as max_runs,MIN(run_count) as min_runs- FROM mv_agent_run_counts+ FROM {schema_prefix}mv_agent_run_counts""")# Get counts from mv_review_stats- review_stats = await db.query_raw(+ review_stats = await query_raw_with_schema("""SELECT COUNT(*) as total_listings,SUM(review_count) as total_reviews,AVG(avg_rating) as overall_avg_rating- FROM mv_review_stats+ FROM {schema_prefix}mv_review_stats""")# Get sample data from StoreAgent view- store_agents = await db.query_raw(+ store_agents = await query_raw_with_schema("""SELECT COUNT(*) as total_store_agents,AVG(runs) as avg_runs,AVG(rating) as avg_rating- FROM "StoreAgent"+ FROM {schema_prefix}"StoreAgent"""")diff --git a/autogpt_platform/backend/backend/check_store_data.py b/autogpt_platform/backend/backend/check_store_data.pyindex 10aa6507ba..c17393a6d4 100644--- a/autogpt_platform/backend/backend/check_store_data.py+++ b/autogpt_platform/backend/backend/check_store_data.py@@ -5,6 +5,8 @@ import asynciofrom prisma import Prisma+from backend.data.db import query_raw_with_schema+async def check_store_data(db):"""Check what store data exists in the database."""@@ -89,11 +91,11 @@ async def check_store_data(db):sa.creator_username,sa.categories,sa.updated_at- FROM "StoreAgent" sa+ FROM {schema_prefix}"StoreAgent" saLIMIT 10;"""- store_agents = await db.query_raw(query)+ store_agents = await query_raw_with_schema(query)print(f"Total store agents in view: {len(store_agents)}")if store_agents:@@ -111,22 +113,22 @@ async def check_store_data(db):# Check for any APPROVED store listing versionsquery = """SELECT COUNT(*) as count- FROM "StoreListingVersion"+ FROM {schema_prefix}"StoreListingVersion"WHERE "submissionStatus" = 'APPROVED'"""- result = await db.query_raw(query)+ result = await query_raw_with_schema(query)approved_count = result[0]["count"] if result else 0print(f"Approved store listing versions: {approved_count}")# Check for store listings with hasApprovedVersion = truequery = """SELECT COUNT(*) as count- FROM "StoreListing"+ FROM {schema_prefix}"StoreListing"WHERE "hasApprovedVersion" = true AND "isDeleted" = false"""- result = await db.query_raw(query)+ result = await query_raw_with_schema(query)has_approved_count = result[0]["count"] if result else 0print(f"Store listings with approved versions: {has_approved_count}")@@ -134,10 +136,10 @@ async def check_store_data(db):query = """SELECT COUNT(DISTINCT "agentGraphId") as unique_agents,COUNT(*) as total_executions- FROM "AgentGraphExecution"+ FROM {schema_prefix}"AgentGraphExecution""""- result = await db.query_raw(query)+ result = await query_raw_with_schema(query)if result:print("\nAgent Graph Executions:")print(f" Unique agents with executions: {result[0]['unique_agents']}")diff --git a/autogpt_platform/backend/backend/server/v2/builder/db.py b/autogpt_platform/backend/backend/server/v2/builder/db.pyindex ed5938b218..c3f6ac88ab 100644--- a/autogpt_platform/backend/backend/server/v2/builder/db.py+++ b/autogpt_platform/backend/backend/server/v2/builder/db.py@@ -7,6 +7,7 @@ import backend.data.blockfrom backend.blocks import load_all_blocksfrom backend.blocks.llm import LlmModelfrom backend.data.block import AnyBlockSchema, BlockCategory, BlockInfo, BlockSchema+from backend.data.db import query_raw_with_schemafrom backend.integrations.providers import ProviderNamefrom backend.server.v2.builder.model import (BlockCategoryResponse,@@ -340,13 +341,13 @@ async def get_suggested_blocks(count: int = 5) -> list[BlockInfo]:# Calculate the cutoff timestamptimestamp_threshold = datetime.now(timezone.utc) - timedelta(days=30)- results = await prisma.get_client().query_raw(+ results = await query_raw_with_schema("""SELECTagent_node."agentBlockId" AS block_id,COUNT(execution.id) AS execution_count- FROM "AgentNodeExecution" execution- JOIN "AgentNode" agent_node ON execution."agentNodeId" = agent_node.id+ FROM {schema_prefix}"AgentNodeExecution" execution+ JOIN {schema_prefix}"AgentNode" agent_node ON execution."agentNodeId" = agent_node.idWHERE execution."endedTime" >= $1::timestampGROUP BY agent_node."agentBlockId"ORDER BY execution_count DESC;diff --git a/autogpt_platform/backend/backend/server/v2/store/db.py b/autogpt_platform/backend/backend/server/v2/store/db.pyindex f6f0f812fe..fe782e8eea 100644--- a/autogpt_platform/backend/backend/server/v2/store/db.py+++ b/autogpt_platform/backend/backend/server/v2/store/db.py@@ -12,7 +12,7 @@ import prisma.typesimport backend.server.v2.store.exceptionsimport backend.server.v2.store.model-from backend.data.db import transaction+from backend.data.db import query_raw_with_schema, transactionfrom backend.data.graph import (GraphMeta,GraphModel,@@ -120,7 +120,7 @@ async def get_store_agents(is_available,updated_at,ts_rank_cd(search, query) AS rank- FROM "StoreAgent",+ FROM {{schema_prefix}}"StoreAgent",plainto_tsquery('english', $1) AS queryWHERE {sql_where_clause}AND search @@ query@@ -131,22 +131,18 @@ async def get_store_agents(# Count query for pagination - only uses search term parametercount_query = f"""SELECT COUNT(*) as count- FROM "StoreAgent",+ FROM {{schema_prefix}}"StoreAgent",plainto_tsquery('english', $1) AS queryWHERE {sql_where_clause}AND search @@ query"""# Execute both queries with parameters- agents = await prisma.client.get_client().query_raw(- typing.cast(typing.LiteralString, sql_query), *params- )+ agents = await query_raw_with_schema(sql_query, *params)# For count, use params without pagination (last 2 params)count_params = params[:-2]- count_result = await prisma.client.get_client().query_raw(- typing.cast(typing.LiteralString, count_query), *count_params- )+ count_result = await query_raw_with_schema(count_query, *count_params)total = count_result[0]["count"] if count_result else 0total_pages = (total + page_size - 1) // page_size