Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(api): correct types for message attachment tools #787

Merged
merged 1 commit into from
Apr 19, 2024
Merged

fix(api): correct types for message attachment tools #787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/resources/beta/threads/messages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import * as Core from 'openai/core';
import { APIResource } from 'openai/resource';
import { isRequestOptions } from 'openai/core';
import * as MessagesAPI from 'openai/resources/beta/threads/messages';
import * as AssistantsAPI from 'openai/resources/beta/assistants';
import { CursorPage, type CursorPageParams } from 'openai/pagination';

export class Messages extends APIResource {
Expand Down Expand Up @@ -374,7 +375,10 @@ export namespace Message {
*/
file_id?: string;

tools?: Array<'file_search' | 'code_interpreter'>;
/**
* The tools to add this file to.
*/
tools?: Array<AssistantsAPI.CodeInterpreterTool | AssistantsAPI.FileSearchTool>;
}

/**
Expand Down Expand Up @@ -528,7 +532,10 @@ export namespace MessageCreateParams {
*/
file_id?: string;

tools?: Array<'file_search' | 'code_interpreter'>;
/**
* The tools to add this file to.
*/
tools?: Array<AssistantsAPI.CodeInterpreterTool | AssistantsAPI.FileSearchTool>;
}
}

Expand Down
20 changes: 16 additions & 4 deletions src/resources/beta/threads/runs/runs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,10 @@ export namespace RunCreateParams {
*/
file_id?: string;

tools?: Array<'file_search' | 'code_interpreter'>;
/**
* The tools to add this file to.
*/
tools?: Array<AssistantsAPI.CodeInterpreterTool | AssistantsAPI.FileSearchTool>;
}
}

Expand Down Expand Up @@ -1028,7 +1031,10 @@ export namespace RunCreateAndPollParams {
*/
file_id?: string;

tools?: Array<'file_search' | 'code_interpreter'>;
/**
* The tools to add this file to.
*/
tools?: Array<AssistantsAPI.CodeInterpreterTool | AssistantsAPI.FileSearchTool>;
}
}

Expand Down Expand Up @@ -1229,7 +1235,10 @@ export namespace RunCreateAndStreamParams {
*/
file_id?: string;

tools?: Array<'file_search' | 'code_interpreter'>;
/**
* The tools to add this file to.
*/
tools?: Array<AssistantsAPI.CodeInterpreterTool | AssistantsAPI.FileSearchTool>;
}
}

Expand Down Expand Up @@ -1430,7 +1439,10 @@ export namespace RunStreamParams {
*/
file_id?: string;

tools?: Array<'file_search' | 'code_interpreter'>;
/**
* The tools to add this file to.
*/
tools?: Array<AssistantsAPI.CodeInterpreterTool | AssistantsAPI.FileSearchTool>;
}
}

Expand Down
20 changes: 16 additions & 4 deletions src/resources/beta/threads/threads.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,10 @@ export namespace ThreadCreateParams {
*/
file_id?: string;

tools?: Array<'file_search' | 'code_interpreter'>;
/**
* The tools to add this file to.
*/
tools?: Array<AssistantsAPI.CodeInterpreterTool | AssistantsAPI.FileSearchTool>;
}
}

Expand Down Expand Up @@ -653,7 +656,10 @@ export namespace ThreadCreateAndRunParams {
*/
file_id?: string;

tools?: Array<'file_search' | 'code_interpreter'>;
/**
* The tools to add this file to.
*/
tools?: Array<AssistantsAPI.CodeInterpreterTool | AssistantsAPI.FileSearchTool>;
}
}

Expand Down Expand Up @@ -999,7 +1005,10 @@ export namespace ThreadCreateAndRunPollParams {
*/
file_id?: string;

tools?: Array<'file_search' | 'code_interpreter'>;
/**
* The tools to add this file to.
*/
tools?: Array<AssistantsAPI.CodeInterpreterTool | AssistantsAPI.FileSearchTool>;
}
}

Expand Down Expand Up @@ -1324,7 +1333,10 @@ export namespace ThreadCreateAndRunStreamParams {
*/
file_id?: string;

tools?: Array<'file_search' | 'code_interpreter'>;
/**
* The tools to add this file to.
*/
tools?: Array<AssistantsAPI.CodeInterpreterTool | AssistantsAPI.FileSearchTool>;
}
}

Expand Down
15 changes: 12 additions & 3 deletions tests/api-resources/beta/threads/messages.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,18 @@ describe('resource messages', () => {
content: 'x',
role: 'user',
attachments: [
{ file_id: 'string', tools: ['file_search', 'code_interpreter'] },
{ file_id: 'string', tools: ['file_search', 'code_interpreter'] },
{ file_id: 'string', tools: ['file_search', 'code_interpreter'] },
{
file_id: 'string',
tools: [{ type: 'code_interpreter' }, { type: 'code_interpreter' }, { type: 'code_interpreter' }],
},
{
file_id: 'string',
tools: [{ type: 'code_interpreter' }, { type: 'code_interpreter' }, { type: 'code_interpreter' }],
},
{
file_id: 'string',
tools: [{ type: 'code_interpreter' }, { type: 'code_interpreter' }, { type: 'code_interpreter' }],
},
],
metadata: {},
});
Expand Down
81 changes: 72 additions & 9 deletions tests/api-resources/beta/threads/runs/runs.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,29 +29,92 @@ describe('resource runs', () => {
role: 'user',
content: 'x',
attachments: [
{ file_id: 'string', tools: ['file_search', 'code_interpreter'] },
{ file_id: 'string', tools: ['file_search', 'code_interpreter'] },
{ file_id: 'string', tools: ['file_search', 'code_interpreter'] },
{
file_id: 'string',
tools: [
{ type: 'code_interpreter' },
{ type: 'code_interpreter' },
{ type: 'code_interpreter' },
],
},
{
file_id: 'string',
tools: [
{ type: 'code_interpreter' },
{ type: 'code_interpreter' },
{ type: 'code_interpreter' },
],
},
{
file_id: 'string',
tools: [
{ type: 'code_interpreter' },
{ type: 'code_interpreter' },
{ type: 'code_interpreter' },
],
},
],
metadata: {},
},
{
role: 'user',
content: 'x',
attachments: [
{ file_id: 'string', tools: ['file_search', 'code_interpreter'] },
{ file_id: 'string', tools: ['file_search', 'code_interpreter'] },
{ file_id: 'string', tools: ['file_search', 'code_interpreter'] },
{
file_id: 'string',
tools: [
{ type: 'code_interpreter' },
{ type: 'code_interpreter' },
{ type: 'code_interpreter' },
],
},
{
file_id: 'string',
tools: [
{ type: 'code_interpreter' },
{ type: 'code_interpreter' },
{ type: 'code_interpreter' },
],
},
{
file_id: 'string',
tools: [
{ type: 'code_interpreter' },
{ type: 'code_interpreter' },
{ type: 'code_interpreter' },
],
},
],
metadata: {},
},
{
role: 'user',
content: 'x',
attachments: [
{ file_id: 'string', tools: ['file_search', 'code_interpreter'] },
{ file_id: 'string', tools: ['file_search', 'code_interpreter'] },
{ file_id: 'string', tools: ['file_search', 'code_interpreter'] },
{
file_id: 'string',
tools: [
{ type: 'code_interpreter' },
{ type: 'code_interpreter' },
{ type: 'code_interpreter' },
],
},
{
file_id: 'string',
tools: [
{ type: 'code_interpreter' },
{ type: 'code_interpreter' },
{ type: 'code_interpreter' },
],
},
{
file_id: 'string',
tools: [
{ type: 'code_interpreter' },
{ type: 'code_interpreter' },
{ type: 'code_interpreter' },
],
},
],
metadata: {},
},
Expand Down
Loading