Merge pull request cloudflare#145 from cloudflare/pass-correlation-id…

…-for-openai-calls-session-and-tracks Provide extra API params and correlation id for openai API calls
code · Dec 20, 2024 · e356ef3 · e356ef3
2 parents c143f77 + 740d444
commit e356ef3
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 10 deletions.
diff --git a/app/durableObjects/ChatRoom.server.ts b/app/durableObjects/ChatRoom.server.ts
@@ -387,6 +387,8 @@ export class ChatRoom extends Server<Env> {
 						const openAiSession = await CallsNewSession(
 							this.env.CALLS_APP_ID,
 							this.env.CALLS_APP_SECRET,
+							this.env.API_EXTRA_PARAMS,
+							await this.getMeetingId(),
 							true
 						)
 						const openAiTracksResponse = await openAiSession.NewTracks({

diff --git a/app/utils/openai.server.ts b/app/utils/openai.server.ts
@@ -25,14 +25,25 @@ export class CallsSession {
 	sessionId: string
 	headers: any
 	endpoint: string
-	constructor(sessionId: string, headers: any, endpoint: string) {
+	params: URLSearchParams
+	constructor(
+		sessionId: string,
+		headers: any,
+		endpoint: string,
+		apiExtraParams?: string,
+		meetingId?: string
+	) {
 		this.sessionId = sessionId
 		this.headers = headers
 		this.endpoint = endpoint
+		this.params = new URLSearchParams(apiExtraParams)
+		if (meetingId) {
+			this.params.set('correlationId', meetingId)
+		}
 	}
 	async NewTracks(body: any): Promise<NewTracksResponse> {
 		const newTracksURL = new URL(
-			`${this.endpoint}/sessions/${this.sessionId}/tracks/new?streamDebug&forceTracing=true`
+			`${this.endpoint}/sessions/${this.sessionId}/tracks/new?${this.params.toString()}`
 		)
 		const newTracksResponse = (await fetch(newTracksURL.href, {
 			method: 'POST',
@@ -49,7 +60,7 @@ export class CallsSession {
 			sessionDescription: sdp,
 		}
 		const renegotiateURL = new URL(
-			`${this.endpoint}/sessions/${this.sessionId}/renegotiate?streamDebug&forceTracing=true`
+			`${this.endpoint}/sessions/${this.sessionId}/renegotiate?${this.params.toString()}`
 		)
 		return fetch(renegotiateURL.href, {
 			method: 'PUT',
@@ -64,16 +75,20 @@ const baseURL = 'https://rtc.live.cloudflare.com/apps'
 export async function CallsNewSession(
 	appID: string,
 	appToken: string,
-	thirdparty: boolean = false
+	apiExtraParams?: string,
+	meetingId?: string,
+	thirdparty = false
 ): Promise<CallsSession> {
 	const headers = {
 		Authorization: `Bearer ${appToken}`,
 		'Content-Type': 'application/json',
 	}
 	const endpoint = `${baseURL}/${appID}`
-	const newSessionURL = new URL(
-		`${endpoint}/sessions/new?streamDebug&forceTracing=true`
-	)
+	const params = new URLSearchParams(apiExtraParams)
+	if (meetingId) {
+		params.set('correlationId', meetingId)
+	}
+	const newSessionURL = new URL(`${endpoint}/sessions/new?${params.toString()}`)
 	if (thirdparty) {
 		newSessionURL.searchParams.set('thirdparty', 'true')
 	}
@@ -89,7 +104,13 @@ export async function CallsNewSession(
 		})
 
 		.then((res) => res.json())) as NewSessionResponse
-	return new CallsSession(sessionResponse.sessionId, headers, endpoint)
+	return new CallsSession(
+		sessionResponse.sessionId,
+		headers,
+		endpoint,
+		apiExtraParams,
+		meetingId
+	)
 }
 
 export function checkNewTracksResponse(
@@ -114,10 +135,8 @@ export async function requestOpenAIService(
 	offer: SessionDescription,
 	openAiKey: string,
 	openAiModelEndpoint: string,
-	// env: Env,
 	searchParams?: URLSearchParams
 ): Promise<SessionDescription> {
-	// const originalRequestURL = new URL(originalRequest.url)
 	console.log(`Request to: ${openAiModelEndpoint}`)
 	const endpointURL = new URL(openAiModelEndpoint)
 	endpointURL.search = searchParams?.toString() ?? ''