Skip to content

mcp: dedup wire type for image and audio #149

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 1 commit into from
Jul 21, 2025
Merged

mcp: dedup wire type for image and audio #149

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 11 additions & 14 deletions mcp/content.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,7 @@ func (c *ImageContent) MarshalJSON() ([]byte, error) {
if data == nil {
data = []byte{}
}
wire := struct {
Type string `json:"type"`
MIMEType string `json:"mimeType"`
Data []byte `json:"data"`
Meta Meta `json:"_meta,omitempty"`
Annotations *Annotations `json:"annotations,omitempty"`
}{
wire := imageAudioWire{
Type: "image",
MIMEType: c.MIMEType,
Data: data,
Expand Down Expand Up @@ -100,13 +94,7 @@ func (c AudioContent) MarshalJSON() ([]byte, error) {
if data == nil {
data = []byte{}
}
wire := struct {
Type string `json:"type"`
MIMEType string `json:"mimeType"`
Data []byte `json:"data"`
Meta Meta `json:"_meta,omitempty"`
Annotations *Annotations `json:"annotations,omitempty"`
}{
wire := imageAudioWire{
Type: "audio",
MIMEType: c.MIMEType,
Data: data,
Expand All @@ -123,6 +111,15 @@ func (c *AudioContent) fromWire(wire *wireContent) {
c.Annotations = wire.Annotations
}

// Custom wire format to ensure required fields are always included, even when empty.
type imageAudioWire struct {
Type string `json:"type"`
MIMEType string `json:"mimeType"`
Data []byte `json:"data"`
Meta Meta `json:"_meta,omitempty"`
Annotations *Annotations `json:"annotations,omitempty"`
}

// ResourceLink is a link to a resource
type ResourceLink struct {
URI string
Expand Down
Loading