2222import java .time .OffsetDateTime ;
2323import java .time .format .DateTimeFormatter ;
2424import java .time .format .DateTimeParseException ;
25+ import java .util .Map ;
2526import java .util .Set ;
2627
2728import com .google .gson .Gson ;
2829import com .google .gson .GsonBuilder ;
2930import com .google .gson .JsonSyntaxException ;
3031import com .google .gson .ToNumberPolicy ;
3132import com .google .gson .TypeAdapter ;
33+ import com .google .gson .reflect .TypeToken ;
3234import com .google .gson .stream .JsonReader ;
3335import com .google .gson .stream .JsonToken ;
3436import com .google .gson .stream .JsonWriter ;
@@ -543,10 +545,18 @@ public void write(JsonWriter out, Message.Role value) throws java.io.IOException
543545 static class PartTypeAdapter extends TypeAdapter <Part <?>> {
544546
545547 private static final Set <String > VALID_KEYS = Set .of (TEXT , FILE , DATA );
548+ private static final Type MAP_TYPE = new TypeToken <Map <String , Object >>(){}.getType ();
546549
547550 // Create separate Gson instance without the Part adapter to avoid recursion
548551 private final Gson delegateGson = createBaseGsonBuilder ().create ();
549552
553+ private void writeMetadata (JsonWriter out , @ Nullable Map <String , Object > metadata ) throws java .io .IOException {
554+ if (metadata != null && !metadata .isEmpty ()) {
555+ out .name ("metadata" );
556+ delegateGson .toJson (metadata , MAP_TYPE , out );
557+ }
558+ }
559+
550560 @ Override
551561 public void write (JsonWriter out , Part <?> value ) throws java .io .IOException {
552562 if (value == null ) {
@@ -560,14 +570,17 @@ public void write(JsonWriter out, Part<?> value) throws java.io.IOException {
560570 // TextPart: { "text": "value" } - direct string value
561571 out .name (TEXT );
562572 out .value (textPart .text ());
573+ writeMetadata (out , textPart .metadata ());
563574 } else if (value instanceof FilePart filePart ) {
564575 // FilePart: { "file": {...} }
565576 out .name (FILE );
566577 delegateGson .toJson (filePart .file (), FileContent .class , out );
578+ writeMetadata (out , filePart .metadata ());
567579 } else if (value instanceof DataPart dataPart ) {
568580 // DataPart: { "data": <any JSON value> }
569581 out .name (DATA );
570582 delegateGson .toJson (dataPart .data (), Object .class , out );
583+ writeMetadata (out , dataPart .metadata ());
571584 } else {
572585 throw new JsonSyntaxException ("Unknown Part subclass: " + value .getClass ().getName ());
573586 }
@@ -591,24 +604,34 @@ Part<?> read(JsonReader in) throws java.io.IOException {
591604
592605 com .google .gson .JsonObject jsonObject = jsonElement .getAsJsonObject ();
593606
607+ // Extract metadata if present
608+ Map <String , Object > metadata = null ;
609+ if (jsonObject .has ("metadata" )) {
610+ metadata = delegateGson .fromJson (jsonObject .get ("metadata" ), new TypeToken <Map <String , Object >>(){}.getType ());
611+ }
612+
594613 // Check for member name discriminators (v1.0 protocol)
595614 Set <String > keys = jsonObject .keySet ();
596- if (keys .size () != 1 ) {
597- throw new JsonSyntaxException (format ("Part object must have exactly one key, which must be one of: %s (found: %s)" , VALID_KEYS , keys ));
615+ if (keys .size () < 1 || keys . size () > 2 ) {
616+ throw new JsonSyntaxException (format ("Part object must have one content key from %s and optionally 'metadata' (found: %s)" , VALID_KEYS , keys ));
598617 }
599618
600- String discriminator = keys .iterator ().next ();
619+ // Find the discriminator (should be one of TEXT, FILE, DATA)
620+ String discriminator = keys .stream ()
621+ .filter (VALID_KEYS ::contains )
622+ .findFirst ()
623+ .orElseThrow (() -> new JsonSyntaxException (format ("Part must have one of: %s (found: %s)" , VALID_KEYS , keys )));
601624
602625 return switch (discriminator ) {
603- case TEXT -> new TextPart (jsonObject .get (TEXT ).getAsString ());
604- case FILE -> new FilePart (delegateGson .fromJson (jsonObject .get (FILE ), FileContent .class ));
626+ case TEXT -> new TextPart (jsonObject .get (TEXT ).getAsString (), metadata );
627+ case FILE -> new FilePart (delegateGson .fromJson (jsonObject .get (FILE ), FileContent .class ), metadata );
605628 case DATA -> {
606629 // DataPart supports any JSON value: object, array, primitive, or null
607630 Object data = delegateGson .fromJson (
608631 jsonObject .get (DATA ),
609632 Object .class
610633 );
611- yield new DataPart (data );
634+ yield new DataPart (data , metadata );
612635 }
613636 default ->
614637 throw new JsonSyntaxException (format ("Part must have one of: %s (found: %s)" , VALID_KEYS , discriminator ));
0 commit comments