Skip to content

Commit bad479b

Browse files
author
stlc-bot
committed
LI-9565: page organization members as members, not as grants (#26737)
Stainless-Generated-From: d680d9f
1 parent 15e0c56 commit bad479b

5 files changed

Lines changed: 50 additions & 3 deletions

File tree

‎llama-cloud-admin-core/src/main/kotlin/ai/llamaindex/llamacloudadmin/models/organizations/users/UserListMembersParams.kt‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,14 @@ import java.util.Objects
99
import java.util.Optional
1010
import kotlin.jvm.optionals.getOrNull
1111

12-
/** Get all users in an organization. */
12+
/**
13+
* Get all users in an organization.
14+
*
15+
* Deprecated: use `GET /api/v2/organizations/{organization_id}/users`, which is paginated. This one
16+
* collapses grants to members in memory after reading up to 10,000 of them, so a large organization
17+
* silently loses members.
18+
*/
19+
@Deprecated("deprecated")
1320
class UserListMembersParams
1421
private constructor(
1522
private val organizationId: String?,

‎llama-cloud-admin-core/src/main/kotlin/ai/llamaindex/llamacloudadmin/services/async/organizations/UserServiceAsync.kt‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,19 @@ interface UserServiceAsync {
135135
requestOptions: RequestOptions = RequestOptions.none(),
136136
): CompletableFuture<UserOrganizationRole>
137137

138-
/** Get all users in an organization. */
138+
/**
139+
* Get all users in an organization.
140+
*
141+
* Deprecated: use `GET /api/v2/organizations/{organization_id}/users`, which is paginated. This
142+
* one collapses grants to members in memory after reading up to 10,000 of them, so a large
143+
* organization silently loses members.
144+
*/
145+
@Deprecated("deprecated")
139146
fun listMembers(organizationId: String): CompletableFuture<List<OrganizationMember>> =
140147
listMembers(organizationId, UserListMembersParams.none())
141148

142149
/** @see listMembers */
150+
@Deprecated("deprecated")
143151
fun listMembers(
144152
organizationId: String,
145153
params: UserListMembersParams = UserListMembersParams.none(),
@@ -148,23 +156,27 @@ interface UserServiceAsync {
148156
listMembers(params.toBuilder().organizationId(organizationId).build(), requestOptions)
149157

150158
/** @see listMembers */
159+
@Deprecated("deprecated")
151160
fun listMembers(
152161
organizationId: String,
153162
params: UserListMembersParams = UserListMembersParams.none(),
154163
): CompletableFuture<List<OrganizationMember>> =
155164
listMembers(organizationId, params, RequestOptions.none())
156165

157166
/** @see listMembers */
167+
@Deprecated("deprecated")
158168
fun listMembers(
159169
params: UserListMembersParams,
160170
requestOptions: RequestOptions = RequestOptions.none(),
161171
): CompletableFuture<List<OrganizationMember>>
162172

163173
/** @see listMembers */
174+
@Deprecated("deprecated")
164175
fun listMembers(params: UserListMembersParams): CompletableFuture<List<OrganizationMember>> =
165176
listMembers(params, RequestOptions.none())
166177

167178
/** @see listMembers */
179+
@Deprecated("deprecated")
168180
fun listMembers(
169181
organizationId: String,
170182
requestOptions: RequestOptions,
@@ -371,12 +383,14 @@ interface UserServiceAsync {
371383
* Returns a raw HTTP response for `get /api/v1/organizations/{organization_id}/users`, but
372384
* is otherwise the same as [UserServiceAsync.listMembers].
373385
*/
386+
@Deprecated("deprecated")
374387
fun listMembers(
375388
organizationId: String
376389
): CompletableFuture<HttpResponseFor<List<OrganizationMember>>> =
377390
listMembers(organizationId, UserListMembersParams.none())
378391

379392
/** @see listMembers */
393+
@Deprecated("deprecated")
380394
fun listMembers(
381395
organizationId: String,
382396
params: UserListMembersParams = UserListMembersParams.none(),
@@ -385,25 +399,29 @@ interface UserServiceAsync {
385399
listMembers(params.toBuilder().organizationId(organizationId).build(), requestOptions)
386400

387401
/** @see listMembers */
402+
@Deprecated("deprecated")
388403
fun listMembers(
389404
organizationId: String,
390405
params: UserListMembersParams = UserListMembersParams.none(),
391406
): CompletableFuture<HttpResponseFor<List<OrganizationMember>>> =
392407
listMembers(organizationId, params, RequestOptions.none())
393408

394409
/** @see listMembers */
410+
@Deprecated("deprecated")
395411
fun listMembers(
396412
params: UserListMembersParams,
397413
requestOptions: RequestOptions = RequestOptions.none(),
398414
): CompletableFuture<HttpResponseFor<List<OrganizationMember>>>
399415

400416
/** @see listMembers */
417+
@Deprecated("deprecated")
401418
fun listMembers(
402419
params: UserListMembersParams
403420
): CompletableFuture<HttpResponseFor<List<OrganizationMember>>> =
404421
listMembers(params, RequestOptions.none())
405422

406423
/** @see listMembers */
424+
@Deprecated("deprecated")
407425
fun listMembers(
408426
organizationId: String,
409427
requestOptions: RequestOptions,

‎llama-cloud-admin-core/src/main/kotlin/ai/llamaindex/llamacloudadmin/services/async/organizations/UserServiceAsyncImpl.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ class UserServiceAsyncImpl internal constructor(private val clientOptions: Clien
7373
// put /api/v1/organizations/{organization_id}/users/roles
7474
withRawResponse().assignRole(params, requestOptions).thenApply { it.parse() }
7575

76+
@Deprecated("deprecated")
7677
override fun listMembers(
7778
params: UserListMembersParams,
7879
requestOptions: RequestOptions,
@@ -262,6 +263,7 @@ class UserServiceAsyncImpl internal constructor(private val clientOptions: Clien
262263
private val listMembersHandler: Handler<List<OrganizationMember>> =
263264
jsonHandler<List<OrganizationMember>>(clientOptions.jsonMapper)
264265

266+
@Deprecated("deprecated")
265267
override fun listMembers(
266268
params: UserListMembersParams,
267269
requestOptions: RequestOptions,

‎llama-cloud-admin-core/src/main/kotlin/ai/llamaindex/llamacloudadmin/services/blocking/organizations/UserService.kt‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,19 @@ interface UserService {
120120
requestOptions: RequestOptions = RequestOptions.none(),
121121
): UserOrganizationRole
122122

123-
/** Get all users in an organization. */
123+
/**
124+
* Get all users in an organization.
125+
*
126+
* Deprecated: use `GET /api/v2/organizations/{organization_id}/users`, which is paginated. This
127+
* one collapses grants to members in memory after reading up to 10,000 of them, so a large
128+
* organization silently loses members.
129+
*/
130+
@Deprecated("deprecated")
124131
fun listMembers(organizationId: String): List<OrganizationMember> =
125132
listMembers(organizationId, UserListMembersParams.none())
126133

127134
/** @see listMembers */
135+
@Deprecated("deprecated")
128136
fun listMembers(
129137
organizationId: String,
130138
params: UserListMembersParams = UserListMembersParams.none(),
@@ -133,22 +141,26 @@ interface UserService {
133141
listMembers(params.toBuilder().organizationId(organizationId).build(), requestOptions)
134142

135143
/** @see listMembers */
144+
@Deprecated("deprecated")
136145
fun listMembers(
137146
organizationId: String,
138147
params: UserListMembersParams = UserListMembersParams.none(),
139148
): List<OrganizationMember> = listMembers(organizationId, params, RequestOptions.none())
140149

141150
/** @see listMembers */
151+
@Deprecated("deprecated")
142152
fun listMembers(
143153
params: UserListMembersParams,
144154
requestOptions: RequestOptions = RequestOptions.none(),
145155
): List<OrganizationMember>
146156

147157
/** @see listMembers */
158+
@Deprecated("deprecated")
148159
fun listMembers(params: UserListMembersParams): List<OrganizationMember> =
149160
listMembers(params, RequestOptions.none())
150161

151162
/** @see listMembers */
163+
@Deprecated("deprecated")
152164
fun listMembers(
153165
organizationId: String,
154166
requestOptions: RequestOptions,
@@ -357,11 +369,13 @@ interface UserService {
357369
* Returns a raw HTTP response for `get /api/v1/organizations/{organization_id}/users`, but
358370
* is otherwise the same as [UserService.listMembers].
359371
*/
372+
@Deprecated("deprecated")
360373
@MustBeClosed
361374
fun listMembers(organizationId: String): HttpResponseFor<List<OrganizationMember>> =
362375
listMembers(organizationId, UserListMembersParams.none())
363376

364377
/** @see listMembers */
378+
@Deprecated("deprecated")
365379
@MustBeClosed
366380
fun listMembers(
367381
organizationId: String,
@@ -371,6 +385,7 @@ interface UserService {
371385
listMembers(params.toBuilder().organizationId(organizationId).build(), requestOptions)
372386

373387
/** @see listMembers */
388+
@Deprecated("deprecated")
374389
@MustBeClosed
375390
fun listMembers(
376391
organizationId: String,
@@ -379,18 +394,21 @@ interface UserService {
379394
listMembers(organizationId, params, RequestOptions.none())
380395

381396
/** @see listMembers */
397+
@Deprecated("deprecated")
382398
@MustBeClosed
383399
fun listMembers(
384400
params: UserListMembersParams,
385401
requestOptions: RequestOptions = RequestOptions.none(),
386402
): HttpResponseFor<List<OrganizationMember>>
387403

388404
/** @see listMembers */
405+
@Deprecated("deprecated")
389406
@MustBeClosed
390407
fun listMembers(params: UserListMembersParams): HttpResponseFor<List<OrganizationMember>> =
391408
listMembers(params, RequestOptions.none())
392409

393410
/** @see listMembers */
411+
@Deprecated("deprecated")
394412
@MustBeClosed
395413
fun listMembers(
396414
organizationId: String,

‎llama-cloud-admin-core/src/main/kotlin/ai/llamaindex/llamacloudadmin/services/blocking/organizations/UserServiceImpl.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ class UserServiceImpl internal constructor(private val clientOptions: ClientOpti
6969
// put /api/v1/organizations/{organization_id}/users/roles
7070
withRawResponse().assignRole(params, requestOptions).parse()
7171

72+
@Deprecated("deprecated")
7273
override fun listMembers(
7374
params: UserListMembersParams,
7475
requestOptions: RequestOptions,
@@ -246,6 +247,7 @@ class UserServiceImpl internal constructor(private val clientOptions: ClientOpti
246247
private val listMembersHandler: Handler<List<OrganizationMember>> =
247248
jsonHandler<List<OrganizationMember>>(clientOptions.jsonMapper)
248249

250+
@Deprecated("deprecated")
249251
override fun listMembers(
250252
params: UserListMembersParams,
251253
requestOptions: RequestOptions,

0 commit comments

Comments
 (0)