Skip to content

Commit 83b2cbe

Browse files
fix(adk): modify cbHandler address check after rebasing
Change-Id: Ia9dcb9b92541d3e9ba4ef82746bbd8386763d3c1
1 parent 6fc347c commit 83b2cbe

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

adk/chatmodel.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ type cbHandler struct {
350350
func (h *cbHandler) onChatModelEnd(ctx context.Context,
351351
_ *callbacks.RunInfo, output *model.CallbackOutput) context.Context {
352352
addr := core.GetCurrentAddress(ctx)
353-
if len(addr) != len(h.addr)+2 || !addr[:len(h.addr)].Equals(h.addr) {
353+
if len(addr) != len(h.addr)+3 || !addr[:len(h.addr)].Equals(h.addr) {
354354
return ctx
355355
}
356356

@@ -362,7 +362,7 @@ func (h *cbHandler) onChatModelEnd(ctx context.Context,
362362
func (h *cbHandler) onChatModelEndWithStreamOutput(ctx context.Context,
363363
_ *callbacks.RunInfo, output *schema.StreamReader[*model.CallbackOutput]) context.Context {
364364
addr := core.GetCurrentAddress(ctx)
365-
if len(addr) != len(h.addr)+2 || !addr[:len(h.addr)].Equals(h.addr) {
365+
if len(addr) != len(h.addr)+3 || !addr[:len(h.addr)].Equals(h.addr) {
366366
return ctx
367367
}
368368

@@ -379,7 +379,7 @@ func (h *cbHandler) onChatModelEndWithStreamOutput(ctx context.Context,
379379
func (h *cbHandler) onToolEnd(ctx context.Context,
380380
runInfo *callbacks.RunInfo, output *tool.CallbackOutput) context.Context {
381381
addr := core.GetCurrentAddress(ctx)
382-
if len(addr) != len(h.addr)+3 || !addr[:len(h.addr)].Equals(h.addr) {
382+
if len(addr) != len(h.addr)+4 || !addr[:len(h.addr)].Equals(h.addr) {
383383
return ctx
384384
}
385385

@@ -403,7 +403,7 @@ func (h *cbHandler) onToolEnd(ctx context.Context,
403403
func (h *cbHandler) onToolEndWithStreamOutput(ctx context.Context,
404404
runInfo *callbacks.RunInfo, output *schema.StreamReader[*tool.CallbackOutput]) context.Context {
405405
addr := core.GetCurrentAddress(ctx)
406-
if len(addr) != len(h.addr)+3 || !addr[:len(h.addr)].Equals(h.addr) {
406+
if len(addr) != len(h.addr)+4 || !addr[:len(h.addr)].Equals(h.addr) {
407407
return ctx
408408
}
409409

@@ -433,7 +433,7 @@ func (h *cbHandler) sendReturnDirectlyToolEvent() {
433433

434434
func (h *cbHandler) onToolsNodeEnd(ctx context.Context, _ *callbacks.RunInfo, _ []*schema.Message) context.Context {
435435
addr := core.GetCurrentAddress(ctx)
436-
if len(addr) != len(h.addr)+2 || !addr[:len(h.addr)].Equals(h.addr) {
436+
if len(addr) != len(h.addr)+3 || !addr[:len(h.addr)].Equals(h.addr) {
437437
return ctx
438438
}
439439
h.sendReturnDirectlyToolEvent()
@@ -442,7 +442,7 @@ func (h *cbHandler) onToolsNodeEnd(ctx context.Context, _ *callbacks.RunInfo, _
442442

443443
func (h *cbHandler) onToolsNodeEndWithStreamOutput(ctx context.Context, _ *callbacks.RunInfo, _ *schema.StreamReader[[]*schema.Message]) context.Context {
444444
addr := core.GetCurrentAddress(ctx)
445-
if len(addr) != len(h.addr)+2 || !addr[:len(h.addr)].Equals(h.addr) {
445+
if len(addr) != len(h.addr)+3 || !addr[:len(h.addr)].Equals(h.addr) {
446446
return ctx
447447
}
448448
h.sendReturnDirectlyToolEvent()

0 commit comments

Comments
 (0)