update to be custom

Author: colegottdank

bifrost/lib/clients/jawnTypes/private.ts

@@ -19538,8 +19538,7 @@ export interface operations {
     requestBody: {
       content: {
         "application/json": {
-          /** Format: double */
-          heliconePricingMultiplier: number;
+          endpointMultipliers: components["schemas"]["Record_string.number_"];
         };
       };
     };

bifrost/lib/clients/jawnTypes/public.ts

@@ -3305,6 +3305,7 @@ Json: JsonObject;
       ptbEnabled: boolean;
       version?: string;
       unsupportedParameters?: components["schemas"]["StandardParameter"][];
+      registryKey: string;
       modelConfig: components["schemas"]["ModelProviderConfig"];
       userConfig: components["schemas"]["UserEndpointConfig"];
       provider: components["schemas"]["ModelProviderName"];

docs/swagger.json

@@ -9162,6 +9162,9 @@
 						},
 						"type": "array"
 					},
+					"registryKey": {
+						"type": "string"
+					},
 					"modelConfig": {
 						"$ref": "#/components/schemas/ModelProviderConfig"
 					},
@@ -9193,6 +9196,7 @@
 					"contextLength",
 					"maxCompletionTokens",
 					"ptbEnabled",
+					"registryKey",
 					"modelConfig",
 					"userConfig",
 					"provider",

packages/cost/models/build-indexes.ts

@@ -10,7 +10,8 @@ import type {
 function mergeConfigs(
   modelProviderConfig: ModelProviderConfig,
   endpointConfig: EndpointConfig,
-  deploymentId: string
+  deploymentId: string,
+  registryKey: string
 ): Endpoint {
   const userConfig: UserEndpointConfig = {
     region: deploymentId,
@@ -22,6 +23,7 @@ function mergeConfigs(
   };
 
   return {
+    registryKey,
     author: modelProviderConfig.author,
     modelConfig: modelProviderConfig,
     userConfig: userConfig,
@@ -142,7 +144,7 @@ export function buildIndexes(
       config.endpointConfigs
     )) {
       const endpointKey = `${configKey}:${deploymentId}` as EndpointId;
-      const endpoint = mergeConfigs(config, deploymentConfig, deploymentId);
+      const endpoint = mergeConfigs(config, deploymentConfig, deploymentId, configKey);
       endpointIdToEndpoint.set(endpointKey, endpoint);
 
       // Add to ALL endpoints index (regardless of PTB status)

packages/cost/models/registry.ts

@@ -140,7 +140,10 @@ function buildEndpoint(
     return err(modelIdResult.error);
   }
 
+  const registryKey = `${modelIdResult.data}:${endpointConfig.provider}`;
+
   return ok({
+    registryKey,
     modelConfig: endpointConfig,
     userConfig: userEndpointConfig,
     provider: endpointConfig.provider,

packages/cost/models/types.ts

@@ -214,6 +214,7 @@ export interface RequestParams {
 }
 
 export interface Endpoint extends BaseConfig {
+  registryKey: string;
   modelConfig: ModelProviderConfig;
   userConfig: UserEndpointConfig;
   provider: ModelProviderName;

valhalla/jawn/src/controllers/private/adminController.ts

@@ -1352,23 +1352,33 @@ export class AdminController extends Controller {
   public async updateOrgPricingConfig(
     @Request() request: JawnAuthenticatedRequest,
     @Path() orgId: string,
-    @Body() body: { heliconePricingMultiplier: number }
+    @Body() body: { endpointMultipliers: Record<string, number> }
   ): Promise<Result<null, string>> {
     await authCheckThrow(request.authParams.userId);
 
-    const { heliconePricingMultiplier } = body;
+    const { endpointMultipliers } = body;
 
-    if (
-      heliconePricingMultiplier < 0 ||
-      heliconePricingMultiplier > 2 ||
-      isNaN(heliconePricingMultiplier)
-    ) {
-      return err("Pricing multiplier must be between 0 and 2");
+    // Validate each multiplier
+    for (const [endpoint, multiplier] of Object.entries(endpointMultipliers)) {
+      if (multiplier < 0 || multiplier > 2 || isNaN(multiplier)) {
+        return err(`Invalid multiplier for ${endpoint}: must be between 0 and 2`);
+      }
+
+      // Validate endpoint key format (should contain colon)
+      if (!endpoint.includes(':')) {
+        return err(`Invalid endpoint key format: ${endpoint}`);
+      }
     }
 
     const { error } = await dbExecute(
-      `UPDATE organization SET pricing_config = jsonb_set(COALESCE(pricing_config, '{}'), '{heliconePricingMultiplier}', $1::text::jsonb) WHERE id = $2`,
-      [heliconePricingMultiplier.toString(), orgId]
+      `UPDATE organization
+       SET pricing_config = jsonb_set(
+         COALESCE(pricing_config, '{}'),
+         '{endpointMultipliers}',
+         $1::jsonb
+       )
+       WHERE id = $2`,
+      [JSON.stringify(endpointMultipliers), orgId]
     );
 
     if (error) {

valhalla/jawn/src/tsoa-build/private/routes.ts

@@ -20631,7 +20631,7 @@ export function RegisterRoutes(app: Router) {
         const argsAdminController_updateOrgPricingConfig: Record<string, TsoaRoute.ParameterSchema> = {
                 request: {"in":"request","name":"request","required":true,"dataType":"object"},
                 orgId: {"in":"path","name":"orgId","required":true,"dataType":"string"},
-                body: {"in":"body","name":"body","required":true,"dataType":"nestedObjectLiteral","nestedProperties":{"heliconePricingMultiplier":{"dataType":"double","required":true}}},
+                body: {"in":"body","name":"body","required":true,"dataType":"nestedObjectLiteral","nestedProperties":{"endpointMultipliers":{"ref":"Record_string.number_","required":true}}},
         };
         app.post('/v1/admin/org/:orgId/pricing-config',
             authenticateMiddleware([{"api_key":[]}]),

valhalla/jawn/src/tsoa-build/private/swagger.json

@@ -56940,13 +56940,12 @@
 						"application/json": {
 							"schema": {
 								"properties": {
-									"heliconePricingMultiplier": {
-										"type": "number",
-										"format": "double"
+									"endpointMultipliers": {
+										"$ref": "#/components/schemas/Record_string.number_"
 									}
 								},
 								"required": [
-									"heliconePricingMultiplier"
+									"endpointMultipliers"
 								],
 								"type": "object"
 							}

valhalla/jawn/src/tsoa-build/public/routes.ts

@@ -2929,6 +2929,7 @@ const models: TsoaRoute.Models = {
             "ptbEnabled": {"dataType":"boolean","required":true},
             "version": {"dataType":"string"},
             "unsupportedParameters": {"dataType":"array","array":{"dataType":"refAlias","ref":"StandardParameter"}},
+            "registryKey": {"dataType":"string","required":true},
             "modelConfig": {"ref":"ModelProviderConfig","required":true},
             "userConfig": {"ref":"UserEndpointConfig","required":true},
             "provider": {"ref":"ModelProviderName","required":true},