Skip to content

Commit 8a115a0

Browse files
stainless-botRobertCraigie
stainless-bot
authored and
RobertCraigie
committed
fix: correctly send default header values
chore: unknown commit message
1 parent bcfb9fe commit 8a115a0

File tree

12 files changed

+51
-44
lines changed

12 files changed

+51
-44
lines changed

‎src/client.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import * as Shims from './internal/shims';
1212
import * as Opts from './internal/request-options';
1313
import * as qs from './internal/qs';
1414
import { VERSION } from './version';
15-
import { buildHeaders } from './internal/headers';
1615
import * as Errors from './error';
1716
import * as Pagination from './pagination';
1817
import { AbstractPage, type CursorPageParams, CursorPageResponse, PageResponse } from './pagination';
@@ -21,7 +20,7 @@ import * as API from './resources/index';
2120
import { APIPromise } from './api-promise';
2221
import { type Fetch } from './internal/builtin-types';
2322
import { isRunningInBrowser } from './internal/detect-platform';
24-
import { HeadersLike, NullableHeaders } from './internal/headers';
23+
import { HeadersLike, NullableHeaders, buildHeaders } from './internal/headers';
2524
import { FinalRequestOptions, RequestOptions } from './internal/request-options';
2625
import {
2726
Batch,

‎src/resources/audio/speech.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import { APIResource } from '../../resource';
44
import { APIPromise } from '../../api-promise';
5+
import { buildHeaders } from '../../internal/headers';
56
import { RequestOptions } from '../../internal/request-options';
67

78
export class Speech extends APIResource {
@@ -12,7 +13,7 @@ export class Speech extends APIResource {
1213
return this._client.post('/audio/speech', {
1314
body,
1415
...options,
15-
headers: { Accept: 'application/octet-stream', ...options?.headers },
16+
headers: buildHeaders([{ Accept: 'application/octet-stream' }, options?.headers]),
1617
__binaryResponse: true,
1718
});
1819
}

‎src/resources/beta/assistants.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import * as RunsAPI from './threads/runs/runs';
1010
import * as StepsAPI from './threads/runs/steps';
1111
import { APIPromise } from '../../api-promise';
1212
import { CursorPage, type CursorPageParams, PagePromise } from '../../pagination';
13+
import { buildHeaders } from '../../internal/headers';
1314
import { RequestOptions } from '../../internal/request-options';
1415

1516
export class Assistants extends APIResource {
@@ -20,7 +21,7 @@ export class Assistants extends APIResource {
2021
return this._client.post('/assistants', {
2122
body,
2223
...options,
23-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
24+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
2425
});
2526
}
2627

@@ -30,7 +31,7 @@ export class Assistants extends APIResource {
3031
retrieve(assistantID: string, options?: RequestOptions): APIPromise<Assistant> {
3132
return this._client.get(`/assistants/${assistantID}`, {
3233
...options,
33-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
34+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
3435
});
3536
}
3637

@@ -41,7 +42,7 @@ export class Assistants extends APIResource {
4142
return this._client.post(`/assistants/${assistantID}`, {
4243
body,
4344
...options,
44-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
45+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
4546
});
4647
}
4748

@@ -55,7 +56,7 @@ export class Assistants extends APIResource {
5556
return this._client.getAPIList('/assistants', CursorPage<Assistant>, {
5657
query,
5758
...options,
58-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
59+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
5960
});
6061
}
6162

@@ -65,7 +66,7 @@ export class Assistants extends APIResource {
6566
delete(assistantID: string, options?: RequestOptions): APIPromise<AssistantDeleted> {
6667
return this._client.delete(`/assistants/${assistantID}`, {
6768
...options,
68-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
69+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
6970
});
7071
}
7172
}

‎src/resources/beta/realtime/sessions.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import { APIResource } from '../../../resource';
44
import { APIPromise } from '../../../api-promise';
5+
import { buildHeaders } from '../../../internal/headers';
56
import { RequestOptions } from '../../../internal/request-options';
67

78
export class Sessions extends APIResource {
@@ -18,7 +19,7 @@ export class Sessions extends APIResource {
1819
return this._client.post('/realtime/sessions', {
1920
body,
2021
...options,
21-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
22+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
2223
});
2324
}
2425
}

‎src/resources/beta/threads/messages.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { APIResource } from '../../../resource';
44
import * as AssistantsAPI from '../assistants';
55
import { APIPromise } from '../../../api-promise';
66
import { CursorPage, type CursorPageParams, PagePromise } from '../../../pagination';
7+
import { buildHeaders } from '../../../internal/headers';
78
import { RequestOptions } from '../../../internal/request-options';
89

910
export class Messages extends APIResource {
@@ -14,7 +15,7 @@ export class Messages extends APIResource {
1415
return this._client.post(`/threads/${threadID}/messages`, {
1516
body,
1617
...options,
17-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
18+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
1819
});
1920
}
2021

@@ -25,7 +26,7 @@ export class Messages extends APIResource {
2526
const { thread_id } = params;
2627
return this._client.get(`/threads/${thread_id}/messages/${messageID}`, {
2728
...options,
28-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
29+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
2930
});
3031
}
3132

@@ -37,7 +38,7 @@ export class Messages extends APIResource {
3738
return this._client.post(`/threads/${thread_id}/messages/${messageID}`, {
3839
body,
3940
...options,
40-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
41+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
4142
});
4243
}
4344

@@ -52,7 +53,7 @@ export class Messages extends APIResource {
5253
return this._client.getAPIList(`/threads/${threadID}/messages`, CursorPage<Message>, {
5354
query,
5455
...options,
55-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
56+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
5657
});
5758
}
5859

@@ -67,7 +68,7 @@ export class Messages extends APIResource {
6768
const { thread_id } = params;
6869
return this._client.delete(`/threads/${thread_id}/messages/${messageID}`, {
6970
...options,
70-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
71+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
7172
});
7273
}
7374
}

‎src/resources/beta/threads/runs/runs.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ import {
3434
import { APIPromise } from '../../../../api-promise';
3535
import { CursorPage, type CursorPageParams, PagePromise } from '../../../../pagination';
3636
import { Stream } from '../../../../streaming';
37+
import { buildHeaders } from '../../../../internal/headers';
3738
import { RequestOptions } from '../../../../internal/request-options';
3839
import { AssistantStream, RunCreateParamsBaseStream } from '../../../../lib/AssistantStream';
3940
import { sleep } from '../../../../internal/utils/sleep';
4041
import { RunSubmitToolOutputsParamsStream } from '../../../../lib/AssistantStream';
41-
import { buildHeaders } from '../../../../internal/headers';
4242

4343
export class Runs extends APIResource {
4444
steps: StepsAPI.Steps = new StepsAPI.Steps(this._client);
@@ -67,7 +67,7 @@ export class Runs extends APIResource {
6767
query: { include },
6868
body,
6969
...options,
70-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
70+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
7171
stream: params.stream ?? false,
7272
}) as APIPromise<Run> | APIPromise<Stream<AssistantsAPI.AssistantStreamEvent>>;
7373
}
@@ -79,7 +79,7 @@ export class Runs extends APIResource {
7979
const { thread_id } = params;
8080
return this._client.get(`/threads/${thread_id}/runs/${runID}`, {
8181
...options,
82-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
82+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
8383
});
8484
}
8585

@@ -91,7 +91,7 @@ export class Runs extends APIResource {
9191
return this._client.post(`/threads/${thread_id}/runs/${runID}`, {
9292
body,
9393
...options,
94-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
94+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
9595
});
9696
}
9797

@@ -106,7 +106,7 @@ export class Runs extends APIResource {
106106
return this._client.getAPIList(`/threads/${threadID}/runs`, CursorPage<Run>, {
107107
query,
108108
...options,
109-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
109+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
110110
});
111111
}
112112

@@ -117,7 +117,7 @@ export class Runs extends APIResource {
117117
const { thread_id } = params;
118118
return this._client.post(`/threads/${thread_id}/runs/${runID}/cancel`, {
119119
...options,
120-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
120+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
121121
});
122122
}
123123

@@ -241,7 +241,7 @@ export class Runs extends APIResource {
241241
return this._client.post(`/threads/${thread_id}/runs/${runID}/submit_tool_outputs`, {
242242
body,
243243
...options,
244-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
244+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
245245
stream: params.stream ?? false,
246246
}) as APIPromise<Run> | APIPromise<Stream<AssistantsAPI.AssistantStreamEvent>>;
247247
}

‎src/resources/beta/threads/runs/steps.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { APIResource } from '../../../../resource';
44
import * as StepsAPI from './steps';
55
import { APIPromise } from '../../../../api-promise';
66
import { CursorPage, type CursorPageParams, PagePromise } from '../../../../pagination';
7+
import { buildHeaders } from '../../../../internal/headers';
78
import { RequestOptions } from '../../../../internal/request-options';
89

910
export class Steps extends APIResource {
@@ -15,7 +16,7 @@ export class Steps extends APIResource {
1516
return this._client.get(`/threads/${thread_id}/runs/${run_id}/steps/${stepID}`, {
1617
query,
1718
...options,
18-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
19+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
1920
});
2021
}
2122

@@ -27,7 +28,7 @@ export class Steps extends APIResource {
2728
return this._client.getAPIList(`/threads/${thread_id}/runs/${runID}/steps`, CursorPage<RunStep>, {
2829
query,
2930
...options,
30-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
31+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
3132
});
3233
}
3334
}

‎src/resources/beta/threads/threads.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ import {
6969
} from './runs/runs';
7070
import { APIPromise } from '../../../api-promise';
7171
import { Stream } from '../../../streaming';
72+
import { buildHeaders } from '../../../internal/headers';
7273
import { RequestOptions } from '../../../internal/request-options';
7374
import { AssistantStream, ThreadCreateAndRunParamsBaseStream } from '../../../lib/AssistantStream';
7475

@@ -83,7 +84,7 @@ export class Threads extends APIResource {
8384
return this._client.post('/threads', {
8485
body,
8586
...options,
86-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
87+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
8788
});
8889
}
8990

@@ -93,7 +94,7 @@ export class Threads extends APIResource {
9394
retrieve(threadID: string, options?: RequestOptions): APIPromise<Thread> {
9495
return this._client.get(`/threads/${threadID}`, {
9596
...options,
96-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
97+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
9798
});
9899
}
99100

@@ -104,7 +105,7 @@ export class Threads extends APIResource {
104105
return this._client.post(`/threads/${threadID}`, {
105106
body,
106107
...options,
107-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
108+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
108109
});
109110
}
110111

@@ -114,7 +115,7 @@ export class Threads extends APIResource {
114115
delete(threadID: string, options?: RequestOptions): APIPromise<ThreadDeleted> {
115116
return this._client.delete(`/threads/${threadID}`, {
116117
...options,
117-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
118+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
118119
});
119120
}
120121

@@ -137,7 +138,7 @@ export class Threads extends APIResource {
137138
return this._client.post('/threads/runs', {
138139
body,
139140
...options,
140-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
141+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
141142
stream: body.stream ?? false,
142143
}) as APIPromise<RunsAPI.Run> | APIPromise<Stream<AssistantsAPI.AssistantStreamEvent>>;
143144
}

‎src/resources/beta/vector-stores/file-batches.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import { VectorStoreFilesPage } from './files';
66
import * as VectorStoresAPI from './vector-stores';
77
import { APIPromise } from '../../../api-promise';
88
import { CursorPage, type CursorPageParams, PagePromise } from '../../../pagination';
9+
import { buildHeaders } from '../../../internal/headers';
910
import { RequestOptions } from '../../../internal/request-options';
1011
import { sleep } from '../../../internal/utils/sleep';
1112
import { type Uploadable } from '../../../uploads';
1213
import { allSettledWithThrow } from '../../../lib/Util';
13-
import { buildHeaders } from '../../../internal/headers';
1414

1515
export class FileBatches extends APIResource {
1616
/**
@@ -24,7 +24,7 @@ export class FileBatches extends APIResource {
2424
return this._client.post(`/vector_stores/${vectorStoreID}/file_batches`, {
2525
body,
2626
...options,
27-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
27+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
2828
});
2929
}
3030

@@ -39,7 +39,7 @@ export class FileBatches extends APIResource {
3939
const { vector_store_id } = params;
4040
return this._client.get(`/vector_stores/${vector_store_id}/file_batches/${batchID}`, {
4141
...options,
42-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
42+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
4343
});
4444
}
4545

@@ -55,7 +55,7 @@ export class FileBatches extends APIResource {
5555
const { vector_store_id } = params;
5656
return this._client.post(`/vector_stores/${vector_store_id}/file_batches/${batchID}/cancel`, {
5757
...options,
58-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
58+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
5959
});
6060
}
6161

@@ -83,7 +83,7 @@ export class FileBatches extends APIResource {
8383
return this._client.getAPIList(
8484
`/vector_stores/${vector_store_id}/file_batches/${batchID}/files`,
8585
CursorPage<FilesAPI.VectorStoreFile>,
86-
{ query, ...options, headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers } },
86+
{ query, ...options, headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]) },
8787
);
8888
}
8989

‎src/resources/beta/vector-stores/files.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import { APIResource } from '../../../resource';
44
import * as VectorStoresAPI from './vector-stores';
55
import { APIPromise } from '../../../api-promise';
66
import { CursorPage, type CursorPageParams, PagePromise } from '../../../pagination';
7+
import { buildHeaders } from '../../../internal/headers';
78
import { RequestOptions } from '../../../internal/request-options';
89
import { sleep } from '../../../internal/utils';
910
import { Uploadable } from '../../../uploads';
10-
import { buildHeaders } from '../../../internal/headers';
1111

1212
export class Files extends APIResource {
1313
/**
@@ -23,7 +23,7 @@ export class Files extends APIResource {
2323
return this._client.post(`/vector_stores/${vectorStoreID}/files`, {
2424
body,
2525
...options,
26-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
26+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
2727
});
2828
}
2929

@@ -38,7 +38,7 @@ export class Files extends APIResource {
3838
const { vector_store_id } = params;
3939
return this._client.get(`/vector_stores/${vector_store_id}/files/${fileID}`, {
4040
...options,
41-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
41+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
4242
});
4343
}
4444

@@ -53,7 +53,7 @@ export class Files extends APIResource {
5353
return this._client.getAPIList(`/vector_stores/${vectorStoreID}/files`, CursorPage<VectorStoreFile>, {
5454
query,
5555
...options,
56-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
56+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
5757
});
5858
}
5959

@@ -71,7 +71,7 @@ export class Files extends APIResource {
7171
const { vector_store_id } = params;
7272
return this._client.delete(`/vector_stores/${vector_store_id}/files/${fileID}`, {
7373
...options,
74-
headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
74+
headers: buildHeaders([{ 'OpenAI-Beta': 'assistants=v2' }, options?.headers]),
7575
});
7676
}
7777

0 commit comments

Comments
 (0)