@@ -25,6 +25,7 @@ import io.ktor.client.request.HttpRequestBuilder
25
25
import io.ktor.client.request.get
26
26
import io.ktor.client.request.post
27
27
import io.ktor.client.request.prepareGet
28
+ import io.ktor.client.request.preparePost
28
29
import io.ktor.client.request.put
29
30
import io.ktor.client.request.setBody
30
31
import io.ktor.client.statement.HttpResponse
@@ -123,14 +124,15 @@ class ModelClientV2(
123
124
override fun getUserId (): String? = clientProvidedUserId ? : serverProvidedUserId
124
125
125
126
override suspend fun initRepository (repository : RepositoryId ): IVersion {
126
- val response = httpClient.post {
127
+ return httpClient.preparePost {
127
128
url {
128
129
takeFrom(baseUrl)
129
130
appendPathSegmentsEncodingSlash(" repositories" , repository.id, " init" )
130
131
}
131
132
useVersionStreamFormat()
133
+ }.execute { response ->
134
+ createVersion(null , response.readVersionDelta())
132
135
}
133
- return createVersion(null , response.readVersionDelta())
134
136
}
135
137
136
138
override suspend fun listRepositories (): List <RepositoryId > {
@@ -168,7 +170,7 @@ class ModelClientV2(
168
170
@Deprecated(" repository ID is required for permission checks" )
169
171
@DeprecationInfo(" 3.7.0" , " May be removed with the next major release. Also remove the endpoint from the model-server." )
170
172
override suspend fun loadVersion (versionHash : String , baseVersion : IVersion ? ): IVersion {
171
- val response = httpClient.get {
173
+ return httpClient.prepareGet {
172
174
url {
173
175
takeFrom(baseUrl)
174
176
appendPathSegments(" versions" , versionHash)
@@ -177,16 +179,17 @@ class ModelClientV2(
177
179
}
178
180
}
179
181
useVersionStreamFormat()
182
+ }.execute { response ->
183
+ createVersion(baseVersion as CLVersion ? , response.readVersionDelta())
180
184
}
181
- return createVersion(baseVersion as CLVersion ? , response.readVersionDelta())
182
185
}
183
186
184
187
override suspend fun loadVersion (
185
188
repositoryId : RepositoryId ,
186
189
versionHash : String ,
187
190
baseVersion : IVersion ? ,
188
191
): IVersion {
189
- val response = httpClient.get {
192
+ return httpClient.prepareGet {
190
193
url {
191
194
takeFrom(baseUrl)
192
195
appendPathSegments(" repositories" , repositoryId.id, " versions" , versionHash)
@@ -195,8 +198,9 @@ class ModelClientV2(
195
198
}
196
199
}
197
200
useVersionStreamFormat()
201
+ }.execute { response ->
202
+ createVersion(baseVersion as CLVersion ? , response.readVersionDelta())
198
203
}
199
- return createVersion(baseVersion as CLVersion ? , response.readVersionDelta())
200
204
}
201
205
202
206
override suspend fun push (branch : BranchReference , version : IVersion , baseVersion : IVersion ? ): IVersion {
@@ -213,16 +217,17 @@ class ModelClientV2(
213
217
} else {
214
218
VersionDelta (version.getContentHash(), null , objectsMap = objects)
215
219
}
216
- val response = httpClient.post {
220
+ return httpClient.preparePost {
217
221
url {
218
222
takeFrom(baseUrl)
219
223
appendPathSegmentsEncodingSlash(" repositories" , branch.repositoryId.id, " branches" , branch.branchName)
220
224
}
221
225
useVersionStreamFormat()
222
226
contentType(ContentType .Application .Json )
223
227
setBody(delta)
228
+ }.execute { response ->
229
+ createVersion(version, response.readVersionDelta())
224
230
}
225
- return createVersion(version, response.readVersionDelta())
226
231
}
227
232
228
233
private suspend fun uploadObjects (repository : RepositoryId , objects : Sequence <Pair <String , String >>) {
0 commit comments