@anthropic-ai/sdk 0.34.0-alpha.0 → 0.36.2

package/src/resources/beta/messages/batches.ts

@@ -1,13 +1,13 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../../resource';
-import * as BetaAPI from '../beta';
-import * as BetaMessagesAPI from './messages';
-import { APIPromise } from '../../../api-promise';
-import { Page, type PageParams, PagePromise } from '../../../pagination';
-import { RequestOptions } from '../../../internal/request-options';
-import { JSONLDecoder } from '../../../internal/decoders/jsonl';
-import { AnthropicError } from '../../../error';
+import { APIResource } from "../../../resource.js";
+import { isRequestOptions } from "../../../core.js";
+import * as Core from "../../../core.js";
+import * as BetaAPI from "../beta.js";
+import * as BetaMessagesAPI from "./messages.js";
+import { Page, type PageParams } from "../../../pagination.js";
+import { JSONLDecoder } from "../../../internal/decoders/jsonl.js";
+import { AnthropicError } from "../../../error.js";
 
 export class Batches extends APIResource {
   /**
@@ -17,7 +17,7 @@ export class Batches extends APIResource {
    * once. Once a Message Batch is created, it begins processing immediately. Batches
    * can take up to 24 hours to complete.
    */
-  create(params: BatchCreateParams, options?: RequestOptions): APIPromise<BetaMessageBatch> {
+  create(params: BatchCreateParams, options?: Core.RequestOptions): Core.APIPromise<BetaMessageBatch> {
     const { betas, ...body } = params;
     return this._client.post('/v1/messages/batches?beta=true', {
       body,
@@ -35,12 +35,21 @@ export class Batches extends APIResource {
    * `results_url` field in the response.
    */
   retrieve(
-    messageBatchID: string,
-    params: BatchRetrieveParams | null | undefined = {},
-    options?: RequestOptions,
-  ): APIPromise<BetaMessageBatch> {
-    const { betas } = params ?? {};
-    return this._client.get(`/v1/messages/batches/${messageBatchID}?beta=true`, {
+    messageBatchId: string,
+    params?: BatchRetrieveParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<BetaMessageBatch>;
+  retrieve(messageBatchId: string, options?: Core.RequestOptions): Core.APIPromise<BetaMessageBatch>;
+  retrieve(
+    messageBatchId: string,
+    params: BatchRetrieveParams | Core.RequestOptions = {},
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<BetaMessageBatch> {
+    if (isRequestOptions(params)) {
+      return this.retrieve(messageBatchId, {}, params);
+    }
+    const { betas } = params;
+    return this._client.get(`/v1/messages/batches/${messageBatchId}?beta=true`, {
       ...options,
       headers: {
         'anthropic-beta': [...(betas ?? []), 'message-batches-2024-09-24'].toString(),
@@ -54,11 +63,19 @@ export class Batches extends APIResource {
    * returned first.
    */
   list(
-    params: BatchListParams | null | undefined = {},
-    options?: RequestOptions,
-  ): PagePromise<BetaMessageBatchesPage, BetaMessageBatch> {
-    const { betas, ...query } = params ?? {};
-    return this._client.getAPIList('/v1/messages/batches?beta=true', Page<BetaMessageBatch>, {
+    params?: BatchListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<BetaMessageBatchesPage, BetaMessageBatch>;
+  list(options?: Core.RequestOptions): Core.PagePromise<BetaMessageBatchesPage, BetaMessageBatch>;
+  list(
+    params: BatchListParams | Core.RequestOptions = {},
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<BetaMessageBatchesPage, BetaMessageBatch> {
+    if (isRequestOptions(params)) {
+      return this.list({}, params);
+    }
+    const { betas, ...query } = params;
+    return this._client.getAPIList('/v1/messages/batches?beta=true', BetaMessageBatchesPage, {
       query,
       ...options,
       headers: {
@@ -69,17 +86,27 @@ export class Batches extends APIResource {
   }
 
   /**
-   * This endpoint is idempotent and can be used to poll for Message Batch
-   * completion. To access the results of a Message Batch, make a request to the
-   * `results_url` field in the response.
+   * Delete a Message Batch.
+   *
+   * Message Batches can only be deleted once they've finished processing. If you'd
+   * like to delete an in-progress batch, you must first cancel it.
    */
   delete(
-    messageBatchID: string,
-    params: BatchDeleteParams | null | undefined = {},
-    options?: RequestOptions,
-  ): APIPromise<BetaDeletedMessageBatch> {
-    const { betas } = params ?? {};
-    return this._client.delete(`/v1/messages/batches/${messageBatchID}?beta=true`, {
+    messageBatchId: string,
+    params?: BatchDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<BetaDeletedMessageBatch>;
+  delete(messageBatchId: string, options?: Core.RequestOptions): Core.APIPromise<BetaDeletedMessageBatch>;
+  delete(
+    messageBatchId: string,
+    params: BatchDeleteParams | Core.RequestOptions = {},
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<BetaDeletedMessageBatch> {
+    if (isRequestOptions(params)) {
+      return this.delete(messageBatchId, {}, params);
+    }
+    const { betas } = params;
+    return this._client.delete(`/v1/messages/batches/${messageBatchId}?beta=true`, {
       ...options,
       headers: {
         'anthropic-beta': [...(betas ?? []), 'message-batches-2024-09-24'].toString(),
@@ -100,12 +127,21 @@ export class Batches extends APIResource {
    * non-interruptible.
    */
   cancel(
-    messageBatchID: string,
-    params: BatchCancelParams | null | undefined = {},
-    options?: RequestOptions,
-  ): APIPromise<BetaMessageBatch> {
-    const { betas } = params ?? {};
-    return this._client.post(`/v1/messages/batches/${messageBatchID}/cancel?beta=true`, {
+    messageBatchId: string,
+    params?: BatchCancelParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<BetaMessageBatch>;
+  cancel(messageBatchId: string, options?: Core.RequestOptions): Core.APIPromise<BetaMessageBatch>;
+  cancel(
+    messageBatchId: string,
+    params: BatchCancelParams | Core.RequestOptions = {},
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<BetaMessageBatch> {
+    if (isRequestOptions(params)) {
+      return this.cancel(messageBatchId, {}, params);
+    }
+    const { betas } = params;
+    return this._client.post(`/v1/messages/batches/${messageBatchId}/cancel?beta=true`, {
       ...options,
       headers: {
         'anthropic-beta': [...(betas ?? []), 'message-batches-2024-09-24'].toString(),
@@ -122,23 +158,37 @@ export class Batches extends APIResource {
    * requests. Use the `custom_id` field to match results to requests.
    */
   async results(
-    messageBatchID: string,
-    params: BatchResultsParams | null | undefined = {},
-    options?: RequestOptions,
+    messageBatchId: string,
+    params?: BatchResultsParams,
+    options?: Core.RequestOptions,
+  ): Promise<JSONLDecoder<BetaMessageBatchIndividualResponse>>;
+  async results(
+    messageBatchId: string,
+    options?: Core.RequestOptions,
+  ): Promise<JSONLDecoder<BetaMessageBatchIndividualResponse>>;
+  async results(
+    messageBatchId: string,
+    params: BatchResultsParams | Core.RequestOptions = {},
+    options?: Core.RequestOptions,
   ): Promise<JSONLDecoder<BetaMessageBatchIndividualResponse>> {
-    const batch = await this.retrieve(messageBatchID);
+    if (isRequestOptions(params)) {
+      return this.results(messageBatchId, {}, params);
+    }
+
+    const batch = await this.retrieve(messageBatchId);
     if (!batch.results_url) {
       throw new AnthropicError(
         `No batch \`results_url\`; Has it finished processing? ${batch.processing_status} - ${batch.id}`,
       );
     }
 
-    const { betas } = params ?? {};
+    const { betas } = params;
     return this._client
       .get(batch.results_url, {
         ...options,
         headers: {
           'anthropic-beta': [...(betas ?? []), 'message-batches-2024-09-24'].toString(),
+          Accept: 'application/binary',
           ...options?.headers,
         },
         __binaryResponse: true,
@@ -147,7 +197,7 @@ export class Batches extends APIResource {
   }
 }
 
-export type BetaMessageBatchesPage = Page<BetaMessageBatch>;
+export class BetaMessageBatchesPage extends Page<BetaMessageBatch> {}
 
 export interface BetaDeletedMessageBatch {
   /**
@@ -390,6 +440,8 @@ export interface BatchResultsParams {
   betas?: Array<BetaAPI.AnthropicBeta>;
 }
 
+Batches.BetaMessageBatchesPage = BetaMessageBatchesPage;
+
 export declare namespace Batches {
   export {
     type BetaDeletedMessageBatch as BetaDeletedMessageBatch,
@@ -401,7 +453,7 @@ export declare namespace Batches {
     type BetaMessageBatchRequestCounts as BetaMessageBatchRequestCounts,
     type BetaMessageBatchResult as BetaMessageBatchResult,
     type BetaMessageBatchSucceededResult as BetaMessageBatchSucceededResult,
-    type BetaMessageBatchesPage as BetaMessageBatchesPage,
+    BetaMessageBatchesPage as BetaMessageBatchesPage,
     type BatchCreateParams as BatchCreateParams,
     type BatchRetrieveParams as BatchRetrieveParams,
     type BatchListParams as BatchListParams,

package/src/resources/beta/messages/index.ts

@@ -1,6 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
+  BetaMessageBatchesPage,
   Batches,
   type BetaDeletedMessageBatch,
   type BetaMessageBatch,
@@ -17,15 +18,24 @@ export {
   type BatchDeleteParams,
   type BatchCancelParams,
   type BatchResultsParams,
-  type BetaMessageBatchesPage,
-} from './batches';
+} from "./batches.js";
 export {
   Messages,
   type BetaBase64PDFBlock,
   type BetaBase64PDFSource,
   type BetaCacheControlEphemeral,
+  type BetaCitationCharLocation,
+  type BetaCitationCharLocationParam,
+  type BetaCitationContentBlockLocation,
+  type BetaCitationContentBlockLocationParam,
+  type BetaCitationPageLocation,
+  type BetaCitationPageLocationParam,
+  type BetaCitationsConfigParam,
+  type BetaCitationsDelta,
   type BetaContentBlock,
   type BetaContentBlockParam,
+  type BetaContentBlockSource,
+  type BetaContentBlockSourceContent,
   type BetaImageBlockParam,
   type BetaInputJSONDelta,
   type BetaMessage,
@@ -33,6 +43,7 @@ export {
   type BetaMessageParam,
   type BetaMessageTokensCount,
   type BetaMetadata,
+  type BetaPlainTextSource,
   type BetaRawContentBlockDeltaEvent,
   type BetaRawContentBlockStartEvent,
   type BetaRawContentBlockStopEvent,
@@ -42,6 +53,8 @@ export {
   type BetaRawMessageStreamEvent,
   type BetaTextBlock,
   type BetaTextBlockParam,
+  type BetaTextCitation,
+  type BetaTextCitationParam,
   type BetaTextDelta,
   type BetaTool,
   type BetaToolBash20241022,
@@ -60,4 +73,5 @@ export {
   type MessageCreateParamsNonStreaming,
   type MessageCreateParamsStreaming,
   type MessageCountTokensParams,
-} from './messages';
+  type BetaMessageStreamParams,
+} from "./messages.js";

package/src/resources/beta/messages/messages.ts

@@ -1,10 +1,12 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../../resource';
-import * as MessagesMessagesAPI from './messages';
-import * as BetaAPI from '../beta';
-import * as MessagesAPI from '../../messages/messages';
-import * as BatchesAPI from './batches';
+import { APIResource } from "../../../resource.js";
+import { APIPromise } from "../../../core.js";
+import * as Core from "../../../core.js";
+import * as MessagesMessagesAPI from "./messages.js";
+import * as BetaAPI from "../beta.js";
+import * as MessagesAPI from "../../messages/messages.js";
+import * as BatchesAPI from "./batches.js";
 import {
   BatchCancelParams,
   BatchCreateParams,
@@ -23,10 +25,23 @@ import {
   BetaMessageBatchResult,
   BetaMessageBatchSucceededResult,
   BetaMessageBatchesPage,
-} from './batches';
-import { APIPromise } from '../../../api-promise';
-import { Stream } from '../../../streaming';
-import { RequestOptions } from '../../../internal/request-options';
+} from "./batches.js";
+import { Stream } from "../../../streaming.js";
+import { BetaMessageStream } from "../../../lib/BetaMessageStream.js";
+import type { Model } from "../../messages/messages.js";
+
+const DEPRECATED_MODELS: {
+  [K in Model]?: string;
+} = {
+  'claude-1.3': 'November 6th, 2024',
+  'claude-1.3-100k': 'November 6th, 2024',
+  'claude-instant-1.1': 'November 6th, 2024',
+  'claude-instant-1.1-100k': 'November 6th, 2024',
+  'claude-instant-1.2': 'November 6th, 2024',
+  'claude-3-sonnet-20240229': 'July 21st, 2025',
+  'claude-2.1': 'July 21st, 2025',
+  'claude-2.0': 'July 21st, 2025',
+};
 
 export class Messages extends APIResource {
   batches: BatchesAPI.Batches = new BatchesAPI.Batches(this._client);
@@ -38,20 +53,29 @@ export class Messages extends APIResource {
    * The Messages API can be used for either single queries or stateless multi-turn
    * conversations.
    */
-  create(params: MessageCreateParamsNonStreaming, options?: RequestOptions): APIPromise<BetaMessage>;
+  create(params: MessageCreateParamsNonStreaming, options?: Core.RequestOptions): APIPromise<BetaMessage>;
   create(
     params: MessageCreateParamsStreaming,
-    options?: RequestOptions,
+    options?: Core.RequestOptions,
   ): APIPromise<Stream<BetaRawMessageStreamEvent>>;
   create(
     params: MessageCreateParamsBase,
-    options?: RequestOptions,
+    options?: Core.RequestOptions,
   ): APIPromise<Stream<BetaRawMessageStreamEvent> | BetaMessage>;
   create(
     params: MessageCreateParams,
-    options?: RequestOptions,
+    options?: Core.RequestOptions,
   ): APIPromise<BetaMessage> | APIPromise<Stream<BetaRawMessageStreamEvent>> {
     const { betas, ...body } = params;
+
+    if (body.model in DEPRECATED_MODELS) {
+      console.warn(
+        `The model '${body.model}' is deprecated and will reach end-of-life on ${
+          DEPRECATED_MODELS[body.model]
+        }\nPlease migrate to a newer model. Visit https://docs.anthropic.com/en/docs/resources/model-deprecations for more information.`,
+      );
+    }
+
     return this._client.post('/v1/messages?beta=true', {
       body,
       timeout: (this._client as any)._options.timeout ?? 600000,
@@ -64,6 +88,13 @@ export class Messages extends APIResource {
     }) as APIPromise<BetaMessage> | APIPromise<Stream<BetaRawMessageStreamEvent>>;
   }
 
+  /**
+   * Create a Message stream
+   */
+  stream(body: BetaMessageStreamParams, options?: Core.RequestOptions): BetaMessageStream {
+    return BetaMessageStream.createMessage(this, body, options);
+  }
+
   /**
    * Count the number of tokens in a Message.
    *
@@ -72,8 +103,8 @@ export class Messages extends APIResource {
    */
   countTokens(
     params: MessageCountTokensParams,
-    options?: RequestOptions,
-  ): APIPromise<BetaMessageTokensCount> {
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<BetaMessageTokensCount> {
     const { betas, ...body } = params;
     return this._client.post('/v1/messages/count_tokens?beta=true', {
       body,
@@ -86,12 +117,20 @@ export class Messages extends APIResource {
   }
 }
 
+export type BetaMessageStreamParams = MessageCreateParamsBase;
+
 export interface BetaBase64PDFBlock {
-  source: BetaBase64PDFSource;
+  source: BetaBase64PDFSource | BetaPlainTextSource | BetaContentBlockSource;
 
   type: 'document';
 
   cache_control?: BetaCacheControlEphemeral | null;
+
+  citations?: BetaCitationsConfigParam;
+
+  context?: string | null;
+
+  title?: string | null;
 }
 
 export interface BetaBase64PDFSource {
@@ -106,6 +145,100 @@ export interface BetaCacheControlEphemeral {
   type: 'ephemeral';
 }
 
+export interface BetaCitationCharLocation {
+  cited_text: string;
+
+  document_index: number;
+
+  document_title: string | null;
+
+  end_char_index: number;
+
+  start_char_index: number;
+
+  type: 'char_location';
+}
+
+export interface BetaCitationCharLocationParam {
+  cited_text: string;
+
+  document_index: number;
+
+  document_title: string | null;
+
+  end_char_index: number;
+
+  start_char_index: number;
+
+  type: 'char_location';
+}
+
+export interface BetaCitationContentBlockLocation {
+  cited_text: string;
+
+  document_index: number;
+
+  document_title: string | null;
+
+  end_block_index: number;
+
+  start_block_index: number;
+
+  type: 'content_block_location';
+}
+
+export interface BetaCitationContentBlockLocationParam {
+  cited_text: string;
+
+  document_index: number;
+
+  document_title: string | null;
+
+  end_block_index: number;
+
+  start_block_index: number;
+
+  type: 'content_block_location';
+}
+
+export interface BetaCitationPageLocation {
+  cited_text: string;
+
+  document_index: number;
+
+  document_title: string | null;
+
+  end_page_number: number;
+
+  start_page_number: number;
+
+  type: 'page_location';
+}
+
+export interface BetaCitationPageLocationParam {
+  cited_text: string;
+
+  document_index: number;
+
+  document_title: string | null;
+
+  end_page_number: number;
+
+  start_page_number: number;
+
+  type: 'page_location';
+}
+
+export interface BetaCitationsConfigParam {
+  enabled?: boolean;
+}
+
+export interface BetaCitationsDelta {
+  citation: BetaCitationCharLocation | BetaCitationPageLocation | BetaCitationContentBlockLocation;
+
+  type: 'citations_delta';
+}
+
 export type BetaContentBlock = BetaTextBlock | BetaToolUseBlock;
 
 export type BetaContentBlockParam =
@@ -115,6 +248,14 @@ export type BetaContentBlockParam =
   | BetaToolResultBlockParam
   | BetaBase64PDFBlock;
 
+export interface BetaContentBlockSource {
+  content: string | Array<BetaContentBlockSourceContent>;
+
+  type: 'content';
+}
+
+export type BetaContentBlockSourceContent = BetaTextBlockParam | BetaImageBlockParam;
+
 export interface BetaImageBlockParam {
   source: BetaImageBlockParam.Source;
 
@@ -276,8 +417,16 @@ export interface BetaMetadata {
   user_id?: string | null;
 }
 
+export interface BetaPlainTextSource {
+  data: string;
+
+  media_type: 'text/plain';
+
+  type: 'text';
+}
+
 export interface BetaRawContentBlockDeltaEvent {
-  delta: BetaTextDelta | BetaInputJSONDelta;
+  delta: BetaTextDelta | BetaInputJSONDelta | BetaCitationsDelta;
 
   index: number;
 
@@ -347,6 +496,15 @@ export type BetaRawMessageStreamEvent =
   | BetaRawContentBlockStopEvent;
 
 export interface BetaTextBlock {
+  /**
+   * Citations supporting the text block.
+   *
+   * The type of citation returned will depend on the type of document being cited.
+   * Citing a PDF results in `page_location`, plain text results in `char_location`,
+   * and content document results in `content_block_location`.
+   */
+  citations: Array<BetaTextCitation> | null;
+
   text: string;
 
   type: 'text';
@@ -358,8 +516,20 @@ export interface BetaTextBlockParam {
   type: 'text';
 
   cache_control?: BetaCacheControlEphemeral | null;
+
+  citations?: Array<BetaTextCitationParam> | null;
 }
 
+export type BetaTextCitation =
+  | BetaCitationCharLocation
+  | BetaCitationPageLocation
+  | BetaCitationContentBlockLocation;
+
+export type BetaTextCitationParam =
+  | BetaCitationCharLocationParam
+  | BetaCitationPageLocationParam
+  | BetaCitationContentBlockLocationParam;
+
 export interface BetaTextDelta {
   text: string;
 
@@ -1070,14 +1240,25 @@ export interface MessageCountTokensParams {
 }
 
 Messages.Batches = Batches;
+Messages.BetaMessageBatchesPage = BetaMessageBatchesPage;
 
 export declare namespace Messages {
   export {
     type BetaBase64PDFBlock as BetaBase64PDFBlock,
     type BetaBase64PDFSource as BetaBase64PDFSource,
     type BetaCacheControlEphemeral as BetaCacheControlEphemeral,
+    type BetaCitationCharLocation as BetaCitationCharLocation,
+    type BetaCitationCharLocationParam as BetaCitationCharLocationParam,
+    type BetaCitationContentBlockLocation as BetaCitationContentBlockLocation,
+    type BetaCitationContentBlockLocationParam as BetaCitationContentBlockLocationParam,
+    type BetaCitationPageLocation as BetaCitationPageLocation,
+    type BetaCitationPageLocationParam as BetaCitationPageLocationParam,
+    type BetaCitationsConfigParam as BetaCitationsConfigParam,
+    type BetaCitationsDelta as BetaCitationsDelta,
     type BetaContentBlock as BetaContentBlock,
     type BetaContentBlockParam as BetaContentBlockParam,
+    type BetaContentBlockSource as BetaContentBlockSource,
+    type BetaContentBlockSourceContent as BetaContentBlockSourceContent,
     type BetaImageBlockParam as BetaImageBlockParam,
     type BetaInputJSONDelta as BetaInputJSONDelta,
     type BetaMessage as BetaMessage,
@@ -1085,6 +1266,7 @@ export declare namespace Messages {
     type BetaMessageParam as BetaMessageParam,
     type BetaMessageTokensCount as BetaMessageTokensCount,
     type BetaMetadata as BetaMetadata,
+    type BetaPlainTextSource as BetaPlainTextSource,
     type BetaRawContentBlockDeltaEvent as BetaRawContentBlockDeltaEvent,
     type BetaRawContentBlockStartEvent as BetaRawContentBlockStartEvent,
     type BetaRawContentBlockStopEvent as BetaRawContentBlockStopEvent,
@@ -1094,6 +1276,8 @@ export declare namespace Messages {
     type BetaRawMessageStreamEvent as BetaRawMessageStreamEvent,
     type BetaTextBlock as BetaTextBlock,
     type BetaTextBlockParam as BetaTextBlockParam,
+    type BetaTextCitation as BetaTextCitation,
+    type BetaTextCitationParam as BetaTextCitationParam,
     type BetaTextDelta as BetaTextDelta,
     type BetaTool as BetaTool,
     type BetaToolBash20241022 as BetaToolBash20241022,
@@ -1125,7 +1309,7 @@ export declare namespace Messages {
     type BetaMessageBatchRequestCounts as BetaMessageBatchRequestCounts,
     type BetaMessageBatchResult as BetaMessageBatchResult,
     type BetaMessageBatchSucceededResult as BetaMessageBatchSucceededResult,
-    type BetaMessageBatchesPage as BetaMessageBatchesPage,
+    BetaMessageBatchesPage as BetaMessageBatchesPage,
     type BatchCreateParams as BatchCreateParams,
     type BatchRetrieveParams as BatchRetrieveParams,
     type BatchListParams as BatchListParams,

package/src/resources/beta/models.ts

@@ -1,9 +1,9 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../resource';
-import { APIPromise } from '../../api-promise';
-import { Page, type PageParams, PagePromise } from '../../pagination';
-import { RequestOptions } from '../../internal/request-options';
+import { APIResource } from "../../resource.js";
+import { isRequestOptions } from "../../core.js";
+import * as Core from "../../core.js";
+import { Page, type PageParams } from "../../pagination.js";
 
 export class Models extends APIResource {
   /**
@@ -12,8 +12,8 @@ export class Models extends APIResource {
    * The Models API response can be used to determine information about a specific
    * model or resolve a model alias to a model ID.
    */
-  retrieve(modelID: string, options?: RequestOptions): APIPromise<BetaModelInfo> {
-    return this._client.get(`/v1/models/${modelID}?beta=true`, options);
+  retrieve(modelId: string, options?: Core.RequestOptions): Core.APIPromise<BetaModelInfo> {
+    return this._client.get(`/v1/models/${modelId}?beta=true`, options);
   }
 
   /**
@@ -23,14 +23,22 @@ export class Models extends APIResource {
    * use in the API. More recently released models are listed first.
    */
   list(
-    query: ModelListParams | null | undefined = {},
-    options?: RequestOptions,
-  ): PagePromise<BetaModelInfosPage, BetaModelInfo> {
-    return this._client.getAPIList('/v1/models?beta=true', Page<BetaModelInfo>, { query, ...options });
+    query?: ModelListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<BetaModelInfosPage, BetaModelInfo>;
+  list(options?: Core.RequestOptions): Core.PagePromise<BetaModelInfosPage, BetaModelInfo>;
+  list(
+    query: ModelListParams | Core.RequestOptions = {},
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<BetaModelInfosPage, BetaModelInfo> {
+    if (isRequestOptions(query)) {
+      return this.list({}, query);
+    }
+    return this._client.getAPIList('/v1/models?beta=true', BetaModelInfosPage, { query, ...options });
   }
 }
 
-export type BetaModelInfosPage = Page<BetaModelInfo>;
+export class BetaModelInfosPage extends Page<BetaModelInfo> {}
 
 export interface BetaModelInfo {
   /**
@@ -59,10 +67,12 @@ export interface BetaModelInfo {
 
 export interface ModelListParams extends PageParams {}
 
+Models.BetaModelInfosPage = BetaModelInfosPage;
+
 export declare namespace Models {
   export {
     type BetaModelInfo as BetaModelInfo,
-    type BetaModelInfosPage as BetaModelInfosPage,
+    BetaModelInfosPage as BetaModelInfosPage,
     type ModelListParams as ModelListParams,
   };
 }