@@ -139,19 +139,16 @@ export async function handler(
139139 const startTimestamp = Date . now ( )
140140 const reqUrl = providerInfo . modifyUrl ( providerInfo . api , isStream )
141141 const reqBody = JSON . stringify (
142- providerInfo . modifyBody (
143- {
144- ...createBodyConverter ( opts . format , providerInfo . format ) ( body ) ,
145- model : providerInfo . model ,
146- ...( providerInfo . payloadModifier ?? { } ) ,
147- ...Object . fromEntries (
148- Object . entries ( providerInfo . payloadMappings ?? { } )
149- . map ( ( [ k , v ] ) => [ k , input . request . headers . get ( v ) ] )
150- . filter ( ( [ _k , v ] ) => ! ! v ) ,
151- ) ,
152- } ,
153- authInfo ?. workspaceID ,
154- ) ,
142+ providerInfo . modifyBody ( {
143+ ...createBodyConverter ( opts . format , providerInfo . format ) ( body ) ,
144+ model : providerInfo . model ,
145+ ...( providerInfo . payloadModifier ?? { } ) ,
146+ ...Object . fromEntries (
147+ Object . entries ( providerInfo . payloadMappings ?? { } )
148+ . map ( ( [ k , v ] ) => [ k , input . request . headers . get ( v ) ] )
149+ . filter ( ( [ _k , v ] ) => ! ! v ) ,
150+ ) ,
151+ } ) ,
155152 )
156153 logger . debug ( "REQUEST URL: " + reqUrl )
157154 logger . debug ( "REQUEST: " + reqBody . substring ( 0 , 300 ) + "..." )
@@ -470,15 +467,17 @@ export async function handler(
470467 ...( ( ) => {
471468 const providerProps = zenData . providers [ modelProvider . id ]
472469 const format = providerProps . format
473- const providerModel = modelProvider . model
474- if ( format === "anthropic" ) return anthropicHelper ( { reqModel, providerModel } )
475- if ( format === "google" ) return googleHelper ( { reqModel, providerModel } )
476- if ( format === "openai" ) return openaiHelper ( { reqModel, providerModel } )
477- return oaCompatHelper ( {
470+ const opts = {
478471 reqModel,
479- providerModel,
472+ providerModel : modelProvider . model ,
480473 adjustCacheUsage : providerProps . adjustCacheUsage ,
481- } )
474+ safetyIdentifier : ip ,
475+ workspaceID : authInfo ?. workspaceID ,
476+ }
477+ if ( format === "anthropic" ) return anthropicHelper ( opts )
478+ if ( format === "google" ) return googleHelper ( opts )
479+ if ( format === "openai" ) return openaiHelper ( opts )
480+ return oaCompatHelper ( opts )
482481 } ) ( ) ,
483482 }
484483 }
0 commit comments