-
Notifications
You must be signed in to change notification settings - Fork 2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[OpenAI] Improved logging and specific handlers #43460
Open
jpalvarezl
wants to merge
1
commit into
main
Choose a base branch
from
jpalvarezl/aoai_realtime_ws_fixes
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
...src/main/java/com/azure/ai/openai/realtime/implementation/websocket/KeepAliveHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
// Copyright (c) Microsoft Corporation. All rights reserved. | ||
// Licensed under the MIT License. | ||
|
||
package com.azure.ai.openai.realtime.implementation.websocket; | ||
|
||
import com.azure.core.util.logging.ClientLogger; | ||
import io.netty.channel.Channel; | ||
import io.netty.channel.ChannelDuplexHandler; | ||
import io.netty.channel.ChannelHandlerContext; | ||
import io.netty.handler.codec.http.FullHttpResponse; | ||
import io.netty.handler.codec.http.websocketx.PingWebSocketFrame; | ||
import io.netty.handler.codec.http.websocketx.PongWebSocketFrame; | ||
import io.netty.handler.codec.http.websocketx.WebSocketFrame; | ||
import io.netty.util.CharsetUtil; | ||
|
||
/** | ||
* Dedicated handler for server-side ping messages. | ||
*/ | ||
public class KeepAliveHandler extends ChannelDuplexHandler { | ||
private static final ClientLogger LOGGER = new ClientLogger(KeepAliveHandler.class); | ||
|
||
/** | ||
* {@inheritDoc} | ||
*/ | ||
@Override | ||
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception { | ||
if (msg instanceof FullHttpResponse) { | ||
FullHttpResponse response = (FullHttpResponse) msg; | ||
throw LOGGER.logExceptionAsError(new IllegalStateException("Unexpected FullHttpResponse (getStatus=" | ||
+ response.status() + ", content=" + response.content().toString(CharsetUtil.UTF_8) + ')')); | ||
} | ||
Channel ch = ctx.channel(); | ||
|
||
LOGGER.atVerbose().log("Processing message: "); | ||
WebSocketFrame frame = (WebSocketFrame) msg; | ||
if (frame instanceof PingWebSocketFrame) { | ||
// Ping, reply Pong | ||
LOGGER.atVerbose().log(() -> "Received PingWebSocketFrame"); | ||
LOGGER.atVerbose().log(() -> "Sending PongWebSocketFrame"); | ||
ch.writeAndFlush(new PongWebSocketFrame()); | ||
} else if (frame instanceof PongWebSocketFrame) { | ||
// Pong | ||
LOGGER.atVerbose().log(() -> "Received PongWebSocketFrame"); | ||
} else { | ||
// Pass other frames down the pipeline | ||
// We only pass down the pipeline messages this handler doesn't process | ||
ctx.fireChannelRead(msg); | ||
} | ||
|
||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
...main/java/com/azure/ai/openai/realtime/implementation/websocket/WebSocketPingHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,33 @@ | ||||||
// Copyright (c) Microsoft Corporation. All rights reserved. | ||||||
// Licensed under the MIT License. | ||||||
|
||||||
package com.azure.ai.openai.realtime.implementation.websocket; | ||||||
|
||||||
import com.azure.core.util.logging.ClientLogger; | ||||||
import io.netty.channel.ChannelDuplexHandler; | ||||||
import io.netty.channel.ChannelHandlerContext; | ||||||
import io.netty.handler.codec.http.websocketx.PingWebSocketFrame; | ||||||
import io.netty.handler.timeout.IdleStateEvent; | ||||||
|
||||||
/** | ||||||
* Handler that sends a ping frame to the server when the channel is idle to prevent keep-alive timeouts. | ||||||
*/ | ||||||
public class WebSocketPingHandler extends ChannelDuplexHandler { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
private static final ClientLogger LOGGER = new ClientLogger(WebSocketPingHandler.class); | ||||||
|
||||||
/** | ||||||
* {@inheritDoc} | ||||||
*/ | ||||||
@Override | ||||||
public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception { | ||||||
if (evt instanceof IdleStateEvent) { | ||||||
LOGGER.atVerbose().log("Received IdleStateEvent"); | ||||||
IdleStateEvent event = (IdleStateEvent) evt; | ||||||
if (event.state() == IdleStateEvent.ALL_IDLE_STATE_EVENT.state()) { | ||||||
LOGGER.atVerbose().log("Sending PingWebSocketFrame"); | ||||||
ctx.writeAndFlush(new PingWebSocketFrame()); | ||||||
} | ||||||
} | ||||||
super.userEventTriggered(ctx, evt); | ||||||
} | ||||||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.