From 0c24503ebc0f981c247c0657a4be5b52c196000b Mon Sep 17 00:00:00 2001
From: jonadimovska <jona.dimovska@hotmail.com>
Date: Mon, 28 Sep 2026 22:50:12 +0200
Subject: [PATCH] feat: regenerate with the flat sendRequest response and no
 default JSON content type

---
 src/ApiClient.ts                    |    2 +-
 src/gen/chat/ChatApi.ts             | 1222 +++++++++-----------
 src/gen/common/CommonApi.ts         | 1062 ++++++++---------
 src/gen/feeds/FeedsApi.ts           | 1651 +++++++++++++--------------
 src/gen/model-decoders/decoders.ts  |   20 +
 src/gen/models/index.ts             |  132 ++-
 src/gen/moderation/ModerationApi.ts |  746 ++++++------
 src/gen/video/VideoApi.ts           | 1036 ++++++++---------
 8 files changed, 2856 insertions(+), 3015 deletions(-)

diff --git a/src/ApiClient.ts b/src/ApiClient.ts
index be83548..57af75e 100644
--- a/src/ApiClient.ts
+++ b/src/ApiClient.ts
@@ -94,7 +94,7 @@ export class ApiClient {
 
       const responseBody = (await response.json()) as T;
 
-      return { body: responseBody, metadata };
+      return { ...responseBody, metadata };
     } catch (error: any) {
       if (error instanceof StreamError) {
         throw error;
diff --git a/src/gen/chat/ChatApi.ts b/src/gen/chat/ChatApi.ts
index c7b0dee..0e4388d 100644
--- a/src/gen/chat/ChatApi.ts
+++ b/src/gen/chat/ChatApi.ts
@@ -176,20 +176,17 @@ export class ChatApi {
       channel_template: request?.channel_template,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CreateCampaignResponse>
-    >(
+    const response = await this.apiClient.sendRequest<CreateCampaignResponse>(
       'POST',
       '/api/v2/chat/campaigns',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['CreateCampaignResponse']?.(response.body);
+    decoders['CreateCampaignResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryCampaigns(
@@ -204,20 +201,17 @@ export class ChatApi {
       filter: request?.filter,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryCampaignsResponse>
-    >(
+    const response = await this.apiClient.sendRequest<QueryCampaignsResponse>(
       'POST',
       '/api/v2/chat/campaigns/query',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['QueryCampaignsResponse']?.(response.body);
+    decoders['QueryCampaignsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteCampaign(request: {
@@ -227,13 +221,16 @@ export class ChatApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteCampaignResponse>
-    >('DELETE', '/api/v2/chat/campaigns/{id}', pathParams, undefined);
+    const response = await this.apiClient.sendRequest<DeleteCampaignResponse>(
+      'DELETE',
+      '/api/v2/chat/campaigns/{id}',
+      pathParams,
+      undefined,
+    );
 
-    decoders['DeleteCampaignResponse']?.(response.body);
+    decoders['DeleteCampaignResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getCampaign(request: {
@@ -251,13 +248,16 @@ export class ChatApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetCampaignResponse>
-    >('GET', '/api/v2/chat/campaigns/{id}', pathParams, queryParams);
+    const response = await this.apiClient.sendRequest<GetCampaignResponse>(
+      'GET',
+      '/api/v2/chat/campaigns/{id}',
+      pathParams,
+      queryParams,
+    );
 
-    decoders['GetCampaignResponse']?.(response.body);
+    decoders['GetCampaignResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateCampaign(
@@ -283,20 +283,17 @@ export class ChatApi {
       channel_template: request?.channel_template,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CampaignResponse>
-    >(
+    const response = await this.apiClient.sendRequest<CampaignResponse>(
       'PUT',
       '/api/v2/chat/campaigns/{id}',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['CampaignResponse']?.(response.body);
+    decoders['CampaignResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async startCampaign(
@@ -310,20 +307,17 @@ export class ChatApi {
       stop_at: request?.stop_at,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<StartCampaignResponse>
-    >(
+    const response = await this.apiClient.sendRequest<StartCampaignResponse>(
       'POST',
       '/api/v2/chat/campaigns/{id}/start',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['StartCampaignResponse']?.(response.body);
+    decoders['StartCampaignResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async stopCampaign(
@@ -334,20 +328,17 @@ export class ChatApi {
     };
     const body = {};
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CampaignResponse>
-    >(
+    const response = await this.apiClient.sendRequest<CampaignResponse>(
       'POST',
       '/api/v2/chat/campaigns/{id}/stop',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['CampaignResponse']?.(response.body);
+    decoders['CampaignResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryChannels(
@@ -369,20 +360,17 @@ export class ChatApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryChannelsResponse>
-    >(
+    const response = await this.apiClient.sendRequest<QueryChannelsResponse>(
       'POST',
       '/api/v2/chat/channels',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['QueryChannelsResponse']?.(response.body);
+    decoders['QueryChannelsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async channelBatchUpdate(
@@ -399,20 +387,18 @@ export class ChatApi {
       data: request?.data,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ChannelBatchUpdateResponse>
-    >(
-      'PUT',
-      '/api/v2/chat/channels/batch',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<ChannelBatchUpdateResponse>(
+        'PUT',
+        '/api/v2/chat/channels/batch',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['ChannelBatchUpdateResponse']?.(response.body);
+    decoders['ChannelBatchUpdateResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteChannels(
@@ -424,20 +410,17 @@ export class ChatApi {
       skip_truncate: request?.skip_truncate,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteChannelsResponse>
-    >(
+    const response = await this.apiClient.sendRequest<DeleteChannelsResponse>(
       'POST',
       '/api/v2/chat/channels/delete',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['DeleteChannelsResponse']?.(response.body);
+    decoders['DeleteChannelsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async markDelivered(
@@ -450,20 +433,17 @@ export class ChatApi {
       latest_delivered_messages: request?.latest_delivered_messages,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<MarkDeliveredResponse>
-    >(
+    const response = await this.apiClient.sendRequest<MarkDeliveredResponse>(
       'POST',
       '/api/v2/chat/channels/delivered',
       undefined,
       queryParams,
       body,
-      'application/json',
     );
 
-    decoders['MarkDeliveredResponse']?.(response.body);
+    decoders['MarkDeliveredResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async groupedQueryChannels(
@@ -476,20 +456,18 @@ export class ChatApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GroupedQueryChannelsResponse>
-    >(
-      'POST',
-      '/api/v2/chat/channels/grouped',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<GroupedQueryChannelsResponse>(
+        'POST',
+        '/api/v2/chat/channels/grouped',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['GroupedQueryChannelsResponse']?.(response.body);
+    decoders['GroupedQueryChannelsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async markChannelsRead(
@@ -501,20 +479,17 @@ export class ChatApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<MarkReadResponse>
-    >(
+    const response = await this.apiClient.sendRequest<MarkReadResponse>(
       'POST',
       '/api/v2/chat/channels/read',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['MarkReadResponse']?.(response.body);
+    decoders['MarkReadResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getOrCreateDistinctChannel(
@@ -534,20 +509,17 @@ export class ChatApi {
       watchers: request?.watchers,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ChannelStateResponse>
-    >(
+    const response = await this.apiClient.sendRequest<ChannelStateResponse>(
       'POST',
       '/api/v2/chat/channels/{type}/query',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['ChannelStateResponse']?.(response.body);
+    decoders['ChannelStateResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteChannel(request: {
@@ -565,13 +537,16 @@ export class ChatApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteChannelResponse>
-    >('DELETE', '/api/v2/chat/channels/{type}/{id}', pathParams, queryParams);
+    const response = await this.apiClient.sendRequest<DeleteChannelResponse>(
+      'DELETE',
+      '/api/v2/chat/channels/{type}/{id}',
+      pathParams,
+      queryParams,
+    );
 
-    decoders['DeleteChannelResponse']?.(response.body);
+    decoders['DeleteChannelResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getChannel(request: {
@@ -605,13 +580,16 @@ export class ChatApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ChannelStateResponse>
-    >('GET', '/api/v2/chat/channels/{type}/{id}', pathParams, queryParams);
+    const response = await this.apiClient.sendRequest<ChannelStateResponse>(
+      'GET',
+      '/api/v2/chat/channels/{type}/{id}',
+      pathParams,
+      queryParams,
+    );
 
-    decoders['ChannelStateResponse']?.(response.body);
+    decoders['ChannelStateResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateChannelPartial(
@@ -628,20 +606,18 @@ export class ChatApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateChannelPartialResponse>
-    >(
-      'PATCH',
-      '/api/v2/chat/channels/{type}/{id}',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpdateChannelPartialResponse>(
+        'PATCH',
+        '/api/v2/chat/channels/{type}/{id}',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['UpdateChannelPartialResponse']?.(response.body);
+    decoders['UpdateChannelPartialResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateChannel(
@@ -672,20 +648,17 @@ export class ChatApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateChannelResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UpdateChannelResponse>(
       'POST',
       '/api/v2/chat/channels/{type}/{id}',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UpdateChannelResponse']?.(response.body);
+    decoders['UpdateChannelResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteDraft(request: {
@@ -703,16 +676,16 @@ export class ChatApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'DELETE',
       '/api/v2/chat/channels/{type}/{id}/draft',
       pathParams,
       queryParams,
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getDraft(request: {
@@ -730,18 +703,16 @@ export class ChatApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetDraftResponse>
-    >(
+    const response = await this.apiClient.sendRequest<GetDraftResponse>(
       'GET',
       '/api/v2/chat/channels/{type}/{id}/draft',
       pathParams,
       queryParams,
     );
 
-    decoders['GetDraftResponse']?.(response.body);
+    decoders['GetDraftResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async sendEvent(
@@ -755,20 +726,17 @@ export class ChatApi {
       event: request?.event,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<EventResponse>
-    >(
+    const response = await this.apiClient.sendRequest<EventResponse>(
       'POST',
       '/api/v2/chat/channels/{type}/{id}/event',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['EventResponse']?.(response.body);
+    decoders['EventResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteChannelFile(request: {
@@ -784,16 +752,16 @@ export class ChatApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'DELETE',
       '/api/v2/chat/channels/{type}/{id}/file',
       pathParams,
       queryParams,
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async uploadChannelFile(
@@ -808,20 +776,19 @@ export class ChatApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UploadChannelFileResponse>
-    >(
-      'POST',
-      '/api/v2/chat/channels/{type}/{id}/file',
-      pathParams,
-      undefined,
-      body,
-      'multipart/form-data',
-    );
+    const response =
+      await this.apiClient.sendRequest<UploadChannelFileResponse>(
+        'POST',
+        '/api/v2/chat/channels/{type}/{id}/file',
+        pathParams,
+        undefined,
+        body,
+        'multipart/form-data',
+      );
 
-    decoders['UploadChannelFileResponse']?.(response.body);
+    decoders['UploadChannelFileResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async hideChannel(
@@ -837,20 +804,17 @@ export class ChatApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<HideChannelResponse>
-    >(
+    const response = await this.apiClient.sendRequest<HideChannelResponse>(
       'POST',
       '/api/v2/chat/channels/{type}/{id}/hide',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['HideChannelResponse']?.(response.body);
+    decoders['HideChannelResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteChannelImage(request: {
@@ -866,16 +830,16 @@ export class ChatApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'DELETE',
       '/api/v2/chat/channels/{type}/{id}/image',
       pathParams,
       queryParams,
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async uploadChannelImage(
@@ -891,9 +855,7 @@ export class ChatApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UploadChannelResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UploadChannelResponse>(
       'POST',
       '/api/v2/chat/channels/{type}/{id}/image',
       pathParams,
@@ -902,9 +864,9 @@ export class ChatApi {
       'multipart/form-data',
     );
 
-    decoders['UploadChannelResponse']?.(response.body);
+    decoders['UploadChannelResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateMemberPartial(
@@ -926,20 +888,18 @@ export class ChatApi {
       set: request?.set,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateMemberPartialResponse>
-    >(
-      'PATCH',
-      '/api/v2/chat/channels/{type}/{id}/member',
-      pathParams,
-      queryParams,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpdateMemberPartialResponse>(
+        'PATCH',
+        '/api/v2/chat/channels/{type}/{id}/member',
+        pathParams,
+        queryParams,
+        body,
+      );
 
-    decoders['UpdateMemberPartialResponse']?.(response.body);
+    decoders['UpdateMemberPartialResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async sendMessage(
@@ -961,20 +921,17 @@ export class ChatApi {
       pending_message_metadata: request?.pending_message_metadata,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<SendMessageResponse>
-    >(
+    const response = await this.apiClient.sendRequest<SendMessageResponse>(
       'POST',
       '/api/v2/chat/channels/{type}/{id}/message',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['SendMessageResponse']?.(response.body);
+    decoders['SendMessageResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getManyMessages(request: {
@@ -992,18 +949,16 @@ export class ChatApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetManyMessagesResponse>
-    >(
+    const response = await this.apiClient.sendRequest<GetManyMessagesResponse>(
       'GET',
       '/api/v2/chat/channels/{type}/{id}/messages',
       pathParams,
       queryParams,
     );
 
-    decoders['GetManyMessagesResponse']?.(response.body);
+    decoders['GetManyMessagesResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getPinnedMessages(request: {
@@ -1047,18 +1002,17 @@ export class ChatApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetPinnedMessagesResponse>
-    >(
-      'GET',
-      '/api/v2/chat/channels/{type}/{id}/pinned_messages',
-      pathParams,
-      queryParams,
-    );
+    const response =
+      await this.apiClient.sendRequest<GetPinnedMessagesResponse>(
+        'GET',
+        '/api/v2/chat/channels/{type}/{id}/pinned_messages',
+        pathParams,
+        queryParams,
+      );
 
-    decoders['GetPinnedMessagesResponse']?.(response.body);
+    decoders['GetPinnedMessagesResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getOrCreateChannel(
@@ -1079,20 +1033,17 @@ export class ChatApi {
       watchers: request?.watchers,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ChannelStateResponse>
-    >(
+    const response = await this.apiClient.sendRequest<ChannelStateResponse>(
       'POST',
       '/api/v2/chat/channels/{type}/{id}/query',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['ChannelStateResponse']?.(response.body);
+    decoders['ChannelStateResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async markRead(
@@ -1109,20 +1060,17 @@ export class ChatApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<MarkReadResponse>
-    >(
+    const response = await this.apiClient.sendRequest<MarkReadResponse>(
       'POST',
       '/api/v2/chat/channels/{type}/{id}/read',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['MarkReadResponse']?.(response.body);
+    decoders['MarkReadResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async showChannel(
@@ -1137,20 +1085,17 @@ export class ChatApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ShowChannelResponse>
-    >(
+    const response = await this.apiClient.sendRequest<ShowChannelResponse>(
       'POST',
       '/api/v2/chat/channels/{type}/{id}/show',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['ShowChannelResponse']?.(response.body);
+    decoders['ShowChannelResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async truncateChannel(
@@ -1170,20 +1115,17 @@ export class ChatApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<TruncateChannelResponse>
-    >(
+    const response = await this.apiClient.sendRequest<TruncateChannelResponse>(
       'POST',
       '/api/v2/chat/channels/{type}/{id}/truncate',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['TruncateChannelResponse']?.(response.body);
+    decoders['TruncateChannelResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async markUnread(
@@ -1201,28 +1143,30 @@ export class ChatApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'POST',
       '/api/v2/chat/channels/{type}/{id}/unread',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async listChannelTypes(): Promise<StreamResponse<ListChannelTypesResponse>> {
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ListChannelTypesResponse>
-    >('GET', '/api/v2/chat/channeltypes', undefined, undefined);
+    const response = await this.apiClient.sendRequest<ListChannelTypesResponse>(
+      'GET',
+      '/api/v2/chat/channeltypes',
+      undefined,
+      undefined,
+    );
 
-    decoders['ListChannelTypesResponse']?.(response.body);
+    decoders['ListChannelTypesResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createChannelType(
@@ -1265,20 +1209,18 @@ export class ChatApi {
       grants: request?.grants,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CreateChannelTypeResponse>
-    >(
-      'POST',
-      '/api/v2/chat/channeltypes',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<CreateChannelTypeResponse>(
+        'POST',
+        '/api/v2/chat/channeltypes',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['CreateChannelTypeResponse']?.(response.body);
+    decoders['CreateChannelTypeResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteChannelType(request: {
@@ -1288,16 +1230,16 @@ export class ChatApi {
       name: request?.name,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'DELETE',
       '/api/v2/chat/channeltypes/{name}',
       pathParams,
       undefined,
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getChannelType(request: {
@@ -1307,13 +1249,16 @@ export class ChatApi {
       name: request?.name,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetChannelTypeResponse>
-    >('GET', '/api/v2/chat/channeltypes/{name}', pathParams, undefined);
+    const response = await this.apiClient.sendRequest<GetChannelTypeResponse>(
+      'GET',
+      '/api/v2/chat/channeltypes/{name}',
+      pathParams,
+      undefined,
+    );
 
-    decoders['GetChannelTypeResponse']?.(response.body);
+    decoders['GetChannelTypeResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateChannelType(
@@ -1362,30 +1307,31 @@ export class ChatApi {
       grants: request?.grants,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateChannelTypeResponse>
-    >(
-      'PUT',
-      '/api/v2/chat/channeltypes/{name}',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpdateChannelTypeResponse>(
+        'PUT',
+        '/api/v2/chat/channeltypes/{name}',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['UpdateChannelTypeResponse']?.(response.body);
+    decoders['UpdateChannelTypeResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async listCommands(): Promise<StreamResponse<ListCommandsResponse>> {
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ListCommandsResponse>
-    >('GET', '/api/v2/chat/commands', undefined, undefined);
+    const response = await this.apiClient.sendRequest<ListCommandsResponse>(
+      'GET',
+      '/api/v2/chat/commands',
+      undefined,
+      undefined,
+    );
 
-    decoders['ListCommandsResponse']?.(response.body);
+    decoders['ListCommandsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createCommand(
@@ -1398,20 +1344,17 @@ export class ChatApi {
       set: request?.set,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CreateCommandResponse>
-    >(
+    const response = await this.apiClient.sendRequest<CreateCommandResponse>(
       'POST',
       '/api/v2/chat/commands',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['CreateCommandResponse']?.(response.body);
+    decoders['CreateCommandResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteCommand(request: {
@@ -1421,13 +1364,16 @@ export class ChatApi {
       name: request?.name,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteCommandResponse>
-    >('DELETE', '/api/v2/chat/commands/{name}', pathParams, undefined);
+    const response = await this.apiClient.sendRequest<DeleteCommandResponse>(
+      'DELETE',
+      '/api/v2/chat/commands/{name}',
+      pathParams,
+      undefined,
+    );
 
-    decoders['DeleteCommandResponse']?.(response.body);
+    decoders['DeleteCommandResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getCommand(request: {
@@ -1437,13 +1383,16 @@ export class ChatApi {
       name: request?.name,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetCommandResponse>
-    >('GET', '/api/v2/chat/commands/{name}', pathParams, undefined);
+    const response = await this.apiClient.sendRequest<GetCommandResponse>(
+      'GET',
+      '/api/v2/chat/commands/{name}',
+      pathParams,
+      undefined,
+    );
 
-    decoders['GetCommandResponse']?.(response.body);
+    decoders['GetCommandResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateCommand(
@@ -1458,20 +1407,17 @@ export class ChatApi {
       set: request?.set,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateCommandResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UpdateCommandResponse>(
       'PUT',
       '/api/v2/chat/commands/{name}',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UpdateCommandResponse']?.(response.body);
+    decoders['UpdateCommandResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryDrafts(
@@ -1487,20 +1433,17 @@ export class ChatApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryDraftsResponse>
-    >(
+    const response = await this.apiClient.sendRequest<QueryDraftsResponse>(
       'POST',
       '/api/v2/chat/drafts/query',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['QueryDraftsResponse']?.(response.body);
+    decoders['QueryDraftsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async exportChannels(
@@ -1517,20 +1460,17 @@ export class ChatApi {
       include_fields: request?.include_fields,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ExportChannelsResponse>
-    >(
+    const response = await this.apiClient.sendRequest<ExportChannelsResponse>(
       'POST',
       '/api/v2/chat/export_channels',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['ExportChannelsResponse']?.(response.body);
+    decoders['ExportChannelsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryMembers(request?: {
@@ -1540,13 +1480,16 @@ export class ChatApi {
       payload: request?.payload,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<MembersResponse>
-    >('GET', '/api/v2/chat/members', undefined, queryParams);
+    const response = await this.apiClient.sendRequest<MembersResponse>(
+      'GET',
+      '/api/v2/chat/members',
+      undefined,
+      queryParams,
+    );
 
-    decoders['MembersResponse']?.(response.body);
+    decoders['MembersResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryMessageHistory(
@@ -1560,20 +1503,18 @@ export class ChatApi {
       sort: request?.sort,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryMessageHistoryResponse>
-    >(
-      'POST',
-      '/api/v2/chat/messages/history',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<QueryMessageHistoryResponse>(
+        'POST',
+        '/api/v2/chat/messages/history',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['QueryMessageHistoryResponse']?.(response.body);
+    decoders['QueryMessageHistoryResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteMessage(request: {
@@ -1591,13 +1532,16 @@ export class ChatApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteMessageResponse>
-    >('DELETE', '/api/v2/chat/messages/{id}', pathParams, queryParams);
+    const response = await this.apiClient.sendRequest<DeleteMessageResponse>(
+      'DELETE',
+      '/api/v2/chat/messages/{id}',
+      pathParams,
+      queryParams,
+    );
 
-    decoders['DeleteMessageResponse']?.(response.body);
+    decoders['DeleteMessageResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getMessage(request: {
@@ -1611,13 +1555,16 @@ export class ChatApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetMessageResponse>
-    >('GET', '/api/v2/chat/messages/{id}', pathParams, queryParams);
+    const response = await this.apiClient.sendRequest<GetMessageResponse>(
+      'GET',
+      '/api/v2/chat/messages/{id}',
+      pathParams,
+      queryParams,
+    );
 
-    decoders['GetMessageResponse']?.(response.body);
+    decoders['GetMessageResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateMessage(
@@ -1632,20 +1579,17 @@ export class ChatApi {
       skip_push: request?.skip_push,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateMessageResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UpdateMessageResponse>(
       'POST',
       '/api/v2/chat/messages/{id}',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UpdateMessageResponse']?.(response.body);
+    decoders['UpdateMessageResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateMessagePartial(
@@ -1663,20 +1607,18 @@ export class ChatApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateMessagePartialResponse>
-    >(
-      'PUT',
-      '/api/v2/chat/messages/{id}',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpdateMessagePartialResponse>(
+        'PUT',
+        '/api/v2/chat/messages/{id}',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['UpdateMessagePartialResponse']?.(response.body);
+    decoders['UpdateMessagePartialResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async runMessageAction(
@@ -1691,20 +1633,17 @@ export class ChatApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<MessageActionResponse>
-    >(
+    const response = await this.apiClient.sendRequest<MessageActionResponse>(
       'POST',
       '/api/v2/chat/messages/{id}/action',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['MessageActionResponse']?.(response.body);
+    decoders['MessageActionResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async commitMessage(
@@ -1715,20 +1654,17 @@ export class ChatApi {
     };
     const body = {};
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<MessageActionResponse>
-    >(
+    const response = await this.apiClient.sendRequest<MessageActionResponse>(
       'POST',
       '/api/v2/chat/messages/{id}/commit',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['MessageActionResponse']?.(response.body);
+    decoders['MessageActionResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async ephemeralMessageUpdate(
@@ -1746,20 +1682,18 @@ export class ChatApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateMessagePartialResponse>
-    >(
-      'PATCH',
-      '/api/v2/chat/messages/{id}/ephemeral',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpdateMessagePartialResponse>(
+        'PATCH',
+        '/api/v2/chat/messages/{id}/ephemeral',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['UpdateMessagePartialResponse']?.(response.body);
+    decoders['UpdateMessagePartialResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async sendReaction(
@@ -1774,20 +1708,17 @@ export class ChatApi {
       skip_push: request?.skip_push,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<SendReactionResponse>
-    >(
+    const response = await this.apiClient.sendRequest<SendReactionResponse>(
       'POST',
       '/api/v2/chat/messages/{id}/reaction',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['SendReactionResponse']?.(response.body);
+    decoders['SendReactionResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteReaction(request: {
@@ -1803,18 +1734,16 @@ export class ChatApi {
       type: request?.type,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteReactionResponse>
-    >(
+    const response = await this.apiClient.sendRequest<DeleteReactionResponse>(
       'DELETE',
       '/api/v2/chat/messages/{id}/reaction/{type}',
       pathParams,
       queryParams,
     );
 
-    decoders['DeleteReactionResponse']?.(response.body);
+    decoders['DeleteReactionResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getReactions(request: {
@@ -1830,13 +1759,16 @@ export class ChatApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetReactionsResponse>
-    >('GET', '/api/v2/chat/messages/{id}/reactions', pathParams, queryParams);
+    const response = await this.apiClient.sendRequest<GetReactionsResponse>(
+      'GET',
+      '/api/v2/chat/messages/{id}/reactions',
+      pathParams,
+      queryParams,
+    );
 
-    decoders['GetReactionsResponse']?.(response.body);
+    decoders['GetReactionsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryReactions(
@@ -1855,20 +1787,17 @@ export class ChatApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryReactionsResponse>
-    >(
+    const response = await this.apiClient.sendRequest<QueryReactionsResponse>(
       'POST',
       '/api/v2/chat/messages/{id}/reactions',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['QueryReactionsResponse']?.(response.body);
+    decoders['QueryReactionsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async translateMessage(
@@ -1881,20 +1810,17 @@ export class ChatApi {
       language: request?.language,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<TranslateMessageResponse>
-    >(
+    const response = await this.apiClient.sendRequest<TranslateMessageResponse>(
       'POST',
       '/api/v2/chat/messages/{id}/translate',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['TranslateMessageResponse']?.(response.body);
+    decoders['TranslateMessageResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async undeleteMessage(
@@ -1907,20 +1833,17 @@ export class ChatApi {
       undeleted_by: request?.undeleted_by,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UndeleteMessageResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UndeleteMessageResponse>(
       'POST',
       '/api/v2/chat/messages/{id}/undelete',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UndeleteMessageResponse']?.(response.body);
+    decoders['UndeleteMessageResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async castPollVote(
@@ -1936,20 +1859,17 @@ export class ChatApi {
       vote: request?.vote,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<PollVoteResponse>
-    >(
+    const response = await this.apiClient.sendRequest<PollVoteResponse>(
       'POST',
       '/api/v2/chat/messages/{message_id}/polls/{poll_id}/vote',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['PollVoteResponse']?.(response.body);
+    decoders['PollVoteResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deletePollVote(request: {
@@ -1967,18 +1887,16 @@ export class ChatApi {
       vote_id: request?.vote_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<PollVoteResponse>
-    >(
+    const response = await this.apiClient.sendRequest<PollVoteResponse>(
       'DELETE',
       '/api/v2/chat/messages/{message_id}/polls/{poll_id}/vote/{vote_id}',
       pathParams,
       queryParams,
     );
 
-    decoders['PollVoteResponse']?.(response.body);
+    decoders['PollVoteResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteReminder(request: {
@@ -1992,18 +1910,16 @@ export class ChatApi {
       message_id: request?.message_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteReminderResponse>
-    >(
+    const response = await this.apiClient.sendRequest<DeleteReminderResponse>(
       'DELETE',
       '/api/v2/chat/messages/{message_id}/reminders',
       pathParams,
       queryParams,
     );
 
-    decoders['DeleteReminderResponse']?.(response.body);
+    decoders['DeleteReminderResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateReminder(
@@ -2013,25 +1929,23 @@ export class ChatApi {
       message_id: request?.message_id,
     };
     const body = {
+      expires_at: request?.expires_at,
       remind_at: request?.remind_at,
       user_id: request?.user_id,
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateReminderResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UpdateReminderResponse>(
       'PATCH',
       '/api/v2/chat/messages/{message_id}/reminders',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UpdateReminderResponse']?.(response.body);
+    decoders['UpdateReminderResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createReminder(
@@ -2041,25 +1955,23 @@ export class ChatApi {
       message_id: request?.message_id,
     };
     const body = {
+      expires_at: request?.expires_at,
       remind_at: request?.remind_at,
       user_id: request?.user_id,
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CreateReminderResponse>
-    >(
+    const response = await this.apiClient.sendRequest<CreateReminderResponse>(
       'POST',
       '/api/v2/chat/messages/{message_id}/reminders',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['CreateReminderResponse']?.(response.body);
+    decoders['CreateReminderResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getReplies(request: {
@@ -2087,18 +1999,16 @@ export class ChatApi {
       parent_id: request?.parent_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetRepliesResponse>
-    >(
+    const response = await this.apiClient.sendRequest<GetRepliesResponse>(
       'GET',
       '/api/v2/chat/messages/{parent_id}/replies',
       pathParams,
       queryParams,
     );
 
-    decoders['GetRepliesResponse']?.(response.body);
+    decoders['GetRepliesResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryMessageFlags(request?: {
@@ -2108,13 +2018,17 @@ export class ChatApi {
       payload: request?.payload,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryMessageFlagsResponse>
-    >('GET', '/api/v2/chat/moderation/flags/message', undefined, queryParams);
+    const response =
+      await this.apiClient.sendRequest<QueryMessageFlagsResponse>(
+        'GET',
+        '/api/v2/chat/moderation/flags/message',
+        undefined,
+        queryParams,
+      );
 
-    decoders['QueryMessageFlagsResponse']?.(response.body);
+    decoders['QueryMessageFlagsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async muteChannel(
@@ -2127,20 +2041,17 @@ export class ChatApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<MuteChannelResponse>
-    >(
+    const response = await this.apiClient.sendRequest<MuteChannelResponse>(
       'POST',
       '/api/v2/chat/moderation/mute/channel',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['MuteChannelResponse']?.(response.body);
+    decoders['MuteChannelResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async unmuteChannel(
@@ -2153,20 +2064,17 @@ export class ChatApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UnmuteResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UnmuteResponse>(
       'POST',
       '/api/v2/chat/moderation/unmute/channel',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UnmuteResponse']?.(response.body);
+    decoders['UnmuteResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getPredefinedFilters(request?: {
@@ -2178,13 +2086,17 @@ export class ChatApi {
       sort: request?.sort,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryPredefinedFiltersResponse>
-    >('GET', '/api/v2/chat/predefined_filters', undefined, queryParams);
+    const response =
+      await this.apiClient.sendRequest<QueryPredefinedFiltersResponse>(
+        'GET',
+        '/api/v2/chat/predefined_filters',
+        undefined,
+        queryParams,
+      );
 
-    decoders['QueryPredefinedFiltersResponse']?.(response.body);
+    decoders['QueryPredefinedFiltersResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createPredefinedFilter(
@@ -2198,20 +2110,18 @@ export class ChatApi {
       sort: request?.sort,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CreatePredefinedFilterResponse>
-    >(
-      'POST',
-      '/api/v2/chat/predefined_filters',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<CreatePredefinedFilterResponse>(
+        'POST',
+        '/api/v2/chat/predefined_filters',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['CreatePredefinedFilterResponse']?.(response.body);
+    decoders['CreatePredefinedFilterResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deletePredefinedFilter(request: {
@@ -2221,16 +2131,16 @@ export class ChatApi {
       name: request?.name,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'DELETE',
       '/api/v2/chat/predefined_filters/{name}',
       pathParams,
       undefined,
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getPredefinedFilter(request: {
@@ -2240,13 +2150,17 @@ export class ChatApi {
       name: request?.name,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetPredefinedFilterResponse>
-    >('GET', '/api/v2/chat/predefined_filters/{name}', pathParams, undefined);
+    const response =
+      await this.apiClient.sendRequest<GetPredefinedFilterResponse>(
+        'GET',
+        '/api/v2/chat/predefined_filters/{name}',
+        pathParams,
+        undefined,
+      );
 
-    decoders['GetPredefinedFilterResponse']?.(response.body);
+    decoders['GetPredefinedFilterResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updatePredefinedFilter(
@@ -2262,20 +2176,18 @@ export class ChatApi {
       sort: request?.sort,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdatePredefinedFilterResponse>
-    >(
-      'PUT',
-      '/api/v2/chat/predefined_filters/{name}',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpdatePredefinedFilterResponse>(
+        'PUT',
+        '/api/v2/chat/predefined_filters/{name}',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['UpdatePredefinedFilterResponse']?.(response.body);
+    decoders['UpdatePredefinedFilterResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryBannedUsers(request?: {
@@ -2285,13 +2197,16 @@ export class ChatApi {
       payload: request?.payload,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryBannedUsersResponse>
-    >('GET', '/api/v2/chat/query_banned_users', undefined, queryParams);
+    const response = await this.apiClient.sendRequest<QueryBannedUsersResponse>(
+      'GET',
+      '/api/v2/chat/query_banned_users',
+      undefined,
+      queryParams,
+    );
 
-    decoders['QueryBannedUsersResponse']?.(response.body);
+    decoders['QueryBannedUsersResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryFutureChannelBans(request?: {
@@ -2301,13 +2216,17 @@ export class ChatApi {
       payload: request?.payload,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryFutureChannelBansResponse>
-    >('GET', '/api/v2/chat/query_future_channel_bans', undefined, queryParams);
+    const response =
+      await this.apiClient.sendRequest<QueryFutureChannelBansResponse>(
+        'GET',
+        '/api/v2/chat/query_future_channel_bans',
+        undefined,
+        queryParams,
+      );
 
-    decoders['QueryFutureChannelBansResponse']?.(response.body);
+    decoders['QueryFutureChannelBansResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryReminders(
@@ -2323,32 +2242,33 @@ export class ChatApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryRemindersResponse>
-    >(
+    const response = await this.apiClient.sendRequest<QueryRemindersResponse>(
       'POST',
       '/api/v2/chat/reminders/query',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['QueryRemindersResponse']?.(response.body);
+    decoders['QueryRemindersResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getRetentionPolicy(): Promise<
     StreamResponse<GetRetentionPolicyResponse>
   > {
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetRetentionPolicyResponse>
-    >('GET', '/api/v2/chat/retention_policy', undefined, undefined);
+    const response =
+      await this.apiClient.sendRequest<GetRetentionPolicyResponse>(
+        'GET',
+        '/api/v2/chat/retention_policy',
+        undefined,
+        undefined,
+      );
 
-    decoders['GetRetentionPolicyResponse']?.(response.body);
+    decoders['GetRetentionPolicyResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async setRetentionPolicy(
@@ -2359,20 +2279,18 @@ export class ChatApi {
       policy: request?.policy,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<SetRetentionPolicyResponse>
-    >(
-      'POST',
-      '/api/v2/chat/retention_policy',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<SetRetentionPolicyResponse>(
+        'POST',
+        '/api/v2/chat/retention_policy',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['SetRetentionPolicyResponse']?.(response.body);
+    decoders['SetRetentionPolicyResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteRetentionPolicy(
@@ -2382,20 +2300,18 @@ export class ChatApi {
       policy: request?.policy,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteRetentionPolicyResponse>
-    >(
-      'POST',
-      '/api/v2/chat/retention_policy/delete',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<DeleteRetentionPolicyResponse>(
+        'POST',
+        '/api/v2/chat/retention_policy/delete',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['DeleteRetentionPolicyResponse']?.(response.body);
+    decoders['DeleteRetentionPolicyResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getRetentionPolicyRuns(
@@ -2409,20 +2325,18 @@ export class ChatApi {
       filter_conditions: request?.filter_conditions,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetRetentionPolicyRunsResponse>
-    >(
-      'POST',
-      '/api/v2/chat/retention_policy/runs',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<GetRetentionPolicyRunsResponse>(
+        'POST',
+        '/api/v2/chat/retention_policy/runs',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['GetRetentionPolicyRunsResponse']?.(response.body);
+    decoders['GetRetentionPolicyRunsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async search(request?: {
@@ -2432,13 +2346,16 @@ export class ChatApi {
       payload: request?.payload,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<SearchResponse>
-    >('GET', '/api/v2/chat/search', undefined, queryParams);
+    const response = await this.apiClient.sendRequest<SearchResponse>(
+      'GET',
+      '/api/v2/chat/search',
+      undefined,
+      queryParams,
+    );
 
-    decoders['SearchResponse']?.(response.body);
+    decoders['SearchResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createSegment(
@@ -2454,20 +2371,17 @@ export class ChatApi {
       filter: request?.filter,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CreateSegmentResponse>
-    >(
+    const response = await this.apiClient.sendRequest<CreateSegmentResponse>(
       'POST',
       '/api/v2/chat/segments',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['CreateSegmentResponse']?.(response.body);
+    decoders['CreateSegmentResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async querySegments(
@@ -2481,20 +2395,17 @@ export class ChatApi {
       sort: request?.sort,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QuerySegmentsResponse>
-    >(
+    const response = await this.apiClient.sendRequest<QuerySegmentsResponse>(
       'POST',
       '/api/v2/chat/segments/query',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['QuerySegmentsResponse']?.(response.body);
+    decoders['QuerySegmentsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteSegment(request: {
@@ -2504,16 +2415,16 @@ export class ChatApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'DELETE',
       '/api/v2/chat/segments/{id}',
       pathParams,
       undefined,
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getSegment(request: {
@@ -2523,13 +2434,16 @@ export class ChatApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetSegmentResponse>
-    >('GET', '/api/v2/chat/segments/{id}', pathParams, undefined);
+    const response = await this.apiClient.sendRequest<GetSegmentResponse>(
+      'GET',
+      '/api/v2/chat/segments/{id}',
+      pathParams,
+      undefined,
+    );
 
-    decoders['GetSegmentResponse']?.(response.body);
+    decoders['GetSegmentResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateSegment(
@@ -2544,20 +2458,17 @@ export class ChatApi {
       filter: request?.filter,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateSegmentResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UpdateSegmentResponse>(
       'PUT',
       '/api/v2/chat/segments/{id}',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UpdateSegmentResponse']?.(response.body);
+    decoders['UpdateSegmentResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async addSegmentTargets(
@@ -2570,18 +2481,17 @@ export class ChatApi {
       target_ids: request?.target_ids,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'POST',
       '/api/v2/chat/segments/{id}/addtargets',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteSegmentTargets(
@@ -2594,18 +2504,17 @@ export class ChatApi {
       target_ids: request?.target_ids,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'POST',
       '/api/v2/chat/segments/{id}/deletetargets',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async segmentTargetExists(request: {
@@ -2617,16 +2526,16 @@ export class ChatApi {
       target_id: request?.target_id,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'GET',
       '/api/v2/chat/segments/{id}/target/{target_id}',
       pathParams,
       undefined,
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async querySegmentTargets(
@@ -2643,20 +2552,18 @@ export class ChatApi {
       filter: request?.filter,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QuerySegmentTargetsResponse>
-    >(
-      'POST',
-      '/api/v2/chat/segments/{id}/targets/query',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<QuerySegmentTargetsResponse>(
+        'POST',
+        '/api/v2/chat/segments/{id}/targets/query',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['QuerySegmentTargetsResponse']?.(response.body);
+    decoders['QuerySegmentTargetsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryTeamUsageStats(
@@ -2671,20 +2578,18 @@ export class ChatApi {
       team: request?.team,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryTeamUsageStatsResponse>
-    >(
-      'POST',
-      '/api/v2/chat/stats/team_usage',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<QueryTeamUsageStatsResponse>(
+        'POST',
+        '/api/v2/chat/stats/team_usage',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['QueryTeamUsageStatsResponse']?.(response.body);
+    decoders['QueryTeamUsageStatsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryThreads(
@@ -2703,20 +2608,17 @@ export class ChatApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryThreadsResponse>
-    >(
+    const response = await this.apiClient.sendRequest<QueryThreadsResponse>(
       'POST',
       '/api/v2/chat/threads',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['QueryThreadsResponse']?.(response.body);
+    decoders['QueryThreadsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getThread(request: {
@@ -2734,13 +2636,16 @@ export class ChatApi {
       message_id: request?.message_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetThreadResponse>
-    >('GET', '/api/v2/chat/threads/{message_id}', pathParams, queryParams);
+    const response = await this.apiClient.sendRequest<GetThreadResponse>(
+      'GET',
+      '/api/v2/chat/threads/{message_id}',
+      pathParams,
+      queryParams,
+    );
 
-    decoders['GetThreadResponse']?.(response.body);
+    decoders['GetThreadResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateThreadPartial(
@@ -2756,20 +2661,18 @@ export class ChatApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateThreadPartialResponse>
-    >(
-      'PATCH',
-      '/api/v2/chat/threads/{message_id}',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpdateThreadPartialResponse>(
+        'PATCH',
+        '/api/v2/chat/threads/{message_id}',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['UpdateThreadPartialResponse']?.(response.body);
+    decoders['UpdateThreadPartialResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async unreadCounts(request?: {
@@ -2779,13 +2682,17 @@ export class ChatApi {
       user_id: request?.user_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<WrappedUnreadCountsResponse>
-    >('GET', '/api/v2/chat/unread', undefined, queryParams);
+    const response =
+      await this.apiClient.sendRequest<WrappedUnreadCountsResponse>(
+        'GET',
+        '/api/v2/chat/unread',
+        undefined,
+        queryParams,
+      );
 
-    decoders['WrappedUnreadCountsResponse']?.(response.body);
+    decoders['WrappedUnreadCountsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async unreadCountsBatch(
@@ -2795,20 +2702,18 @@ export class ChatApi {
       user_ids: request?.user_ids,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UnreadCountsBatchResponse>
-    >(
-      'POST',
-      '/api/v2/chat/unread_batch',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UnreadCountsBatchResponse>(
+        'POST',
+        '/api/v2/chat/unread_batch',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['UnreadCountsBatchResponse']?.(response.body);
+    decoders['UnreadCountsBatchResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async sendUserCustomEvent(
@@ -2821,17 +2726,16 @@ export class ChatApi {
       event: request?.event,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'POST',
       '/api/v2/chat/users/{user_id}/event',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 }
diff --git a/src/gen/common/CommonApi.ts b/src/gen/common/CommonApi.ts
index ca36e96..bd53ffb 100644
--- a/src/gen/common/CommonApi.ts
+++ b/src/gen/common/CommonApi.ts
@@ -123,13 +123,16 @@ export class CommonApi {
   constructor(public readonly apiClient: ApiClient) {}
 
   async getApp(): Promise<StreamResponse<GetApplicationResponse>> {
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetApplicationResponse>
-    >('GET', '/api/v2/app', undefined, undefined);
+    const response = await this.apiClient.sendRequest<GetApplicationResponse>(
+      'GET',
+      '/api/v2/app',
+      undefined,
+      undefined,
+    );
 
-    decoders['GetApplicationResponse']?.(response.body);
+    decoders['GetApplicationResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateApp(
@@ -205,18 +208,17 @@ export class CommonApi {
       xiaomi_config: request?.xiaomi_config,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'PATCH',
       '/api/v2/app',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async listBlockLists(request?: {
@@ -230,13 +232,16 @@ export class CommonApi {
       limit: request?.limit,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ListBlockListResponse>
-    >('GET', '/api/v2/blocklists', undefined, queryParams);
+    const response = await this.apiClient.sendRequest<ListBlockListResponse>(
+      'GET',
+      '/api/v2/blocklists',
+      undefined,
+      queryParams,
+    );
 
-    decoders['ListBlockListResponse']?.(response.body);
+    decoders['ListBlockListResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createBlockList(
@@ -255,20 +260,17 @@ export class CommonApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CreateBlockListResponse>
-    >(
+    const response = await this.apiClient.sendRequest<CreateBlockListResponse>(
       'POST',
       '/api/v2/blocklists',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['CreateBlockListResponse']?.(response.body);
+    decoders['CreateBlockListResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async importBlockList(
@@ -282,20 +284,17 @@ export class CommonApi {
       chunk_size: request?.chunk_size,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ImportBlockListResponse>
-    >(
+    const response = await this.apiClient.sendRequest<ImportBlockListResponse>(
       'POST',
       '/api/v2/blocklists/{id}/import',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['ImportBlockListResponse']?.(response.body);
+    decoders['ImportBlockListResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteBlockList(request: {
@@ -311,16 +310,16 @@ export class CommonApi {
       name: request?.name,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'DELETE',
       '/api/v2/blocklists/{name}',
       pathParams,
       queryParams,
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getBlockList(request: {
@@ -334,13 +333,16 @@ export class CommonApi {
       name: request?.name,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetBlockListResponse>
-    >('GET', '/api/v2/blocklists/{name}', pathParams, queryParams);
+    const response = await this.apiClient.sendRequest<GetBlockListResponse>(
+      'GET',
+      '/api/v2/blocklists/{name}',
+      pathParams,
+      queryParams,
+    );
 
-    decoders['GetBlockListResponse']?.(response.body);
+    decoders['GetBlockListResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateBlockList(
@@ -360,20 +362,17 @@ export class CommonApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateBlockListResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UpdateBlockListResponse>(
       'PUT',
       '/api/v2/blocklists/{name}',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UpdateBlockListResponse']?.(response.body);
+    decoders['UpdateBlockListResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async checkPush(
@@ -392,20 +391,17 @@ export class CommonApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CheckPushResponse>
-    >(
+    const response = await this.apiClient.sendRequest<CheckPushResponse>(
       'POST',
       '/api/v2/check_push',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['CheckPushResponse']?.(response.body);
+    decoders['CheckPushResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async checkSNS(
@@ -417,20 +413,17 @@ export class CommonApi {
       sns_topic_arn: request?.sns_topic_arn,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CheckSNSResponse>
-    >(
+    const response = await this.apiClient.sendRequest<CheckSNSResponse>(
       'POST',
       '/api/v2/check_sns',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['CheckSNSResponse']?.(response.body);
+    decoders['CheckSNSResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async checkSQS(
@@ -442,20 +435,17 @@ export class CommonApi {
       sqs_url: request?.sqs_url,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CheckSQSResponse>
-    >(
+    const response = await this.apiClient.sendRequest<CheckSQSResponse>(
       'POST',
       '/api/v2/check_sqs',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['CheckSQSResponse']?.(response.body);
+    decoders['CheckSQSResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteDevice(request: {
@@ -467,16 +457,16 @@ export class CommonApi {
       user_id: request?.user_id,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'DELETE',
       '/api/v2/devices',
       undefined,
       queryParams,
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async listDevices(request?: {
@@ -486,13 +476,16 @@ export class CommonApi {
       user_id: request?.user_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ListDevicesResponse>
-    >('GET', '/api/v2/devices', undefined, queryParams);
+    const response = await this.apiClient.sendRequest<ListDevicesResponse>(
+      'GET',
+      '/api/v2/devices',
+      undefined,
+      queryParams,
+    );
 
-    decoders['ListDevicesResponse']?.(response.body);
+    decoders['ListDevicesResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createDevice(
@@ -508,18 +501,17 @@ export class CommonApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'POST',
       '/api/v2/devices',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async exportUsers(
@@ -529,32 +521,33 @@ export class CommonApi {
       user_ids: request?.user_ids,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ExportUsersResponse>
-    >(
+    const response = await this.apiClient.sendRequest<ExportUsersResponse>(
       'POST',
       '/api/v2/export/users',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['ExportUsersResponse']?.(response.body);
+    decoders['ExportUsersResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async listExternalStorage(): Promise<
     StreamResponse<ListExternalStorageResponse>
   > {
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ListExternalStorageResponse>
-    >('GET', '/api/v2/external_storage', undefined, undefined);
+    const response =
+      await this.apiClient.sendRequest<ListExternalStorageResponse>(
+        'GET',
+        '/api/v2/external_storage',
+        undefined,
+        undefined,
+      );
 
-    decoders['ListExternalStorageResponse']?.(response.body);
+    decoders['ListExternalStorageResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createExternalStorage(
@@ -570,20 +563,18 @@ export class CommonApi {
       azure_blob: request?.azure_blob,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CreateExternalStorageResponse>
-    >(
-      'POST',
-      '/api/v2/external_storage',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<CreateExternalStorageResponse>(
+        'POST',
+        '/api/v2/external_storage',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['CreateExternalStorageResponse']?.(response.body);
+    decoders['CreateExternalStorageResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteExternalStorage(request: {
@@ -593,13 +584,17 @@ export class CommonApi {
       name: request?.name,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteExternalStorageResponse>
-    >('DELETE', '/api/v2/external_storage/{name}', pathParams, undefined);
+    const response =
+      await this.apiClient.sendRequest<DeleteExternalStorageResponse>(
+        'DELETE',
+        '/api/v2/external_storage/{name}',
+        pathParams,
+        undefined,
+      );
 
-    decoders['DeleteExternalStorageResponse']?.(response.body);
+    decoders['DeleteExternalStorageResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateExternalStorage(
@@ -617,20 +612,18 @@ export class CommonApi {
       azure_blob: request?.azure_blob,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateExternalStorageResponse>
-    >(
-      'PUT',
-      '/api/v2/external_storage/{name}',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpdateExternalStorageResponse>(
+        'PUT',
+        '/api/v2/external_storage/{name}',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['UpdateExternalStorageResponse']?.(response.body);
+    decoders['UpdateExternalStorageResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async checkExternalStorage(request: {
@@ -640,13 +633,17 @@ export class CommonApi {
       name: request?.name,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CheckExternalStorageResponse>
-    >('GET', '/api/v2/external_storage/{name}/check', pathParams, undefined);
+    const response =
+      await this.apiClient.sendRequest<CheckExternalStorageResponse>(
+        'GET',
+        '/api/v2/external_storage/{name}/check',
+        pathParams,
+        undefined,
+      );
 
-    decoders['CheckExternalStorageResponse']?.(response.body);
+    decoders['CheckExternalStorageResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createGuest(
@@ -656,13 +653,17 @@ export class CommonApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CreateGuestResponse>
-    >('POST', '/api/v2/guest', undefined, undefined, body, 'application/json');
+    const response = await this.apiClient.sendRequest<CreateGuestResponse>(
+      'POST',
+      '/api/v2/guest',
+      undefined,
+      undefined,
+      body,
+    );
 
-    decoders['CreateGuestResponse']?.(response.body);
+    decoders['CreateGuestResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createImportURL(
@@ -672,30 +673,30 @@ export class CommonApi {
       filename: request?.filename,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CreateImportURLResponse>
-    >(
+    const response = await this.apiClient.sendRequest<CreateImportURLResponse>(
       'POST',
       '/api/v2/import_urls',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['CreateImportURLResponse']?.(response.body);
+    decoders['CreateImportURLResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async listImports(): Promise<StreamResponse<ListImportsResponse>> {
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ListImportsResponse>
-    >('GET', '/api/v2/imports', undefined, undefined);
+    const response = await this.apiClient.sendRequest<ListImportsResponse>(
+      'GET',
+      '/api/v2/imports',
+      undefined,
+      undefined,
+    );
 
-    decoders['ListImportsResponse']?.(response.body);
+    decoders['ListImportsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createImport(
@@ -707,20 +708,17 @@ export class CommonApi {
       merge_custom: request?.merge_custom,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CreateImportResponse>
-    >(
+    const response = await this.apiClient.sendRequest<CreateImportResponse>(
       'POST',
       '/api/v2/imports',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['CreateImportResponse']?.(response.body);
+    decoders['CreateImportResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async listImportV2Tasks(request?: {
@@ -730,13 +728,17 @@ export class CommonApi {
       state: request?.state,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ListImportV2TasksResponse>
-    >('GET', '/api/v2/imports/v2', undefined, queryParams);
+    const response =
+      await this.apiClient.sendRequest<ListImportV2TasksResponse>(
+        'GET',
+        '/api/v2/imports/v2',
+        undefined,
+        queryParams,
+      );
 
-    decoders['ListImportV2TasksResponse']?.(response.body);
+    decoders['ListImportV2TasksResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createImportV2Task(
@@ -749,44 +751,50 @@ export class CommonApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CreateImportV2TaskResponse>
-    >(
-      'POST',
-      '/api/v2/imports/v2',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<CreateImportV2TaskResponse>(
+        'POST',
+        '/api/v2/imports/v2',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['CreateImportV2TaskResponse']?.(response.body);
+    decoders['CreateImportV2TaskResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteImporterExternalStorage(): Promise<
     StreamResponse<DeleteExternalStorageResponse>
   > {
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteExternalStorageResponse>
-    >('DELETE', '/api/v2/imports/v2/external-storage', undefined, undefined);
+    const response =
+      await this.apiClient.sendRequest<DeleteExternalStorageResponse>(
+        'DELETE',
+        '/api/v2/imports/v2/external-storage',
+        undefined,
+        undefined,
+      );
 
-    decoders['DeleteExternalStorageResponse']?.(response.body);
+    decoders['DeleteExternalStorageResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getImporterExternalStorage(): Promise<
     StreamResponse<GetExternalStorageResponse>
   > {
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetExternalStorageResponse>
-    >('GET', '/api/v2/imports/v2/external-storage', undefined, undefined);
+    const response =
+      await this.apiClient.sendRequest<GetExternalStorageResponse>(
+        'GET',
+        '/api/v2/imports/v2/external-storage',
+        undefined,
+        undefined,
+      );
 
-    decoders['GetExternalStorageResponse']?.(response.body);
+    decoders['GetExternalStorageResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async upsertImporterExternalStorage(
@@ -798,37 +806,34 @@ export class CommonApi {
       gcs: request?.gcs,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpsertExternalStorageResponse>
-    >(
-      'PUT',
-      '/api/v2/imports/v2/external-storage',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpsertExternalStorageResponse>(
+        'PUT',
+        '/api/v2/imports/v2/external-storage',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['UpsertExternalStorageResponse']?.(response.body);
+    decoders['UpsertExternalStorageResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async validateImporterExternalStorage(): Promise<
     StreamResponse<ValidateExternalStorageResponse>
   > {
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ValidateExternalStorageResponse>
-    >(
-      'POST',
-      '/api/v2/imports/v2/external-storage/validate',
-      undefined,
-      undefined,
-    );
+    const response =
+      await this.apiClient.sendRequest<ValidateExternalStorageResponse>(
+        'POST',
+        '/api/v2/imports/v2/external-storage/validate',
+        undefined,
+        undefined,
+      );
 
-    decoders['ValidateExternalStorageResponse']?.(response.body);
+    decoders['ValidateExternalStorageResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteImportV2Task(request: {
@@ -838,13 +843,17 @@ export class CommonApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteImportV2TaskResponse>
-    >('DELETE', '/api/v2/imports/v2/{id}', pathParams, undefined);
+    const response =
+      await this.apiClient.sendRequest<DeleteImportV2TaskResponse>(
+        'DELETE',
+        '/api/v2/imports/v2/{id}',
+        pathParams,
+        undefined,
+      );
 
-    decoders['DeleteImportV2TaskResponse']?.(response.body);
+    decoders['DeleteImportV2TaskResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getImportV2Task(request: {
@@ -854,13 +863,16 @@ export class CommonApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetImportV2TaskResponse>
-    >('GET', '/api/v2/imports/v2/{id}', pathParams, undefined);
+    const response = await this.apiClient.sendRequest<GetImportV2TaskResponse>(
+      'GET',
+      '/api/v2/imports/v2/{id}',
+      pathParams,
+      undefined,
+    );
 
-    decoders['GetImportV2TaskResponse']?.(response.body);
+    decoders['GetImportV2TaskResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async cancelImportV2Task(request: {
@@ -870,13 +882,17 @@ export class CommonApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CancelImportV2TaskResponse>
-    >('POST', '/api/v2/imports/v2/{id}/cancel', pathParams, undefined);
+    const response =
+      await this.apiClient.sendRequest<CancelImportV2TaskResponse>(
+        'POST',
+        '/api/v2/imports/v2/{id}/cancel',
+        pathParams,
+        undefined,
+      );
 
-    decoders['CancelImportV2TaskResponse']?.(response.body);
+    decoders['CancelImportV2TaskResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getImport(request: {
@@ -886,13 +902,16 @@ export class CommonApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetImportResponse>
-    >('GET', '/api/v2/imports/{id}', pathParams, undefined);
+    const response = await this.apiClient.sendRequest<GetImportResponse>(
+      'GET',
+      '/api/v2/imports/{id}',
+      pathParams,
+      undefined,
+    );
 
-    decoders['GetImportResponse']?.(response.body);
+    decoders['GetImportResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getOG(request: {
@@ -902,23 +921,29 @@ export class CommonApi {
       url: request?.url,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetOGResponse>
-    >('GET', '/api/v2/og', undefined, queryParams);
+    const response = await this.apiClient.sendRequest<GetOGResponse>(
+      'GET',
+      '/api/v2/og',
+      undefined,
+      queryParams,
+    );
 
-    decoders['GetOGResponse']?.(response.body);
+    decoders['GetOGResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async listPermissions(): Promise<StreamResponse<ListPermissionsResponse>> {
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ListPermissionsResponse>
-    >('GET', '/api/v2/permissions', undefined, undefined);
+    const response = await this.apiClient.sendRequest<ListPermissionsResponse>(
+      'GET',
+      '/api/v2/permissions',
+      undefined,
+      undefined,
+    );
 
-    decoders['ListPermissionsResponse']?.(response.body);
+    decoders['ListPermissionsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createPermission(
@@ -934,18 +959,17 @@ export class CommonApi {
       same_team: request?.same_team,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'POST',
       '/api/v2/permissions',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deletePermission(request: {
@@ -955,16 +979,16 @@ export class CommonApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'DELETE',
       '/api/v2/permissions/{id}',
       pathParams,
       undefined,
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getPermission(request: {
@@ -974,13 +998,17 @@ export class CommonApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetCustomPermissionResponse>
-    >('GET', '/api/v2/permissions/{id}', pathParams, undefined);
+    const response =
+      await this.apiClient.sendRequest<GetCustomPermissionResponse>(
+        'GET',
+        '/api/v2/permissions/{id}',
+        pathParams,
+        undefined,
+      );
 
-    decoders['GetCustomPermissionResponse']?.(response.body);
+    decoders['GetCustomPermissionResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updatePermission(
@@ -998,18 +1026,17 @@ export class CommonApi {
       same_team: request?.same_team,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'PUT',
       '/api/v2/permissions/{id}',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createPoll(
@@ -1032,13 +1059,17 @@ export class CommonApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<PollResponse>
-    >('POST', '/api/v2/polls', undefined, undefined, body, 'application/json');
+    const response = await this.apiClient.sendRequest<PollResponse>(
+      'POST',
+      '/api/v2/polls',
+      undefined,
+      undefined,
+      body,
+    );
 
-    decoders['PollResponse']?.(response.body);
+    decoders['PollResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updatePoll(
@@ -1060,13 +1091,17 @@ export class CommonApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<PollResponse>
-    >('PUT', '/api/v2/polls', undefined, undefined, body, 'application/json');
+    const response = await this.apiClient.sendRequest<PollResponse>(
+      'PUT',
+      '/api/v2/polls',
+      undefined,
+      undefined,
+      body,
+    );
 
-    decoders['PollResponse']?.(response.body);
+    decoders['PollResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryPolls(
@@ -1083,20 +1118,17 @@ export class CommonApi {
       filter: request?.filter,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryPollsResponse>
-    >(
+    const response = await this.apiClient.sendRequest<QueryPollsResponse>(
       'POST',
       '/api/v2/polls/query',
       undefined,
       queryParams,
       body,
-      'application/json',
     );
 
-    decoders['QueryPollsResponse']?.(response.body);
+    decoders['QueryPollsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deletePoll(request: {
@@ -1110,16 +1142,16 @@ export class CommonApi {
       poll_id: request?.poll_id,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'DELETE',
       '/api/v2/polls/{poll_id}',
       pathParams,
       queryParams,
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getPoll(request: {
@@ -1133,13 +1165,16 @@ export class CommonApi {
       poll_id: request?.poll_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<PollResponse>
-    >('GET', '/api/v2/polls/{poll_id}', pathParams, queryParams);
+    const response = await this.apiClient.sendRequest<PollResponse>(
+      'GET',
+      '/api/v2/polls/{poll_id}',
+      pathParams,
+      queryParams,
+    );
 
-    decoders['PollResponse']?.(response.body);
+    decoders['PollResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updatePollPartial(
@@ -1155,20 +1190,17 @@ export class CommonApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<PollResponse>
-    >(
+    const response = await this.apiClient.sendRequest<PollResponse>(
       'PATCH',
       '/api/v2/polls/{poll_id}',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['PollResponse']?.(response.body);
+    decoders['PollResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createPollOption(
@@ -1184,20 +1216,17 @@ export class CommonApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<PollOptionResponse>
-    >(
+    const response = await this.apiClient.sendRequest<PollOptionResponse>(
       'POST',
       '/api/v2/polls/{poll_id}/options',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['PollOptionResponse']?.(response.body);
+    decoders['PollOptionResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updatePollOption(
@@ -1214,20 +1243,17 @@ export class CommonApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<PollOptionResponse>
-    >(
+    const response = await this.apiClient.sendRequest<PollOptionResponse>(
       'PUT',
       '/api/v2/polls/{poll_id}/options',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['PollOptionResponse']?.(response.body);
+    decoders['PollOptionResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deletePollOption(request: {
@@ -1243,16 +1269,16 @@ export class CommonApi {
       option_id: request?.option_id,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'DELETE',
       '/api/v2/polls/{poll_id}/options/{option_id}',
       pathParams,
       queryParams,
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getPollOption(request: {
@@ -1268,18 +1294,16 @@ export class CommonApi {
       option_id: request?.option_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<PollOptionResponse>
-    >(
+    const response = await this.apiClient.sendRequest<PollOptionResponse>(
       'GET',
       '/api/v2/polls/{poll_id}/options/{option_id}',
       pathParams,
       queryParams,
     );
 
-    decoders['PollOptionResponse']?.(response.body);
+    decoders['PollOptionResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryPollVotes(
@@ -1299,20 +1323,17 @@ export class CommonApi {
       filter: request?.filter,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<PollVotesResponse>
-    >(
+    const response = await this.apiClient.sendRequest<PollVotesResponse>(
       'POST',
       '/api/v2/polls/{poll_id}/votes',
       pathParams,
       queryParams,
       body,
-      'application/json',
     );
 
-    decoders['PollVotesResponse']?.(response.body);
+    decoders['PollVotesResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updatePushNotificationPreferences(
@@ -1322,32 +1343,34 @@ export class CommonApi {
       preferences: request?.preferences,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpsertPushPreferencesResponse>
-    >(
-      'POST',
-      '/api/v2/push_preferences',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpsertPushPreferencesResponse>(
+        'POST',
+        '/api/v2/push_preferences',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['UpsertPushPreferencesResponse']?.(response.body);
+    decoders['UpsertPushPreferencesResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async listPushProviders(): Promise<
     StreamResponse<ListPushProvidersResponse>
   > {
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ListPushProvidersResponse>
-    >('GET', '/api/v2/push_providers', undefined, undefined);
+    const response =
+      await this.apiClient.sendRequest<ListPushProvidersResponse>(
+        'GET',
+        '/api/v2/push_providers',
+        undefined,
+        undefined,
+      );
 
-    decoders['ListPushProvidersResponse']?.(response.body);
+    decoders['ListPushProvidersResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async upsertPushProvider(
@@ -1357,20 +1380,18 @@ export class CommonApi {
       push_provider: request?.push_provider,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpsertPushProviderResponse>
-    >(
-      'POST',
-      '/api/v2/push_providers',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpsertPushProviderResponse>(
+        'POST',
+        '/api/v2/push_providers',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['UpsertPushProviderResponse']?.(response.body);
+    decoders['UpsertPushProviderResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deletePushProvider(request: {
@@ -1382,16 +1403,16 @@ export class CommonApi {
       name: request?.name,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'DELETE',
       '/api/v2/push_providers/{type}/{name}',
       pathParams,
       undefined,
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getPushTemplates(request: {
@@ -1403,13 +1424,16 @@ export class CommonApi {
       push_provider_name: request?.push_provider_name,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetPushTemplatesResponse>
-    >('GET', '/api/v2/push_templates', undefined, queryParams);
+    const response = await this.apiClient.sendRequest<GetPushTemplatesResponse>(
+      'GET',
+      '/api/v2/push_templates',
+      undefined,
+      queryParams,
+    );
 
-    decoders['GetPushTemplatesResponse']?.(response.body);
+    decoders['GetPushTemplatesResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async upsertPushTemplate(
@@ -1423,20 +1447,18 @@ export class CommonApi {
       template: request?.template,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpsertPushTemplateResponse>
-    >(
-      'POST',
-      '/api/v2/push_templates',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpsertPushTemplateResponse>(
+        'POST',
+        '/api/v2/push_templates',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['UpsertPushTemplateResponse']?.(response.body);
+    decoders['UpsertPushTemplateResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getRateLimits(request?: {
@@ -1460,23 +1482,29 @@ export class CommonApi {
       endpoints: request?.endpoints,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetRateLimitsResponse>
-    >('GET', '/api/v2/rate_limits', undefined, queryParams);
+    const response = await this.apiClient.sendRequest<GetRateLimitsResponse>(
+      'GET',
+      '/api/v2/rate_limits',
+      undefined,
+      queryParams,
+    );
 
-    decoders['GetRateLimitsResponse']?.(response.body);
+    decoders['GetRateLimitsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async listRoles(): Promise<StreamResponse<ListRolesResponse>> {
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ListRolesResponse>
-    >('GET', '/api/v2/roles', undefined, undefined);
+    const response = await this.apiClient.sendRequest<ListRolesResponse>(
+      'GET',
+      '/api/v2/roles',
+      undefined,
+      undefined,
+    );
 
-    decoders['ListRolesResponse']?.(response.body);
+    decoders['ListRolesResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createRole(
@@ -1486,13 +1514,17 @@ export class CommonApi {
       name: request?.name,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CreateRoleResponse>
-    >('POST', '/api/v2/roles', undefined, undefined, body, 'application/json');
+    const response = await this.apiClient.sendRequest<CreateRoleResponse>(
+      'POST',
+      '/api/v2/roles',
+      undefined,
+      undefined,
+      body,
+    );
 
-    decoders['CreateRoleResponse']?.(response.body);
+    decoders['CreateRoleResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async searchRoles(request: {
@@ -1510,13 +1542,16 @@ export class CommonApi {
       include_global_roles: request?.include_global_roles,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<SearchRolesResponse>
-    >('GET', '/api/v2/roles/search', undefined, queryParams);
+    const response = await this.apiClient.sendRequest<SearchRolesResponse>(
+      'GET',
+      '/api/v2/roles/search',
+      undefined,
+      queryParams,
+    );
 
-    decoders['SearchRolesResponse']?.(response.body);
+    decoders['SearchRolesResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteRole(request: {
@@ -1526,16 +1561,16 @@ export class CommonApi {
       name: request?.name,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'DELETE',
       '/api/v2/roles/{name}',
       pathParams,
       undefined,
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getTask(request: {
@@ -1545,13 +1580,16 @@ export class CommonApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetTaskResponse>
-    >('GET', '/api/v2/tasks/{id}', pathParams, undefined);
+    const response = await this.apiClient.sendRequest<GetTaskResponse>(
+      'GET',
+      '/api/v2/tasks/{id}',
+      pathParams,
+      undefined,
+    );
 
-    decoders['GetTaskResponse']?.(response.body);
+    decoders['GetTaskResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteFile(request?: {
@@ -1561,16 +1599,16 @@ export class CommonApi {
       url: request?.url,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'DELETE',
       '/api/v2/uploads/file',
       undefined,
       queryParams,
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async uploadFile(
@@ -1581,9 +1619,7 @@ export class CommonApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<FileUploadResponse>
-    >(
+    const response = await this.apiClient.sendRequest<FileUploadResponse>(
       'POST',
       '/api/v2/uploads/file',
       undefined,
@@ -1592,9 +1628,9 @@ export class CommonApi {
       'multipart/form-data',
     );
 
-    decoders['FileUploadResponse']?.(response.body);
+    decoders['FileUploadResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteImage(request?: {
@@ -1604,16 +1640,16 @@ export class CommonApi {
       url: request?.url,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'DELETE',
       '/api/v2/uploads/image',
       undefined,
       queryParams,
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async uploadImage(
@@ -1625,9 +1661,7 @@ export class CommonApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ImageUploadResponse>
-    >(
+    const response = await this.apiClient.sendRequest<ImageUploadResponse>(
       'POST',
       '/api/v2/uploads/image',
       undefined,
@@ -1636,9 +1670,9 @@ export class CommonApi {
       'multipart/form-data',
     );
 
-    decoders['ImageUploadResponse']?.(response.body);
+    decoders['ImageUploadResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async listUserGroups(request?: {
@@ -1654,13 +1688,16 @@ export class CommonApi {
       team_id: request?.team_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ListUserGroupsResponse>
-    >('GET', '/api/v2/usergroups', undefined, queryParams);
+    const response = await this.apiClient.sendRequest<ListUserGroupsResponse>(
+      'GET',
+      '/api/v2/usergroups',
+      undefined,
+      queryParams,
+    );
 
-    decoders['ListUserGroupsResponse']?.(response.body);
+    decoders['ListUserGroupsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createUserGroup(
@@ -1674,20 +1711,17 @@ export class CommonApi {
       member_ids: request?.member_ids,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CreateUserGroupResponse>
-    >(
+    const response = await this.apiClient.sendRequest<CreateUserGroupResponse>(
       'POST',
       '/api/v2/usergroups',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['CreateUserGroupResponse']?.(response.body);
+    decoders['CreateUserGroupResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async searchUserGroups(request: {
@@ -1705,13 +1739,16 @@ export class CommonApi {
       team_id: request?.team_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<SearchUserGroupsResponse>
-    >('GET', '/api/v2/usergroups/search', undefined, queryParams);
+    const response = await this.apiClient.sendRequest<SearchUserGroupsResponse>(
+      'GET',
+      '/api/v2/usergroups/search',
+      undefined,
+      queryParams,
+    );
 
-    decoders['SearchUserGroupsResponse']?.(response.body);
+    decoders['SearchUserGroupsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteUserGroup(request: {
@@ -1725,16 +1762,16 @@ export class CommonApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'DELETE',
       '/api/v2/usergroups/{id}',
       pathParams,
       queryParams,
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getUserGroup(request: {
@@ -1748,13 +1785,16 @@ export class CommonApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetUserGroupResponse>
-    >('GET', '/api/v2/usergroups/{id}', pathParams, queryParams);
+    const response = await this.apiClient.sendRequest<GetUserGroupResponse>(
+      'GET',
+      '/api/v2/usergroups/{id}',
+      pathParams,
+      queryParams,
+    );
 
-    decoders['GetUserGroupResponse']?.(response.body);
+    decoders['GetUserGroupResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateUserGroup(
@@ -1769,20 +1809,17 @@ export class CommonApi {
       team_id: request?.team_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateUserGroupResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UpdateUserGroupResponse>(
       'PUT',
       '/api/v2/usergroups/{id}',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UpdateUserGroupResponse']?.(response.body);
+    decoders['UpdateUserGroupResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async addUserGroupMembers(
@@ -1797,20 +1834,18 @@ export class CommonApi {
       team_id: request?.team_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<AddUserGroupMembersResponse>
-    >(
-      'POST',
-      '/api/v2/usergroups/{id}/members',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<AddUserGroupMembersResponse>(
+        'POST',
+        '/api/v2/usergroups/{id}/members',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['AddUserGroupMembersResponse']?.(response.body);
+    decoders['AddUserGroupMembersResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async removeUserGroupMembers(
@@ -1824,20 +1859,18 @@ export class CommonApi {
       team_id: request?.team_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<RemoveUserGroupMembersResponse>
-    >(
-      'POST',
-      '/api/v2/usergroups/{id}/members/delete',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<RemoveUserGroupMembersResponse>(
+        'POST',
+        '/api/v2/usergroups/{id}/members/delete',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['RemoveUserGroupMembersResponse']?.(response.body);
+    decoders['RemoveUserGroupMembersResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryUsers(request?: {
@@ -1847,13 +1880,16 @@ export class CommonApi {
       payload: request?.payload,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryUsersResponse>
-    >('GET', '/api/v2/users', undefined, queryParams);
+    const response = await this.apiClient.sendRequest<QueryUsersResponse>(
+      'GET',
+      '/api/v2/users',
+      undefined,
+      queryParams,
+    );
 
-    decoders['QueryUsersResponse']?.(response.body);
+    decoders['QueryUsersResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateUsersPartial(
@@ -1863,13 +1899,17 @@ export class CommonApi {
       users: request?.users,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateUsersResponse>
-    >('PATCH', '/api/v2/users', undefined, undefined, body, 'application/json');
+    const response = await this.apiClient.sendRequest<UpdateUsersResponse>(
+      'PATCH',
+      '/api/v2/users',
+      undefined,
+      undefined,
+      body,
+    );
 
-    decoders['UpdateUsersResponse']?.(response.body);
+    decoders['UpdateUsersResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateUsers(
@@ -1879,13 +1919,17 @@ export class CommonApi {
       users: request?.users,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateUsersResponse>
-    >('POST', '/api/v2/users', undefined, undefined, body, 'application/json');
+    const response = await this.apiClient.sendRequest<UpdateUsersResponse>(
+      'POST',
+      '/api/v2/users',
+      undefined,
+      undefined,
+      body,
+    );
 
-    decoders['UpdateUsersResponse']?.(response.body);
+    decoders['UpdateUsersResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getBlockedUsers(request?: {
@@ -1895,13 +1939,16 @@ export class CommonApi {
       user_id: request?.user_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetBlockedUsersResponse>
-    >('GET', '/api/v2/users/block', undefined, queryParams);
+    const response = await this.apiClient.sendRequest<GetBlockedUsersResponse>(
+      'GET',
+      '/api/v2/users/block',
+      undefined,
+      queryParams,
+    );
 
-    decoders['GetBlockedUsersResponse']?.(response.body);
+    decoders['GetBlockedUsersResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async blockUsers(
@@ -1913,20 +1960,17 @@ export class CommonApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<BlockUsersResponse>
-    >(
+    const response = await this.apiClient.sendRequest<BlockUsersResponse>(
       'POST',
       '/api/v2/users/block',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['BlockUsersResponse']?.(response.body);
+    decoders['BlockUsersResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deactivateUsers(
@@ -1939,20 +1983,17 @@ export class CommonApi {
       mark_messages_deleted: request?.mark_messages_deleted,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeactivateUsersResponse>
-    >(
+    const response = await this.apiClient.sendRequest<DeactivateUsersResponse>(
       'POST',
       '/api/v2/users/deactivate',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['DeactivateUsersResponse']?.(response.body);
+    decoders['DeactivateUsersResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteUsers(
@@ -1969,20 +2010,17 @@ export class CommonApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteUsersResponse>
-    >(
+    const response = await this.apiClient.sendRequest<DeleteUsersResponse>(
       'POST',
       '/api/v2/users/delete',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['DeleteUsersResponse']?.(response.body);
+    decoders['DeleteUsersResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getUserLiveLocations(request?: {
@@ -1992,13 +2030,16 @@ export class CommonApi {
       user_id: request?.user_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<SharedLocationsResponse>
-    >('GET', '/api/v2/users/live_locations', undefined, queryParams);
+    const response = await this.apiClient.sendRequest<SharedLocationsResponse>(
+      'GET',
+      '/api/v2/users/live_locations',
+      undefined,
+      queryParams,
+    );
 
-    decoders['SharedLocationsResponse']?.(response.body);
+    decoders['SharedLocationsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateLiveLocation(
@@ -2014,20 +2055,17 @@ export class CommonApi {
       longitude: request?.longitude,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<SharedLocationResponse>
-    >(
+    const response = await this.apiClient.sendRequest<SharedLocationResponse>(
       'PUT',
       '/api/v2/users/live_locations',
       undefined,
       queryParams,
       body,
-      'application/json',
     );
 
-    decoders['SharedLocationResponse']?.(response.body);
+    decoders['SharedLocationResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async reactivateUsers(
@@ -2040,20 +2078,17 @@ export class CommonApi {
       restore_messages: request?.restore_messages,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ReactivateUsersResponse>
-    >(
+    const response = await this.apiClient.sendRequest<ReactivateUsersResponse>(
       'POST',
       '/api/v2/users/reactivate',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['ReactivateUsersResponse']?.(response.body);
+    decoders['ReactivateUsersResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async restoreUsers(
@@ -2063,18 +2098,17 @@ export class CommonApi {
       user_ids: request?.user_ids,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'POST',
       '/api/v2/users/restore',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async unblockUsers(
@@ -2086,20 +2120,17 @@ export class CommonApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UnblockUsersResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UnblockUsersResponse>(
       'POST',
       '/api/v2/users/unblock',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UnblockUsersResponse']?.(response.body);
+    decoders['UnblockUsersResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deactivateUser(
@@ -2113,20 +2144,17 @@ export class CommonApi {
       mark_messages_deleted: request?.mark_messages_deleted,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeactivateUserResponse>
-    >(
+    const response = await this.apiClient.sendRequest<DeactivateUserResponse>(
       'POST',
       '/api/v2/users/{user_id}/deactivate',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['DeactivateUserResponse']?.(response.body);
+    decoders['DeactivateUserResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async exportUser(request: {
@@ -2136,13 +2164,16 @@ export class CommonApi {
       user_id: request?.user_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ExportUserResponse>
-    >('GET', '/api/v2/users/{user_id}/export', pathParams, undefined);
+    const response = await this.apiClient.sendRequest<ExportUserResponse>(
+      'GET',
+      '/api/v2/users/{user_id}/export',
+      pathParams,
+      undefined,
+    );
 
-    decoders['ExportUserResponse']?.(response.body);
+    decoders['ExportUserResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async reactivateUser(
@@ -2157,19 +2188,16 @@ export class CommonApi {
       restore_messages: request?.restore_messages,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ReactivateUserResponse>
-    >(
+    const response = await this.apiClient.sendRequest<ReactivateUserResponse>(
       'POST',
       '/api/v2/users/{user_id}/reactivate',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['ReactivateUserResponse']?.(response.body);
+    decoders['ReactivateUserResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 }
diff --git a/src/gen/feeds/FeedsApi.ts b/src/gen/feeds/FeedsApi.ts
index 1ed2c37..7cfcf10 100644
--- a/src/gen/feeds/FeedsApi.ts
+++ b/src/gen/feeds/FeedsApi.ts
@@ -54,6 +54,8 @@ import {
   DeleteFeedViewResponse,
   DeleteFeedsBatchRequest,
   DeleteFeedsBatchResponse,
+  DeleteFeedsRetentionPolicyRequest,
+  DeleteFeedsRetentionPolicyResponse,
   DeleteUserInterestsResponse,
   ExportFeedUserDataResponse,
   FollowBatchRequest,
@@ -68,6 +70,9 @@ import {
   GetFeedViewResponse,
   GetFeedVisibilityResponse,
   GetFeedsRateLimitsResponse,
+  GetFeedsRetentionPolicyResponse,
+  GetFeedsRetentionPolicyRunsRequest,
+  GetFeedsRetentionPolicyRunsResponse,
   GetFollowSuggestionsResponse,
   GetOrCreateFeedGroupRequest,
   GetOrCreateFeedGroupResponse,
@@ -128,6 +133,8 @@ import {
   RestoreCommentRequest,
   RestoreCommentResponse,
   RestoreFeedGroupResponse,
+  SetFeedsRetentionPolicyRequest,
+  SetFeedsRetentionPolicyResponse,
   SingleFollowResponse,
   TrackActivityMetricsRequest,
   TrackActivityMetricsResponse,
@@ -216,20 +223,17 @@ export class FeedsApi {
       search_data: request?.search_data,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<AddActivityResponse>
-    >(
+    const response = await this.apiClient.sendRequest<AddActivityResponse>(
       'POST',
       '/api/v2/feeds/activities',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['AddActivityResponse']?.(response.body);
+    decoders['AddActivityResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async upsertActivities(
@@ -242,20 +246,17 @@ export class FeedsApi {
       force_moderation: request?.force_moderation,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpsertActivitiesResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UpsertActivitiesResponse>(
       'POST',
       '/api/v2/feeds/activities/batch',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UpsertActivitiesResponse']?.(response.body);
+    decoders['UpsertActivitiesResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateActivitiesPartialBatch(
@@ -266,20 +267,18 @@ export class FeedsApi {
       force_moderation: request?.force_moderation,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateActivitiesPartialBatchResponse>
-    >(
-      'PATCH',
-      '/api/v2/feeds/activities/batch/partial',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpdateActivitiesPartialBatchResponse>(
+        'PATCH',
+        '/api/v2/feeds/activities/batch/partial',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['UpdateActivitiesPartialBatchResponse']?.(response.body);
+    decoders['UpdateActivitiesPartialBatchResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteActivities(
@@ -293,20 +292,17 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteActivitiesResponse>
-    >(
+    const response = await this.apiClient.sendRequest<DeleteActivitiesResponse>(
       'POST',
       '/api/v2/feeds/activities/delete',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['DeleteActivitiesResponse']?.(response.body);
+    decoders['DeleteActivitiesResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async trackActivityMetrics(
@@ -318,20 +314,18 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<TrackActivityMetricsResponse>
-    >(
-      'POST',
-      '/api/v2/feeds/activities/metrics/track',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<TrackActivityMetricsResponse>(
+        'POST',
+        '/api/v2/feeds/activities/metrics/track',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['TrackActivityMetricsResponse']?.(response.body);
+    decoders['TrackActivityMetricsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryActivities(
@@ -358,20 +352,17 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryActivitiesResponse>
-    >(
+    const response = await this.apiClient.sendRequest<QueryActivitiesResponse>(
       'POST',
       '/api/v2/feeds/activities/query',
       undefined,
       queryParams,
       body,
-      'application/json',
     );
 
-    decoders['QueryActivitiesResponse']?.(response.body);
+    decoders['QueryActivitiesResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async batchQueryActivityReactions(
@@ -388,20 +379,18 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<BatchQueryActivityReactionsResponse>
-    >(
-      'POST',
-      '/api/v2/feeds/activities/reactions/query',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<BatchQueryActivityReactionsResponse>(
+        'POST',
+        '/api/v2/feeds/activities/reactions/query',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['BatchQueryActivityReactionsResponse']?.(response.body);
+    decoders['BatchQueryActivityReactionsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteBookmark(request: {
@@ -417,18 +406,16 @@ export class FeedsApi {
       activity_id: request?.activity_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteBookmarkResponse>
-    >(
+    const response = await this.apiClient.sendRequest<DeleteBookmarkResponse>(
       'DELETE',
       '/api/v2/feeds/activities/{activity_id}/bookmarks',
       pathParams,
       queryParams,
     );
 
-    decoders['DeleteBookmarkResponse']?.(response.body);
+    decoders['DeleteBookmarkResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateBookmark(
@@ -446,20 +433,17 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateBookmarkResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UpdateBookmarkResponse>(
       'PATCH',
       '/api/v2/feeds/activities/{activity_id}/bookmarks',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UpdateBookmarkResponse']?.(response.body);
+    decoders['UpdateBookmarkResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async addBookmark(
@@ -476,20 +460,17 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<AddBookmarkResponse>
-    >(
+    const response = await this.apiClient.sendRequest<AddBookmarkResponse>(
       'POST',
       '/api/v2/feeds/activities/{activity_id}/bookmarks',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['AddBookmarkResponse']?.(response.body);
+    decoders['AddBookmarkResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async activityFeedback(
@@ -506,20 +487,17 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ActivityFeedbackResponse>
-    >(
+    const response = await this.apiClient.sendRequest<ActivityFeedbackResponse>(
       'POST',
       '/api/v2/feeds/activities/{activity_id}/feedback',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['ActivityFeedbackResponse']?.(response.body);
+    decoders['ActivityFeedbackResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async castPollVote(
@@ -535,20 +513,17 @@ export class FeedsApi {
       vote: request?.vote,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<PollVoteResponse>
-    >(
+    const response = await this.apiClient.sendRequest<PollVoteResponse>(
       'POST',
       '/api/v2/feeds/activities/{activity_id}/polls/{poll_id}/vote',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['PollVoteResponse']?.(response.body);
+    decoders['PollVoteResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deletePollVote(request: {
@@ -566,18 +541,16 @@ export class FeedsApi {
       vote_id: request?.vote_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<PollVoteResponse>
-    >(
+    const response = await this.apiClient.sendRequest<PollVoteResponse>(
       'DELETE',
       '/api/v2/feeds/activities/{activity_id}/polls/{poll_id}/vote/{vote_id}',
       pathParams,
       queryParams,
     );
 
-    decoders['PollVoteResponse']?.(response.body);
+    decoders['PollVoteResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async addActivityReaction(
@@ -599,20 +572,17 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<AddReactionResponse>
-    >(
+    const response = await this.apiClient.sendRequest<AddReactionResponse>(
       'POST',
       '/api/v2/feeds/activities/{activity_id}/reactions',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['AddReactionResponse']?.(response.body);
+    decoders['AddReactionResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryActivityReactions(
@@ -629,20 +599,18 @@ export class FeedsApi {
       filter: request?.filter,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryActivityReactionsResponse>
-    >(
-      'POST',
-      '/api/v2/feeds/activities/{activity_id}/reactions/query',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<QueryActivityReactionsResponse>(
+        'POST',
+        '/api/v2/feeds/activities/{activity_id}/reactions/query',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['QueryActivityReactionsResponse']?.(response.body);
+    decoders['QueryActivityReactionsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteActivityReaction(request: {
@@ -660,18 +628,17 @@ export class FeedsApi {
       type: request?.type,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteActivityReactionResponse>
-    >(
-      'DELETE',
-      '/api/v2/feeds/activities/{activity_id}/reactions/{type}',
-      pathParams,
-      queryParams,
-    );
+    const response =
+      await this.apiClient.sendRequest<DeleteActivityReactionResponse>(
+        'DELETE',
+        '/api/v2/feeds/activities/{activity_id}/reactions/{type}',
+        pathParams,
+        queryParams,
+      );
 
-    decoders['DeleteActivityReactionResponse']?.(response.body);
+    decoders['DeleteActivityReactionResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryActivityShares(request: {
@@ -689,18 +656,17 @@ export class FeedsApi {
       activity_id: request?.activity_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryActivitySharesResponse>
-    >(
-      'GET',
-      '/api/v2/feeds/activities/{activity_id}/shares',
-      pathParams,
-      queryParams,
-    );
+    const response =
+      await this.apiClient.sendRequest<QueryActivitySharesResponse>(
+        'GET',
+        '/api/v2/feeds/activities/{activity_id}/shares',
+        pathParams,
+        queryParams,
+      );
 
-    decoders['QueryActivitySharesResponse']?.(response.body);
+    decoders['QueryActivitySharesResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteActivity(request: {
@@ -716,13 +682,16 @@ export class FeedsApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteActivityResponse>
-    >('DELETE', '/api/v2/feeds/activities/{id}', pathParams, queryParams);
+    const response = await this.apiClient.sendRequest<DeleteActivityResponse>(
+      'DELETE',
+      '/api/v2/feeds/activities/{id}',
+      pathParams,
+      queryParams,
+    );
 
-    decoders['DeleteActivityResponse']?.(response.body);
+    decoders['DeleteActivityResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getActivity(request: {
@@ -746,13 +715,16 @@ export class FeedsApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetActivityResponse>
-    >('GET', '/api/v2/feeds/activities/{id}', pathParams, queryParams);
+    const response = await this.apiClient.sendRequest<GetActivityResponse>(
+      'GET',
+      '/api/v2/feeds/activities/{id}',
+      pathParams,
+      queryParams,
+    );
 
-    decoders['GetActivityResponse']?.(response.body);
+    decoders['GetActivityResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateActivityPartial(
@@ -773,20 +745,18 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateActivityPartialResponse>
-    >(
-      'PATCH',
-      '/api/v2/feeds/activities/{id}',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpdateActivityPartialResponse>(
+        'PATCH',
+        '/api/v2/feeds/activities/{id}',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['UpdateActivityPartialResponse']?.(response.body);
+    decoders['UpdateActivityPartialResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateActivity(
@@ -821,20 +791,17 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateActivityResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UpdateActivityResponse>(
       'PUT',
       '/api/v2/feeds/activities/{id}',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UpdateActivityResponse']?.(response.body);
+    decoders['UpdateActivityResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async restoreActivity(
@@ -854,20 +821,17 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<RestoreActivityResponse>
-    >(
+    const response = await this.apiClient.sendRequest<RestoreActivityResponse>(
       'POST',
       '/api/v2/feeds/activities/{id}/restore',
       pathParams,
       queryParams,
       body,
-      'application/json',
     );
 
-    decoders['RestoreActivityResponse']?.(response.body);
+    decoders['RestoreActivityResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async translateActivity(
@@ -880,20 +844,18 @@ export class FeedsApi {
       language: request?.language,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<TranslateActivityResponse>
-    >(
-      'POST',
-      '/api/v2/feeds/activities/{id}/translate',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<TranslateActivityResponse>(
+        'POST',
+        '/api/v2/feeds/activities/{id}/translate',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['TranslateActivityResponse']?.(response.body);
+    decoders['TranslateActivityResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryBookmarkFolders(
@@ -907,20 +869,18 @@ export class FeedsApi {
       filter: request?.filter,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryBookmarkFoldersResponse>
-    >(
-      'POST',
-      '/api/v2/feeds/bookmark_folders/query',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<QueryBookmarkFoldersResponse>(
+        'POST',
+        '/api/v2/feeds/bookmark_folders/query',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['QueryBookmarkFoldersResponse']?.(response.body);
+    decoders['QueryBookmarkFoldersResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteBookmarkFolder(request: {
@@ -930,18 +890,17 @@ export class FeedsApi {
       folder_id: request?.folder_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteBookmarkFolderResponse>
-    >(
-      'DELETE',
-      '/api/v2/feeds/bookmark_folders/{folder_id}',
-      pathParams,
-      undefined,
-    );
+    const response =
+      await this.apiClient.sendRequest<DeleteBookmarkFolderResponse>(
+        'DELETE',
+        '/api/v2/feeds/bookmark_folders/{folder_id}',
+        pathParams,
+        undefined,
+      );
 
-    decoders['DeleteBookmarkFolderResponse']?.(response.body);
+    decoders['DeleteBookmarkFolderResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateBookmarkFolder(
@@ -957,20 +916,18 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateBookmarkFolderResponse>
-    >(
-      'PATCH',
-      '/api/v2/feeds/bookmark_folders/{folder_id}',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpdateBookmarkFolderResponse>(
+        'PATCH',
+        '/api/v2/feeds/bookmark_folders/{folder_id}',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['UpdateBookmarkFolderResponse']?.(response.body);
+    decoders['UpdateBookmarkFolderResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryBookmarks(
@@ -994,20 +951,17 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryBookmarksResponse>
-    >(
+    const response = await this.apiClient.sendRequest<QueryBookmarksResponse>(
       'POST',
       '/api/v2/feeds/bookmarks/query',
       undefined,
       queryParams,
       body,
-      'application/json',
     );
 
-    decoders['QueryBookmarksResponse']?.(response.body);
+    decoders['QueryBookmarksResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteCollections(request: {
@@ -1017,13 +971,17 @@ export class FeedsApi {
       collection_refs: request?.collection_refs,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteCollectionsResponse>
-    >('DELETE', '/api/v2/feeds/collections', undefined, queryParams);
+    const response =
+      await this.apiClient.sendRequest<DeleteCollectionsResponse>(
+        'DELETE',
+        '/api/v2/feeds/collections',
+        undefined,
+        queryParams,
+      );
 
-    decoders['DeleteCollectionsResponse']?.(response.body);
+    decoders['DeleteCollectionsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async readCollections(request?: {
@@ -1035,13 +993,16 @@ export class FeedsApi {
       collection_refs: request?.collection_refs,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ReadCollectionsResponse>
-    >('GET', '/api/v2/feeds/collections', undefined, queryParams);
+    const response = await this.apiClient.sendRequest<ReadCollectionsResponse>(
+      'GET',
+      '/api/v2/feeds/collections',
+      undefined,
+      queryParams,
+    );
 
-    decoders['ReadCollectionsResponse']?.(response.body);
+    decoders['ReadCollectionsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateCollections(
@@ -1053,20 +1014,18 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateCollectionsResponse>
-    >(
-      'PATCH',
-      '/api/v2/feeds/collections',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpdateCollectionsResponse>(
+        'PATCH',
+        '/api/v2/feeds/collections',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['UpdateCollectionsResponse']?.(response.body);
+    decoders['UpdateCollectionsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createCollections(
@@ -1078,20 +1037,18 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CreateCollectionsResponse>
-    >(
-      'POST',
-      '/api/v2/feeds/collections',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<CreateCollectionsResponse>(
+        'POST',
+        '/api/v2/feeds/collections',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['CreateCollectionsResponse']?.(response.body);
+    decoders['CreateCollectionsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async upsertCollections(
@@ -1101,20 +1058,18 @@ export class FeedsApi {
       collections: request?.collections,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpsertCollectionsResponse>
-    >(
-      'PUT',
-      '/api/v2/feeds/collections',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpsertCollectionsResponse>(
+        'PUT',
+        '/api/v2/feeds/collections',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['UpsertCollectionsResponse']?.(response.body);
+    decoders['UpsertCollectionsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryCollections(
@@ -1130,20 +1085,17 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryCollectionsResponse>
-    >(
+    const response = await this.apiClient.sendRequest<QueryCollectionsResponse>(
       'POST',
       '/api/v2/feeds/collections/query',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['QueryCollectionsResponse']?.(response.body);
+    decoders['QueryCollectionsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getComments(request: {
@@ -1175,13 +1127,16 @@ export class FeedsApi {
       next: request?.next,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetCommentsResponse>
-    >('GET', '/api/v2/feeds/comments', undefined, queryParams);
+    const response = await this.apiClient.sendRequest<GetCommentsResponse>(
+      'GET',
+      '/api/v2/feeds/comments',
+      undefined,
+      queryParams,
+    );
 
-    decoders['GetCommentsResponse']?.(response.body);
+    decoders['GetCommentsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async addComment(
@@ -1205,20 +1160,17 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<AddCommentResponse>
-    >(
+    const response = await this.apiClient.sendRequest<AddCommentResponse>(
       'POST',
       '/api/v2/feeds/comments',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['AddCommentResponse']?.(response.body);
+    decoders['AddCommentResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async addCommentsBatch(
@@ -1228,20 +1180,17 @@ export class FeedsApi {
       comments: request?.comments,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<AddCommentsBatchResponse>
-    >(
+    const response = await this.apiClient.sendRequest<AddCommentsBatchResponse>(
       'POST',
       '/api/v2/feeds/comments/batch',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['AddCommentsBatchResponse']?.(response.body);
+    decoders['AddCommentsBatchResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryComments(
@@ -1257,7 +1206,6 @@ export class FeedsApi {
     const body = {
       filter: request?.filter,
       id_around: request?.id_around,
-      include_soft_deleted_comments: request?.include_soft_deleted_comments,
       limit: request?.limit,
       next: request?.next,
       prev: request?.prev,
@@ -1266,20 +1214,17 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryCommentsResponse>
-    >(
+    const response = await this.apiClient.sendRequest<QueryCommentsResponse>(
       'POST',
       '/api/v2/feeds/comments/query',
       undefined,
       queryParams,
       body,
-      'application/json',
     );
 
-    decoders['QueryCommentsResponse']?.(response.body);
+    decoders['QueryCommentsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async batchQueryCommentReactions(
@@ -1296,20 +1241,18 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<BatchQueryCommentReactionsResponse>
-    >(
-      'POST',
-      '/api/v2/feeds/comments/reactions/query',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<BatchQueryCommentReactionsResponse>(
+        'POST',
+        '/api/v2/feeds/comments/reactions/query',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['BatchQueryCommentReactionsResponse']?.(response.body);
+    decoders['BatchQueryCommentReactionsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteCommentBookmark(request: {
@@ -1325,18 +1268,17 @@ export class FeedsApi {
       comment_id: request?.comment_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteCommentBookmarkResponse>
-    >(
-      'DELETE',
-      '/api/v2/feeds/comments/{comment_id}/bookmarks',
-      pathParams,
-      queryParams,
-    );
+    const response =
+      await this.apiClient.sendRequest<DeleteCommentBookmarkResponse>(
+        'DELETE',
+        '/api/v2/feeds/comments/{comment_id}/bookmarks',
+        pathParams,
+        queryParams,
+      );
 
-    decoders['DeleteCommentBookmarkResponse']?.(response.body);
+    decoders['DeleteCommentBookmarkResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateCommentBookmark(
@@ -1354,20 +1296,18 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateCommentBookmarkResponse>
-    >(
-      'PATCH',
-      '/api/v2/feeds/comments/{comment_id}/bookmarks',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpdateCommentBookmarkResponse>(
+        'PATCH',
+        '/api/v2/feeds/comments/{comment_id}/bookmarks',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['UpdateCommentBookmarkResponse']?.(response.body);
+    decoders['UpdateCommentBookmarkResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async addCommentBookmark(
@@ -1384,20 +1324,18 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<AddCommentBookmarkResponse>
-    >(
-      'POST',
-      '/api/v2/feeds/comments/{comment_id}/bookmarks',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<AddCommentBookmarkResponse>(
+        'POST',
+        '/api/v2/feeds/comments/{comment_id}/bookmarks',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['AddCommentBookmarkResponse']?.(response.body);
+    decoders['AddCommentBookmarkResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteComment(request: {
@@ -1413,13 +1351,16 @@ export class FeedsApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteCommentResponse>
-    >('DELETE', '/api/v2/feeds/comments/{id}', pathParams, queryParams);
+    const response = await this.apiClient.sendRequest<DeleteCommentResponse>(
+      'DELETE',
+      '/api/v2/feeds/comments/{id}',
+      pathParams,
+      queryParams,
+    );
 
-    decoders['DeleteCommentResponse']?.(response.body);
+    decoders['DeleteCommentResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getComment(request: {
@@ -1437,13 +1378,16 @@ export class FeedsApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetCommentResponse>
-    >('GET', '/api/v2/feeds/comments/{id}', pathParams, queryParams);
+    const response = await this.apiClient.sendRequest<GetCommentResponse>(
+      'GET',
+      '/api/v2/feeds/comments/{id}',
+      pathParams,
+      queryParams,
+    );
 
-    decoders['GetCommentResponse']?.(response.body);
+    decoders['GetCommentResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateComment(
@@ -1466,20 +1410,17 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateCommentResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UpdateCommentResponse>(
       'PATCH',
       '/api/v2/feeds/comments/{id}',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UpdateCommentResponse']?.(response.body);
+    decoders['UpdateCommentResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateCommentPartial(
@@ -1500,20 +1441,18 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateCommentPartialResponse>
-    >(
-      'POST',
-      '/api/v2/feeds/comments/{id}/partial',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpdateCommentPartialResponse>(
+        'POST',
+        '/api/v2/feeds/comments/{id}/partial',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['UpdateCommentPartialResponse']?.(response.body);
+    decoders['UpdateCommentPartialResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async addCommentReaction(
@@ -1534,20 +1473,18 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<AddCommentReactionResponse>
-    >(
-      'POST',
-      '/api/v2/feeds/comments/{id}/reactions',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<AddCommentReactionResponse>(
+        'POST',
+        '/api/v2/feeds/comments/{id}/reactions',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['AddCommentReactionResponse']?.(response.body);
+    decoders['AddCommentReactionResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryCommentReactions(
@@ -1564,20 +1501,18 @@ export class FeedsApi {
       filter: request?.filter,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryCommentReactionsResponse>
-    >(
-      'POST',
-      '/api/v2/feeds/comments/{id}/reactions/query',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<QueryCommentReactionsResponse>(
+        'POST',
+        '/api/v2/feeds/comments/{id}/reactions/query',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['QueryCommentReactionsResponse']?.(response.body);
+    decoders['QueryCommentReactionsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteCommentReaction(request: {
@@ -1595,18 +1530,17 @@ export class FeedsApi {
       type: request?.type,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteCommentReactionResponse>
-    >(
-      'DELETE',
-      '/api/v2/feeds/comments/{id}/reactions/{type}',
-      pathParams,
-      queryParams,
-    );
+    const response =
+      await this.apiClient.sendRequest<DeleteCommentReactionResponse>(
+        'DELETE',
+        '/api/v2/feeds/comments/{id}/reactions/{type}',
+        pathParams,
+        queryParams,
+      );
 
-    decoders['DeleteCommentReactionResponse']?.(response.body);
+    decoders['DeleteCommentReactionResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getCommentReplies(request: {
@@ -1638,13 +1572,17 @@ export class FeedsApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetCommentRepliesResponse>
-    >('GET', '/api/v2/feeds/comments/{id}/replies', pathParams, queryParams);
+    const response =
+      await this.apiClient.sendRequest<GetCommentRepliesResponse>(
+        'GET',
+        '/api/v2/feeds/comments/{id}/replies',
+        pathParams,
+        queryParams,
+      );
 
-    decoders['GetCommentRepliesResponse']?.(response.body);
+    decoders['GetCommentRepliesResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async restoreComment(
@@ -1658,20 +1596,17 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<RestoreCommentResponse>
-    >(
+    const response = await this.apiClient.sendRequest<RestoreCommentResponse>(
       'POST',
       '/api/v2/feeds/comments/{id}/restore',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['RestoreCommentResponse']?.(response.body);
+    decoders['RestoreCommentResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async translateComment(
@@ -1684,20 +1619,17 @@ export class FeedsApi {
       language: request?.language,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<TranslateCommentResponse>
-    >(
+    const response = await this.apiClient.sendRequest<TranslateCommentResponse>(
       'POST',
       '/api/v2/feeds/comments/{id}/translate',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['TranslateCommentResponse']?.(response.body);
+    decoders['TranslateCommentResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async listFeedGroups(request?: {
@@ -1707,13 +1639,16 @@ export class FeedsApi {
       include_soft_deleted: request?.include_soft_deleted,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ListFeedGroupsResponse>
-    >('GET', '/api/v2/feeds/feed_groups', undefined, queryParams);
+    const response = await this.apiClient.sendRequest<ListFeedGroupsResponse>(
+      'GET',
+      '/api/v2/feeds/feed_groups',
+      undefined,
+      queryParams,
+    );
 
-    decoders['ListFeedGroupsResponse']?.(response.body);
+    decoders['ListFeedGroupsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createFeedGroup(
@@ -1736,20 +1671,17 @@ export class FeedsApi {
       stories: request?.stories,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CreateFeedGroupResponse>
-    >(
+    const response = await this.apiClient.sendRequest<CreateFeedGroupResponse>(
       'POST',
       '/api/v2/feeds/feed_groups',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['CreateFeedGroupResponse']?.(response.body);
+    decoders['CreateFeedGroupResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteFeed(request: {
@@ -1767,18 +1699,16 @@ export class FeedsApi {
       feed_id: request?.feed_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteFeedResponse>
-    >(
+    const response = await this.apiClient.sendRequest<DeleteFeedResponse>(
       'DELETE',
       '/api/v2/feeds/feed_groups/{feed_group_id}/feeds/{feed_id}',
       pathParams,
       queryParams,
     );
 
-    decoders['DeleteFeedResponse']?.(response.body);
+    decoders['DeleteFeedResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getOrCreateFeed(
@@ -1818,20 +1748,17 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetOrCreateFeedResponse>
-    >(
+    const response = await this.apiClient.sendRequest<GetOrCreateFeedResponse>(
       'POST',
       '/api/v2/feeds/feed_groups/{feed_group_id}/feeds/{feed_id}',
       pathParams,
       queryParams,
       body,
-      'application/json',
     );
 
-    decoders['GetOrCreateFeedResponse']?.(response.body);
+    decoders['GetOrCreateFeedResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateFeed(
@@ -1852,20 +1779,17 @@ export class FeedsApi {
       location: request?.location,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateFeedResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UpdateFeedResponse>(
       'PUT',
       '/api/v2/feeds/feed_groups/{feed_group_id}/feeds/{feed_id}',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UpdateFeedResponse']?.(response.body);
+    decoders['UpdateFeedResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async markActivity(
@@ -1885,18 +1809,17 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'POST',
       '/api/v2/feeds/feed_groups/{feed_group_id}/feeds/{feed_id}/activities/mark/batch',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async unpinActivity(request: {
@@ -1916,18 +1839,16 @@ export class FeedsApi {
       activity_id: request?.activity_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UnpinActivityResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UnpinActivityResponse>(
       'DELETE',
       '/api/v2/feeds/feed_groups/{feed_group_id}/feeds/{feed_id}/activities/{activity_id}/pin',
       pathParams,
       queryParams,
     );
 
-    decoders['UnpinActivityResponse']?.(response.body);
+    decoders['UnpinActivityResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async pinActivity(
@@ -1948,20 +1869,17 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<PinActivityResponse>
-    >(
+    const response = await this.apiClient.sendRequest<PinActivityResponse>(
       'POST',
       '/api/v2/feeds/feed_groups/{feed_group_id}/feeds/{feed_id}/activities/{activity_id}/pin',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['PinActivityResponse']?.(response.body);
+    decoders['PinActivityResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async changeFeedVisibility(
@@ -1979,20 +1897,18 @@ export class FeedsApi {
       pending_follows_action: request?.pending_follows_action,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ChangeFeedVisibilityResponse>
-    >(
-      'POST',
-      '/api/v2/feeds/feed_groups/{feed_group_id}/feeds/{feed_id}/change_visibility',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<ChangeFeedVisibilityResponse>(
+        'POST',
+        '/api/v2/feeds/feed_groups/{feed_group_id}/feeds/{feed_id}/change_visibility',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['ChangeFeedVisibilityResponse']?.(response.body);
+    decoders['ChangeFeedVisibilityResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getFeedCounts(request: {
@@ -2004,18 +1920,16 @@ export class FeedsApi {
       feed_id: request?.feed_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetFeedCountsResponse>
-    >(
+    const response = await this.apiClient.sendRequest<GetFeedCountsResponse>(
       'GET',
       '/api/v2/feeds/feed_groups/{feed_group_id}/feeds/{feed_id}/counts',
       pathParams,
       undefined,
     );
 
-    decoders['GetFeedCountsResponse']?.(response.body);
+    decoders['GetFeedCountsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateFeedMembers(
@@ -2036,20 +1950,18 @@ export class FeedsApi {
       members: request?.members,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateFeedMembersResponse>
-    >(
-      'PATCH',
-      '/api/v2/feeds/feed_groups/{feed_group_id}/feeds/{feed_id}/members',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpdateFeedMembersResponse>(
+        'PATCH',
+        '/api/v2/feeds/feed_groups/{feed_group_id}/feeds/{feed_id}/members',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['UpdateFeedMembersResponse']?.(response.body);
+    decoders['UpdateFeedMembersResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async acceptFeedMemberInvite(
@@ -2067,20 +1979,18 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<AcceptFeedMemberInviteResponse>
-    >(
-      'POST',
-      '/api/v2/feeds/feed_groups/{feed_group_id}/feeds/{feed_id}/members/accept',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<AcceptFeedMemberInviteResponse>(
+        'POST',
+        '/api/v2/feeds/feed_groups/{feed_group_id}/feeds/{feed_id}/members/accept',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['AcceptFeedMemberInviteResponse']?.(response.body);
+    decoders['AcceptFeedMemberInviteResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryFeedMembers(
@@ -2101,20 +2011,17 @@ export class FeedsApi {
       filter: request?.filter,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryFeedMembersResponse>
-    >(
+    const response = await this.apiClient.sendRequest<QueryFeedMembersResponse>(
       'POST',
       '/api/v2/feeds/feed_groups/{feed_group_id}/feeds/{feed_id}/members/query',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['QueryFeedMembersResponse']?.(response.body);
+    decoders['QueryFeedMembersResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async rejectFeedMemberInvite(
@@ -2132,20 +2039,18 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<RejectFeedMemberInviteResponse>
-    >(
-      'POST',
-      '/api/v2/feeds/feed_groups/{feed_group_id}/feeds/{feed_id}/members/reject',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<RejectFeedMemberInviteResponse>(
+        'POST',
+        '/api/v2/feeds/feed_groups/{feed_group_id}/feeds/{feed_id}/members/reject',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['RejectFeedMemberInviteResponse']?.(response.body);
+    decoders['RejectFeedMemberInviteResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryPinnedActivities(
@@ -2173,20 +2078,18 @@ export class FeedsApi {
       filter: request?.filter,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryPinnedActivitiesResponse>
-    >(
-      'POST',
-      '/api/v2/feeds/feed_groups/{feed_group_id}/feeds/{feed_id}/pinned_activities/query',
-      pathParams,
-      queryParams,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<QueryPinnedActivitiesResponse>(
+        'POST',
+        '/api/v2/feeds/feed_groups/{feed_group_id}/feeds/{feed_id}/pinned_activities/query',
+        pathParams,
+        queryParams,
+        body,
+      );
 
-    decoders['QueryPinnedActivitiesResponse']?.(response.body);
+    decoders['QueryPinnedActivitiesResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getFollowSuggestions(request: {
@@ -2202,18 +2105,17 @@ export class FeedsApi {
       feed_group_id: request?.feed_group_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetFollowSuggestionsResponse>
-    >(
-      'GET',
-      '/api/v2/feeds/feed_groups/{feed_group_id}/follow_suggestions',
-      pathParams,
-      queryParams,
-    );
+    const response =
+      await this.apiClient.sendRequest<GetFollowSuggestionsResponse>(
+        'GET',
+        '/api/v2/feeds/feed_groups/{feed_group_id}/follow_suggestions',
+        pathParams,
+        queryParams,
+      );
 
-    decoders['GetFollowSuggestionsResponse']?.(response.body);
+    decoders['GetFollowSuggestionsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async restoreFeedGroup(request: {
@@ -2223,18 +2125,16 @@ export class FeedsApi {
       feed_group_id: request?.feed_group_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<RestoreFeedGroupResponse>
-    >(
+    const response = await this.apiClient.sendRequest<RestoreFeedGroupResponse>(
       'POST',
       '/api/v2/feeds/feed_groups/{feed_group_id}/restore',
       pathParams,
       undefined,
     );
 
-    decoders['RestoreFeedGroupResponse']?.(response.body);
+    decoders['RestoreFeedGroupResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteFeedGroup(request: {
@@ -2248,13 +2148,16 @@ export class FeedsApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteFeedGroupResponse>
-    >('DELETE', '/api/v2/feeds/feed_groups/{id}', pathParams, queryParams);
+    const response = await this.apiClient.sendRequest<DeleteFeedGroupResponse>(
+      'DELETE',
+      '/api/v2/feeds/feed_groups/{id}',
+      pathParams,
+      queryParams,
+    );
 
-    decoders['DeleteFeedGroupResponse']?.(response.body);
+    decoders['DeleteFeedGroupResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getFeedGroup(request: {
@@ -2268,13 +2171,16 @@ export class FeedsApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetFeedGroupResponse>
-    >('GET', '/api/v2/feeds/feed_groups/{id}', pathParams, queryParams);
+    const response = await this.apiClient.sendRequest<GetFeedGroupResponse>(
+      'GET',
+      '/api/v2/feeds/feed_groups/{id}',
+      pathParams,
+      queryParams,
+    );
 
-    decoders['GetFeedGroupResponse']?.(response.body);
+    decoders['GetFeedGroupResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getOrCreateFeedGroup(
@@ -2299,20 +2205,18 @@ export class FeedsApi {
       stories: request?.stories,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetOrCreateFeedGroupResponse>
-    >(
-      'POST',
-      '/api/v2/feeds/feed_groups/{id}',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<GetOrCreateFeedGroupResponse>(
+        'POST',
+        '/api/v2/feeds/feed_groups/{id}',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['GetOrCreateFeedGroupResponse']?.(response.body);
+    decoders['GetOrCreateFeedGroupResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateFeedGroup(
@@ -2337,30 +2241,30 @@ export class FeedsApi {
       stories: request?.stories,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateFeedGroupResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UpdateFeedGroupResponse>(
       'PUT',
       '/api/v2/feeds/feed_groups/{id}',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UpdateFeedGroupResponse']?.(response.body);
+    decoders['UpdateFeedGroupResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async listFeedViews(): Promise<StreamResponse<ListFeedViewsResponse>> {
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ListFeedViewsResponse>
-    >('GET', '/api/v2/feeds/feed_views', undefined, undefined);
+    const response = await this.apiClient.sendRequest<ListFeedViewsResponse>(
+      'GET',
+      '/api/v2/feeds/feed_views',
+      undefined,
+      undefined,
+    );
 
-    decoders['ListFeedViewsResponse']?.(response.body);
+    decoders['ListFeedViewsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createFeedView(
@@ -2373,20 +2277,17 @@ export class FeedsApi {
       ranking: request?.ranking,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CreateFeedViewResponse>
-    >(
+    const response = await this.apiClient.sendRequest<CreateFeedViewResponse>(
       'POST',
       '/api/v2/feeds/feed_views',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['CreateFeedViewResponse']?.(response.body);
+    decoders['CreateFeedViewResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteFeedView(request: {
@@ -2396,13 +2297,16 @@ export class FeedsApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteFeedViewResponse>
-    >('DELETE', '/api/v2/feeds/feed_views/{id}', pathParams, undefined);
+    const response = await this.apiClient.sendRequest<DeleteFeedViewResponse>(
+      'DELETE',
+      '/api/v2/feeds/feed_views/{id}',
+      pathParams,
+      undefined,
+    );
 
-    decoders['DeleteFeedViewResponse']?.(response.body);
+    decoders['DeleteFeedViewResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getFeedView(request: {
@@ -2412,13 +2316,16 @@ export class FeedsApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetFeedViewResponse>
-    >('GET', '/api/v2/feeds/feed_views/{id}', pathParams, undefined);
+    const response = await this.apiClient.sendRequest<GetFeedViewResponse>(
+      'GET',
+      '/api/v2/feeds/feed_views/{id}',
+      pathParams,
+      undefined,
+    );
 
-    decoders['GetFeedViewResponse']?.(response.body);
+    decoders['GetFeedViewResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getOrCreateFeedView(
@@ -2433,20 +2340,18 @@ export class FeedsApi {
       ranking: request?.ranking,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetOrCreateFeedViewResponse>
-    >(
-      'POST',
-      '/api/v2/feeds/feed_views/{id}',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<GetOrCreateFeedViewResponse>(
+        'POST',
+        '/api/v2/feeds/feed_views/{id}',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['GetOrCreateFeedViewResponse']?.(response.body);
+    decoders['GetOrCreateFeedViewResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateFeedView(
@@ -2461,32 +2366,33 @@ export class FeedsApi {
       ranking: request?.ranking,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateFeedViewResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UpdateFeedViewResponse>(
       'PUT',
       '/api/v2/feeds/feed_views/{id}',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UpdateFeedViewResponse']?.(response.body);
+    decoders['UpdateFeedViewResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async listFeedVisibilities(): Promise<
     StreamResponse<ListFeedVisibilitiesResponse>
   > {
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ListFeedVisibilitiesResponse>
-    >('GET', '/api/v2/feeds/feed_visibilities', undefined, undefined);
+    const response =
+      await this.apiClient.sendRequest<ListFeedVisibilitiesResponse>(
+        'GET',
+        '/api/v2/feeds/feed_visibilities',
+        undefined,
+        undefined,
+      );
 
-    decoders['ListFeedVisibilitiesResponse']?.(response.body);
+    decoders['ListFeedVisibilitiesResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getFeedVisibility(request: {
@@ -2496,13 +2402,17 @@ export class FeedsApi {
       name: request?.name,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetFeedVisibilityResponse>
-    >('GET', '/api/v2/feeds/feed_visibilities/{name}', pathParams, undefined);
+    const response =
+      await this.apiClient.sendRequest<GetFeedVisibilityResponse>(
+        'GET',
+        '/api/v2/feeds/feed_visibilities/{name}',
+        pathParams,
+        undefined,
+      );
 
-    decoders['GetFeedVisibilityResponse']?.(response.body);
+    decoders['GetFeedVisibilityResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateFeedVisibility(
@@ -2515,20 +2425,18 @@ export class FeedsApi {
       grants: request?.grants,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateFeedVisibilityResponse>
-    >(
-      'PUT',
-      '/api/v2/feeds/feed_visibilities/{name}',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpdateFeedVisibilityResponse>(
+        'PUT',
+        '/api/v2/feeds/feed_visibilities/{name}',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['UpdateFeedVisibilityResponse']?.(response.body);
+    decoders['UpdateFeedVisibilityResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createFeedsBatch(
@@ -2540,20 +2448,17 @@ export class FeedsApi {
       enrich_own_fields: request?.enrich_own_fields,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CreateFeedsBatchResponse>
-    >(
+    const response = await this.apiClient.sendRequest<CreateFeedsBatchResponse>(
       'POST',
       '/api/v2/feeds/feeds/batch',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['CreateFeedsBatchResponse']?.(response.body);
+    decoders['CreateFeedsBatchResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteFeedsBatch(
@@ -2565,20 +2470,17 @@ export class FeedsApi {
       purge_user_activities: request?.purge_user_activities,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteFeedsBatchResponse>
-    >(
+    const response = await this.apiClient.sendRequest<DeleteFeedsBatchResponse>(
       'POST',
       '/api/v2/feeds/feeds/delete',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['DeleteFeedsBatchResponse']?.(response.body);
+    decoders['DeleteFeedsBatchResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async ownBatch(
@@ -2591,20 +2493,17 @@ export class FeedsApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<OwnBatchResponse>
-    >(
+    const response = await this.apiClient.sendRequest<OwnBatchResponse>(
       'POST',
       '/api/v2/feeds/feeds/own/batch',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['OwnBatchResponse']?.(response.body);
+    decoders['OwnBatchResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   protected async _queryFeeds(
@@ -2620,20 +2519,17 @@ export class FeedsApi {
       filter: request?.filter,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryFeedsResponse>
-    >(
+    const response = await this.apiClient.sendRequest<QueryFeedsResponse>(
       'POST',
       '/api/v2/feeds/feeds/query',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['QueryFeedsResponse']?.(response.body);
+    decoders['QueryFeedsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getFeedsRateLimits(request?: {
@@ -2657,13 +2553,17 @@ export class FeedsApi {
       server_side: request?.server_side,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetFeedsRateLimitsResponse>
-    >('GET', '/api/v2/feeds/feeds/rate_limits', undefined, queryParams);
+    const response =
+      await this.apiClient.sendRequest<GetFeedsRateLimitsResponse>(
+        'GET',
+        '/api/v2/feeds/feeds/rate_limits',
+        undefined,
+        queryParams,
+      );
 
-    decoders['GetFeedsRateLimitsResponse']?.(response.body);
+    decoders['GetFeedsRateLimitsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateFollow(
@@ -2684,20 +2584,17 @@ export class FeedsApi {
       custom: request?.custom,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateFollowResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UpdateFollowResponse>(
       'PATCH',
       '/api/v2/feeds/follows',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UpdateFollowResponse']?.(response.body);
+    decoders['UpdateFollowResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async follow(
@@ -2717,20 +2614,17 @@ export class FeedsApi {
       custom: request?.custom,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<SingleFollowResponse>
-    >(
+    const response = await this.apiClient.sendRequest<SingleFollowResponse>(
       'POST',
       '/api/v2/feeds/follows',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['SingleFollowResponse']?.(response.body);
+    decoders['SingleFollowResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async acceptFollow(
@@ -2742,20 +2636,17 @@ export class FeedsApi {
       follower_role: request?.follower_role,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<AcceptFollowResponse>
-    >(
+    const response = await this.apiClient.sendRequest<AcceptFollowResponse>(
       'POST',
       '/api/v2/feeds/follows/accept',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['AcceptFollowResponse']?.(response.body);
+    decoders['AcceptFollowResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async followBatch(
@@ -2767,20 +2658,17 @@ export class FeedsApi {
       enrich_own_fields: request?.enrich_own_fields,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<FollowBatchResponse>
-    >(
+    const response = await this.apiClient.sendRequest<FollowBatchResponse>(
       'POST',
       '/api/v2/feeds/follows/batch',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['FollowBatchResponse']?.(response.body);
+    decoders['FollowBatchResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getOrCreateFollows(
@@ -2792,20 +2680,17 @@ export class FeedsApi {
       enrich_own_fields: request?.enrich_own_fields,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<FollowBatchResponse>
-    >(
+    const response = await this.apiClient.sendRequest<FollowBatchResponse>(
       'POST',
       '/api/v2/feeds/follows/batch/upsert',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['FollowBatchResponse']?.(response.body);
+    decoders['FollowBatchResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryFollows(
@@ -2819,20 +2704,17 @@ export class FeedsApi {
       filter: request?.filter,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryFollowsResponse>
-    >(
+    const response = await this.apiClient.sendRequest<QueryFollowsResponse>(
       'POST',
       '/api/v2/feeds/follows/query',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['QueryFollowsResponse']?.(response.body);
+    decoders['QueryFollowsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async rejectFollow(
@@ -2843,20 +2725,17 @@ export class FeedsApi {
       target: request?.target,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<RejectFollowResponse>
-    >(
+    const response = await this.apiClient.sendRequest<RejectFollowResponse>(
       'POST',
       '/api/v2/feeds/follows/reject',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['RejectFollowResponse']?.(response.body);
+    decoders['RejectFollowResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getOrCreateFollow(
@@ -2876,20 +2755,18 @@ export class FeedsApi {
       custom: request?.custom,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetOrCreateFollowResponse>
-    >(
-      'POST',
-      '/api/v2/feeds/follows/upsert',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<GetOrCreateFollowResponse>(
+        'POST',
+        '/api/v2/feeds/follows/upsert',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['GetOrCreateFollowResponse']?.(response.body);
+    decoders['GetOrCreateFollowResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async unfollow(request: {
@@ -2909,18 +2786,16 @@ export class FeedsApi {
       target: request?.target,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UnfollowResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UnfollowResponse>(
       'DELETE',
       '/api/v2/feeds/follows/{source}/{target}',
       pathParams,
       queryParams,
     );
 
-    decoders['UnfollowResponse']?.(response.body);
+    decoders['UnfollowResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createMembershipLevel(
@@ -2935,20 +2810,18 @@ export class FeedsApi {
       custom: request?.custom,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CreateMembershipLevelResponse>
-    >(
-      'POST',
-      '/api/v2/feeds/membership_levels',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<CreateMembershipLevelResponse>(
+        'POST',
+        '/api/v2/feeds/membership_levels',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['CreateMembershipLevelResponse']?.(response.body);
+    decoders['CreateMembershipLevelResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryMembershipLevels(
@@ -2962,20 +2835,18 @@ export class FeedsApi {
       filter: request?.filter,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryMembershipLevelsResponse>
-    >(
-      'POST',
-      '/api/v2/feeds/membership_levels/query',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<QueryMembershipLevelsResponse>(
+        'POST',
+        '/api/v2/feeds/membership_levels/query',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['QueryMembershipLevelsResponse']?.(response.body);
+    decoders['QueryMembershipLevelsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteMembershipLevel(request: {
@@ -2985,16 +2856,16 @@ export class FeedsApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'DELETE',
       '/api/v2/feeds/membership_levels/{id}',
       pathParams,
       undefined,
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateMembershipLevel(
@@ -3011,20 +2882,103 @@ export class FeedsApi {
       custom: request?.custom,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateMembershipLevelResponse>
-    >(
-      'PATCH',
-      '/api/v2/feeds/membership_levels/{id}',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpdateMembershipLevelResponse>(
+        'PATCH',
+        '/api/v2/feeds/membership_levels/{id}',
+        pathParams,
+        undefined,
+        body,
+      );
+
+    decoders['UpdateMembershipLevelResponse']?.(response);
+
+    return response;
+  }
+
+  async feedsGetRetentionPolicy(): Promise<
+    StreamResponse<GetFeedsRetentionPolicyResponse>
+  > {
+    const response =
+      await this.apiClient.sendRequest<GetFeedsRetentionPolicyResponse>(
+        'GET',
+        '/api/v2/feeds/retention_policy',
+        undefined,
+        undefined,
+      );
+
+    decoders['GetFeedsRetentionPolicyResponse']?.(response);
+
+    return response;
+  }
+
+  async feedsSetRetentionPolicy(
+    request: SetFeedsRetentionPolicyRequest,
+  ): Promise<StreamResponse<SetFeedsRetentionPolicyResponse>> {
+    const body = {
+      max_age_hours: request?.max_age_hours,
+      policy: request?.policy,
+      enabled: request?.enabled,
+    };
+
+    const response =
+      await this.apiClient.sendRequest<SetFeedsRetentionPolicyResponse>(
+        'POST',
+        '/api/v2/feeds/retention_policy',
+        undefined,
+        undefined,
+        body,
+      );
+
+    decoders['SetFeedsRetentionPolicyResponse']?.(response);
+
+    return response;
+  }
+
+  async feedsDeleteRetentionPolicy(
+    request: DeleteFeedsRetentionPolicyRequest,
+  ): Promise<StreamResponse<DeleteFeedsRetentionPolicyResponse>> {
+    const body = {
+      policy: request?.policy,
+    };
+
+    const response =
+      await this.apiClient.sendRequest<DeleteFeedsRetentionPolicyResponse>(
+        'POST',
+        '/api/v2/feeds/retention_policy/delete',
+        undefined,
+        undefined,
+        body,
+      );
+
+    decoders['DeleteFeedsRetentionPolicyResponse']?.(response);
+
+    return response;
+  }
+
+  async feedsGetRetentionPolicyRuns(
+    request?: GetFeedsRetentionPolicyRunsRequest,
+  ): Promise<StreamResponse<GetFeedsRetentionPolicyRunsResponse>> {
+    const body = {
+      limit: request?.limit,
+      next: request?.next,
+      prev: request?.prev,
+      sort: request?.sort,
+      filter_conditions: request?.filter_conditions,
+    };
 
-    decoders['UpdateMembershipLevelResponse']?.(response.body);
+    const response =
+      await this.apiClient.sendRequest<GetFeedsRetentionPolicyRunsResponse>(
+        'POST',
+        '/api/v2/feeds/retention_policy/runs',
+        undefined,
+        undefined,
+        body,
+      );
 
-    return { ...response.body, metadata: response.metadata };
+    decoders['GetFeedsRetentionPolicyRunsResponse']?.(response);
+
+    return response;
   }
 
   async queryRevisionHistory(
@@ -3038,20 +2992,18 @@ export class FeedsApi {
       sort: request?.sort,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryRevisionHistoryResponse>
-    >(
-      'POST',
-      '/api/v2/feeds/revisions/query',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<QueryRevisionHistoryResponse>(
+        'POST',
+        '/api/v2/feeds/revisions/query',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['QueryRevisionHistoryResponse']?.(response.body);
+    decoders['QueryRevisionHistoryResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryFeedsUsageStats(
@@ -3062,20 +3014,18 @@ export class FeedsApi {
       to: request?.to,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryFeedsUsageStatsResponse>
-    >(
-      'POST',
-      '/api/v2/feeds/stats/usage',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<QueryFeedsUsageStatsResponse>(
+        'POST',
+        '/api/v2/feeds/stats/usage',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['QueryFeedsUsageStatsResponse']?.(response.body);
+    decoders['QueryFeedsUsageStatsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async unfollowBatch(
@@ -3087,20 +3037,17 @@ export class FeedsApi {
       enrich_own_fields: request?.enrich_own_fields,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UnfollowBatchResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UnfollowBatchResponse>(
       'POST',
       '/api/v2/feeds/unfollow/batch',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UnfollowBatchResponse']?.(response.body);
+    decoders['UnfollowBatchResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getOrCreateUnfollows(
@@ -3112,20 +3059,17 @@ export class FeedsApi {
       enrich_own_fields: request?.enrich_own_fields,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UnfollowBatchResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UnfollowBatchResponse>(
       'POST',
       '/api/v2/feeds/unfollow/batch/upsert',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UnfollowBatchResponse']?.(response.body);
+    decoders['UnfollowBatchResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getOrCreateUnfollow(
@@ -3139,20 +3083,18 @@ export class FeedsApi {
       keep_history: request?.keep_history,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetOrCreateUnfollowResponse>
-    >(
-      'POST',
-      '/api/v2/feeds/unfollow/upsert',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<GetOrCreateUnfollowResponse>(
+        'POST',
+        '/api/v2/feeds/unfollow/upsert',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['GetOrCreateUnfollowResponse']?.(response.body);
+    decoders['GetOrCreateUnfollowResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteFeedUserData(
@@ -3165,20 +3107,18 @@ export class FeedsApi {
       hard_delete: request?.hard_delete,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteFeedUserDataResponse>
-    >(
-      'POST',
-      '/api/v2/feeds/users/{user_id}/delete',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<DeleteFeedUserDataResponse>(
+        'POST',
+        '/api/v2/feeds/users/{user_id}/delete',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['DeleteFeedUserDataResponse']?.(response.body);
+    decoders['DeleteFeedUserDataResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async exportFeedUserData(request: {
@@ -3188,13 +3128,17 @@ export class FeedsApi {
       user_id: request?.user_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ExportFeedUserDataResponse>
-    >('POST', '/api/v2/feeds/users/{user_id}/export', pathParams, undefined);
+    const response =
+      await this.apiClient.sendRequest<ExportFeedUserDataResponse>(
+        'POST',
+        '/api/v2/feeds/users/{user_id}/export',
+        pathParams,
+        undefined,
+      );
 
-    decoders['ExportFeedUserDataResponse']?.(response.body);
+    decoders['ExportFeedUserDataResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteUserInterests(request: {
@@ -3208,18 +3152,17 @@ export class FeedsApi {
       user_id: request?.user_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteUserInterestsResponse>
-    >(
-      'DELETE',
-      '/api/v2/feeds/users/{user_id}/interests',
-      pathParams,
-      queryParams,
-    );
+    const response =
+      await this.apiClient.sendRequest<DeleteUserInterestsResponse>(
+        'DELETE',
+        '/api/v2/feeds/users/{user_id}/interests',
+        pathParams,
+        queryParams,
+      );
 
-    decoders['DeleteUserInterestsResponse']?.(response.body);
+    decoders['DeleteUserInterestsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getUserInterests(request: {
@@ -3233,18 +3176,16 @@ export class FeedsApi {
       user_id: request?.user_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetUserInterestsResponse>
-    >(
+    const response = await this.apiClient.sendRequest<GetUserInterestsResponse>(
       'GET',
       '/api/v2/feeds/users/{user_id}/interests',
       pathParams,
       queryParams,
     );
 
-    decoders['GetUserInterestsResponse']?.(response.body);
+    decoders['GetUserInterestsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async upsertUserInterests(
@@ -3257,19 +3198,17 @@ export class FeedsApi {
       interests: request?.interests,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpsertUserInterestsResponse>
-    >(
-      'PUT',
-      '/api/v2/feeds/users/{user_id}/interests',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpsertUserInterestsResponse>(
+        'PUT',
+        '/api/v2/feeds/users/{user_id}/interests',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['UpsertUserInterestsResponse']?.(response.body);
+    decoders['UpsertUserInterestsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 }
diff --git a/src/gen/model-decoders/decoders.ts b/src/gen/model-decoders/decoders.ts
index 706046b..6d4065d 100644
--- a/src/gen/model-decoders/decoders.ts
+++ b/src/gen/model-decoders/decoders.ts
@@ -3023,6 +3023,15 @@ decoders['GetFeedViewResponse'] = (input?: { [key: string]: any }) => {
   return decode(typeMappings, input);
 };
 
+decoders['GetFeedsRetentionPolicyResponse'] = (input?: {
+  [key: string]: any;
+}) => {
+  const typeMappings: TypeMapping = {
+    policies: { type: 'RetentionPolicy', isSingle: false },
+  };
+  return decode(typeMappings, input);
+};
+
 decoders['GetFollowSuggestionsResponse'] = (input?: { [key: string]: any }) => {
   const typeMappings: TypeMapping = {
     suggestions: { type: 'FeedSuggestionResponse', isSingle: false },
@@ -4879,6 +4888,8 @@ decoders['ReminderResponseData'] = (input?: { [key: string]: any }) => {
 
     updated_at: { type: 'DatetimeType', isSingle: true },
 
+    expires_at: { type: 'DatetimeType', isSingle: true },
+
     remind_at: { type: 'DatetimeType', isSingle: true },
 
     channel: { type: 'ChannelResponse', isSingle: true },
@@ -5190,6 +5201,15 @@ decoders['SessionWarningResponse'] = (input?: { [key: string]: any }) => {
   return decode(typeMappings, input);
 };
 
+decoders['SetFeedsRetentionPolicyResponse'] = (input?: {
+  [key: string]: any;
+}) => {
+  const typeMappings: TypeMapping = {
+    policy: { type: 'RetentionPolicy', isSingle: true },
+  };
+  return decode(typeMappings, input);
+};
+
 decoders['SetRetentionPolicyResponse'] = (input?: { [key: string]: any }) => {
   const typeMappings: TypeMapping = {
     policy: { type: 'RetentionPolicy', isSingle: true },
diff --git a/src/gen/models/index.ts b/src/gen/models/index.ts
index 9ce501d..fed48cd 100644
--- a/src/gen/models/index.ts
+++ b/src/gen/models/index.ts
@@ -2646,7 +2646,8 @@ export interface BulkActionAppealsRequest {
    */
   unban?: UnbanActionRequestPayload;
   /**
-   * Deprecated: use restore instead — it now also reverses a block or shadow block. Configuration for unblock action.
+   * @deprecated
+   * Deprecated: Use restore instead, which now also reverses a block or shadow block. Configuration for unblock action.
    */
   unblock?: UnblockActionRequestPayload;
   /**
@@ -4234,6 +4235,9 @@ export interface ChannelConfig {
   blocklist_behavior?: 'flag' | 'block' | 'shadow_block';
   partition_size?: number;
   partition_ttl?: string;
+  /**
+   * Sets the push notification level for a channel type
+   */
   push_level?: 'all' | 'all_mentions' | 'mentions' | 'direct_mentions' | 'none';
   allowed_flag_reasons?: Array<string>;
   blocklists?: Array<BlockListOptions>;
@@ -4332,6 +4336,9 @@ export interface ChannelConfigWithInfo {
   blocklist_behavior?: 'flag' | 'block' | 'shadow_block';
   partition_size?: number;
   partition_ttl?: string;
+  /**
+   * Sets the push notification level for a channel type
+   */
   push_level?: 'all' | 'all_mentions' | 'mentions' | 'direct_mentions' | 'none';
   allowed_flag_reasons?: Array<string>;
   blocklists?: Array<BlockListOptions>;
@@ -5095,6 +5102,9 @@ export interface ChannelTypeConfig {
   blocklist_behavior?: 'flag' | 'block' | 'shadow_block';
   partition_size?: number;
   partition_ttl?: string;
+  /**
+   * Sets the push notification level for a channel type
+   */
   push_level?: 'all' | 'all_mentions' | 'mentions' | 'direct_mentions' | 'none';
   allowed_flag_reasons?: Array<string>;
   blocklists?: Array<BlockListOptions>;
@@ -5562,6 +5572,9 @@ export interface CheckResponse {
    */
   triggered_rules?: Array<TriggeredRuleResponse>;
   item?: ReviewQueueItemResponse;
+  /**
+   * @deprecated
+   */
   triggered_rule?: TriggeredRuleResponse;
 }
 
@@ -6142,6 +6155,9 @@ export interface ConfigOverridesRequest {
    * Maximum message length
    */
   max_message_length?: number;
+  /**
+   * Overrides the push notification level for this channel
+   */
   push_level?: 'all' | 'all_mentions' | 'mentions' | 'direct_mentions' | 'none';
   /**
    * Enable/disable quotes
@@ -6545,6 +6561,9 @@ export interface CreateChannelTypeResponse {
   created_at: Date;
   custom_events: boolean;
   delivery_events: boolean;
+  /**
+   * Duration of the request in milliseconds
+   */
   duration: string;
   mark_messages_pending: boolean;
   max_message_length: number;
@@ -6573,6 +6592,9 @@ export interface CreateChannelTypeResponse {
   blocklist_behavior?: 'flag' | 'block' | 'shadow_block';
   partition_size?: number;
   partition_ttl?: string;
+  /**
+   * Sets the push notification level for a channel type
+   */
   push_level?: 'all' | 'all_mentions' | 'mentions' | 'direct_mentions' | 'none';
   allowed_flag_reasons?: Array<string>;
   blocklists?: Array<BlockListOptions>;
@@ -7037,6 +7059,7 @@ export interface CreateQueueRequest {
 }
 
 export interface CreateReminderRequest {
+  expires_at?: Date;
   remind_at?: Date;
   user_id?: string;
   /**
@@ -7665,6 +7688,17 @@ export interface DeleteFeedsBatchResponse {
   task_id: string;
 }
 
+export interface DeleteFeedsRetentionPolicyRequest {
+  policy: 'old-activities';
+}
+
+export interface DeleteFeedsRetentionPolicyResponse {
+  /**
+   * Duration of the request in milliseconds
+   */
+  duration: string;
+}
+
 export interface DeleteImportV2TaskResponse {
   /**
    * Duration of the request in milliseconds
@@ -9301,6 +9335,13 @@ export interface FeedsReactionResponse {
   custom?: Record<string, any>;
 }
 
+export interface FeedsRetentionRunResponse {
+  app_pk: number;
+  date: string;
+  policy: string;
+  stats: RunStats;
+}
+
 export interface FeedsShareResponse {
   activity_id: string;
   created_at: Date;
@@ -9629,6 +9670,7 @@ export interface FloodSimilarConfig {
 }
 
 export interface FloodSimilarRuleParameters {
+  min_text_length?: number;
   similarity_distance?: number;
   threshold?: number;
   time_window?: string;
@@ -9843,6 +9885,10 @@ export interface FullUserResponse {
   shadow_banned: boolean;
   total_unread_count: number;
   unread_channels: number;
+  /**
+   * @deprecated
+   * Deprecated: Use total_unread_count instead.
+   */
   unread_count: number;
   unread_threads: number;
   updated_at: Date;
@@ -10072,6 +10118,9 @@ export interface GetChannelTypeResponse {
   blocklist_behavior?: 'flag' | 'block' | 'shadow_block';
   partition_size?: number;
   partition_ttl?: string;
+  /**
+   * Sets the push notification level for a channel type
+   */
   push_level?: 'all' | 'all_mentions' | 'mentions' | 'direct_mentions' | 'none';
   allowed_flag_reasons?: Array<string>;
   blocklists?: Array<BlockListOptions>;
@@ -10259,6 +10308,39 @@ export interface GetFeedsRateLimitsResponse {
   web?: Record<string, LimitInfoResponse>;
 }
 
+export interface GetFeedsRetentionPolicyResponse {
+  /**
+   * Duration of the request in milliseconds
+   */
+  duration: string;
+  enabled: boolean;
+  policies: Array<RetentionPolicy>;
+}
+
+export interface GetFeedsRetentionPolicyRunsRequest {
+  limit?: number;
+  next?: string;
+  prev?: string;
+  /**
+   * Array of sort parameters
+   */
+  sort?: Array<SortParamRequest>;
+  /**
+   * Filter conditions to apply to the query
+   */
+  filter_conditions?: Record<string, any>;
+}
+
+export interface GetFeedsRetentionPolicyRunsResponse {
+  /**
+   * Duration of the request in milliseconds
+   */
+  duration: string;
+  runs: Array<FeedsRetentionRunResponse>;
+  next?: string;
+  prev?: string;
+}
+
 export interface GetFlagCountRequest {
   /**
    * ID of the user whose content was flagged
@@ -14089,6 +14171,10 @@ export interface OwnUserResponse {
   role: string;
   total_unread_count: number;
   unread_channels: number;
+  /**
+   * @deprecated
+   * Deprecated: Use total_unread_count instead.
+   */
   unread_count: number;
   unread_threads: number;
   updated_at: Date;
@@ -15600,10 +15686,6 @@ export interface QueryCommentsRequest {
    * Returns the comment with the specified ID along with surrounding comments for context
    */
   id_around?: string;
-  /**
-   * When true, include soft-deleted comments in the result. Server-side only, and requires an object_id filter. Returns comments deleted by any path, including user-data deletion. Moderation-actioned comments (removed, hidden) remain excluded, and comments whose parent activity is itself deleted are not returned.
-   */
-  include_soft_deleted_comments?: boolean;
   /**
    * Maximum number of comments to return
    */
@@ -16316,7 +16398,7 @@ export interface QueryReviewQueueRequest {
    */
   sort?: Array<SortParamRequest>;
   /**
-   * Filter conditions for review queue items. Accepts built-in fields (e.g. status, channel_cid, severity, recommended_action) and customer-supplied moderation_payload.custom keys: any key that is not a built-in field is matched against the item's custom moderation data (e.g. {"location_id": "loc-42"}). Use filter_config.filterable_custom_keys to discover which custom keys the app exposes as chips.
+   * Filter conditions for review queue items. Accepts built-in fields (e.g. status, channel_cid, severity, recommended_action) and customer-supplied moderation_payload.custom keys: any key that is not a built-in field is matched against the item's custom moderation data (e.g. {"location_id": "loc-42"}). Use filter_config.filterable_custom_keys to discover which custom keys the app exposes as chips. content_text searches the moderated text: "$q" is a keyword search (terms ANDed, no adjacency) over the indexed tsvector, while "$eq" (or "$in" for several wordings) matches the text exactly. The exact form is unindexed, so scope it with date_range rather than running it across the whole queue.
    */
   filter?: Record<string, any>;
   /**
@@ -17214,6 +17296,7 @@ export interface ReminderResponseData {
   message_id: string;
   updated_at: Date;
   user_id: string;
+  expires_at?: Date;
   remind_at?: Date;
   /**
    * Represents channel in chat
@@ -17748,6 +17831,7 @@ export interface RuleBuilderCondition {
   ocr_content_params?: OCRContentParameters;
   text_content_params?: TextContentParameters;
   text_rule_params?: TextRuleParameters;
+  user_channel_count_params?: UserChannelCountRuleParameters;
   user_created_within_params?: UserCreatedWithinParameters;
   user_custom_property_params?: UserCustomPropertyParameters;
   user_flag_count_rule_params?: FlagCountRuleParameters;
@@ -18539,6 +18623,21 @@ export interface SessionWarningResponse {
   time?: Date;
 }
 
+export interface SetFeedsRetentionPolicyRequest {
+  max_age_hours: number;
+  policy: 'old-activities';
+  enabled?: boolean;
+}
+
+export interface SetFeedsRetentionPolicyResponse {
+  /**
+   * Duration of the request in milliseconds
+   */
+  duration: string;
+  enabled: boolean;
+  policy: RetentionPolicy;
+}
+
 export interface SetRetentionPolicyRequest {
   max_age_hours: number;
   policy: 'old-messages' | 'inactive-channels';
@@ -19161,7 +19260,8 @@ export interface SubmitActionRequest {
    */
   unban?: UnbanActionRequestPayload;
   /**
-   * Deprecated: use restore instead — it now also reverses a block or shadow block. Configuration for unblock action.
+   * @deprecated
+   * Deprecated: Use restore instead, which now also reverses a block or shadow block. Configuration for unblock action.
    */
   unblock?: UnblockActionRequestPayload;
   /**
@@ -20019,6 +20119,7 @@ export interface UnbanRequest {
    */
   unbanned_by_id?: string;
   /**
+   * @deprecated
    * User request object
    */
   unbanned_by?: UserRequest;
@@ -20804,6 +20905,9 @@ export interface UpdateChannelTypeRequest {
   partition_size?: number;
   partition_ttl?: string;
   polls?: boolean;
+  /**
+   * Sets the push notification level for a channel type
+   */
   push_level?: 'all' | 'all_mentions' | 'mentions' | 'direct_mentions' | 'none';
   push_notifications?: boolean;
   quotes?: boolean;
@@ -20841,6 +20945,9 @@ export interface UpdateChannelTypeResponse {
   created_at: Date;
   custom_events: boolean;
   delivery_events: boolean;
+  /**
+   * Duration of the request in milliseconds
+   */
   duration: string;
   mark_messages_pending: boolean;
   max_message_length: number;
@@ -20869,6 +20976,9 @@ export interface UpdateChannelTypeResponse {
   blocklist_behavior?: 'flag' | 'block' | 'shadow_block';
   partition_size?: number;
   partition_ttl?: string;
+  /**
+   * Sets the push notification level for a channel type
+   */
   push_level?: 'all' | 'all_mentions' | 'mentions' | 'direct_mentions' | 'none';
   allowed_flag_reasons?: Array<string>;
   blocklists?: Array<BlockListOptions>;
@@ -21513,6 +21623,7 @@ export interface UpdateQueueRequest {
 }
 
 export interface UpdateReminderRequest {
+  expires_at?: Date;
   remind_at?: Date;
   user_id?: string;
   /**
@@ -21707,7 +21818,7 @@ export interface UpdateUsersResponse {
   duration: string;
   /**
    * @deprecated
-   * Deprecated: always empty. Removing a user from a team no longer deletes their memberships in that team's channels, so there is no task to poll
+   * Deprecated: Always empty. Removing a user from a team no longer deletes their memberships in that team's channels, so there is no task to poll.
    */
   membership_deletion_task_id: string;
   /**
@@ -22222,6 +22333,11 @@ export interface UserBannedEvent {
   created_by?: UserResponseCommonFields;
 }
 
+export interface UserChannelCountRuleParameters {
+  threshold?: number;
+  time_window?: string;
+}
+
 export interface UserCreatedWithinParameters {
   max_age?: string;
 }
diff --git a/src/gen/moderation/ModerationApi.ts b/src/gen/moderation/ModerationApi.ts
index 84f20d2..acb3a3e 100644
--- a/src/gen/moderation/ModerationApi.ts
+++ b/src/gen/moderation/ModerationApi.ts
@@ -106,13 +106,16 @@ export class ModerationApi {
       user_id: request?.user_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetActionConfigResponse>
-    >('GET', '/api/v2/moderation/action_config', undefined, queryParams);
+    const response = await this.apiClient.sendRequest<GetActionConfigResponse>(
+      'GET',
+      '/api/v2/moderation/action_config',
+      undefined,
+      queryParams,
+    );
 
-    decoders['GetActionConfigResponse']?.(response.body);
+    decoders['GetActionConfigResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async upsertActionConfig(
@@ -131,20 +134,18 @@ export class ModerationApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpsertActionConfigResponse>
-    >(
-      'POST',
-      '/api/v2/moderation/action_config',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpsertActionConfigResponse>(
+        'POST',
+        '/api/v2/moderation/action_config',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['UpsertActionConfigResponse']?.(response.body);
+    decoders['UpsertActionConfigResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async bulkUpsertActionConfig(
@@ -156,20 +157,18 @@ export class ModerationApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<BulkUpsertActionConfigResponse>
-    >(
-      'POST',
-      '/api/v2/moderation/action_config/bulk',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<BulkUpsertActionConfigResponse>(
+        'POST',
+        '/api/v2/moderation/action_config/bulk',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['BulkUpsertActionConfigResponse']?.(response.body);
+    decoders['BulkUpsertActionConfigResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async bulkDeleteActionConfig(
@@ -181,20 +180,18 @@ export class ModerationApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<BulkDeleteActionConfigResponse>
-    >(
-      'POST',
-      '/api/v2/moderation/action_config/bulk_delete',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<BulkDeleteActionConfigResponse>(
+        'POST',
+        '/api/v2/moderation/action_config/bulk_delete',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['BulkDeleteActionConfigResponse']?.(response.body);
+    decoders['BulkDeleteActionConfigResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteActionConfig(request: {
@@ -208,18 +205,17 @@ export class ModerationApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteActionConfigResponse>
-    >(
-      'DELETE',
-      '/api/v2/moderation/action_config/{id}',
-      pathParams,
-      queryParams,
-    );
+    const response =
+      await this.apiClient.sendRequest<DeleteActionConfigResponse>(
+        'DELETE',
+        '/api/v2/moderation/action_config/{id}',
+        pathParams,
+        queryParams,
+      );
 
-    decoders['DeleteActionConfigResponse']?.(response.body);
+    decoders['DeleteActionConfigResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async insertActionLog(
@@ -236,20 +232,17 @@ export class ModerationApi {
       custom: request?.custom,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<InsertActionLogResponse>
-    >(
+    const response = await this.apiClient.sendRequest<InsertActionLogResponse>(
       'POST',
       '/api/v2/moderation/action_logs',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['InsertActionLogResponse']?.(response.body);
+    decoders['InsertActionLogResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async analyze(
@@ -270,20 +263,17 @@ export class ModerationApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<AnalyzeResponse>
-    >(
+    const response = await this.apiClient.sendRequest<AnalyzeResponse>(
       'POST',
       '/api/v2/moderation/analyze',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['AnalyzeResponse']?.(response.body);
+    decoders['AnalyzeResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async appeal(
@@ -300,20 +290,17 @@ export class ModerationApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<AppealResponse>
-    >(
+    const response = await this.apiClient.sendRequest<AppealResponse>(
       'POST',
       '/api/v2/moderation/appeal',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['AppealResponse']?.(response.body);
+    decoders['AppealResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getAppeal(request: {
@@ -323,13 +310,16 @@ export class ModerationApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetAppealResponse>
-    >('GET', '/api/v2/moderation/appeal/{id}', pathParams, undefined);
+    const response = await this.apiClient.sendRequest<GetAppealResponse>(
+      'GET',
+      '/api/v2/moderation/appeal/{id}',
+      pathParams,
+      undefined,
+    );
 
-    decoders['GetAppealResponse']?.(response.body);
+    decoders['GetAppealResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryAppeals(
@@ -345,20 +335,17 @@ export class ModerationApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryAppealsResponse>
-    >(
+    const response = await this.apiClient.sendRequest<QueryAppealsResponse>(
       'POST',
       '/api/v2/moderation/appeals',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['QueryAppealsResponse']?.(response.body);
+    decoders['QueryAppealsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async bulkActionAppeals(
@@ -376,20 +363,18 @@ export class ModerationApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<BulkActionAppealsResponse>
-    >(
-      'POST',
-      '/api/v2/moderation/appeals/bulk_action',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<BulkActionAppealsResponse>(
+        'POST',
+        '/api/v2/moderation/appeals/bulk_action',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['BulkActionAppealsResponse']?.(response.body);
+    decoders['BulkActionAppealsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async ban(
@@ -407,20 +392,17 @@ export class ModerationApi {
       banned_by: request?.banned_by,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ModerationBanResponse>
-    >(
+    const response = await this.apiClient.sendRequest<ModerationBanResponse>(
       'POST',
       '/api/v2/moderation/ban',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['ModerationBanResponse']?.(response.body);
+    decoders['ModerationBanResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async bulkImageModeration(
@@ -430,20 +412,18 @@ export class ModerationApi {
       csv_file: request?.csv_file,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<BulkImageModerationResponse>
-    >(
-      'POST',
-      '/api/v2/moderation/bulk_image_moderation',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<BulkImageModerationResponse>(
+        'POST',
+        '/api/v2/moderation/bulk_image_moderation',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['BulkImageModerationResponse']?.(response.body);
+    decoders['BulkImageModerationResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async bypass(
@@ -454,20 +434,17 @@ export class ModerationApi {
       target_user_id: request?.target_user_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<BypassResponse>
-    >(
+    const response = await this.apiClient.sendRequest<BypassResponse>(
       'POST',
       '/api/v2/moderation/bypass',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['BypassResponse']?.(response.body);
+    decoders['BypassResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async check(request: CheckRequest): Promise<StreamResponse<CheckResponse>> {
@@ -487,20 +464,17 @@ export class ModerationApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CheckResponse>
-    >(
+    const response = await this.apiClient.sendRequest<CheckResponse>(
       'POST',
       '/api/v2/moderation/check',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['CheckResponse']?.(response.body);
+    decoders['CheckResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async checkS3Access(
@@ -510,20 +484,17 @@ export class ModerationApi {
       s3_url: request?.s3_url,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CheckS3AccessResponse>
-    >(
+    const response = await this.apiClient.sendRequest<CheckS3AccessResponse>(
       'POST',
       '/api/v2/moderation/check_s3_access',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['CheckS3AccessResponse']?.(response.body);
+    decoders['CheckS3AccessResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async upsertConfig(
@@ -554,20 +525,17 @@ export class ModerationApi {
       video_call_rule_config: request?.video_call_rule_config,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpsertConfigResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UpsertConfigResponse>(
       'POST',
       '/api/v2/moderation/config',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UpsertConfigResponse']?.(response.body);
+    decoders['UpsertConfigResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteConfig(request: {
@@ -583,13 +551,17 @@ export class ModerationApi {
       key: request?.key,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteModerationConfigResponse>
-    >('DELETE', '/api/v2/moderation/config/{key}', pathParams, queryParams);
+    const response =
+      await this.apiClient.sendRequest<DeleteModerationConfigResponse>(
+        'DELETE',
+        '/api/v2/moderation/config/{key}',
+        pathParams,
+        queryParams,
+      );
 
-    decoders['DeleteModerationConfigResponse']?.(response.body);
+    decoders['DeleteModerationConfigResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getConfig(request: {
@@ -603,13 +575,16 @@ export class ModerationApi {
       key: request?.key,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetConfigResponse>
-    >('GET', '/api/v2/moderation/config/{key}', pathParams, queryParams);
+    const response = await this.apiClient.sendRequest<GetConfigResponse>(
+      'GET',
+      '/api/v2/moderation/config/{key}',
+      pathParams,
+      queryParams,
+    );
 
-    decoders['GetConfigResponse']?.(response.body);
+    decoders['GetConfigResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryModerationConfigs(
@@ -625,20 +600,18 @@ export class ModerationApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryModerationConfigsResponse>
-    >(
-      'POST',
-      '/api/v2/moderation/configs',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<QueryModerationConfigsResponse>(
+        'POST',
+        '/api/v2/moderation/configs',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['QueryModerationConfigsResponse']?.(response.body);
+    decoders['QueryModerationConfigsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async customCheck(
@@ -654,54 +627,49 @@ export class ModerationApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CustomCheckResponse>
-    >(
+    const response = await this.apiClient.sendRequest<CustomCheckResponse>(
       'POST',
       '/api/v2/moderation/custom_check',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['CustomCheckResponse']?.(response.body);
+    decoders['CustomCheckResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async v2DeleteTemplate(): Promise<
     StreamResponse<DeleteModerationTemplateResponse>
   > {
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteModerationTemplateResponse>
-    >(
-      'DELETE',
-      '/api/v2/moderation/feeds_moderation_template',
-      undefined,
-      undefined,
-    );
+    const response =
+      await this.apiClient.sendRequest<DeleteModerationTemplateResponse>(
+        'DELETE',
+        '/api/v2/moderation/feeds_moderation_template',
+        undefined,
+        undefined,
+      );
 
-    decoders['DeleteModerationTemplateResponse']?.(response.body);
+    decoders['DeleteModerationTemplateResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async v2QueryTemplates(): Promise<
     StreamResponse<QueryFeedModerationTemplatesResponse>
   > {
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryFeedModerationTemplatesResponse>
-    >(
-      'GET',
-      '/api/v2/moderation/feeds_moderation_template',
-      undefined,
-      undefined,
-    );
+    const response =
+      await this.apiClient.sendRequest<QueryFeedModerationTemplatesResponse>(
+        'GET',
+        '/api/v2/moderation/feeds_moderation_template',
+        undefined,
+        undefined,
+      );
 
-    decoders['QueryFeedModerationTemplatesResponse']?.(response.body);
+    decoders['QueryFeedModerationTemplatesResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async v2UpsertTemplate(
@@ -712,20 +680,18 @@ export class ModerationApi {
       config: request?.config,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpsertModerationTemplateResponse>
-    >(
-      'POST',
-      '/api/v2/moderation/feeds_moderation_template',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpsertModerationTemplateResponse>(
+        'POST',
+        '/api/v2/moderation/feeds_moderation_template',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['UpsertModerationTemplateResponse']?.(response.body);
+    decoders['UpsertModerationTemplateResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async flag(request: FlagRequest): Promise<StreamResponse<FlagItemResponse>> {
@@ -740,20 +706,17 @@ export class ModerationApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<FlagItemResponse>
-    >(
+    const response = await this.apiClient.sendRequest<FlagItemResponse>(
       'POST',
       '/api/v2/moderation/flag',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['FlagItemResponse']?.(response.body);
+    decoders['FlagItemResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getFlagCount(
@@ -764,20 +727,17 @@ export class ModerationApi {
       entity_type: request?.entity_type,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetFlagCountResponse>
-    >(
+    const response = await this.apiClient.sendRequest<GetFlagCountResponse>(
       'POST',
       '/api/v2/moderation/flag_count',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['GetFlagCountResponse']?.(response.body);
+    decoders['GetFlagCountResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryModerationFlags(
@@ -791,20 +751,18 @@ export class ModerationApi {
       filter: request?.filter,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryModerationFlagsResponse>
-    >(
-      'POST',
-      '/api/v2/moderation/flags',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<QueryModerationFlagsResponse>(
+        'POST',
+        '/api/v2/moderation/flags',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['QueryModerationFlagsResponse']?.(response.body);
+    decoders['QueryModerationFlagsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async labels(
@@ -820,20 +778,17 @@ export class ModerationApi {
       user_id: request?.user_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<LabelsResponse>
-    >(
+    const response = await this.apiClient.sendRequest<LabelsResponse>(
       'POST',
       '/api/v2/moderation/labels',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['LabelsResponse']?.(response.body);
+    decoders['LabelsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryLabelResults(
@@ -849,20 +804,18 @@ export class ModerationApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryLabelResultsResponse>
-    >(
-      'POST',
-      '/api/v2/moderation/labels/results',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<QueryLabelResultsResponse>(
+        'POST',
+        '/api/v2/moderation/labels/results',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['QueryLabelResultsResponse']?.(response.body);
+    decoders['QueryLabelResultsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryModerationLogs(
@@ -878,20 +831,18 @@ export class ModerationApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryModerationLogsResponse>
-    >(
-      'POST',
-      '/api/v2/moderation/logs',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<QueryModerationLogsResponse>(
+        'POST',
+        '/api/v2/moderation/logs',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['QueryModerationLogsResponse']?.(response.body);
+    decoders['QueryModerationLogsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async upsertModerationRule(
@@ -914,20 +865,18 @@ export class ModerationApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpsertModerationRuleResponse>
-    >(
-      'POST',
-      '/api/v2/moderation/moderation_rule',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpsertModerationRuleResponse>(
+        'POST',
+        '/api/v2/moderation/moderation_rule',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['UpsertModerationRuleResponse']?.(response.body);
+    decoders['UpsertModerationRuleResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteModerationRule(request: {
@@ -941,18 +890,17 @@ export class ModerationApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteModerationRuleResponse>
-    >(
-      'DELETE',
-      '/api/v2/moderation/moderation_rule/{id}',
-      pathParams,
-      queryParams,
-    );
+    const response =
+      await this.apiClient.sendRequest<DeleteModerationRuleResponse>(
+        'DELETE',
+        '/api/v2/moderation/moderation_rule/{id}',
+        pathParams,
+        queryParams,
+      );
 
-    decoders['DeleteModerationRuleResponse']?.(response.body);
+    decoders['DeleteModerationRuleResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getModerationRule(request: {
@@ -962,13 +910,17 @@ export class ModerationApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetModerationRuleResponse>
-    >('GET', '/api/v2/moderation/moderation_rule/{id}', pathParams, undefined);
+    const response =
+      await this.apiClient.sendRequest<GetModerationRuleResponse>(
+        'GET',
+        '/api/v2/moderation/moderation_rule/{id}',
+        pathParams,
+        undefined,
+      );
 
-    decoders['GetModerationRuleResponse']?.(response.body);
+    decoders['GetModerationRuleResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryModerationRules(
@@ -984,20 +936,18 @@ export class ModerationApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryModerationRulesResponse>
-    >(
-      'POST',
-      '/api/v2/moderation/moderation_rules',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<QueryModerationRulesResponse>(
+        'POST',
+        '/api/v2/moderation/moderation_rules',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['QueryModerationRulesResponse']?.(response.body);
+    decoders['QueryModerationRulesResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async mute(request: MuteRequest): Promise<StreamResponse<MuteResponse>> {
@@ -1008,20 +958,17 @@ export class ModerationApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<MuteResponse>
-    >(
+    const response = await this.apiClient.sendRequest<MuteResponse>(
       'POST',
       '/api/v2/moderation/mute',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['MuteResponse']?.(response.body);
+    decoders['MuteResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getPolicyTestRun(request: {
@@ -1031,30 +978,32 @@ export class ModerationApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<PolicyTestRunResponse>
-    >(
+    const response = await this.apiClient.sendRequest<PolicyTestRunResponse>(
       'GET',
       '/api/v2/moderation/policy_tests/runs/{id}',
       pathParams,
       undefined,
     );
 
-    decoders['PolicyTestRunResponse']?.(response.body);
+    decoders['PolicyTestRunResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async listPolicyTestSets(): Promise<
     StreamResponse<PolicyTestSetListResponse>
   > {
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<PolicyTestSetListResponse>
-    >('GET', '/api/v2/moderation/policy_tests/sets', undefined, undefined);
+    const response =
+      await this.apiClient.sendRequest<PolicyTestSetListResponse>(
+        'GET',
+        '/api/v2/moderation/policy_tests/sets',
+        undefined,
+        undefined,
+      );
 
-    decoders['PolicyTestSetListResponse']?.(response.body);
+    decoders['PolicyTestSetListResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createPolicyTestSet(
@@ -1069,20 +1018,17 @@ export class ModerationApi {
       seed: request?.seed,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<PolicyTestSetResponse>
-    >(
+    const response = await this.apiClient.sendRequest<PolicyTestSetResponse>(
       'POST',
       '/api/v2/moderation/policy_tests/sets',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['PolicyTestSetResponse']?.(response.body);
+    decoders['PolicyTestSetResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deletePolicyTestSet(request: {
@@ -1092,16 +1038,16 @@ export class ModerationApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'DELETE',
       '/api/v2/moderation/policy_tests/sets/{id}',
       pathParams,
       undefined,
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getPolicyTestSet(request: {
@@ -1111,18 +1057,16 @@ export class ModerationApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<PolicyTestSetResponse>
-    >(
+    const response = await this.apiClient.sendRequest<PolicyTestSetResponse>(
       'GET',
       '/api/v2/moderation/policy_tests/sets/{id}',
       pathParams,
       undefined,
     );
 
-    decoders['PolicyTestSetResponse']?.(response.body);
+    decoders['PolicyTestSetResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async startPolicyTestRun(request: {
@@ -1132,18 +1076,16 @@ export class ModerationApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<PolicyTestRunResponse>
-    >(
+    const response = await this.apiClient.sendRequest<PolicyTestRunResponse>(
       'POST',
       '/api/v2/moderation/policy_tests/sets/{id}/runs',
       pathParams,
       undefined,
     );
 
-    decoders['PolicyTestRunResponse']?.(response.body);
+    decoders['PolicyTestRunResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async listQueues(request?: {
@@ -1153,13 +1095,16 @@ export class ModerationApi {
       user_id: request?.user_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ListQueuesResponse>
-    >('GET', '/api/v2/moderation/queues', undefined, queryParams);
+    const response = await this.apiClient.sendRequest<ListQueuesResponse>(
+      'GET',
+      '/api/v2/moderation/queues',
+      undefined,
+      queryParams,
+    );
 
-    decoders['ListQueuesResponse']?.(response.body);
+    decoders['ListQueuesResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createQueue(
@@ -1175,20 +1120,17 @@ export class ModerationApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueueResponse>
-    >(
+    const response = await this.apiClient.sendRequest<QueueResponse>(
       'POST',
       '/api/v2/moderation/queues',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['QueueResponse']?.(response.body);
+    decoders['QueueResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getQueue(request: {
@@ -1202,13 +1144,16 @@ export class ModerationApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueueResponse>
-    >('GET', '/api/v2/moderation/queues/{id}', pathParams, queryParams);
+    const response = await this.apiClient.sendRequest<QueueResponse>(
+      'GET',
+      '/api/v2/moderation/queues/{id}',
+      pathParams,
+      queryParams,
+    );
 
-    decoders['QueueResponse']?.(response.body);
+    decoders['QueueResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateQueue(
@@ -1226,20 +1171,17 @@ export class ModerationApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueueResponse>
-    >(
+    const response = await this.apiClient.sendRequest<QueueResponse>(
       'PATCH',
       '/api/v2/moderation/queues/{id}',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['QueueResponse']?.(response.body);
+    decoders['QueueResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteQueue(
@@ -1253,20 +1195,17 @@ export class ModerationApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueueResponse>
-    >(
+    const response = await this.apiClient.sendRequest<QueueResponse>(
       'POST',
       '/api/v2/moderation/queues/{id}/delete',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['QueueResponse']?.(response.body);
+    decoders['QueueResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryReviewQueue(
@@ -1287,20 +1226,17 @@ export class ModerationApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryReviewQueueResponse>
-    >(
+    const response = await this.apiClient.sendRequest<QueryReviewQueueResponse>(
       'POST',
       '/api/v2/moderation/review_queue',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['QueryReviewQueueResponse']?.(response.body);
+    decoders['QueryReviewQueueResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getReviewQueueItem(request: {
@@ -1310,23 +1246,30 @@ export class ModerationApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetReviewQueueItemResponse>
-    >('GET', '/api/v2/moderation/review_queue/{id}', pathParams, undefined);
+    const response =
+      await this.apiClient.sendRequest<GetReviewQueueItemResponse>(
+        'GET',
+        '/api/v2/moderation/review_queue/{id}',
+        pathParams,
+        undefined,
+      );
 
-    decoders['GetReviewQueueItemResponse']?.(response.body);
+    decoders['GetReviewQueueItemResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getSetupSession(): Promise<StreamResponse<GetSetupSessionResponse>> {
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetSetupSessionResponse>
-    >('GET', '/api/v2/moderation/setup', undefined, undefined);
+    const response = await this.apiClient.sendRequest<GetSetupSessionResponse>(
+      'GET',
+      '/api/v2/moderation/setup',
+      undefined,
+      undefined,
+    );
 
-    decoders['GetSetupSessionResponse']?.(response.body);
+    decoders['GetSetupSessionResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async upsertSetupSession(
@@ -1338,20 +1281,18 @@ export class ModerationApi {
       setup_data: request?.setup_data,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpsertSetupSessionResponse>
-    >(
-      'POST',
-      '/api/v2/moderation/setup',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpsertSetupSessionResponse>(
+        'POST',
+        '/api/v2/moderation/setup',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['UpsertSetupSessionResponse']?.(response.body);
+    decoders['UpsertSetupSessionResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async submitAction(
@@ -1383,20 +1324,17 @@ export class ModerationApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<SubmitActionResponse>
-    >(
+    const response = await this.apiClient.sendRequest<SubmitActionResponse>(
       'POST',
       '/api/v2/moderation/submit_action',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['SubmitActionResponse']?.(response.body);
+    decoders['SubmitActionResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async submitModerationFeedback(
@@ -1414,20 +1352,18 @@ export class ModerationApi {
       expected_labels: request?.expected_labels,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<SubmitModerationFeedbackResponse>
-    >(
-      'POST',
-      '/api/v2/moderation/submit_moderation_feedback',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<SubmitModerationFeedbackResponse>(
+        'POST',
+        '/api/v2/moderation/submit_moderation_feedback',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['SubmitModerationFeedbackResponse']?.(response.body);
+    decoders['SubmitModerationFeedbackResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async unban(
@@ -1447,20 +1383,17 @@ export class ModerationApi {
       unbanned_by: request?.unbanned_by,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UnbanResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UnbanResponse>(
       'POST',
       '/api/v2/moderation/unban',
       undefined,
       queryParams,
       body,
-      'application/json',
     );
 
-    decoders['UnbanResponse']?.(response.body);
+    decoders['UnbanResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async unmute(
@@ -1472,19 +1405,16 @@ export class ModerationApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UnmuteResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UnmuteResponse>(
       'POST',
       '/api/v2/moderation/unmute',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UnmuteResponse']?.(response.body);
+    decoders['UnmuteResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 }
diff --git a/src/gen/video/VideoApi.ts b/src/gen/video/VideoApi.ts
index c6d10c0..447e18c 100644
--- a/src/gen/video/VideoApi.ts
+++ b/src/gen/video/VideoApi.ts
@@ -121,13 +121,17 @@ export class VideoApi {
   async getActiveCallsStatus(): Promise<
     StreamResponse<GetActiveCallsStatusResponse>
   > {
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetActiveCallsStatusResponse>
-    >('GET', '/api/v2/video/active_calls_status', undefined, undefined);
+    const response =
+      await this.apiClient.sendRequest<GetActiveCallsStatusResponse>(
+        'GET',
+        '/api/v2/video/active_calls_status',
+        undefined,
+        undefined,
+      );
 
-    decoders['GetActiveCallsStatusResponse']?.(response.body);
+    decoders['GetActiveCallsStatusResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryUserFeedback(
@@ -144,20 +148,18 @@ export class VideoApi {
       filter_conditions: request?.filter_conditions,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryUserFeedbackResponse>
-    >(
-      'POST',
-      '/api/v2/video/call/feedback',
-      undefined,
-      queryParams,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<QueryUserFeedbackResponse>(
+        'POST',
+        '/api/v2/video/call/feedback',
+        undefined,
+        queryParams,
+        body,
+      );
 
-    decoders['QueryUserFeedbackResponse']?.(response.body);
+    decoders['QueryUserFeedbackResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryCallMembers(
@@ -173,20 +175,17 @@ export class VideoApi {
       filter_conditions: request?.filter_conditions,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryCallMembersResponse>
-    >(
+    const response = await this.apiClient.sendRequest<QueryCallMembersResponse>(
       'POST',
       '/api/v2/video/call/members',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['QueryCallMembersResponse']?.(response.body);
+    decoders['QueryCallMembersResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryCallStats(
@@ -200,20 +199,17 @@ export class VideoApi {
       filter_conditions: request?.filter_conditions,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryCallStatsResponse>
-    >(
+    const response = await this.apiClient.sendRequest<QueryCallStatsResponse>(
       'POST',
       '/api/v2/video/call/stats',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['QueryCallStatsResponse']?.(response.body);
+    decoders['QueryCallStatsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getCall(request: {
@@ -235,13 +231,16 @@ export class VideoApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetCallResponse>
-    >('GET', '/api/v2/video/call/{type}/{id}', pathParams, queryParams);
+    const response = await this.apiClient.sendRequest<GetCallResponse>(
+      'GET',
+      '/api/v2/video/call/{type}/{id}',
+      pathParams,
+      queryParams,
+    );
 
-    decoders['GetCallResponse']?.(response.body);
+    decoders['GetCallResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateCall(
@@ -257,20 +256,17 @@ export class VideoApi {
       settings_override: request?.settings_override,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateCallResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UpdateCallResponse>(
       'PATCH',
       '/api/v2/video/call/{type}/{id}',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UpdateCallResponse']?.(response.body);
+    decoders['UpdateCallResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getOrCreateCall(
@@ -288,20 +284,17 @@ export class VideoApi {
       data: request?.data,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetOrCreateCallResponse>
-    >(
+    const response = await this.apiClient.sendRequest<GetOrCreateCallResponse>(
       'POST',
       '/api/v2/video/call/{type}/{id}',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['GetOrCreateCallResponse']?.(response.body);
+    decoders['GetOrCreateCallResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async blockUser(
@@ -315,20 +308,17 @@ export class VideoApi {
       user_id: request?.user_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<BlockUserResponse>
-    >(
+    const response = await this.apiClient.sendRequest<BlockUserResponse>(
       'POST',
       '/api/v2/video/call/{type}/{id}/block',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['BlockUserResponse']?.(response.body);
+    decoders['BlockUserResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async sendClosedCaption(
@@ -350,20 +340,18 @@ export class VideoApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<SendClosedCaptionResponse>
-    >(
-      'POST',
-      '/api/v2/video/call/{type}/{id}/closed_captions',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<SendClosedCaptionResponse>(
+        'POST',
+        '/api/v2/video/call/{type}/{id}/closed_captions',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['SendClosedCaptionResponse']?.(response.body);
+    decoders['SendClosedCaptionResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteCall(
@@ -377,20 +365,17 @@ export class VideoApi {
       hard: request?.hard,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteCallResponse>
-    >(
+    const response = await this.apiClient.sendRequest<DeleteCallResponse>(
       'POST',
       '/api/v2/video/call/{type}/{id}/delete',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['DeleteCallResponse']?.(response.body);
+    decoders['DeleteCallResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async sendCallEvent(
@@ -406,20 +391,17 @@ export class VideoApi {
       user: request?.user,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<SendCallEventResponse>
-    >(
+    const response = await this.apiClient.sendRequest<SendCallEventResponse>(
       'POST',
       '/api/v2/video/call/{type}/{id}/event',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['SendCallEventResponse']?.(response.body);
+    decoders['SendCallEventResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async collectUserFeedback(
@@ -438,20 +420,18 @@ export class VideoApi {
       custom: request?.custom,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CollectUserFeedbackResponse>
-    >(
-      'POST',
-      '/api/v2/video/call/{type}/{id}/feedback',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<CollectUserFeedbackResponse>(
+        'POST',
+        '/api/v2/video/call/{type}/{id}/feedback',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['CollectUserFeedbackResponse']?.(response.body);
+    decoders['CollectUserFeedbackResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async goLive(
@@ -473,20 +453,17 @@ export class VideoApi {
       transcription_storage_name: request?.transcription_storage_name,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GoLiveResponse>
-    >(
+    const response = await this.apiClient.sendRequest<GoLiveResponse>(
       'POST',
       '/api/v2/video/call/{type}/{id}/go_live',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['GoLiveResponse']?.(response.body);
+    decoders['GoLiveResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async kickUser(
@@ -503,20 +480,17 @@ export class VideoApi {
       kicked_by: request?.kicked_by,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<KickUserResponse>
-    >(
+    const response = await this.apiClient.sendRequest<KickUserResponse>(
       'POST',
       '/api/v2/video/call/{type}/{id}/kick',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['KickUserResponse']?.(response.body);
+    decoders['KickUserResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async endCall(request: {
@@ -528,18 +502,16 @@ export class VideoApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<EndCallResponse>
-    >(
+    const response = await this.apiClient.sendRequest<EndCallResponse>(
       'POST',
       '/api/v2/video/call/{type}/{id}/mark_ended',
       pathParams,
       undefined,
     );
 
-    decoders['EndCallResponse']?.(response.body);
+    decoders['EndCallResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateCallMembers(
@@ -554,20 +526,18 @@ export class VideoApi {
       update_members: request?.update_members,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateCallMembersResponse>
-    >(
-      'POST',
-      '/api/v2/video/call/{type}/{id}/members',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpdateCallMembersResponse>(
+        'POST',
+        '/api/v2/video/call/{type}/{id}/members',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['UpdateCallMembersResponse']?.(response.body);
+    decoders['UpdateCallMembersResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async muteUsers(
@@ -588,20 +558,17 @@ export class VideoApi {
       muted_by: request?.muted_by,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<MuteUsersResponse>
-    >(
+    const response = await this.apiClient.sendRequest<MuteUsersResponse>(
       'POST',
       '/api/v2/video/call/{type}/{id}/mute_users',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['MuteUsersResponse']?.(response.body);
+    decoders['MuteUsersResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryCallParticipants(
@@ -622,20 +589,18 @@ export class VideoApi {
       filter_conditions: request?.filter_conditions,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryCallParticipantsResponse>
-    >(
-      'POST',
-      '/api/v2/video/call/{type}/{id}/participants',
-      pathParams,
-      queryParams,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<QueryCallParticipantsResponse>(
+        'POST',
+        '/api/v2/video/call/{type}/{id}/participants',
+        pathParams,
+        queryParams,
+        body,
+      );
 
-    decoders['QueryCallParticipantsResponse']?.(response.body);
+    decoders['QueryCallParticipantsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async videoPin(
@@ -650,20 +615,17 @@ export class VideoApi {
       user_id: request?.user_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<PinResponse>
-    >(
+    const response = await this.apiClient.sendRequest<PinResponse>(
       'POST',
       '/api/v2/video/call/{type}/{id}/pin',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['PinResponse']?.(response.body);
+    decoders['PinResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async listRecordings(request: {
@@ -675,18 +637,16 @@ export class VideoApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ListRecordingsResponse>
-    >(
+    const response = await this.apiClient.sendRequest<ListRecordingsResponse>(
       'GET',
       '/api/v2/video/call/{type}/{id}/recordings',
       pathParams,
       undefined,
     );
 
-    decoders['ListRecordingsResponse']?.(response.body);
+    decoders['ListRecordingsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async startRecording(
@@ -705,20 +665,17 @@ export class VideoApi {
       recording_external_storage: request?.recording_external_storage,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<StartRecordingResponse>
-    >(
+    const response = await this.apiClient.sendRequest<StartRecordingResponse>(
       'POST',
       '/api/v2/video/call/{type}/{id}/recordings/{recording_type}/start',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['StartRecordingResponse']?.(response.body);
+    decoders['StartRecordingResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async stopRecording(
@@ -735,20 +692,17 @@ export class VideoApi {
     };
     const body = {};
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<StopRecordingResponse>
-    >(
+    const response = await this.apiClient.sendRequest<StopRecordingResponse>(
       'POST',
       '/api/v2/video/call/{type}/{id}/recordings/{recording_type}/stop',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['StopRecordingResponse']?.(response.body);
+    decoders['StopRecordingResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getCallReport(request: {
@@ -764,13 +718,16 @@ export class VideoApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetCallReportResponse>
-    >('GET', '/api/v2/video/call/{type}/{id}/report', pathParams, queryParams);
+    const response = await this.apiClient.sendRequest<GetCallReportResponse>(
+      'GET',
+      '/api/v2/video/call/{type}/{id}/report',
+      pathParams,
+      queryParams,
+    );
 
-    decoders['GetCallReportResponse']?.(response.body);
+    decoders['GetCallReportResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async ringCall(
@@ -786,20 +743,17 @@ export class VideoApi {
       custom: request?.custom,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<RingCallResponse>
-    >(
+    const response = await this.apiClient.sendRequest<RingCallResponse>(
       'POST',
       '/api/v2/video/call/{type}/{id}/ring',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['RingCallResponse']?.(response.body);
+    decoders['RingCallResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async startRTMPBroadcasts(
@@ -813,20 +767,18 @@ export class VideoApi {
       broadcasts: request?.broadcasts,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<StartRTMPBroadcastsResponse>
-    >(
-      'POST',
-      '/api/v2/video/call/{type}/{id}/rtmp_broadcasts',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<StartRTMPBroadcastsResponse>(
+        'POST',
+        '/api/v2/video/call/{type}/{id}/rtmp_broadcasts',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['StartRTMPBroadcastsResponse']?.(response.body);
+    decoders['StartRTMPBroadcastsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async stopAllRTMPBroadcasts(request: {
@@ -838,18 +790,17 @@ export class VideoApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<StopAllRTMPBroadcastsResponse>
-    >(
-      'POST',
-      '/api/v2/video/call/{type}/{id}/rtmp_broadcasts/stop',
-      pathParams,
-      undefined,
-    );
+    const response =
+      await this.apiClient.sendRequest<StopAllRTMPBroadcastsResponse>(
+        'POST',
+        '/api/v2/video/call/{type}/{id}/rtmp_broadcasts/stop',
+        pathParams,
+        undefined,
+      );
 
-    decoders['StopAllRTMPBroadcastsResponse']?.(response.body);
+    decoders['StopAllRTMPBroadcastsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async stopRTMPBroadcast(
@@ -866,20 +817,18 @@ export class VideoApi {
     };
     const body = {};
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<StopRTMPBroadcastsResponse>
-    >(
-      'POST',
-      '/api/v2/video/call/{type}/{id}/rtmp_broadcasts/{name}/stop',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<StopRTMPBroadcastsResponse>(
+        'POST',
+        '/api/v2/video/call/{type}/{id}/rtmp_broadcasts/{name}/stop',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['StopRTMPBroadcastsResponse']?.(response.body);
+    decoders['StopRTMPBroadcastsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getCallParticipantSessionMetrics(request: {
@@ -903,18 +852,17 @@ export class VideoApi {
       user_session: request?.user_session,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetCallParticipantSessionMetricsResponse>
-    >(
-      'GET',
-      '/api/v2/video/call/{type}/{id}/session/{session}/participant/{user}/{user_session}/details/track',
-      pathParams,
-      queryParams,
-    );
+    const response =
+      await this.apiClient.sendRequest<GetCallParticipantSessionMetricsResponse>(
+        'GET',
+        '/api/v2/video/call/{type}/{id}/session/{session}/participant/{user}/{user_session}/details/track',
+        pathParams,
+        queryParams,
+      );
 
-    decoders['GetCallParticipantSessionMetricsResponse']?.(response.body);
+    decoders['GetCallParticipantSessionMetricsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryCallParticipantSessions(request: {
@@ -938,18 +886,17 @@ export class VideoApi {
       session: request?.session,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryCallParticipantSessionsResponse>
-    >(
-      'GET',
-      '/api/v2/video/call/{type}/{id}/session/{session}/participant_sessions',
-      pathParams,
-      queryParams,
-    );
+    const response =
+      await this.apiClient.sendRequest<QueryCallParticipantSessionsResponse>(
+        'GET',
+        '/api/v2/video/call/{type}/{id}/session/{session}/participant_sessions',
+        pathParams,
+        queryParams,
+      );
 
-    decoders['QueryCallParticipantSessionsResponse']?.(response.body);
+    decoders['QueryCallParticipantSessionsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async startHLSBroadcasting(request: {
@@ -961,18 +908,17 @@ export class VideoApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<StartHLSBroadcastingResponse>
-    >(
-      'POST',
-      '/api/v2/video/call/{type}/{id}/start_broadcasting',
-      pathParams,
-      undefined,
-    );
+    const response =
+      await this.apiClient.sendRequest<StartHLSBroadcastingResponse>(
+        'POST',
+        '/api/v2/video/call/{type}/{id}/start_broadcasting',
+        pathParams,
+        undefined,
+      );
 
-    decoders['StartHLSBroadcastingResponse']?.(response.body);
+    decoders['StartHLSBroadcastingResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async startClosedCaptions(
@@ -989,20 +935,18 @@ export class VideoApi {
       speech_segment_config: request?.speech_segment_config,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<StartClosedCaptionsResponse>
-    >(
-      'POST',
-      '/api/v2/video/call/{type}/{id}/start_closed_captions',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<StartClosedCaptionsResponse>(
+        'POST',
+        '/api/v2/video/call/{type}/{id}/start_closed_captions',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['StartClosedCaptionsResponse']?.(response.body);
+    decoders['StartClosedCaptionsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async startFrameRecording(
@@ -1016,20 +960,18 @@ export class VideoApi {
       recording_external_storage: request?.recording_external_storage,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<StartFrameRecordingResponse>
-    >(
-      'POST',
-      '/api/v2/video/call/{type}/{id}/start_frame_recording',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<StartFrameRecordingResponse>(
+        'POST',
+        '/api/v2/video/call/{type}/{id}/start_frame_recording',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['StartFrameRecordingResponse']?.(response.body);
+    decoders['StartFrameRecordingResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async startTranscription(
@@ -1045,20 +987,18 @@ export class VideoApi {
       transcription_external_storage: request?.transcription_external_storage,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<StartTranscriptionResponse>
-    >(
-      'POST',
-      '/api/v2/video/call/{type}/{id}/start_transcription',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<StartTranscriptionResponse>(
+        'POST',
+        '/api/v2/video/call/{type}/{id}/start_transcription',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['StartTranscriptionResponse']?.(response.body);
+    decoders['StartTranscriptionResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async stopHLSBroadcasting(request: {
@@ -1070,18 +1010,17 @@ export class VideoApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<StopHLSBroadcastingResponse>
-    >(
-      'POST',
-      '/api/v2/video/call/{type}/{id}/stop_broadcasting',
-      pathParams,
-      undefined,
-    );
+    const response =
+      await this.apiClient.sendRequest<StopHLSBroadcastingResponse>(
+        'POST',
+        '/api/v2/video/call/{type}/{id}/stop_broadcasting',
+        pathParams,
+        undefined,
+      );
 
-    decoders['StopHLSBroadcastingResponse']?.(response.body);
+    decoders['StopHLSBroadcastingResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async stopClosedCaptions(
@@ -1095,20 +1034,18 @@ export class VideoApi {
       stop_transcription: request?.stop_transcription,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<StopClosedCaptionsResponse>
-    >(
-      'POST',
-      '/api/v2/video/call/{type}/{id}/stop_closed_captions',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<StopClosedCaptionsResponse>(
+        'POST',
+        '/api/v2/video/call/{type}/{id}/stop_closed_captions',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['StopClosedCaptionsResponse']?.(response.body);
+    decoders['StopClosedCaptionsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async stopFrameRecording(request: {
@@ -1120,18 +1057,17 @@ export class VideoApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<StopFrameRecordingResponse>
-    >(
-      'POST',
-      '/api/v2/video/call/{type}/{id}/stop_frame_recording',
-      pathParams,
-      undefined,
-    );
+    const response =
+      await this.apiClient.sendRequest<StopFrameRecordingResponse>(
+        'POST',
+        '/api/v2/video/call/{type}/{id}/stop_frame_recording',
+        pathParams,
+        undefined,
+      );
 
-    decoders['StopFrameRecordingResponse']?.(response.body);
+    decoders['StopFrameRecordingResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async stopLive(
@@ -1152,20 +1088,17 @@ export class VideoApi {
       continue_transcription: request?.continue_transcription,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<StopLiveResponse>
-    >(
+    const response = await this.apiClient.sendRequest<StopLiveResponse>(
       'POST',
       '/api/v2/video/call/{type}/{id}/stop_live',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['StopLiveResponse']?.(response.body);
+    decoders['StopLiveResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async stopTranscription(
@@ -1179,20 +1112,18 @@ export class VideoApi {
       stop_closed_captions: request?.stop_closed_captions,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<StopTranscriptionResponse>
-    >(
-      'POST',
-      '/api/v2/video/call/{type}/{id}/stop_transcription',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<StopTranscriptionResponse>(
+        'POST',
+        '/api/v2/video/call/{type}/{id}/stop_transcription',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['StopTranscriptionResponse']?.(response.body);
+    decoders['StopTranscriptionResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async listTranscriptions(request: {
@@ -1204,18 +1135,17 @@ export class VideoApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ListTranscriptionsResponse>
-    >(
-      'GET',
-      '/api/v2/video/call/{type}/{id}/transcriptions',
-      pathParams,
-      undefined,
-    );
+    const response =
+      await this.apiClient.sendRequest<ListTranscriptionsResponse>(
+        'GET',
+        '/api/v2/video/call/{type}/{id}/transcriptions',
+        pathParams,
+        undefined,
+      );
 
-    decoders['ListTranscriptionsResponse']?.(response.body);
+    decoders['ListTranscriptionsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async unblockUser(
@@ -1229,20 +1159,17 @@ export class VideoApi {
       user_id: request?.user_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UnblockUserResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UnblockUserResponse>(
       'POST',
       '/api/v2/video/call/{type}/{id}/unblock',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UnblockUserResponse']?.(response.body);
+    decoders['UnblockUserResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async videoUnpin(
@@ -1257,20 +1184,17 @@ export class VideoApi {
       user_id: request?.user_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UnpinResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UnpinResponse>(
       'POST',
       '/api/v2/video/call/{type}/{id}/unpin',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UnpinResponse']?.(response.body);
+    decoders['UnpinResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateUserPermissions(
@@ -1286,20 +1210,18 @@ export class VideoApi {
       revoke_permissions: request?.revoke_permissions,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateUserPermissionsResponse>
-    >(
-      'POST',
-      '/api/v2/video/call/{type}/{id}/user_permissions',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpdateUserPermissionsResponse>(
+        'POST',
+        '/api/v2/video/call/{type}/{id}/user_permissions',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['UpdateUserPermissionsResponse']?.(response.body);
+    decoders['UpdateUserPermissionsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteRecording(request: {
@@ -1315,18 +1237,16 @@ export class VideoApi {
       filename: request?.filename,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteRecordingResponse>
-    >(
+    const response = await this.apiClient.sendRequest<DeleteRecordingResponse>(
       'DELETE',
       '/api/v2/video/call/{type}/{id}/{session}/recordings/{filename}',
       pathParams,
       undefined,
     );
 
-    decoders['DeleteRecordingResponse']?.(response.body);
+    decoders['DeleteRecordingResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteTranscription(request: {
@@ -1342,18 +1262,17 @@ export class VideoApi {
       filename: request?.filename,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteTranscriptionResponse>
-    >(
-      'DELETE',
-      '/api/v2/video/call/{type}/{id}/{session}/transcriptions/{filename}',
-      pathParams,
-      undefined,
-    );
+    const response =
+      await this.apiClient.sendRequest<DeleteTranscriptionResponse>(
+        'DELETE',
+        '/api/v2/video/call/{type}/{id}/{session}/transcriptions/{filename}',
+        pathParams,
+        undefined,
+      );
 
-    decoders['DeleteTranscriptionResponse']?.(response.body);
+    decoders['DeleteTranscriptionResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async reportClientCallEvent(
@@ -1363,20 +1282,18 @@ export class VideoApi {
       events: request?.events,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ReportClientEventResponse>
-    >(
-      'POST',
-      '/api/v2/video/call_client_event',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<ReportClientEventResponse>(
+        'POST',
+        '/api/v2/video/call_client_event',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['ReportClientEventResponse']?.(response.body);
+    decoders['ReportClientEventResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryCallSessionStats(
@@ -1390,20 +1307,18 @@ export class VideoApi {
       filter_conditions: request?.filter_conditions,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryCallSessionStatsResponse>
-    >(
-      'POST',
-      '/api/v2/video/call_stats',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<QueryCallSessionStatsResponse>(
+        'POST',
+        '/api/v2/video/call_stats',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['QueryCallSessionStatsResponse']?.(response.body);
+    decoders['QueryCallSessionStatsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getCallStatsMap(request: {
@@ -1429,18 +1344,17 @@ export class VideoApi {
       session: request?.session,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryCallStatsMapResponse>
-    >(
-      'GET',
-      '/api/v2/video/call_stats/{call_type}/{call_id}/{session}/map',
-      pathParams,
-      queryParams,
-    );
+    const response =
+      await this.apiClient.sendRequest<QueryCallStatsMapResponse>(
+        'GET',
+        '/api/v2/video/call_stats/{call_type}/{call_id}/{session}/map',
+        pathParams,
+        queryParams,
+      );
 
-    decoders['QueryCallStatsMapResponse']?.(response.body);
+    decoders['QueryCallStatsMapResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getCallSessionParticipantStatsDetails(request: {
@@ -1466,18 +1380,17 @@ export class VideoApi {
       user_session: request?.user_session,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetCallSessionParticipantStatsDetailsResponse>
-    >(
-      'GET',
-      '/api/v2/video/call_stats/{call_type}/{call_id}/{session}/participant/{user}/{user_session}/details',
-      pathParams,
-      queryParams,
-    );
+    const response =
+      await this.apiClient.sendRequest<GetCallSessionParticipantStatsDetailsResponse>(
+        'GET',
+        '/api/v2/video/call_stats/{call_type}/{call_id}/{session}/participant/{user}/{user_session}/details',
+        pathParams,
+        queryParams,
+      );
 
-    decoders['GetCallSessionParticipantStatsDetailsResponse']?.(response.body);
+    decoders['GetCallSessionParticipantStatsDetailsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryCallSessionParticipantStats(request: {
@@ -1503,18 +1416,17 @@ export class VideoApi {
       session: request?.session,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryCallSessionParticipantStatsResponse>
-    >(
-      'GET',
-      '/api/v2/video/call_stats/{call_type}/{call_id}/{session}/participants',
-      pathParams,
-      queryParams,
-    );
+    const response =
+      await this.apiClient.sendRequest<QueryCallSessionParticipantStatsResponse>(
+        'GET',
+        '/api/v2/video/call_stats/{call_type}/{call_id}/{session}/participants',
+        pathParams,
+        queryParams,
+      );
 
-    decoders['QueryCallSessionParticipantStatsResponse']?.(response.body);
+    decoders['QueryCallSessionParticipantStatsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getCallSessionParticipantStatsTimeline(request: {
@@ -1542,20 +1454,17 @@ export class VideoApi {
       user_session: request?.user_session,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryCallSessionParticipantStatsTimelineResponse>
-    >(
-      'GET',
-      '/api/v2/video/call_stats/{call_type}/{call_id}/{session}/participants/{user}/{user_session}/timeline',
-      pathParams,
-      queryParams,
-    );
+    const response =
+      await this.apiClient.sendRequest<QueryCallSessionParticipantStatsTimelineResponse>(
+        'GET',
+        '/api/v2/video/call_stats/{call_type}/{call_id}/{session}/participants/{user}/{user_session}/timeline',
+        pathParams,
+        queryParams,
+      );
 
-    decoders['QueryCallSessionParticipantStatsTimelineResponse']?.(
-      response.body,
-    );
+    decoders['QueryCallSessionParticipantStatsTimelineResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryCalls(
@@ -1569,30 +1478,30 @@ export class VideoApi {
       filter_conditions: request?.filter_conditions,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryCallsResponse>
-    >(
+    const response = await this.apiClient.sendRequest<QueryCallsResponse>(
       'POST',
       '/api/v2/video/calls',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['QueryCallsResponse']?.(response.body);
+    decoders['QueryCallsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async listCallTypes(): Promise<StreamResponse<ListCallTypeResponse>> {
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ListCallTypeResponse>
-    >('GET', '/api/v2/video/calltypes', undefined, undefined);
+    const response = await this.apiClient.sendRequest<ListCallTypeResponse>(
+      'GET',
+      '/api/v2/video/calltypes',
+      undefined,
+      undefined,
+    );
 
-    decoders['ListCallTypeResponse']?.(response.body);
+    decoders['ListCallTypeResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createCallType(
@@ -1606,20 +1515,17 @@ export class VideoApi {
       settings: request?.settings,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CreateCallTypeResponse>
-    >(
+    const response = await this.apiClient.sendRequest<CreateCallTypeResponse>(
       'POST',
       '/api/v2/video/calltypes',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['CreateCallTypeResponse']?.(response.body);
+    decoders['CreateCallTypeResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteCallType(request: {
@@ -1629,16 +1535,16 @@ export class VideoApi {
       name: request?.name,
     };
 
-    const response = await this.apiClient.sendRequest<StreamResponse<Response>>(
+    const response = await this.apiClient.sendRequest<Response>(
       'DELETE',
       '/api/v2/video/calltypes/{name}',
       pathParams,
       undefined,
     );
 
-    decoders['Response']?.(response.body);
+    decoders['Response']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getCallType(request: {
@@ -1648,13 +1554,16 @@ export class VideoApi {
       name: request?.name,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetCallTypeResponse>
-    >('GET', '/api/v2/video/calltypes/{name}', pathParams, undefined);
+    const response = await this.apiClient.sendRequest<GetCallTypeResponse>(
+      'GET',
+      '/api/v2/video/calltypes/{name}',
+      pathParams,
+      undefined,
+    );
 
-    decoders['GetCallTypeResponse']?.(response.body);
+    decoders['GetCallTypeResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateCallType(
@@ -1670,30 +1579,30 @@ export class VideoApi {
       settings: request?.settings,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateCallTypeResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UpdateCallTypeResponse>(
       'PUT',
       '/api/v2/video/calltypes/{name}',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UpdateCallTypeResponse']?.(response.body);
+    decoders['UpdateCallTypeResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getEdges(): Promise<StreamResponse<GetEdgesResponse>> {
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetEdgesResponse>
-    >('GET', '/api/v2/video/edges', undefined, undefined);
+    const response = await this.apiClient.sendRequest<GetEdgesResponse>(
+      'GET',
+      '/api/v2/video/edges',
+      undefined,
+      undefined,
+    );
 
-    decoders['GetEdgesResponse']?.(response.body);
+    decoders['GetEdgesResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async resolveSipAuth(
@@ -1706,32 +1615,33 @@ export class VideoApi {
       source_ip: request?.source_ip,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ResolveSipAuthResponse>
-    >(
+    const response = await this.apiClient.sendRequest<ResolveSipAuthResponse>(
       'POST',
       '/api/v2/video/sip/auth',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['ResolveSipAuthResponse']?.(response.body);
+    decoders['ResolveSipAuthResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async listSIPInboundRoutingRule(): Promise<
     StreamResponse<ListSIPInboundRoutingRuleResponse>
   > {
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ListSIPInboundRoutingRuleResponse>
-    >('GET', '/api/v2/video/sip/inbound_routing_rules', undefined, undefined);
+    const response =
+      await this.apiClient.sendRequest<ListSIPInboundRoutingRuleResponse>(
+        'GET',
+        '/api/v2/video/sip/inbound_routing_rules',
+        undefined,
+        undefined,
+      );
 
-    decoders['ListSIPInboundRoutingRuleResponse']?.(response.body);
+    decoders['ListSIPInboundRoutingRuleResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createSIPInboundRoutingRule(
@@ -1749,20 +1659,18 @@ export class VideoApi {
       pin_routing_configs: request?.pin_routing_configs,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<SIPInboundRoutingRuleResponse>
-    >(
-      'POST',
-      '/api/v2/video/sip/inbound_routing_rules',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<SIPInboundRoutingRuleResponse>(
+        'POST',
+        '/api/v2/video/sip/inbound_routing_rules',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['SIPInboundRoutingRuleResponse']?.(response.body);
+    decoders['SIPInboundRoutingRuleResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteSIPInboundRoutingRule(request: {
@@ -1772,18 +1680,17 @@ export class VideoApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteSIPInboundRoutingRuleResponse>
-    >(
-      'DELETE',
-      '/api/v2/video/sip/inbound_routing_rules/{id}',
-      pathParams,
-      undefined,
-    );
+    const response =
+      await this.apiClient.sendRequest<DeleteSIPInboundRoutingRuleResponse>(
+        'DELETE',
+        '/api/v2/video/sip/inbound_routing_rules/{id}',
+        pathParams,
+        undefined,
+      );
 
-    decoders['DeleteSIPInboundRoutingRuleResponse']?.(response.body);
+    decoders['DeleteSIPInboundRoutingRuleResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateSIPInboundRoutingRule(
@@ -1804,30 +1711,31 @@ export class VideoApi {
       pin_routing_configs: request?.pin_routing_configs,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateSIPInboundRoutingRuleResponse>
-    >(
-      'PUT',
-      '/api/v2/video/sip/inbound_routing_rules/{id}',
-      pathParams,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<UpdateSIPInboundRoutingRuleResponse>(
+        'PUT',
+        '/api/v2/video/sip/inbound_routing_rules/{id}',
+        pathParams,
+        undefined,
+        body,
+      );
 
-    decoders['UpdateSIPInboundRoutingRuleResponse']?.(response.body);
+    decoders['UpdateSIPInboundRoutingRuleResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async listSIPTrunks(): Promise<StreamResponse<ListSIPTrunksResponse>> {
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ListSIPTrunksResponse>
-    >('GET', '/api/v2/video/sip/inbound_trunks', undefined, undefined);
+    const response = await this.apiClient.sendRequest<ListSIPTrunksResponse>(
+      'GET',
+      '/api/v2/video/sip/inbound_trunks',
+      undefined,
+      undefined,
+    );
 
-    decoders['ListSIPTrunksResponse']?.(response.body);
+    decoders['ListSIPTrunksResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async createSIPTrunk(
@@ -1840,20 +1748,17 @@ export class VideoApi {
       allowed_ips: request?.allowed_ips,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<CreateSIPTrunkResponse>
-    >(
+    const response = await this.apiClient.sendRequest<CreateSIPTrunkResponse>(
       'POST',
       '/api/v2/video/sip/inbound_trunks',
       undefined,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['CreateSIPTrunkResponse']?.(response.body);
+    decoders['CreateSIPTrunkResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async deleteSIPTrunk(request: {
@@ -1863,13 +1768,16 @@ export class VideoApi {
       id: request?.id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<DeleteSIPTrunkResponse>
-    >('DELETE', '/api/v2/video/sip/inbound_trunks/{id}', pathParams, undefined);
+    const response = await this.apiClient.sendRequest<DeleteSIPTrunkResponse>(
+      'DELETE',
+      '/api/v2/video/sip/inbound_trunks/{id}',
+      pathParams,
+      undefined,
+    );
 
-    decoders['DeleteSIPTrunkResponse']?.(response.body);
+    decoders['DeleteSIPTrunkResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async updateSIPTrunk(
@@ -1885,20 +1793,17 @@ export class VideoApi {
       allowed_ips: request?.allowed_ips,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<UpdateSIPTrunkResponse>
-    >(
+    const response = await this.apiClient.sendRequest<UpdateSIPTrunkResponse>(
       'PUT',
       '/api/v2/video/sip/inbound_trunks/{id}',
       pathParams,
       undefined,
       body,
-      'application/json',
     );
 
-    decoders['UpdateSIPTrunkResponse']?.(response.body);
+    decoders['UpdateSIPTrunkResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async resolveSipInbound(
@@ -1913,20 +1818,18 @@ export class VideoApi {
       sip_headers: request?.sip_headers,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<ResolveSipInboundResponse>
-    >(
-      'POST',
-      '/api/v2/video/sip/resolve',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<ResolveSipInboundResponse>(
+        'POST',
+        '/api/v2/video/sip/resolve',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['ResolveSipInboundResponse']?.(response.body);
+    decoders['ResolveSipInboundResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async queryAggregateCallStats(
@@ -1938,20 +1841,18 @@ export class VideoApi {
       report_types: request?.report_types,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<QueryAggregateCallStatsResponse>
-    >(
-      'POST',
-      '/api/v2/video/stats',
-      undefined,
-      undefined,
-      body,
-      'application/json',
-    );
+    const response =
+      await this.apiClient.sendRequest<QueryAggregateCallStatsResponse>(
+        'POST',
+        '/api/v2/video/stats',
+        undefined,
+        undefined,
+        body,
+      );
 
-    decoders['QueryAggregateCallStatsResponse']?.(response.body);
+    decoders['QueryAggregateCallStatsResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 
   async getDailyDigest(request?: {
@@ -1963,12 +1864,15 @@ export class VideoApi {
       target_app_id: request?.target_app_id,
     };
 
-    const response = await this.apiClient.sendRequest<
-      StreamResponse<GetDailyDigestResponse>
-    >('GET', '/api/v2/video/stats/daily_digest', undefined, queryParams);
+    const response = await this.apiClient.sendRequest<GetDailyDigestResponse>(
+      'GET',
+      '/api/v2/video/stats/daily_digest',
+      undefined,
+      queryParams,
+    );
 
-    decoders['GetDailyDigestResponse']?.(response.body);
+    decoders['GetDailyDigestResponse']?.(response);
 
-    return { ...response.body, metadata: response.metadata };
+    return response;
   }
 }