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 ;
@@ -500,10 +502,18 @@ public void write(JsonWriter out, Message.Role value) throws java.io.IOException
500502 static class PartTypeAdapter extends TypeAdapter <Part <?>> {
501503
502504 private static final Set <String > VALID_KEYS = Set .of (TEXT , FILE , DATA );
505+ private static final Type MAP_TYPE = new TypeToken <Map <String , Object >>(){}.getType ();
503506
504507 // Create separate Gson instance without the Part adapter to avoid recursion
505508 private final Gson delegateGson = createBaseGsonBuilder ().create ();
506509
510+ private void writeMetadata (JsonWriter out , @ Nullable Map <String , Object > metadata ) throws java .io .IOException {
511+ if (metadata != null && !metadata .isEmpty ()) {
512+ out .name ("metadata" );
513+ delegateGson .toJson (metadata , MAP_TYPE , out );
514+ }
515+ }
516+
507517 @ Override
508518 public void write (JsonWriter out , Part <?> value ) throws java .io .IOException {
509519 if (value == null ) {
@@ -517,14 +527,17 @@ public void write(JsonWriter out, Part<?> value) throws java.io.IOException {
517527 // TextPart: { "text": "value" } - direct string value
518528 out .name (TEXT );
519529 out .value (textPart .text ());
530+ writeMetadata (out , textPart .metadata ());
520531 } else if (value instanceof FilePart filePart ) {
521532 // FilePart: { "file": {...} }
522533 out .name (FILE );
523534 delegateGson .toJson (filePart .file (), FileContent .class , out );
535+ writeMetadata (out , filePart .metadata ());
524536 } else if (value instanceof DataPart dataPart ) {
525537 // DataPart: { "data": <any JSON value> }
526538 out .name (DATA );
527539 delegateGson .toJson (dataPart .data (), Object .class , out );
540+ writeMetadata (out , dataPart .metadata ());
528541 } else {
529542 throw new JsonSyntaxException ("Unknown Part subclass: " + value .getClass ().getName ());
530543 }
@@ -548,24 +561,34 @@ Part<?> read(JsonReader in) throws java.io.IOException {
548561
549562 com .google .gson .JsonObject jsonObject = jsonElement .getAsJsonObject ();
550563
564+ // Extract metadata if present
565+ Map <String , Object > metadata = null ;
566+ if (jsonObject .has ("metadata" )) {
567+ metadata = delegateGson .fromJson (jsonObject .get ("metadata" ), new TypeToken <Map <String , Object >>(){}.getType ());
568+ }
569+
551570 // Check for member name discriminators (v1.0 protocol)
552571 Set <String > keys = jsonObject .keySet ();
553- if (keys .size () != 1 ) {
554- throw new JsonSyntaxException (format ("Part object must have exactly one key, which must be one of: %s (found: %s)" , VALID_KEYS , keys ));
572+ if (keys .size () < 1 || keys . size () > 2 ) {
573+ throw new JsonSyntaxException (format ("Part object must have one content key from %s and optionally 'metadata' (found: %s)" , VALID_KEYS , keys ));
555574 }
556575
557- String discriminator = keys .iterator ().next ();
576+ // Find the discriminator (should be one of TEXT, FILE, DATA)
577+ String discriminator = keys .stream ()
578+ .filter (VALID_KEYS ::contains )
579+ .findFirst ()
580+ .orElseThrow (() -> new JsonSyntaxException (format ("Part must have one of: %s (found: %s)" , VALID_KEYS , keys )));
558581
559582 return switch (discriminator ) {
560- case TEXT -> new TextPart (jsonObject .get (TEXT ).getAsString ());
561- case FILE -> new FilePart (delegateGson .fromJson (jsonObject .get (FILE ), FileContent .class ));
583+ case TEXT -> new TextPart (jsonObject .get (TEXT ).getAsString (), metadata );
584+ case FILE -> new FilePart (delegateGson .fromJson (jsonObject .get (FILE ), FileContent .class ), metadata );
562585 case DATA -> {
563586 // DataPart supports any JSON value: object, array, primitive, or null
564587 Object data = delegateGson .fromJson (
565588 jsonObject .get (DATA ),
566589 Object .class
567590 );
568- yield new DataPart (data );
591+ yield new DataPart (data , metadata );
569592 }
570593 default ->
571594 throw new JsonSyntaxException (format ("Part must have one of: %s (found: %s)" , VALID_KEYS , discriminator ));
0 commit comments