Skip to content

Fix JSON Marshal for StreamingMessageEvent #36

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Jun 25, 2025
Merged

Fix JSON Marshal for StreamingMessageEvent #36

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
20d2893
1. add missing marshal kind
Gaojianli Jun 24, 2025
8f0a1c0
status-update not status_update
Gaojianli Jun 24, 2025
7780f0b
fix final args
Gaojianli Jun 24, 2025
05c0562
remove 4 kinds
Gaojianli Jun 24, 2025
ff8b021
use a pointer in sendSSEEvent
Gaojianli Jun 25, 2025
45472e8
closeData pointer
Gaojianli Jun 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions protocol/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,9 @@ const (
// KindTask is the kind of the task.
KindTask = "task"
// KindTaskStatusUpdate is the kind of the task status update event.
KindTaskStatusUpdate = "status_update"
KindTaskStatusUpdate = "status-update"
// KindTaskArtifactUpdate is the kind of the task artifact update event.
KindTaskArtifactUpdate = "artifact_update"
KindTaskArtifactUpdate = "artifact-update"
// KindData is the kind of the data.
KindData = "data"
// KindFile is the kind of the file.
Expand Down Expand Up @@ -661,11 +661,12 @@ func NewTaskStatusUpdateEvent(taskID, contextID string, status TaskStatus, final
ContextID: contextID,
Kind: KindTaskStatusUpdate,
Status: status,
Final: &final,
}
}

// NewTaskArtifactUpdateEvent creates a new TaskArtifactUpdateEvent.
func NewTaskArtifactUpdateEvent(taskID, contextID string, artifact Artifact, final bool) TaskArtifactUpdateEvent {
func NewTaskArtifactUpdateEvent(taskID, contextID string, artifact Artifact) TaskArtifactUpdateEvent {
return TaskArtifactUpdateEvent{
TaskID: taskID,
ContextID: contextID,
Expand Down Expand Up @@ -806,7 +807,7 @@ type StreamingMessageEvent struct {
}

// UnmarshalJSON implements custom unmarshalling logic for StreamingMessageEvent
func (r *StreamingMessageEvent) UnmarshalJSON(data []byte) error {
func (r StreamingMessageEvent) UnmarshalJSON(data []byte) error {
// First, try to detect if this is wrapped in a Result field
type StreamingMessageEventRaw struct {
Result json.RawMessage `json:"Result"`
Expand Down Expand Up @@ -864,12 +865,16 @@ func (r *StreamingMessageEvent) UnmarshalJSON(data []byte) error {
}

// MarshalJSON implements custom marshalling logic for StreamingMessageResult
func (r *StreamingMessageEvent) MarshalJSON() ([]byte, error) {
func (r StreamingMessageEvent) MarshalJSON() ([]byte, error) {
switch r.Result.GetKind() {
case KindMessage:
return json.Marshal(r.Result)
case KindTask:
return json.Marshal(r.Result)
case KindTaskStatusUpdate:
return json.Marshal(r.Result)
case KindTaskArtifactUpdate:
return json.Marshal(r.Result)
default:
return nil, fmt.Errorf("unsupported result kind: %s", r.Result.GetKind())
}
Expand Down
Loading