Simplify and clarify data collection setting enforcement (#3589)

* Simplify and clarify data collection setting enforcement

* test(ai-gateway): update tests for data collection rename

---------

Co-authored-by: kiloconnect[bot] <240665456+kiloconnect[bot]@users.noreply.github.com>

Author: chrarnoldus

apps/web/src/app/api/openrouter/[...path]/route.ts

@@ -30,7 +30,7 @@ import {
   isExcludedForFeature,
   isKiloExclusiveFreeModel,
   isKiloStealthModel,
-  requiresKiloDataCollection,
+  isKiloExclusiveModelRequiringDataCollection,
 } from '@/lib/ai-gateway/models';
 import { isFreeModel } from '@/lib/ai-gateway/is-free-model';
 import {
@@ -58,7 +58,7 @@ import {
 import { ProxyErrorType } from '@/lib/proxy-error-types';
 import { getBalanceAndOrgSettings } from '@/lib/organizations/organization-usage';
 import { repairTools, sanitizeBinaryToolResults } from '@/lib/ai-gateway/tool-calling';
-import { isFreePromptTrainingAllowed } from '@/lib/ai-gateway/providers/openrouter/types';
+import { isDataCollectionExplicitlyDisallowed } from '@/lib/ai-gateway/providers/openrouter/types';
 import {
   rewriteFreeModelResponse_ChatCompletions,
   rewriteFreeModelResponse_Messages,
@@ -419,7 +419,10 @@ export async function POST(request: NextRequest): Promise<NextResponseType<unkno
   // for partner evaluation — which violates the caller's stated
   // intent. Refuse here regardless of org settings, anon/BYOK status,
   // or the org-level check below.
-  if (experiment && !isFreePromptTrainingAllowed(requestBodyParsed.body.provider)) {
+  if (
+    (experiment || isKiloExclusiveModelRequiringDataCollection(originalModelIdLowerCased)) &&
+    isDataCollectionExplicitlyDisallowed(requestBodyParsed.body.provider)
+  ) {
     return dataCollectionRequiredResponse();
   }
 
@@ -554,13 +557,6 @@ export async function POST(request: NextRequest): Promise<NextResponseType<unkno
     op: 'http.client',
   });
 
-  if (
-    requiresKiloDataCollection(originalModelIdLowerCased) &&
-    !isFreePromptTrainingAllowed(requestBodyParsed.body.provider)
-  ) {
-    return dataCollectionRequiredResponse();
-  }
-
   applyTrackingIds(requestBodyParsed, provider, user.id, taskId ?? null);
 
   sanitizeBinaryToolResults(requestBodyParsed);

apps/web/src/lib/ai-gateway/models.test.ts

@@ -3,7 +3,7 @@ import {
   autoFreeModels,
   findKiloExclusiveModel,
   kiloExclusiveModels,
-  requiresKiloDataCollection,
+  isKiloExclusiveModelRequiringDataCollection,
 } from './models';
 import { isFreeModel } from './is-free-model';
 import { getInferenceProvider } from './providers/kilo-exclusive-model';
@@ -80,10 +80,16 @@ describe('isFreeModel', () => {
     });
 
     test('requires data collection for paid training-enabled offerings', () => {
-      expect(requiresKiloDataCollection(claude_opus_4_7_stealth_model.public_id)).toBe(true);
-      expect(requiresKiloDataCollection(claude_sonnet_4_6_stealth_model.public_id)).toBe(true);
-      expect(requiresKiloDataCollection(claude_opus_4_6_stealth_model.public_id)).toBe(true);
-      expect(requiresKiloDataCollection(qwen36_plus_model.public_id)).toBe(false);
+      expect(
+        isKiloExclusiveModelRequiringDataCollection(claude_opus_4_7_stealth_model.public_id)
+      ).toBe(true);
+      expect(
+        isKiloExclusiveModelRequiringDataCollection(claude_sonnet_4_6_stealth_model.public_id)
+      ).toBe(true);
+      expect(
+        isKiloExclusiveModelRequiringDataCollection(claude_opus_4_6_stealth_model.public_id)
+      ).toBe(true);
+      expect(isKiloExclusiveModelRequiringDataCollection(qwen36_plus_model.public_id)).toBe(false);
     });
 
     test('all Kilo exclusive models should have either no pricing or valid pricing', () => {

apps/web/src/lib/ai-gateway/models.ts

@@ -99,7 +99,7 @@ export const kiloExclusiveModels = [
   stepfun_37_flash_free_model,
 ] as KiloExclusiveModel[];
 
-export function requiresKiloDataCollection(model: string): boolean {
+export function isKiloExclusiveModelRequiringDataCollection(model: string): boolean {
   return kiloExclusiveModels.some(
     m =>
       m.public_id === model &&

apps/web/src/lib/ai-gateway/providers/openrouter/types.test.ts

@@ -0,0 +1,34 @@
+import { describe, it, expect } from '@jest/globals';
+import { isDataCollectionExplicitlyDisallowed } from './types';
+
+describe('isDataCollectionExplicitlyDisallowed', () => {
+  it('returns false when no provider config is given', () => {
+    expect(isDataCollectionExplicitlyDisallowed(undefined)).toBe(false);
+  });
+
+  it('returns false for an empty provider config', () => {
+    expect(isDataCollectionExplicitlyDisallowed({})).toBe(false);
+  });
+
+  it('returns false when data collection is explicitly allowed', () => {
+    expect(isDataCollectionExplicitlyDisallowed({ data_collection: 'allow' })).toBe(false);
+  });
+
+  it('returns true when data collection is denied', () => {
+    expect(isDataCollectionExplicitlyDisallowed({ data_collection: 'deny' })).toBe(true);
+  });
+
+  it('returns true when zero data retention is requested', () => {
+    expect(isDataCollectionExplicitlyDisallowed({ zdr: true })).toBe(true);
+  });
+
+  it('returns false when zero data retention is explicitly disabled', () => {
+    expect(isDataCollectionExplicitlyDisallowed({ zdr: false })).toBe(false);
+  });
+
+  it('returns true when zdr is set even though data collection is allowed', () => {
+    expect(isDataCollectionExplicitlyDisallowed({ data_collection: 'allow', zdr: true })).toBe(
+      true
+    );
+  });
+});

apps/web/src/lib/ai-gateway/providers/openrouter/types.ts

@@ -25,8 +25,10 @@ export type VercelProviderConfig = {
   anthropic?: AnthropicProviderOptions;
 };
 
-export function isFreePromptTrainingAllowed(provider: OpenRouterProviderConfig | undefined) {
-  return provider?.data_collection !== 'deny' && !provider?.zdr;
+export function isDataCollectionExplicitlyDisallowed(
+  provider: OpenRouterProviderConfig | undefined
+) {
+  return provider?.data_collection === 'deny' || provider?.zdr === true;
 }
 
 export type OpenRouterReasoningConfig = {