mcp: don't omit required fields in ImageContent and AudioContent (#95)
Update `ImageContent` and `AudioContent` to use an inline wire format to ensure that required fields are not omitted during JSON marshaling, matching TypeScript schema requirements. This follows the TextContent approach. - `ImageContent` requires `data` and `mimeType` fields. - `AudioContent` requires `data` and `mimeType` fields.
This commit is contained in:
parent
d437c81cbe
commit
dced3e4503
1 changed files with 46 additions and 6 deletions
|
|
@ -58,13 +58,25 @@ type ImageContent struct {
|
|||
}
|
||||
|
||||
func (c *ImageContent) MarshalJSON() ([]byte, error) {
|
||||
return json.Marshal(&wireContent{
|
||||
// Custom wire format to ensure required fields are always included, even when empty.
|
||||
data := c.Data
|
||||
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"`
|
||||
}{
|
||||
Type: "image",
|
||||
MIMEType: c.MIMEType,
|
||||
Data: c.Data,
|
||||
Data: data,
|
||||
Meta: c.Meta,
|
||||
Annotations: c.Annotations,
|
||||
})
|
||||
}
|
||||
return json.Marshal(wire)
|
||||
}
|
||||
|
||||
func (c *ImageContent) fromWire(wire *wireContent) {
|
||||
|
|
@ -83,13 +95,25 @@ type AudioContent struct {
|
|||
}
|
||||
|
||||
func (c AudioContent) MarshalJSON() ([]byte, error) {
|
||||
return json.Marshal(&wireContent{
|
||||
// Custom wire format to ensure required fields are always included, even when empty.
|
||||
data := c.Data
|
||||
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"`
|
||||
}{
|
||||
Type: "audio",
|
||||
MIMEType: c.MIMEType,
|
||||
Data: c.Data,
|
||||
Data: data,
|
||||
Meta: c.Meta,
|
||||
Annotations: c.Annotations,
|
||||
})
|
||||
}
|
||||
return json.Marshal(wire)
|
||||
}
|
||||
|
||||
func (c *AudioContent) fromWire(wire *wireContent) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue