Skip to content

Commit

Permalink
feat(api): batch list endpoint (#781)
Browse files Browse the repository at this point in the history
  • Loading branch information
stainless-bot committed Apr 18, 2024
1 parent 9c31244 commit 442138d
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .stats.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
configured_endpoints: 62
configured_endpoints: 63
1 change: 1 addition & 0 deletions api.md
Original file line number Diff line number Diff line change
Expand Up @@ -378,4 +378,5 @@ Methods:

- <code title="post /batches">client.batches.<a href="./src/resources/batches.ts">create</a>({ ...params }) -> Batch</code>
- <code title="get /batches/{batch_id}">client.batches.<a href="./src/resources/batches.ts">retrieve</a>(batchId) -> Batch</code>
- <code title="get /batches">client.batches.<a href="./src/resources/batches.ts">list</a>({ ...params }) -> BatchesPage</code>
- <code title="post /batches/{batch_id}/cancel">client.batches.<a href="./src/resources/batches.ts">cancel</a>(batchId) -> Batch</code>
2 changes: 2 additions & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,9 @@ export namespace OpenAI {
export import Batch = API.Batch;
export import BatchError = API.BatchError;
export import BatchRequestCounts = API.BatchRequestCounts;
export import BatchesPage = API.BatchesPage;
export import BatchCreateParams = API.BatchCreateParams;
export import BatchListParams = API.BatchListParams;

export import ErrorObject = API.ErrorObject;
export import FunctionDefinition = API.FunctionDefinition;
Expand Down
23 changes: 23 additions & 0 deletions src/resources/batches.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import * as Core from 'openai/core';
import { APIResource } from 'openai/resource';
import { isRequestOptions } from 'openai/core';
import * as BatchesAPI from 'openai/resources/batches';
import { CursorPage, type CursorPageParams } from 'openai/pagination';

export class Batches extends APIResource {
/**
Expand All @@ -19,6 +21,21 @@ export class Batches extends APIResource {
return this._client.get(`/batches/${batchId}`, options);
}

/**
* List your organization's batches.
*/
list(query?: BatchListParams, options?: Core.RequestOptions): Core.PagePromise<BatchesPage, Batch>;
list(options?: Core.RequestOptions): Core.PagePromise<BatchesPage, Batch>;
list(
query: BatchListParams | Core.RequestOptions = {},
options?: Core.RequestOptions,
): Core.PagePromise<BatchesPage, Batch> {
if (isRequestOptions(query)) {
return this.list({}, query);
}
return this._client.getAPIList('/batches', BatchesPage, { query, ...options });
}

/**
* Cancels an in-progress batch.
*/
Expand All @@ -27,6 +44,8 @@ export class Batches extends APIResource {
}
}

export class BatchesPage extends CursorPage<Batch> {}

export interface Batch {
id: string;

Expand Down Expand Up @@ -217,9 +236,13 @@ export interface BatchCreateParams {
metadata?: Record<string, string> | null;
}

export interface BatchListParams extends CursorPageParams {}

export namespace Batches {
export import Batch = BatchesAPI.Batch;
export import BatchError = BatchesAPI.BatchError;
export import BatchRequestCounts = BatchesAPI.BatchRequestCounts;
export import BatchesPage = BatchesAPI.BatchesPage;
export import BatchCreateParams = BatchesAPI.BatchCreateParams;
export import BatchListParams = BatchesAPI.BatchListParams;
}
10 changes: 9 additions & 1 deletion src/resources/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@
export * from './chat/index';
export * from './shared';
export { Audio } from './audio/audio';
export { Batch, BatchError, BatchRequestCounts, BatchCreateParams, Batches } from './batches';
export {
Batch,
BatchError,
BatchRequestCounts,
BatchCreateParams,
BatchListParams,
BatchesPage,
Batches,
} from './batches';
export { Beta } from './beta/beta';
export {
Completion,
Expand Down
25 changes: 25 additions & 0 deletions tests/api-resources/batches.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,31 @@ describe('resource batches', () => {
);
});

test('list', async () => {
const responsePromise = openai.batches.list();
const rawResponse = await responsePromise.asResponse();
expect(rawResponse).toBeInstanceOf(Response);
const response = await responsePromise;
expect(response).not.toBeInstanceOf(Response);
const dataAndResponse = await responsePromise.withResponse();
expect(dataAndResponse.data).toBe(response);
expect(dataAndResponse.response).toBe(rawResponse);
});

test('list: request options instead of params are passed correctly', async () => {
// ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
await expect(openai.batches.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
OpenAI.NotFoundError,
);
});

test('list: request options and params are passed correctly', async () => {
// ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
await expect(
openai.batches.list({ after: 'string', limit: 0 }, { path: '/_stainless_unknown_path' }),
).rejects.toThrow(OpenAI.NotFoundError);
});

test('cancel', async () => {
const responsePromise = openai.batches.cancel('string');
const rawResponse = await responsePromise.asResponse();
Expand Down

0 comments on commit 442138d

Please sign in to comment.