Merge pull request #1279 from mnfst/chore/model-pricing-cache-cleanup

chore: clean up model pricing cache

Author: brunobuddy

.changeset/model-pricing-cache-cleanup.md

@@ -0,0 +1,5 @@
+---
+"manifest": patch
+---
+
+Clean up model pricing cache: return ReadonlyMap from PricingSyncService, remove dead code, derive provider prefixes from registry, fix naming inconsistencies

packages/backend/src/database/pricing-sync.service.spec.ts

@@ -414,95 +414,6 @@ describe('PricingSyncService', () => {
     });
   });
 
-  describe('deriveNames', () => {
-    it('maps known providers correctly', () => {
-      expect(service.deriveNames('anthropic/claude-opus-4')).toEqual({
-        canonical: 'claude-opus-4',
-        provider: 'Anthropic',
-      });
-      expect(service.deriveNames('openai/gpt-4o')).toEqual({
-        canonical: 'gpt-4o',
-        provider: 'OpenAI',
-      });
-      expect(service.deriveNames('google/gemini-2.5-pro')).toEqual({
-        canonical: 'gemini-2.5-pro',
-        provider: 'Google',
-      });
-      expect(service.deriveNames('deepseek/deepseek-r1')).toEqual({
-        canonical: 'deepseek-r1',
-        provider: 'DeepSeek',
-      });
-      expect(service.deriveNames('mistralai/mistral-large')).toEqual({
-        canonical: 'mistral-large',
-        provider: 'Mistral',
-      });
-      // meta-llama is not a supported routing provider — title-cased
-      expect(service.deriveNames('meta-llama/llama-3')).toEqual({
-        canonical: 'llama-3',
-        provider: 'Meta-llama',
-      });
-      expect(service.deriveNames('cohere/command-r')).toEqual({
-        canonical: 'command-r',
-        provider: 'Cohere',
-      });
-      expect(service.deriveNames('xai/grok-2')).toEqual({
-        canonical: 'grok-2',
-        provider: 'xAI',
-      });
-      expect(service.deriveNames('moonshotai/moonshot-v1')).toEqual({
-        canonical: 'moonshot-v1',
-        provider: 'Moonshot',
-      });
-      expect(service.deriveNames('qwen/qwen3-235b-a22b')).toEqual({
-        canonical: 'qwen3-235b-a22b',
-        provider: 'Alibaba',
-      });
-      expect(service.deriveNames('zhipuai/glm-4-plus')).toEqual({
-        canonical: 'glm-4-plus',
-        provider: 'Z.ai',
-      });
-      expect(service.deriveNames('amazon/nova-pro')).toEqual({
-        canonical: 'nova-pro',
-        provider: 'Amazon',
-      });
-    });
-
-    it('preserves full ID for openrouter/ models', () => {
-      expect(service.deriveNames('openrouter/auto')).toEqual({
-        canonical: 'openrouter/auto',
-        provider: 'OpenRouter',
-      });
-    });
-
-    it('maps MiniMax provider correctly', () => {
-      expect(service.deriveNames('minimax/minimax-m2.5')).toEqual({
-        canonical: 'minimax-m2.5',
-        provider: 'MiniMax',
-      });
-    });
-
-    it('maps Z.ai provider correctly', () => {
-      expect(service.deriveNames('z-ai/glm-5')).toEqual({
-        canonical: 'glm-5',
-        provider: 'Z.ai',
-      });
-    });
-
-    it('title-cases unknown providers', () => {
-      expect(service.deriveNames('newvendor/some-model')).toEqual({
-        canonical: 'some-model',
-        provider: 'Newvendor',
-      });
-    });
-
-    it('handles model IDs without slash', () => {
-      expect(service.deriveNames('bare-model')).toEqual({
-        canonical: 'bare-model',
-        provider: 'Unknown',
-      });
-    });
-  });
-
   describe('extractDisplayName', () => {
     it('strips vendor prefix from OpenRouter names', () => {
       expect(

packages/backend/src/database/pricing-sync.service.ts

@@ -1,6 +1,5 @@
 import { Injectable, Logger, OnModuleInit } from '@nestjs/common';
 import { Cron, CronExpression } from '@nestjs/schedule';
-import { OPENROUTER_PREFIX_TO_PROVIDER } from '../common/constants/providers';
 
 interface OpenRouterModel {
   id: string;
@@ -87,7 +86,7 @@ export class PricingSyncService implements OnModuleInit {
     return this.cache.get(modelId) ?? null;
   }
 
-  getAll(): Map<string, OpenRouterPricingEntry> {
+  getAll(): ReadonlyMap<string, OpenRouterPricingEntry> {
     return this.cache;
   }
 
@@ -117,30 +116,6 @@ export class PricingSyncService implements OnModuleInit {
     return model.name;
   }
 
-  deriveNames(openRouterId: string): {
-    canonical: string;
-    provider: string;
-  } {
-    if (openRouterId.startsWith('openrouter/')) {
-      return { canonical: openRouterId, provider: 'OpenRouter' };
-    }
-
-    const slashIndex = openRouterId.indexOf('/');
-    if (slashIndex === -1) {
-      return { canonical: openRouterId, provider: 'Unknown' };
-    }
-
-    const prefix = openRouterId.substring(0, slashIndex);
-    const canonical = openRouterId.substring(slashIndex + 1);
-    const provider = OPENROUTER_PREFIX_TO_PROVIDER.get(prefix) ?? this.titleCase(prefix);
-
-    return { canonical, provider };
-  }
-
-  private titleCase(str: string): string {
-    return str.charAt(0).toUpperCase() + str.slice(1);
-  }
-
   isChatCompatible(model: OpenRouterModel): boolean {
     const inputModalities = model.architecture?.input_modalities?.map((m) => m.toLowerCase());
     if (inputModalities && inputModalities.length > 0 && !inputModalities.includes('text')) {

packages/backend/src/model-prices/model-name-normalizer.ts

@@ -1,4 +1,5 @@
 import { buildAnthropicShortModelIdVariants } from '../common/utils/anthropic-model-id';
+import { OPENROUTER_PREFIX_TO_PROVIDER } from '../common/constants/providers';
 
 /**
  * Resolves variant model names (from telemetry) to canonical pricing names.
@@ -39,24 +40,21 @@ const KNOWN_ALIASES: ReadonlyArray<readonly [string, string]> = [
   ['codestral', 'codestral-latest'],
 ];
 
-const PROVIDER_PREFIXES = [
-  'anthropic/',
-  'openai/',
-  'google/',
-  'deepseek/',
-  'mistralai/',
-  'moonshotai/',
-  'qwen/',
-  'zhipuai/',
-  'amazon/',
-  'xai/',
-  'minimax/',
-  'z-ai/',
+// Extra prefixes from non-routing providers that telemetry may send.
+// Multi-segment prefixes must come first so they match before shorter ones.
+const EXTRA_TELEMETRY_PREFIXES = [
   'accounts/fireworks/models/',
+  'amazon/',
   'fireworks/',
   'together/',
 ];
 
+/** Derived from the provider registry + extra telemetry prefixes. */
+const PROVIDER_PREFIXES: readonly string[] = [
+  ...EXTRA_TELEMETRY_PREFIXES,
+  ...[...OPENROUTER_PREFIX_TO_PROVIDER.keys()].map((p) => `${p}/`),
+];
+
 const DATE_SUFFIX_RE = /-\d{4}-?\d{2}-?\d{2}$/;
 
 export function stripProviderPrefix(name: string): string {

packages/backend/src/model-prices/model-prices.controller.spec.ts

@@ -14,7 +14,7 @@ describe('ModelPricesController', () => {
 
   it('delegates to service.getAll()', async () => {
     const expected = { models: [], lastSyncedAt: null };
-    mockService.getAll.mockResolvedValue(expected);
+    mockService.getAll.mockReturnValue(expected);
 
     const result = await controller.getModelPrices();
 

packages/backend/src/model-prices/model-prices.service.ts

@@ -9,7 +9,7 @@ export class ModelPricesService {
     private readonly pricingSync: PricingSyncService,
   ) {}
 
-  async getAll() {
+  getAll() {
     const entries = this.pricingCache.getAll();
     const lastSyncedAt = this.pricingSync.getLastFetchedAt()?.toISOString() ?? null;
 

packages/backend/src/model-prices/model-pricing-cache.service.spec.ts

@@ -29,7 +29,7 @@ describe('ModelPricingCacheService', () => {
     );
   });
 
-  describe('onModuleInit', () => {
+  describe('onApplicationBootstrap', () => {
     it('should call reload()', async () => {
       const spy = jest.spyOn(service, 'reload').mockResolvedValue();
       await service.onApplicationBootstrap();
@@ -196,7 +196,7 @@ describe('ModelPricingCacheService', () => {
       await service.reload();
 
       const result = service.getAll();
-      expect(result.length).toBeGreaterThanOrEqual(2);
+      expect(result.length).toBe(2);
       const names = result.map((e) => e.model_name);
       expect(names).toContain('openai/gpt-4o');
       expect(names).toContain('anthropic/claude-opus-4-6');

packages/backend/src/model-prices/model-pricing-cache.service.ts

@@ -45,30 +45,22 @@ export class ModelPricingCacheService implements OnApplicationBootstrap {
     for (const [fullId, entry] of orCache) {
       const { provider, canonical, providerId } = this.resolveProviderAndName(fullId);
 
-      const displayName = entry.displayName ?? null;
-      const validated = this.resolveValidated(providerId, canonical);
-
-      // Store under full OpenRouter ID (e.g. "anthropic/claude-opus-4-6")
-      this.cache.set(fullId, {
+      const pricingEntry: PricingEntry = {
         model_name: fullId,
         provider,
         input_price_per_token: entry.input,
         output_price_per_token: entry.output,
-        display_name: displayName,
-        validated,
-      });
+        display_name: entry.displayName ?? null,
+        validated: this.resolveValidated(providerId, canonical),
+      };
+
+      // Store under full OpenRouter ID (e.g. "anthropic/claude-opus-4-6")
+      this.cache.set(fullId, pricingEntry);
 
       // For supported providers, also store under canonical name (e.g. "claude-opus-4-6")
       // so cost lookups work when telemetry sends bare model names
       if (canonical !== fullId && !this.cache.has(canonical)) {
-        this.cache.set(canonical, {
-          model_name: fullId,
-          provider,
-          input_price_per_token: entry.input,
-          output_price_per_token: entry.output,
-          display_name: displayName,
-          validated,
-        });
+        this.cache.set(canonical, pricingEntry);
       }
     }
 
@@ -121,10 +113,10 @@ export class ModelPricingCacheService implements OnApplicationBootstrap {
     }
 
     const prefix = openRouterId.substring(0, slashIdx);
-    const displayName = OPENROUTER_PREFIX_TO_PROVIDER.get(prefix);
-    if (displayName) {
+    const providerDisplayName = OPENROUTER_PREFIX_TO_PROVIDER.get(prefix);
+    if (providerDisplayName) {
       return {
-        provider: displayName,
+        provider: providerDisplayName,
         canonical: openRouterId.substring(slashIdx + 1),
         providerId: prefix,
       };

packages/backend/src/routing/model-discovery/model-fallback.ts

@@ -16,7 +16,7 @@ interface PricingLookup {
     contextWindow?: number;
     displayName?: string;
   } | null;
-  getAll(): Map<
+  getAll(): ReadonlyMap<
     string,
     { input: number; output: number; contextWindow?: number; displayName?: string }
   >;

packages/backend/test/costs.e2e-spec.ts

@@ -19,7 +19,7 @@ beforeAll(async () => {
 
   // Populate PricingSyncService cache with gpt-4o pricing
   const pricingSync = app.get(PricingSyncService);
-  pricingSync.getAll().set('openai/gpt-4o', {
+  (pricingSync.getAll() as Map<string, { input: number; output: number; contextWindow?: number }>).set('openai/gpt-4o', {
     input: 0.0000025,
     output: 0.00001,
     contextWindow: 128000,