Skip to content

Commit 7e0d4fc

Browse files
committed
Update DSL API builders for request types across all instances
1 parent 3ee8290 commit 7e0d4fc

File tree

12 files changed

+65
-108
lines changed

12 files changed

+65
-108
lines changed

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

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1171,10 +1171,6 @@ public final class io/modelcontextprotocol/kotlin/sdk/types/CompleteResult$Compl
11711171
public final fun serializer ()Lkotlinx/serialization/KSerializer;
11721172
}
11731173

1174-
public final class io/modelcontextprotocol/kotlin/sdk/types/Completion_dslKt {
1175-
public static final fun completeRequest (Lkotlin/jvm/functions/Function1;)Lio/modelcontextprotocol/kotlin/sdk/types/CompleteRequest;
1176-
}
1177-
11781174
public abstract interface class io/modelcontextprotocol/kotlin/sdk/types/ContentBlock : io/modelcontextprotocol/kotlin/sdk/types/WithMeta {
11791175
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/types/ContentBlock$Companion;
11801176
public abstract fun getType ()Lio/modelcontextprotocol/kotlin/sdk/types/ContentTypes;
@@ -1564,10 +1560,6 @@ public final class io/modelcontextprotocol/kotlin/sdk/types/ElicitResult$Compani
15641560
public final fun serializer ()Lkotlinx/serialization/KSerializer;
15651561
}
15661562

1567-
public final class io/modelcontextprotocol/kotlin/sdk/types/Elicitation_dslKt {
1568-
public static final fun elicitationRequest (Lkotlin/jvm/functions/Function1;)Lio/modelcontextprotocol/kotlin/sdk/types/ElicitRequest;
1569-
}
1570-
15711563
public final class io/modelcontextprotocol/kotlin/sdk/types/EmbeddedResource : io/modelcontextprotocol/kotlin/sdk/types/ContentBlock {
15721564
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/types/EmbeddedResource$Companion;
15731565
public fun <init> (Lio/modelcontextprotocol/kotlin/sdk/types/ResourceContents;Lio/modelcontextprotocol/kotlin/sdk/types/Annotations;Lkotlinx/serialization/json/JsonObject;)V
@@ -2000,10 +1992,6 @@ public final class io/modelcontextprotocol/kotlin/sdk/types/InitializeResult$Com
20001992
public final fun serializer ()Lkotlinx/serialization/KSerializer;
20011993
}
20021994

2003-
public final class io/modelcontextprotocol/kotlin/sdk/types/Initialize_dslKt {
2004-
public static final fun initializeRequest (Lkotlin/jvm/functions/Function1;)Lio/modelcontextprotocol/kotlin/sdk/types/InitializeRequest;
2005-
}
2006-
20071995
public final class io/modelcontextprotocol/kotlin/sdk/types/InitializedNotification : io/modelcontextprotocol/kotlin/sdk/types/ClientNotification {
20081996
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/types/InitializedNotification$Companion;
20091997
public fun <init> ()V
@@ -2633,10 +2621,6 @@ public final class io/modelcontextprotocol/kotlin/sdk/types/LoggingMessageNotifi
26332621
public final fun serializer ()Lkotlinx/serialization/KSerializer;
26342622
}
26352623

2636-
public final class io/modelcontextprotocol/kotlin/sdk/types/Logging_dslKt {
2637-
public static final fun setLevelRequest (Lkotlin/jvm/functions/Function1;)Lio/modelcontextprotocol/kotlin/sdk/types/SetLevelRequest;
2638-
}
2639-
26402624
public abstract interface annotation class io/modelcontextprotocol/kotlin/sdk/types/McpDsl : java/lang/annotation/Annotation {
26412625
}
26422626

@@ -2933,10 +2917,6 @@ public final class io/modelcontextprotocol/kotlin/sdk/types/PingRequestBuilder :
29332917
public synthetic fun build$kotlin_sdk_core ()Lio/modelcontextprotocol/kotlin/sdk/types/Request;
29342918
}
29352919

2936-
public final class io/modelcontextprotocol/kotlin/sdk/types/PingRequest_dslKt {
2937-
public static final fun pingRequest (Lkotlin/jvm/functions/Function1;)Lio/modelcontextprotocol/kotlin/sdk/types/PingRequest;
2938-
}
2939-
29402920
public final class io/modelcontextprotocol/kotlin/sdk/types/Progress {
29412921
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/types/Progress$Companion;
29422922
public fun <init> (DLjava/lang/Double;Ljava/lang/String;)V
@@ -3191,11 +3171,6 @@ public final class io/modelcontextprotocol/kotlin/sdk/types/PromptReference$Comp
31913171
public final fun serializer ()Lkotlinx/serialization/KSerializer;
31923172
}
31933173

3194-
public final class io/modelcontextprotocol/kotlin/sdk/types/Prompts_dslKt {
3195-
public static final fun getPromptRequest (Lkotlin/jvm/functions/Function1;)Lio/modelcontextprotocol/kotlin/sdk/types/GetPromptRequest;
3196-
public static final fun listPromptsRequest (Lkotlin/jvm/functions/Function1;)Lio/modelcontextprotocol/kotlin/sdk/types/ListPromptsRequest;
3197-
}
3198-
31993174
public final class io/modelcontextprotocol/kotlin/sdk/types/RPCError {
32003175
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/types/RPCError$Companion;
32013176
public fun <init> (ILjava/lang/String;Lkotlinx/serialization/json/JsonElement;)V
@@ -3794,14 +3769,6 @@ public final class io/modelcontextprotocol/kotlin/sdk/types/ResourceUpdatedNotif
37943769
public final fun serializer ()Lkotlinx/serialization/KSerializer;
37953770
}
37963771

3797-
public final class io/modelcontextprotocol/kotlin/sdk/types/Resources_dslKt {
3798-
public static final fun listResourceTemplatesRequest (Lkotlin/jvm/functions/Function1;)Lio/modelcontextprotocol/kotlin/sdk/types/ListResourceTemplatesRequest;
3799-
public static final fun listResourcesRequest (Lkotlin/jvm/functions/Function1;)Lio/modelcontextprotocol/kotlin/sdk/types/ListResourcesRequest;
3800-
public static final fun readResourceRequest (Lkotlin/jvm/functions/Function1;)Lio/modelcontextprotocol/kotlin/sdk/types/ReadResourceRequest;
3801-
public static final fun subscribeRequest (Lkotlin/jvm/functions/Function1;)Lio/modelcontextprotocol/kotlin/sdk/types/SubscribeRequest;
3802-
public static final fun unsubscribeRequest (Lkotlin/jvm/functions/Function1;)Lio/modelcontextprotocol/kotlin/sdk/types/UnsubscribeRequest;
3803-
}
3804-
38053772
public final class io/modelcontextprotocol/kotlin/sdk/types/Role : java/lang/Enum {
38063773
public static final field Assistant Lio/modelcontextprotocol/kotlin/sdk/types/Role;
38073774
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/types/Role$Companion;
@@ -3879,10 +3846,6 @@ public final class io/modelcontextprotocol/kotlin/sdk/types/RootsListChangedNoti
38793846
public final fun serializer ()Lkotlinx/serialization/KSerializer;
38803847
}
38813848

3882-
public final class io/modelcontextprotocol/kotlin/sdk/types/Roots_dslKt {
3883-
public static final fun listRootsRequest (Lkotlin/jvm/functions/Function1;)Lio/modelcontextprotocol/kotlin/sdk/types/ListRootsRequest;
3884-
}
3885-
38863849
public final class io/modelcontextprotocol/kotlin/sdk/types/SamplingMessage {
38873850
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/types/SamplingMessage$Companion;
38883851
public fun <init> (Lio/modelcontextprotocol/kotlin/sdk/types/Role;Lio/modelcontextprotocol/kotlin/sdk/types/MediaContent;)V
@@ -3924,7 +3887,6 @@ public final class io/modelcontextprotocol/kotlin/sdk/types/Sampling_dslKt {
39243887
public static final fun assistantAudio (Lio/modelcontextprotocol/kotlin/sdk/types/SamplingMessageBuilder;Lkotlin/jvm/functions/Function1;)V
39253888
public static final fun assistantImage (Lio/modelcontextprotocol/kotlin/sdk/types/SamplingMessageBuilder;Lkotlin/jvm/functions/Function1;)V
39263889
public static final fun assistantText (Lio/modelcontextprotocol/kotlin/sdk/types/SamplingMessageBuilder;Lkotlin/jvm/functions/Function1;)V
3927-
public static final fun createMessageRequest (Lkotlin/jvm/functions/Function1;)Lio/modelcontextprotocol/kotlin/sdk/types/CreateMessageRequest;
39283890
public static final fun user (Lio/modelcontextprotocol/kotlin/sdk/types/SamplingMessageBuilder;Lkotlin/jvm/functions/Function0;)V
39293891
public static final fun userAudio (Lio/modelcontextprotocol/kotlin/sdk/types/SamplingMessageBuilder;Lkotlin/jvm/functions/Function1;)V
39303892
public static final fun userImage (Lio/modelcontextprotocol/kotlin/sdk/types/SamplingMessageBuilder;Lkotlin/jvm/functions/Function1;)V
@@ -4488,11 +4450,6 @@ public final class io/modelcontextprotocol/kotlin/sdk/types/ToolsKt {
44884450
public static synthetic fun success$default (Lio/modelcontextprotocol/kotlin/sdk/types/CallToolResult$Companion;Ljava/lang/String;Lkotlinx/serialization/json/JsonObject;ILjava/lang/Object;)Lio/modelcontextprotocol/kotlin/sdk/types/CallToolResult;
44894451
}
44904452

4491-
public final class io/modelcontextprotocol/kotlin/sdk/types/Tools_dslKt {
4492-
public static final fun callToolRequest (Lkotlin/jvm/functions/Function1;)Lio/modelcontextprotocol/kotlin/sdk/types/CallToolRequest;
4493-
public static final fun listToolsRequest (Lkotlin/jvm/functions/Function1;)Lio/modelcontextprotocol/kotlin/sdk/types/ListToolsRequest;
4494-
}
4495-
44964453
public final class io/modelcontextprotocol/kotlin/sdk/types/UnknownResourceContents : io/modelcontextprotocol/kotlin/sdk/types/ResourceContents {
44974454
public static final field Companion Lio/modelcontextprotocol/kotlin/sdk/types/UnknownResourceContents$Companion;
44984455
public fun <init> (Ljava/lang/String;Ljava/lang/String;Lkotlinx/serialization/json/JsonObject;)V

kotlin-sdk-core/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/types/capabilities.dsl.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import kotlinx.serialization.json.buildJsonObject
1616
* - [elicitation] - Indicates support for elicitation from the server
1717
* - [experimental] - Defines experimental, non-standard capabilities
1818
*
19-
* Example usage within [initializeRequest][io.modelcontextprotocol.kotlin.sdk.types.initializeRequest]:
19+
* Example usage within [buildInitializeRequest][buildInitializeRequest]:
2020
* ```kotlin
21-
* val request = initializeRequest {
21+
* val request = buildInitializeRequest {
2222
* protocolVersion = "1.0"
2323
* capabilities {
2424
* sampling(ClientCapabilities.sampling)

kotlin-sdk-core/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/types/completion.dsl.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ import kotlin.contracts.contract
1818
*
1919
* Example with [PromptReference]:
2020
* ```kotlin
21-
* val request = completeRequest {
21+
* val request = buildCompleteRequest {
2222
* argument("query", "user input")
2323
* ref(PromptReference("searchPrompt"))
2424
* }
2525
* ```
2626
*
2727
* Example with [ResourceTemplateReference]:
2828
* ```kotlin
29-
* val request = completeRequest {
29+
* val request = buildCompleteRequest {
3030
* argument("path", "/users/123")
3131
* ref(ResourceTemplateReference("file:///{path}"))
3232
* context {
@@ -42,7 +42,7 @@ import kotlin.contracts.contract
4242
*/
4343
@OptIn(ExperimentalContracts::class)
4444
@ExperimentalMcpApi
45-
public inline fun completeRequest(block: CompleteRequestBuilder.() -> Unit): CompleteRequest {
45+
internal inline fun buildCompleteRequest(block: CompleteRequestBuilder.() -> Unit): CompleteRequest {
4646
contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
4747
return CompleteRequestBuilder().apply(block).build()
4848
}
@@ -53,7 +53,7 @@ public inline fun completeRequest(block: CompleteRequestBuilder.() -> Unit): Com
5353
* This builder provides methods to configure completion requests for prompts or resource templates.
5454
* Both [argument] and [ref] are required; [context] is optional.
5555
*
56-
* @see completeRequest
56+
* @see buildCompleteRequest
5757
*/
5858
@McpDsl
5959
public class CompleteRequestBuilder @PublishedApi internal constructor() : RequestBuilder() {

kotlin-sdk-core/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/types/elicitation.dsl.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import kotlin.contracts.contract
2020
*
2121
* Example requesting user information:
2222
* ```kotlin
23-
* val request = elicitationRequest {
23+
* val request = buildElicitRequest {
2424
* message = "Please provide your contact information"
2525
* requestedSchema {
2626
* properties {
@@ -39,7 +39,7 @@ import kotlin.contracts.contract
3939
*
4040
* Example with simple text input:
4141
* ```kotlin
42-
* val request = elicitationRequest {
42+
* val request = buildElicitRequest {
4343
* message = "Enter a project name"
4444
* requestedSchema {
4545
* properties {
@@ -59,7 +59,7 @@ import kotlin.contracts.contract
5959
*/
6060
@OptIn(ExperimentalContracts::class)
6161
@ExperimentalMcpApi
62-
public inline fun elicitationRequest(block: ElicitRequestBuilder.() -> Unit): ElicitRequest {
62+
internal inline fun buildElicitRequest(block: ElicitRequestBuilder.() -> Unit): ElicitRequest {
6363
contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
6464
return ElicitRequestBuilder().apply(block).build()
6565
}
@@ -77,7 +77,7 @@ public inline fun elicitationRequest(block: ElicitRequestBuilder.() -> Unit): El
7777
* ## Optional
7878
* - [meta] - Metadata for the request
7979
*
80-
* @see elicitationRequest
80+
* @see buildElicitRequest
8181
* @see ElicitRequest
8282
*/
8383
@McpDsl
@@ -95,7 +95,7 @@ public class ElicitRequestBuilder @PublishedApi internal constructor() : Request
9595
*
9696
* Example:
9797
* ```kotlin
98-
* elicitationRequest {
98+
* buildElicitRequest {
9999
* message = "Enter details"
100100
* requestedSchema(ElicitRequestParams.RequestedSchema(
101101
* properties = buildJsonObject {
@@ -119,7 +119,7 @@ public class ElicitRequestBuilder @PublishedApi internal constructor() : Request
119119
*
120120
* Example:
121121
* ```kotlin
122-
* elicitationRequest {
122+
* buildElicitRequest {
123123
* message = "Configure settings"
124124
* requestedSchema {
125125
* properties {

kotlin-sdk-core/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/types/initialize.dsl.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import kotlin.contracts.contract
1818
*
1919
* Example:
2020
* ```kotlin
21-
* val request = initializeRequest {
21+
* val request = buildInitializeRequest {
2222
* protocolVersion = "2024-11-05"
2323
* capabilities {
2424
* sampling(ClientCapabilities.sampling)
@@ -30,7 +30,7 @@ import kotlin.contracts.contract
3030
*
3131
* Example with full client info:
3232
* ```kotlin
33-
* val request = initializeRequest {
33+
* val request = buildInitializeRequest {
3434
* protocolVersion = "2024-11-05"
3535
* capabilities {
3636
* sampling(ClientCapabilities.sampling)
@@ -54,7 +54,7 @@ import kotlin.contracts.contract
5454
*/
5555
@OptIn(ExperimentalContracts::class)
5656
@ExperimentalMcpApi
57-
public inline fun initializeRequest(block: InitializeRequestBuilder.() -> Unit): InitializeRequest {
57+
internal inline fun buildInitializeRequest(block: InitializeRequestBuilder.() -> Unit): InitializeRequest {
5858
contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
5959
return InitializeRequestBuilder().apply(block).build()
6060
}
@@ -73,7 +73,7 @@ public inline fun initializeRequest(block: InitializeRequestBuilder.() -> Unit):
7373
* ## Optional
7474
* - [meta] - Metadata for the request
7575
*
76-
* @see initializeRequest
76+
* @see buildInitializeRequest
7777
* @see InitializeRequest
7878
*/
7979
@McpDsl

kotlin-sdk-core/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/types/logging.dsl.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ import kotlin.contracts.contract
1616
*
1717
* Example setting info level:
1818
* ```kotlin
19-
* val request = setLevelRequest {
19+
* val request = buildSetLevelRequest {
2020
* loggingLevel = LoggingLevel.Info
2121
* }
2222
* ```
2323
*
2424
* Example setting debug level:
2525
* ```kotlin
26-
* val request = setLevelRequest {
26+
* val request = buildSetLevelRequest {
2727
* loggingLevel = LoggingLevel.Debug
2828
* }
2929
* ```
@@ -36,7 +36,7 @@ import kotlin.contracts.contract
3636
*/
3737
@OptIn(ExperimentalContracts::class)
3838
@ExperimentalMcpApi
39-
public inline fun setLevelRequest(block: SetLevelRequestBuilder.() -> Unit): SetLevelRequest {
39+
internal inline fun buildSetLevelRequest(block: SetLevelRequestBuilder.() -> Unit): SetLevelRequest {
4040
contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
4141
return SetLevelRequestBuilder().apply(block).build()
4242
}
@@ -52,7 +52,7 @@ public inline fun setLevelRequest(block: SetLevelRequestBuilder.() -> Unit): Set
5252
* ## Optional
5353
* - [meta] - Metadata for the request
5454
*
55-
* @see setLevelRequest
55+
* @see buildSetLevelRequest
5656
* @see SetLevelRequest
5757
* @see LoggingLevel
5858
*/

kotlin-sdk-core/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/types/pingRequest.dsl.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ import kotlin.contracts.contract
1313
*
1414
* Example with no parameters:
1515
* ```kotlin
16-
* val request = pingRequest { }
16+
* val request = buildPingRequest { }
1717
* ```
1818
*
1919
* Example with metadata:
2020
* ```kotlin
21-
* val request = pingRequest {
21+
* val request = buildPingRequest {
2222
* meta {
2323
* put("timestamp", JsonPrimitive(System.currentTimeMillis()))
2424
* }
@@ -32,7 +32,7 @@ import kotlin.contracts.contract
3232
*/
3333
@OptIn(ExperimentalContracts::class)
3434
@ExperimentalMcpApi
35-
public inline fun pingRequest(block: PingRequestBuilder.() -> Unit): PingRequest {
35+
internal inline fun buildPingRequest(block: PingRequestBuilder.() -> Unit): PingRequest {
3636
contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
3737
return PingRequestBuilder().apply(block).build()
3838
}
@@ -46,7 +46,7 @@ public inline fun pingRequest(block: PingRequestBuilder.() -> Unit): PingRequest
4646
* ## Optional
4747
* - [meta] - Metadata for the request
4848
*
49-
* @see pingRequest
49+
* @see buildPingRequest
5050
* @see PingRequest
5151
*/
5252
@McpDsl

kotlin-sdk-core/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/types/prompts.dsl.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ import kotlin.contracts.contract
1717
*
1818
* Example without arguments:
1919
* ```kotlin
20-
* val request = getPromptRequest {
20+
* val request = buildGetPromptRequest {
2121
* name = "greeting"
2222
* }
2323
* ```
2424
*
2525
* Example with arguments:
2626
* ```kotlin
27-
* val request = getPromptRequest {
27+
* val request = buildGetPromptRequest {
2828
* name = "userProfile"
2929
* arguments = mapOf(
3030
* "userId" to "123",
@@ -40,7 +40,7 @@ import kotlin.contracts.contract
4040
*/
4141
@OptIn(ExperimentalContracts::class)
4242
@ExperimentalMcpApi
43-
public inline fun getPromptRequest(block: GetPromptRequestBuilder.() -> Unit): GetPromptRequest {
43+
internal inline fun buildGetPromptRequest(block: GetPromptRequestBuilder.() -> Unit): GetPromptRequest {
4444
contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
4545
return GetPromptRequestBuilder().apply(block).build()
4646
}
@@ -57,7 +57,7 @@ public inline fun getPromptRequest(block: GetPromptRequestBuilder.() -> Unit): G
5757
* - [arguments] - Arguments to pass to the prompt
5858
* - [meta] - Metadata for the request
5959
*
60-
* @see getPromptRequest
60+
* @see buildGetPromptRequest
6161
* @see GetPromptRequest
6262
*/
6363
@McpDsl
@@ -99,12 +99,12 @@ public class GetPromptRequestBuilder @PublishedApi internal constructor() : Requ
9999
*
100100
* Example without pagination:
101101
* ```kotlin
102-
* val request = listPromptsRequest { }
102+
* val request = buildListPromptsRequest { }
103103
* ```
104104
*
105105
* Example with pagination:
106106
* ```kotlin
107-
* val request = listPromptsRequest {
107+
* val request = buildListPromptsRequest {
108108
* cursor = "eyJwYWdlIjogMn0="
109109
* }
110110
* ```
@@ -116,7 +116,7 @@ public class GetPromptRequestBuilder @PublishedApi internal constructor() : Requ
116116
*/
117117
@OptIn(ExperimentalContracts::class)
118118
@ExperimentalMcpApi
119-
public inline fun listPromptsRequest(block: ListPromptsRequestBuilder.() -> Unit): ListPromptsRequest {
119+
internal inline fun buildListPromptsRequest(block: ListPromptsRequestBuilder.() -> Unit): ListPromptsRequest {
120120
contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
121121
return ListPromptsRequestBuilder().apply(block).build()
122122
}
@@ -131,7 +131,7 @@ public inline fun listPromptsRequest(block: ListPromptsRequestBuilder.() -> Unit
131131
* - [cursor] - Pagination cursor (inherited from [PaginatedRequestBuilder])
132132
* - [meta] - Metadata for the request (inherited from [RequestBuilder])
133133
*
134-
* @see listPromptsRequest
134+
* @see buildListPromptsRequest
135135
* @see ListPromptsRequest
136136
* @see PaginatedRequestBuilder
137137
*/

0 commit comments

Comments
 (0)