Skip to content

Commit 61213a0

Browse files
dstibbedstibbe
committed
Refactored the model to have the ContentBlock types match the defined schema (#158)
1 parent a23856e commit 61213a0

File tree

5 files changed

+107
-74
lines changed

5 files changed

+107
-74
lines changed

‎kotlin-sdk-core/api/kotlin-sdk-core.api‎

Lines changed: 46 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public final class io/modelcontextprotocol/kotlin/sdk/Annotations$Companion {
2929
public final fun serializer ()Lkotlinx/serialization/KSerializer;
3030
}
3131

32-
public final class io/modelcontextprotocol/kotlin/sdk/AudioContent : io/modelcontextprotocol/kotlin/sdk/PromptMessageContentMultimodal {
32+
public final class io/modelcontextprotocol/kotlin/sdk/AudioContent : io/modelcontextprotocol/kotlin/sdk/ContentBlock, io/modelcontextprotocol/kotlin/sdk/CreateMessageResultContent, io/modelcontextprotocol/kotlin/sdk/SamplingMessageContent {
3333
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/AudioContent$Companion;
3434
public static final field TYPE Ljava/lang/String;
3535
public fun <init> (Ljava/lang/String;Ljava/lang/String;Lio/modelcontextprotocol/kotlin/sdk/Annotations;)V
@@ -450,6 +450,15 @@ public final class io/modelcontextprotocol/kotlin/sdk/CompleteResult$Completion$
450450
public final fun serializer ()Lkotlinx/serialization/KSerializer;
451451
}
452452

453+
public abstract interface class io/modelcontextprotocol/kotlin/sdk/ContentBlock {
454+
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/ContentBlock$Companion;
455+
public abstract fun getType ()Ljava/lang/String;
456+
}
457+
458+
public final class io/modelcontextprotocol/kotlin/sdk/ContentBlock$Companion {
459+
public final fun serializer ()Lkotlinx/serialization/KSerializer;
460+
}
461+
453462
public final class io/modelcontextprotocol/kotlin/sdk/CreateElicitationRequest : io/modelcontextprotocol/kotlin/sdk/ServerRequest, io/modelcontextprotocol/kotlin/sdk/WithMeta {
454463
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/CreateElicitationRequest$Companion;
455464
public fun <init> (Ljava/lang/String;Lio/modelcontextprotocol/kotlin/sdk/CreateElicitationRequest$RequestedSchema;Lkotlinx/serialization/json/JsonObject;)V
@@ -622,17 +631,17 @@ public final class io/modelcontextprotocol/kotlin/sdk/CreateMessageRequest$Inclu
622631

623632
public final class io/modelcontextprotocol/kotlin/sdk/CreateMessageResult : io/modelcontextprotocol/kotlin/sdk/ClientResult {
624633
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/CreateMessageResult$Companion;
625-
public fun <init> (Ljava/lang/String;Lio/modelcontextprotocol/kotlin/sdk/StopReason;Lio/modelcontextprotocol/kotlin/sdk/Role;Lio/modelcontextprotocol/kotlin/sdk/PromptMessageContentMultimodal;Lkotlinx/serialization/json/JsonObject;)V
626-
public synthetic fun <init> (Ljava/lang/String;Lio/modelcontextprotocol/kotlin/sdk/StopReason;Lio/modelcontextprotocol/kotlin/sdk/Role;Lio/modelcontextprotocol/kotlin/sdk/PromptMessageContentMultimodal;Lkotlinx/serialization/json/JsonObject;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
634+
public fun <init> (Ljava/lang/String;Lio/modelcontextprotocol/kotlin/sdk/StopReason;Lio/modelcontextprotocol/kotlin/sdk/Role;Lio/modelcontextprotocol/kotlin/sdk/CreateMessageResultContent;Lkotlinx/serialization/json/JsonObject;)V
635+
public synthetic fun <init> (Ljava/lang/String;Lio/modelcontextprotocol/kotlin/sdk/StopReason;Lio/modelcontextprotocol/kotlin/sdk/Role;Lio/modelcontextprotocol/kotlin/sdk/CreateMessageResultContent;Lkotlinx/serialization/json/JsonObject;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
627636
public final fun component1 ()Ljava/lang/String;
628637
public final fun component2 ()Lio/modelcontextprotocol/kotlin/sdk/StopReason;
629638
public final fun component3 ()Lio/modelcontextprotocol/kotlin/sdk/Role;
630-
public final fun component4 ()Lio/modelcontextprotocol/kotlin/sdk/PromptMessageContentMultimodal;
639+
public final fun component4 ()Lio/modelcontextprotocol/kotlin/sdk/CreateMessageResultContent;
631640
public final fun component5 ()Lkotlinx/serialization/json/JsonObject;
632-
public final fun copy (Ljava/lang/String;Lio/modelcontextprotocol/kotlin/sdk/StopReason;Lio/modelcontextprotocol/kotlin/sdk/Role;Lio/modelcontextprotocol/kotlin/sdk/PromptMessageContentMultimodal;Lkotlinx/serialization/json/JsonObject;)Lio/modelcontextprotocol/kotlin/sdk/CreateMessageResult;
633-
public static synthetic fun copy$default (Lio/modelcontextprotocol/kotlin/sdk/CreateMessageResult;Ljava/lang/String;Lio/modelcontextprotocol/kotlin/sdk/StopReason;Lio/modelcontextprotocol/kotlin/sdk/Role;Lio/modelcontextprotocol/kotlin/sdk/PromptMessageContentMultimodal;Lkotlinx/serialization/json/JsonObject;ILjava/lang/Object;)Lio/modelcontextprotocol/kotlin/sdk/CreateMessageResult;
641+
public final fun copy (Ljava/lang/String;Lio/modelcontextprotocol/kotlin/sdk/StopReason;Lio/modelcontextprotocol/kotlin/sdk/Role;Lio/modelcontextprotocol/kotlin/sdk/CreateMessageResultContent;Lkotlinx/serialization/json/JsonObject;)Lio/modelcontextprotocol/kotlin/sdk/CreateMessageResult;
642+
public static synthetic fun copy$default (Lio/modelcontextprotocol/kotlin/sdk/CreateMessageResult;Ljava/lang/String;Lio/modelcontextprotocol/kotlin/sdk/StopReason;Lio/modelcontextprotocol/kotlin/sdk/Role;Lio/modelcontextprotocol/kotlin/sdk/CreateMessageResultContent;Lkotlinx/serialization/json/JsonObject;ILjava/lang/Object;)Lio/modelcontextprotocol/kotlin/sdk/CreateMessageResult;
634643
public fun equals (Ljava/lang/Object;)Z
635-
public final fun getContent ()Lio/modelcontextprotocol/kotlin/sdk/PromptMessageContentMultimodal;
644+
public final fun getContent ()Lio/modelcontextprotocol/kotlin/sdk/CreateMessageResultContent;
636645
public final fun getModel ()Ljava/lang/String;
637646
public final fun getRole ()Lio/modelcontextprotocol/kotlin/sdk/Role;
638647
public final fun getStopReason ()Lio/modelcontextprotocol/kotlin/sdk/StopReason;
@@ -656,6 +665,14 @@ public final class io/modelcontextprotocol/kotlin/sdk/CreateMessageResult$Compan
656665
public final fun serializer ()Lkotlinx/serialization/KSerializer;
657666
}
658667

668+
public abstract interface class io/modelcontextprotocol/kotlin/sdk/CreateMessageResultContent : io/modelcontextprotocol/kotlin/sdk/ContentBlock {
669+
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/CreateMessageResultContent$Companion;
670+
}
671+
672+
public final class io/modelcontextprotocol/kotlin/sdk/CreateMessageResultContent$Companion {
673+
public final fun serializer ()Lkotlinx/serialization/KSerializer;
674+
}
675+
659676
public final class io/modelcontextprotocol/kotlin/sdk/CustomMeta : io/modelcontextprotocol/kotlin/sdk/WithMeta {
660677
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/CustomMeta$Companion;
661678
public fun <init> ()V
@@ -702,7 +719,7 @@ public final class io/modelcontextprotocol/kotlin/sdk/CustomRequest$Companion {
702719
public final fun serializer ()Lkotlinx/serialization/KSerializer;
703720
}
704721

705-
public final class io/modelcontextprotocol/kotlin/sdk/EmbeddedResource : io/modelcontextprotocol/kotlin/sdk/PromptMessageContent {
722+
public final class io/modelcontextprotocol/kotlin/sdk/EmbeddedResource : io/modelcontextprotocol/kotlin/sdk/ContentBlock {
706723
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/EmbeddedResource$Companion;
707724
public static final field TYPE Ljava/lang/String;
708725
public fun <init> (Lio/modelcontextprotocol/kotlin/sdk/ResourceContents;Lio/modelcontextprotocol/kotlin/sdk/Annotations;)V
@@ -875,7 +892,7 @@ public final class io/modelcontextprotocol/kotlin/sdk/GetPromptResult$Companion
875892
public final fun serializer ()Lkotlinx/serialization/KSerializer;
876893
}
877894

878-
public final class io/modelcontextprotocol/kotlin/sdk/ImageContent : io/modelcontextprotocol/kotlin/sdk/PromptMessageContentMultimodal {
895+
public final class io/modelcontextprotocol/kotlin/sdk/ImageContent : io/modelcontextprotocol/kotlin/sdk/ContentBlock, io/modelcontextprotocol/kotlin/sdk/CreateMessageResultContent, io/modelcontextprotocol/kotlin/sdk/SamplingMessageContent {
879896
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/ImageContent$Companion;
880897
public static final field TYPE Ljava/lang/String;
881898
public fun <init> (Ljava/lang/String;Ljava/lang/String;Lio/modelcontextprotocol/kotlin/sdk/Annotations;)V
@@ -1994,13 +2011,13 @@ public final class io/modelcontextprotocol/kotlin/sdk/PromptListChangedNotificat
19942011

19952012
public final class io/modelcontextprotocol/kotlin/sdk/PromptMessage {
19962013
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/PromptMessage$Companion;
1997-
public fun <init> (Lio/modelcontextprotocol/kotlin/sdk/Role;Lio/modelcontextprotocol/kotlin/sdk/PromptMessageContent;)V
2014+
public fun <init> (Lio/modelcontextprotocol/kotlin/sdk/Role;Lio/modelcontextprotocol/kotlin/sdk/ContentBlock;)V
19982015
public final fun component1 ()Lio/modelcontextprotocol/kotlin/sdk/Role;
1999-
public final fun component2 ()Lio/modelcontextprotocol/kotlin/sdk/PromptMessageContent;
2000-
public final fun copy (Lio/modelcontextprotocol/kotlin/sdk/Role;Lio/modelcontextprotocol/kotlin/sdk/PromptMessageContent;)Lio/modelcontextprotocol/kotlin/sdk/PromptMessage;
2001-
public static synthetic fun copy$default (Lio/modelcontextprotocol/kotlin/sdk/PromptMessage;Lio/modelcontextprotocol/kotlin/sdk/Role;Lio/modelcontextprotocol/kotlin/sdk/PromptMessageContent;ILjava/lang/Object;)Lio/modelcontextprotocol/kotlin/sdk/PromptMessage;
2016+
public final fun component2 ()Lio/modelcontextprotocol/kotlin/sdk/ContentBlock;
2017+
public final fun copy (Lio/modelcontextprotocol/kotlin/sdk/Role;Lio/modelcontextprotocol/kotlin/sdk/ContentBlock;)Lio/modelcontextprotocol/kotlin/sdk/PromptMessage;
2018+
public static synthetic fun copy$default (Lio/modelcontextprotocol/kotlin/sdk/PromptMessage;Lio/modelcontextprotocol/kotlin/sdk/Role;Lio/modelcontextprotocol/kotlin/sdk/ContentBlock;ILjava/lang/Object;)Lio/modelcontextprotocol/kotlin/sdk/PromptMessage;
20022019
public fun equals (Ljava/lang/Object;)Z
2003-
public final fun getContent ()Lio/modelcontextprotocol/kotlin/sdk/PromptMessageContent;
2020+
public final fun getContent ()Lio/modelcontextprotocol/kotlin/sdk/ContentBlock;
20042021
public final fun getRole ()Lio/modelcontextprotocol/kotlin/sdk/Role;
20052022
public fun hashCode ()I
20062023
public fun toString ()Ljava/lang/String;
@@ -2021,23 +2038,6 @@ public final class io/modelcontextprotocol/kotlin/sdk/PromptMessage$Companion {
20212038
public final fun serializer ()Lkotlinx/serialization/KSerializer;
20222039
}
20232040

2024-
public abstract interface class io/modelcontextprotocol/kotlin/sdk/PromptMessageContent {
2025-
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/PromptMessageContent$Companion;
2026-
public abstract fun getType ()Ljava/lang/String;
2027-
}
2028-
2029-
public final class io/modelcontextprotocol/kotlin/sdk/PromptMessageContent$Companion {
2030-
public final fun serializer ()Lkotlinx/serialization/KSerializer;
2031-
}
2032-
2033-
public abstract interface class io/modelcontextprotocol/kotlin/sdk/PromptMessageContentMultimodal : io/modelcontextprotocol/kotlin/sdk/PromptMessageContent {
2034-
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/PromptMessageContentMultimodal$Companion;
2035-
}
2036-
2037-
public final class io/modelcontextprotocol/kotlin/sdk/PromptMessageContentMultimodal$Companion {
2038-
public final fun serializer ()Lkotlinx/serialization/KSerializer;
2039-
}
2040-
20412041
public final class io/modelcontextprotocol/kotlin/sdk/PromptReference : io/modelcontextprotocol/kotlin/sdk/Reference {
20422042
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/PromptReference$Companion;
20432043
public static final field TYPE Ljava/lang/String;
@@ -2558,13 +2558,13 @@ public final class io/modelcontextprotocol/kotlin/sdk/RootsListChangedNotificati
25582558

25592559
public final class io/modelcontextprotocol/kotlin/sdk/SamplingMessage {
25602560
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/SamplingMessage$Companion;
2561-
public fun <init> (Lio/modelcontextprotocol/kotlin/sdk/Role;Lio/modelcontextprotocol/kotlin/sdk/PromptMessageContentMultimodal;)V
2561+
public fun <init> (Lio/modelcontextprotocol/kotlin/sdk/Role;Lio/modelcontextprotocol/kotlin/sdk/SamplingMessageContent;)V
25622562
public final fun component1 ()Lio/modelcontextprotocol/kotlin/sdk/Role;
2563-
public final fun component2 ()Lio/modelcontextprotocol/kotlin/sdk/PromptMessageContentMultimodal;
2564-
public final fun copy (Lio/modelcontextprotocol/kotlin/sdk/Role;Lio/modelcontextprotocol/kotlin/sdk/PromptMessageContentMultimodal;)Lio/modelcontextprotocol/kotlin/sdk/SamplingMessage;
2565-
public static synthetic fun copy$default (Lio/modelcontextprotocol/kotlin/sdk/SamplingMessage;Lio/modelcontextprotocol/kotlin/sdk/Role;Lio/modelcontextprotocol/kotlin/sdk/PromptMessageContentMultimodal;ILjava/lang/Object;)Lio/modelcontextprotocol/kotlin/sdk/SamplingMessage;
2563+
public final fun component2 ()Lio/modelcontextprotocol/kotlin/sdk/SamplingMessageContent;
2564+
public final fun copy (Lio/modelcontextprotocol/kotlin/sdk/Role;Lio/modelcontextprotocol/kotlin/sdk/SamplingMessageContent;)Lio/modelcontextprotocol/kotlin/sdk/SamplingMessage;
2565+
public static synthetic fun copy$default (Lio/modelcontextprotocol/kotlin/sdk/SamplingMessage;Lio/modelcontextprotocol/kotlin/sdk/Role;Lio/modelcontextprotocol/kotlin/sdk/SamplingMessageContent;ILjava/lang/Object;)Lio/modelcontextprotocol/kotlin/sdk/SamplingMessage;
25662566
public fun equals (Ljava/lang/Object;)Z
2567-
public final fun getContent ()Lio/modelcontextprotocol/kotlin/sdk/PromptMessageContentMultimodal;
2567+
public final fun getContent ()Lio/modelcontextprotocol/kotlin/sdk/SamplingMessageContent;
25682568
public final fun getRole ()Lio/modelcontextprotocol/kotlin/sdk/Role;
25692569
public fun hashCode ()I
25702570
public fun toString ()Ljava/lang/String;
@@ -2585,6 +2585,14 @@ public final class io/modelcontextprotocol/kotlin/sdk/SamplingMessage$Companion
25852585
public final fun serializer ()Lkotlinx/serialization/KSerializer;
25862586
}
25872587

2588+
public abstract interface class io/modelcontextprotocol/kotlin/sdk/SamplingMessageContent : io/modelcontextprotocol/kotlin/sdk/ContentBlock {
2589+
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/SamplingMessageContent$Companion;
2590+
}
2591+
2592+
public final class io/modelcontextprotocol/kotlin/sdk/SamplingMessageContent$Companion {
2593+
public final fun serializer ()Lkotlinx/serialization/KSerializer;
2594+
}
2595+
25882596
public final class io/modelcontextprotocol/kotlin/sdk/ServerCapabilities {
25892597
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/ServerCapabilities$Companion;
25902598
public fun <init> ()V
@@ -2823,7 +2831,7 @@ public final class io/modelcontextprotocol/kotlin/sdk/SubscribeRequest$Companion
28232831
public final fun serializer ()Lkotlinx/serialization/KSerializer;
28242832
}
28252833

2826-
public final class io/modelcontextprotocol/kotlin/sdk/TextContent : io/modelcontextprotocol/kotlin/sdk/PromptMessageContentMultimodal {
2834+
public final class io/modelcontextprotocol/kotlin/sdk/TextContent : io/modelcontextprotocol/kotlin/sdk/ContentBlock, io/modelcontextprotocol/kotlin/sdk/CreateMessageResultContent, io/modelcontextprotocol/kotlin/sdk/SamplingMessageContent {
28272835
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/TextContent$Companion;
28282836
public static final field TYPE Ljava/lang/String;
28292837
public fun <init> ()V
@@ -3100,7 +3108,7 @@ public final class io/modelcontextprotocol/kotlin/sdk/Types_utilKt {
31003108
public static synthetic fun ok$default (Lio/modelcontextprotocol/kotlin/sdk/CallToolResult$Companion;Ljava/lang/String;Lkotlinx/serialization/json/JsonObject;ILjava/lang/Object;)Lio/modelcontextprotocol/kotlin/sdk/CallToolResult;
31013109
}
31023110

3103-
public final class io/modelcontextprotocol/kotlin/sdk/UnknownContent : io/modelcontextprotocol/kotlin/sdk/PromptMessageContentMultimodal {
3111+
public final class io/modelcontextprotocol/kotlin/sdk/UnknownContent : io/modelcontextprotocol/kotlin/sdk/ContentBlock, io/modelcontextprotocol/kotlin/sdk/CreateMessageResultContent, io/modelcontextprotocol/kotlin/sdk/SamplingMessageContent {
31043112
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/UnknownContent$Companion;
31053113
public fun <init> (Ljava/lang/String;)V
31063114
public final fun component1 ()Ljava/lang/String;

0 commit comments

Comments
 (0)