Skip to content

Commit c13d141

Browse files
tiginamariatiginamaria
committed
Fix types after rebase
1 parent d4cb3be commit c13d141

File tree

2 files changed

+52
-35
lines changed

2 files changed

+52
-35
lines changed

‎kotlin-sdk-server/api/kotlin-sdk-server.api‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,22 +65,35 @@ public class io/modelcontextprotocol/kotlin/sdk/server/Server {
6565
public final fun addTools (Ljava/util/List;)V
6666
public final fun close (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
6767
public final fun connect (Lio/modelcontextprotocol/kotlin/sdk/shared/Transport;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
68+
public final fun createElicitation (Ljava/lang/String;Ljava/lang/String;Lio/modelcontextprotocol/kotlin/sdk/types/ElicitRequestParams$RequestedSchema;Lio/modelcontextprotocol/kotlin/sdk/shared/RequestOptions;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
69+
public static synthetic fun createElicitation$default (Lio/modelcontextprotocol/kotlin/sdk/server/Server;Ljava/lang/String;Ljava/lang/String;Lio/modelcontextprotocol/kotlin/sdk/types/ElicitRequestParams$RequestedSchema;Lio/modelcontextprotocol/kotlin/sdk/shared/RequestOptions;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
70+
public final fun createMessage (Ljava/lang/String;Lio/modelcontextprotocol/kotlin/sdk/types/CreateMessageRequest;Lio/modelcontextprotocol/kotlin/sdk/shared/RequestOptions;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
71+
public static synthetic fun createMessage$default (Lio/modelcontextprotocol/kotlin/sdk/server/Server;Ljava/lang/String;Lio/modelcontextprotocol/kotlin/sdk/types/CreateMessageRequest;Lio/modelcontextprotocol/kotlin/sdk/shared/RequestOptions;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
6872
public final fun createSession (Lio/modelcontextprotocol/kotlin/sdk/shared/Transport;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
6973
protected final fun getInstructionsProvider ()Lkotlin/jvm/functions/Function0;
7074
protected final fun getOptions ()Lio/modelcontextprotocol/kotlin/sdk/server/ServerOptions;
7175
public final fun getPrompts ()Ljava/util/Map;
7276
public final fun getResources ()Ljava/util/Map;
7377
protected final fun getServerInfo ()Lio/modelcontextprotocol/kotlin/sdk/types/Implementation;
78+
public final fun getSessions ()Ljava/util/Map;
7479
public final fun getTools ()Ljava/util/Map;
80+
public final fun listRoots (Ljava/lang/String;Lkotlinx/serialization/json/JsonObject;Lio/modelcontextprotocol/kotlin/sdk/shared/RequestOptions;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
81+
public static synthetic fun listRoots$default (Lio/modelcontextprotocol/kotlin/sdk/server/Server;Ljava/lang/String;Lkotlinx/serialization/json/JsonObject;Lio/modelcontextprotocol/kotlin/sdk/shared/RequestOptions;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
7582
public final fun onClose (Lkotlin/jvm/functions/Function0;)V
7683
public final fun onConnect (Lkotlin/jvm/functions/Function0;)V
7784
public final fun onInitialized (Lkotlin/jvm/functions/Function0;)V
85+
public final fun ping (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
7886
public final fun removePrompt (Ljava/lang/String;)Z
7987
public final fun removePrompts (Ljava/util/List;)I
8088
public final fun removeResource (Ljava/lang/String;)Z
8189
public final fun removeResources (Ljava/util/List;)I
8290
public final fun removeTool (Ljava/lang/String;)Z
8391
public final fun removeTools (Ljava/util/List;)I
92+
public final fun sendLoggingMessage (Ljava/lang/String;Lio/modelcontextprotocol/kotlin/sdk/types/LoggingMessageNotification;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
93+
public final fun sendPromptListChanged (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
94+
public final fun sendResourceListChanged (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
95+
public final fun sendResourceUpdated (Ljava/lang/String;Lio/modelcontextprotocol/kotlin/sdk/types/ResourceUpdatedNotification;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
96+
public final fun sendToolListChanged (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
8497
}
8598

8699
public final class io/modelcontextprotocol/kotlin/sdk/server/ServerOptions : io/modelcontextprotocol/kotlin/sdk/shared/ProtocolOptions {
@@ -98,10 +111,13 @@ public class io/modelcontextprotocol/kotlin/sdk/server/ServerSession : io/modelc
98111
public static synthetic fun createElicitation$default (Lio/modelcontextprotocol/kotlin/sdk/server/ServerSession;Ljava/lang/String;Lio/modelcontextprotocol/kotlin/sdk/types/ElicitRequestParams$RequestedSchema;Lio/modelcontextprotocol/kotlin/sdk/shared/RequestOptions;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
99112
public final fun createMessage (Lio/modelcontextprotocol/kotlin/sdk/types/CreateMessageRequest;Lio/modelcontextprotocol/kotlin/sdk/shared/RequestOptions;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
100113
public static synthetic fun createMessage$default (Lio/modelcontextprotocol/kotlin/sdk/server/ServerSession;Lio/modelcontextprotocol/kotlin/sdk/types/CreateMessageRequest;Lio/modelcontextprotocol/kotlin/sdk/shared/RequestOptions;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
114+
public fun equals (Ljava/lang/Object;)Z
101115
public final fun getClientCapabilities ()Lio/modelcontextprotocol/kotlin/sdk/types/ClientCapabilities;
102116
public final fun getClientVersion ()Lio/modelcontextprotocol/kotlin/sdk/types/Implementation;
103117
protected final fun getInstructions ()Ljava/lang/String;
104118
protected final fun getServerInfo ()Lio/modelcontextprotocol/kotlin/sdk/types/Implementation;
119+
public final fun getSessionId ()Ljava/lang/String;
120+
public fun hashCode ()I
105121
public final fun listRoots (Lkotlinx/serialization/json/JsonObject;Lio/modelcontextprotocol/kotlin/sdk/shared/RequestOptions;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
106122
public static synthetic fun listRoots$default (Lio/modelcontextprotocol/kotlin/sdk/server/ServerSession;Lkotlinx/serialization/json/JsonObject;Lio/modelcontextprotocol/kotlin/sdk/shared/RequestOptions;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
107123
public fun onClose ()V

‎kotlin-sdk-server/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/server/Server.kt‎

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,42 @@
11
package io.modelcontextprotocol.kotlin.sdk.server
22

33
import io.github.oshai.kotlinlogging.KotlinLogging
4-
import io.modelcontextprotocol.kotlin.sdk.CallToolRequest
5-
import io.modelcontextprotocol.kotlin.sdk.CallToolResult
6-
import io.modelcontextprotocol.kotlin.sdk.CreateElicitationRequest.RequestedSchema
7-
import io.modelcontextprotocol.kotlin.sdk.CreateElicitationResult
8-
import io.modelcontextprotocol.kotlin.sdk.CreateMessageRequest
9-
import io.modelcontextprotocol.kotlin.sdk.CreateMessageResult
10-
import io.modelcontextprotocol.kotlin.sdk.EmptyJsonObject
11-
import io.modelcontextprotocol.kotlin.sdk.EmptyRequestResult
12-
import io.modelcontextprotocol.kotlin.sdk.GetPromptRequest
13-
import io.modelcontextprotocol.kotlin.sdk.GetPromptResult
14-
import io.modelcontextprotocol.kotlin.sdk.Implementation
15-
import io.modelcontextprotocol.kotlin.sdk.ListPromptsRequest
16-
import io.modelcontextprotocol.kotlin.sdk.ListPromptsResult
17-
import io.modelcontextprotocol.kotlin.sdk.ListResourceTemplatesRequest
18-
import io.modelcontextprotocol.kotlin.sdk.ListResourceTemplatesResult
19-
import io.modelcontextprotocol.kotlin.sdk.ListResourcesRequest
20-
import io.modelcontextprotocol.kotlin.sdk.ListResourcesResult
21-
import io.modelcontextprotocol.kotlin.sdk.ListRootsResult
22-
import io.modelcontextprotocol.kotlin.sdk.ListToolsRequest
23-
import io.modelcontextprotocol.kotlin.sdk.ListToolsResult
24-
import io.modelcontextprotocol.kotlin.sdk.LoggingMessageNotification
25-
import io.modelcontextprotocol.kotlin.sdk.Method
26-
import io.modelcontextprotocol.kotlin.sdk.Prompt
27-
import io.modelcontextprotocol.kotlin.sdk.PromptArgument
28-
import io.modelcontextprotocol.kotlin.sdk.ReadResourceRequest
29-
import io.modelcontextprotocol.kotlin.sdk.ReadResourceResult
30-
import io.modelcontextprotocol.kotlin.sdk.Resource
31-
import io.modelcontextprotocol.kotlin.sdk.ResourceUpdatedNotification
32-
import io.modelcontextprotocol.kotlin.sdk.ServerCapabilities
33-
import io.modelcontextprotocol.kotlin.sdk.TextContent
34-
import io.modelcontextprotocol.kotlin.sdk.Tool
35-
import io.modelcontextprotocol.kotlin.sdk.ToolAnnotations
364
import io.modelcontextprotocol.kotlin.sdk.shared.ProtocolOptions
375
import io.modelcontextprotocol.kotlin.sdk.shared.RequestOptions
386
import io.modelcontextprotocol.kotlin.sdk.shared.Transport
7+
import io.modelcontextprotocol.kotlin.sdk.types.CallToolRequest
8+
import io.modelcontextprotocol.kotlin.sdk.types.CallToolResult
9+
import io.modelcontextprotocol.kotlin.sdk.types.CreateMessageRequest
10+
import io.modelcontextprotocol.kotlin.sdk.types.CreateMessageResult
11+
import io.modelcontextprotocol.kotlin.sdk.types.ElicitRequestParams
12+
import io.modelcontextprotocol.kotlin.sdk.types.ElicitResult
13+
import io.modelcontextprotocol.kotlin.sdk.types.EmptyJsonObject
14+
import io.modelcontextprotocol.kotlin.sdk.types.EmptyResult
15+
import io.modelcontextprotocol.kotlin.sdk.types.GetPromptRequest
16+
import io.modelcontextprotocol.kotlin.sdk.types.GetPromptResult
17+
import io.modelcontextprotocol.kotlin.sdk.types.Implementation
18+
import io.modelcontextprotocol.kotlin.sdk.types.ListPromptsRequest
19+
import io.modelcontextprotocol.kotlin.sdk.types.ListPromptsResult
20+
import io.modelcontextprotocol.kotlin.sdk.types.ListResourceTemplatesRequest
21+
import io.modelcontextprotocol.kotlin.sdk.types.ListResourceTemplatesResult
22+
import io.modelcontextprotocol.kotlin.sdk.types.ListResourcesRequest
23+
import io.modelcontextprotocol.kotlin.sdk.types.ListResourcesResult
24+
import io.modelcontextprotocol.kotlin.sdk.types.ListRootsResult
25+
import io.modelcontextprotocol.kotlin.sdk.types.ListToolsRequest
26+
import io.modelcontextprotocol.kotlin.sdk.types.ListToolsResult
27+
import io.modelcontextprotocol.kotlin.sdk.types.LoggingMessageNotification
28+
import io.modelcontextprotocol.kotlin.sdk.types.Method
29+
import io.modelcontextprotocol.kotlin.sdk.types.Prompt
30+
import io.modelcontextprotocol.kotlin.sdk.types.PromptArgument
31+
import io.modelcontextprotocol.kotlin.sdk.types.ReadResourceRequest
32+
import io.modelcontextprotocol.kotlin.sdk.types.ReadResourceResult
33+
import io.modelcontextprotocol.kotlin.sdk.types.Resource
34+
import io.modelcontextprotocol.kotlin.sdk.types.ResourceUpdatedNotification
35+
import io.modelcontextprotocol.kotlin.sdk.types.ServerCapabilities
36+
import io.modelcontextprotocol.kotlin.sdk.types.TextContent
37+
import io.modelcontextprotocol.kotlin.sdk.types.Tool
38+
import io.modelcontextprotocol.kotlin.sdk.types.ToolAnnotations
39+
import io.modelcontextprotocol.kotlin.sdk.types.ToolSchema
3940
import kotlinx.coroutines.CancellationException
4041
import kotlinx.serialization.json.JsonObject
4142

@@ -560,7 +561,7 @@ public open class Server(
560561
* Triggers [ServerSession.ping] request for session by provided [sessionId].
561562
* @param sessionId The session ID to ping
562563
*/
563-
public suspend fun ping(sessionId: String): EmptyRequestResult = with(sessionRegistry.getSession(sessionId)) {
564+
public suspend fun ping(sessionId: String): EmptyResult = with(sessionRegistry.getSession(sessionId)) {
564565
ping()
565566
}
566567

@@ -611,9 +612,9 @@ public open class Server(
611612
public suspend fun createElicitation(
612613
sessionId: String,
613614
message: String,
614-
requestedSchema: RequestedSchema,
615+
requestedSchema: ElicitRequestParams.RequestedSchema,
615616
options: RequestOptions? = null,
616-
): CreateElicitationResult = with(sessionRegistry.getSession(sessionId)) {
617+
): ElicitResult = with(sessionRegistry.getSession(sessionId)) {
617618
createElicitation(message, requestedSchema, options)
618619
}
619620

0 commit comments

Comments
 (0)