Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

chore(ai): remove DPA signer killswitch for assistant tracing (#45134)

Matt Rossman36ae9beb0c5f
diff --git a/apps/studio/lib/ai/ai-details.test.ts b/apps/studio/lib/ai/ai-details.test.ts
index a3236a99b6f..6102aaf445d 100644
--- a/apps/studio/lib/ai/ai-details.test.ts
+++ b/apps/studio/lib/ai/ai-details.test.ts
@@ -30,10 +30,6 @@ vi.mock('@/data/entitlements/entitlements-query', () => ({
checkEntitlement: vi.fn(),
}))
-vi.mock('@/data/fetchers', () => ({
- get: vi.fn(),
-}))
-
const AUTH = 'Bearer token'
const HEADERS = { 'Content-Type': 'application/json', Authorization: AUTH }
@@ -43,7 +39,6 @@ describe('getOrgAIDetails', () => {
let mockGetAiOptInLevel: ReturnType<typeof vi.fn>
let mockSubscriptionHasHipaaAddon: ReturnType<typeof vi.fn>
let mockCheckEntitlement: ReturnType<typeof vi.fn>
- let mockGet: ReturnType<typeof vi.fn>
beforeEach(async () => {
vi.clearAllMocks()
@@ -54,19 +49,16 @@ describe('getOrgAIDetails', () => {
const subscriptionUtils =
await import('@/components/interfaces/Billing/Subscription/Subscription.utils')
const entitlementsQuery = await import('@/data/entitlements/entitlements-query')
- const fetchers = await import('@/data/fetchers')
mockGetOrganizations = vi.mocked(orgsQuery.getOrganizations)
mockGetOrgSubscription = vi.mocked(subscriptionQuery.getOrgSubscription)
mockGetAiOptInLevel = vi.mocked(aiHook.getAiOptInLevel)
mockSubscriptionHasHipaaAddon = vi.mocked(subscriptionUtils.subscriptionHasHipaaAddon)
mockCheckEntitlement = vi.mocked(entitlementsQuery.checkEntitlement)
- mockGet = vi.mocked(fetchers.get)
mockGetOrgSubscription.mockResolvedValue({ addons: [] })
mockSubscriptionHasHipaaAddon.mockReturnValue(false)
mockCheckEntitlement.mockResolvedValue({ hasAccess: false })
- mockGet.mockResolvedValue({ data: { signed: false } })
})
it('returns org-level fields', async () => {
@@ -81,7 +73,6 @@ describe('getOrgAIDetails', () => {
aiOptInLevel: 'schema',
hasAccessToAdvanceModel: false,
hasHipaaAddon: false,
- isDpaSigned: false,
orgId: 1,
planId: 'pro',
})
@@ -111,30 +102,6 @@ describe('getOrgAIDetails', () => {
expect(result.hasHipaaAddon).toBe(true)
})
- it('returns isDpaSigned true when endpoint returns signed: true', async () => {
- mockGetOrganizations.mockResolvedValue([
- { id: 1, slug: 'test-org', plan: { id: 'pro' }, opt_in_tags: [] },
- ])
- mockGetAiOptInLevel.mockReturnValue('schema')
- mockGet.mockResolvedValue({ data: { signed: true } })
-
- const result = await getOrgAIDetails({ orgSlug: 'test-org', authorization: AUTH })
-
- expect(result.isDpaSigned).toBe(true)
- })
-
- it('returns isDpaSigned undefined when endpoint fails', async () => {
- mockGetOrganizations.mockResolvedValue([
- { id: 1, slug: 'test-org', plan: { id: 'pro' }, opt_in_tags: [] },
- ])
- mockGetAiOptInLevel.mockReturnValue('schema')
- mockGet.mockResolvedValue({ data: null, error: { message: 'Unauthorized' } })
-
- const result = await getOrgAIDetails({ orgSlug: 'test-org', authorization: AUTH })
-
- expect(result.isDpaSigned).toBeUndefined()
- })
-
it('calls getAiOptInLevel with the matched org opt_in_tags', async () => {
const opt_in_tags = ['AI_SQL_GENERATOR_OPT_IN']
mockGetOrganizations.mockResolvedValue([
diff --git a/apps/studio/lib/ai/ai-details.ts b/apps/studio/lib/ai/ai-details.ts
index 4b236d25266..026fd852b5b 100644
--- a/apps/studio/lib/ai/ai-details.ts
+++ b/apps/studio/lib/ai/ai-details.ts
@@ -1,7 +1,6 @@
import { subscriptionHasHipaaAddon } from '@/components/interfaces/Billing/Subscription/Subscription.utils'
import { getProjectSettings } from '@/data/config/project-settings-v2-query'
import { checkEntitlement } from '@/data/entitlements/entitlements-query'
-import { get } from '@/data/fetchers'
import { getOrganizations } from '@/data/organizations/organizations-query'
import { getProjectDetail } from '@/data/projects/project-detail-query'
import { getOrgSubscription } from '@/data/subscriptions/org-subscription-query'
@@ -19,14 +18,10 @@ export const getOrgAIDetails = async ({
...(authorization && { Authorization: authorization }),
}
- const [organizations, subscription, advanceModelAccess, dpaSignedStatus] = await Promise.all([
+ const [organizations, subscription, advanceModelAccess] = await Promise.all([
getOrganizations({ headers }),
getOrgSubscription({ orgSlug }, undefined, headers),
checkEntitlement(orgSlug, 'assistant.advance_model', undefined, headers),
- get('/platform/organizations/{slug}/documents/dpa-signed', {
- params: { path: { slug: orgSlug } },
- headers,
- }),
])
const selectedOrg = organizations.find((org) => org.slug === orgSlug)
@@ -35,7 +30,6 @@ export const getOrgAIDetails = async ({
aiOptInLevel: getAiOptInLevel(selectedOrg?.opt_in_tags),
hasAccessToAdvanceModel: advanceModelAccess.hasAccess,
hasHipaaAddon: subscriptionHasHipaaAddon(subscription),
- isDpaSigned: dpaSignedStatus.data?.signed,
orgId: selectedOrg?.id,
planId: selectedOrg?.plan.id,
}
diff --git a/apps/studio/lib/ai/braintrust-logger.test.ts b/apps/studio/lib/ai/braintrust-logger.test.ts
index 5343f8c2111..ac76344fe9f 100644
--- a/apps/studio/lib/ai/braintrust-logger.test.ts
+++ b/apps/studio/lib/ai/braintrust-logger.test.ts
@@ -5,7 +5,6 @@ import { isTracingAllowed } from './braintrust-logger'
const baseAllowed = {
orgHasHipaaAddon: false,
projectIsSensitive: false,
- orgIsDpaSigned: false,
projectRegion: 'us-east-1',
}
@@ -32,10 +31,6 @@ describe('isTracingAllowed', () => {
).toBe(true)
})
- it('disallows tracing when DPA is signed', () => {
- expect(isTracingAllowed({ ...baseAllowed, orgIsDpaSigned: true })).toBe(false)
- })
-
it('disallows tracing for EU regions', () => {
expect(isTracingAllowed({ ...baseAllowed, projectRegion: 'eu-west-1' })).toBe(false)
expect(isTracingAllowed({ ...baseAllowed, projectRegion: 'eu-central-1' })).toBe(false)
@@ -60,11 +55,9 @@ describe('isTracingAllowed', () => {
isTracingAllowed({
orgHasHipaaAddon: undefined,
projectIsSensitive: undefined,
- orgIsDpaSigned: undefined,
projectRegion: undefined,
})
).toBe(false)
- expect(isTracingAllowed({ ...baseAllowed, orgIsDpaSigned: undefined })).toBe(false)
expect(isTracingAllowed({ ...baseAllowed, projectRegion: undefined })).toBe(false)
expect(isTracingAllowed({ ...baseAllowed, orgHasHipaaAddon: undefined })).toBe(false)
// projectIsSensitive unknown only matters when orgHasHipaaAddon is also unknown
diff --git a/apps/studio/lib/ai/braintrust-logger.ts b/apps/studio/lib/ai/braintrust-logger.ts
index c84c1115993..00ef10da3a8 100644
--- a/apps/studio/lib/ai/braintrust-logger.ts
+++ b/apps/studio/lib/ai/braintrust-logger.ts
@@ -18,17 +18,12 @@ if (IS_TRACING_ENABLED) {
export function isTracingAllowed({
orgHasHipaaAddon,
projectIsSensitive,
- orgIsDpaSigned,
projectRegion,
}: {
orgHasHipaaAddon: boolean | undefined
projectIsSensitive: boolean | null | undefined
- orgIsDpaSigned: boolean | undefined
projectRegion: string | undefined
}) {
- // Disable tracing for orgs with a signed (or unknown) DPA status
- if (orgIsDpaSigned !== false) return false
-
// Disable tracing for EU (or unknown) regions
if (projectRegion === undefined || projectRegion.startsWith('eu-')) return false
diff --git a/apps/studio/lib/api/generate-v4.test.ts b/apps/studio/lib/api/generate-v4.test.ts
index 490458dd92b..b8c21f9a116 100644
--- a/apps/studio/lib/api/generate-v4.test.ts
+++ b/apps/studio/lib/api/generate-v4.test.ts
@@ -47,7 +47,6 @@ test('generateV4 calls the tool sanitizer', async () => {
getOrgAIDetails: vi.fn().mockResolvedValue({
aiOptInLevel: 'schema_and_log_and_data',
hasAccessToAdvanceModel: true,
- isDpaSigned: false,
}),
getProjectAIDetails: vi.fn().mockResolvedValue({
region: 'us-east-1',
diff --git a/apps/studio/pages/api/ai/feedback/rate.ts b/apps/studio/pages/api/ai/feedback/rate.ts
index 1dd3dfc347f..597958cbf3c 100644
--- a/apps/studio/pages/api/ai/feedback/rate.ts
+++ b/apps/studio/pages/api/ai/feedback/rate.ts
@@ -57,7 +57,6 @@ export async function handlePost(req: NextApiRequest, res: NextApiResponse) {
let aiOptInLevel: AiOptInLevel = 'disabled'
let orgHasHipaaAddon: boolean | undefined
let projectIsSensitive: boolean | undefined
- let orgIsDpaSigned: boolean | undefined
let projectRegion: string | undefined
if (!IS_PLATFORM) {
@@ -73,7 +72,6 @@ export async function handlePost(req: NextApiRequest, res: NextApiResponse) {
aiOptInLevel = orgDetails.aiOptInLevel
orgHasHipaaAddon = orgDetails.hasHipaaAddon
- orgIsDpaSigned = orgDetails.isDpaSigned
projectIsSensitive = projectDetails.isSensitive
projectRegion = projectDetails.region
} catch (error) {
@@ -138,7 +136,7 @@ Instructions:
// Log feedback to Braintrust if tracing is enabled and span ID is available
if (
IS_TRACING_ENABLED &&
- isTracingAllowed({ orgHasHipaaAddon, projectIsSensitive, orgIsDpaSigned, projectRegion }) &&
+ isTracingAllowed({ orgHasHipaaAddon, projectIsSensitive, projectRegion }) &&
spanId
) {
try {
diff --git a/apps/studio/pages/api/ai/sql/generate-v4.ts b/apps/studio/pages/api/ai/sql/generate-v4.ts
index 372658953ab..06c8e744fd8 100644
--- a/apps/studio/pages/api/ai/sql/generate-v4.ts
+++ b/apps/studio/pages/api/ai/sql/generate-v4.ts
@@ -111,7 +111,6 @@ async function handlePost(req: NextApiRequest, res: NextApiResponse, claims?: Jw
let hasAccessToAdvanceModel = false
let orgHasHipaaAddon: boolean | undefined
let projectIsSensitive: boolean | undefined
- let orgIsDpaSigned: boolean | undefined
let projectRegion: string | undefined
let orgId: number | undefined
let planId: string | undefined
@@ -131,7 +130,6 @@ async function handlePost(req: NextApiRequest, res: NextApiResponse, claims?: Jw
aiOptInLevel = orgDetails.aiOptInLevel
hasAccessToAdvanceModel = orgDetails.hasAccessToAdvanceModel
orgHasHipaaAddon = orgDetails.hasHipaaAddon
- orgIsDpaSigned = orgDetails.isDpaSigned
orgId = orgDetails.orgId
planId = orgDetails.planId
projectIsSensitive = projectDetails.isSensitive
@@ -213,7 +211,6 @@ async function handlePost(req: NextApiRequest, res: NextApiResponse, claims?: Jw
allowTracing: isTracingAllowed({
orgHasHipaaAddon,
projectIsSensitive,
- orgIsDpaSigned,
projectRegion,
}),
userId,