@anthropic-ai/sdk 0.32.1 → 0.33.1

package/resources/shared.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"shared.mjs","sourceRoot":"","sources":["../src/resources/shared.ts"],"names":[],"mappings":"AAAA,sFAAsF"}

package/src/core.ts

@@ -37,7 +37,7 @@ type APIResponseProps = {
   controller: AbortController;
 };
 
-async function defaultParseResponse<T>(props: APIResponseProps): Promise<T> {
+async function defaultParseResponse<T>(props: APIResponseProps): Promise<WithRequestID<T>> {
   const { response } = props;
   if (props.options.stream) {
     debug('response', response.status, response.url, response.headers, response.body);
@@ -54,11 +54,11 @@ async function defaultParseResponse<T>(props: APIResponseProps): Promise<T> {
 
   // fetch refuses to read the body when the status code is 204.
   if (response.status === 204) {
-    return null as T;
+    return null as WithRequestID<T>;
   }
 
   if (props.options.__binaryResponse) {
-    return response as unknown as T;
+    return response as unknown as WithRequestID<T>;
   }
 
   const contentType = response.headers.get('content-type');
@@ -69,26 +69,44 @@ async function defaultParseResponse<T>(props: APIResponseProps): Promise<T> {
 
     debug('response', response.status, response.url, response.headers, json);
 
-    return json as T;
+    return _addRequestID(json as T, response);
   }
 
   const text = await response.text();
   debug('response', response.status, response.url, response.headers, text);
 
   // TODO handle blob, arraybuffer, other content types, etc.
-  return text as unknown as T;
+  return text as unknown as WithRequestID<T>;
+}
+
+type WithRequestID<T> =
+  T extends Array<any> | Response | AbstractPage<any> ? T
+  : T extends Record<string, any> ? T & { _request_id?: string | null }
+  : T;
+
+function _addRequestID<T>(value: T, response: Response): WithRequestID<T> {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) {
+    return value as WithRequestID<T>;
+  }
+
+  return Object.defineProperty(value, '_request_id', {
+    value: response.headers.get('request-id'),
+    enumerable: false,
+  }) as WithRequestID<T>;
 }
 
 /**
  * A subclass of `Promise` providing additional helper methods
  * for interacting with the SDK.
  */
-export class APIPromise<T> extends Promise<T> {
-  private parsedPromise: Promise<T> | undefined;
+export class APIPromise<T> extends Promise<WithRequestID<T>> {
+  private parsedPromise: Promise<WithRequestID<T>> | undefined;
 
   constructor(
     private responsePromise: Promise<APIResponseProps>,
-    private parseResponse: (props: APIResponseProps) => PromiseOrValue<T> = defaultParseResponse,
+    private parseResponse: (
+      props: APIResponseProps,
+    ) => PromiseOrValue<WithRequestID<T>> = defaultParseResponse,
   ) {
     super((resolve) => {
       // this is maybe a bit weird but this has to be a no-op to not implicitly
@@ -100,7 +118,7 @@ export class APIPromise<T> extends Promise<T> {
 
   _thenUnwrap<U>(transform: (data: T, props: APIResponseProps) => U): APIPromise<U> {
     return new APIPromise(this.responsePromise, async (props) =>
-      transform(await this.parseResponse(props), props),
+      _addRequestID(transform(await this.parseResponse(props), props), props.response),
     );
   }
 
@@ -120,33 +138,35 @@ export class APIPromise<T> extends Promise<T> {
   asResponse(): Promise<Response> {
     return this.responsePromise.then((p) => p.response);
   }
+
   /**
-   * Gets the parsed response data and the raw `Response` instance.
+   * Gets the parsed response data, the raw `Response` instance and the ID of the request,
+   * returned vie the `request-id` header which is useful for debugging requests and resporting
+   * issues to Anthropic.
    *
    * If you just want to get the raw `Response` instance without parsing it,
    * you can use {@link asResponse()}.
    *
-   *
    * 👋 Getting the wrong TypeScript type for `Response`?
    * Try setting `"moduleResolution": "NodeNext"` if you can,
    * or add one of these imports before your first `import … from '@anthropic-ai/sdk'`:
    * - `import '@anthropic-ai/sdk/shims/node'` (if you're running on Node)
    * - `import '@anthropic-ai/sdk/shims/web'` (otherwise)
    */
-  async withResponse(): Promise<{ data: T; response: Response }> {
+  async withResponse(): Promise<{ data: T; response: Response; request_id: string | null | undefined }> {
     const [data, response] = await Promise.all([this.parse(), this.asResponse()]);
-    return { data, response };
+    return { data, response, request_id: response.headers.get('request-id') };
   }
 
-  private parse(): Promise<T> {
+  private parse(): Promise<WithRequestID<T>> {
     if (!this.parsedPromise) {
-      this.parsedPromise = this.responsePromise.then(this.parseResponse);
+      this.parsedPromise = this.responsePromise.then(this.parseResponse) as any as Promise<WithRequestID<T>>;
     }
     return this.parsedPromise;
   }
 
-  override then<TResult1 = T, TResult2 = never>(
-    onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null,
+  override then<TResult1 = WithRequestID<T>, TResult2 = never>(
+    onfulfilled?: ((value: WithRequestID<T>) => TResult1 | PromiseLike<TResult1>) | undefined | null,
     onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null,
   ): Promise<TResult1 | TResult2> {
     return this.parse().then(onfulfilled, onrejected);
@@ -154,11 +174,11 @@ export class APIPromise<T> extends Promise<T> {
 
   override catch<TResult = never>(
     onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null,
-  ): Promise<T | TResult> {
+  ): Promise<WithRequestID<T> | TResult> {
     return this.parse().catch(onrejected);
   }
 
-  override finally(onfinally?: (() => void) | undefined | null): Promise<T> {
+  override finally(onfinally?: (() => void) | undefined | null): Promise<WithRequestID<T>> {
     return this.parse().finally(onfinally);
   }
 }
@@ -177,7 +197,7 @@ export abstract class APIClient {
     maxRetries = 2,
     timeout = 600000, // 10 minutes
     httpAgent,
-    fetch: overridenFetch,
+    fetch: overriddenFetch,
   }: {
     baseURL: string;
     maxRetries?: number | undefined;
@@ -190,7 +210,7 @@ export abstract class APIClient {
     this.timeout = validatePositiveInteger('timeout', timeout);
     this.httpAgent = httpAgent;
 
-    this.fetch = overridenFetch ?? fetch;
+    this.fetch = overriddenFetch ?? fetch;
   }
 
   protected authHeaders(opts: FinalRequestOptions): Headers {
@@ -537,19 +557,13 @@ export abstract class APIClient {
     const timeout = setTimeout(() => controller.abort(), ms);
 
     return (
-      this.getRequestClient()
-        // use undefined this binding; fetch errors if bound to something else in browser/cloudflare
-        .fetch.call(undefined, url, { signal: controller.signal as any, ...options })
-        .finally(() => {
-          clearTimeout(timeout);
-        })
+      // use undefined this binding; fetch errors if bound to something else in browser/cloudflare
+      this.fetch.call(undefined, url, { signal: controller.signal as any, ...options }).finally(() => {
+        clearTimeout(timeout);
+      })
     );
   }
 
-  protected getRequestClient(): RequestClient {
-    return { fetch: this.fetch };
-  }
-
   private shouldRetry(response: Response): boolean {
     // Note this is not a standard header.
     const shouldRetryHeader = response.headers.get('x-should-retry');
@@ -724,7 +738,13 @@ export class PagePromise<
   ) {
     super(
       request,
-      async (props) => new Page(client, props.response, await defaultParseResponse(props), props.options),
+      async (props) =>
+        new Page(
+          client,
+          props.response,
+          await defaultParseResponse(props),
+          props.options,
+        ) as WithRequestID<PageClass>,
     );
   }
 
@@ -992,8 +1012,8 @@ export const safeJSON = (text: string) => {
   }
 };
 
-// https://stackoverflow.com/a/19709846
-const startsWithSchemeRegexp = new RegExp('^(?:[a-z]+:)?//', 'i');
+// https://url.spec.whatwg.org/#url-scheme-string
+const startsWithSchemeRegexp = /^[a-z][a-z0-9+.-]*:/i;
 const isAbsoluteURL = (url: string): boolean => {
   return startsWithSchemeRegexp.test(url);
 };

package/src/error.ts

@@ -4,19 +4,21 @@ import { castToError, Headers } from "./core.js";
 
 export class AnthropicError extends Error {}
 
-export class APIError extends AnthropicError {
-  readonly status: number | undefined;
-  readonly headers: Headers | undefined;
-  readonly error: Object | undefined;
+export class APIError<
+  TStatus extends number | undefined = number | undefined,
+  THeaders extends Headers | undefined = Headers | undefined,
+  TError extends Object | undefined = Object | undefined,
+> extends AnthropicError {
+  /** HTTP status for the response that caused the error */
+  readonly status: TStatus;
+  /** HTTP headers for the response that caused the error */
+  readonly headers: THeaders;
+  /** JSON body of the response that caused the error */
+  readonly error: TError;
 
   readonly request_id: string | null | undefined;
 
-  constructor(
-    status: number | undefined,
-    error: Object | undefined,
-    message: string | undefined,
-    headers: Headers | undefined,
-  ) {
+  constructor(status: TStatus, error: TError, message: string | undefined, headers: THeaders) {
     super(`${APIError.makeMessage(status, error, message)}`);
     this.status = status;
     this.headers = headers;
@@ -51,7 +53,7 @@ export class APIError extends AnthropicError {
     message: string | undefined,
     headers: Headers | undefined,
   ): APIError {
-    if (!status) {
+    if (!status || !headers) {
       return new APIConnectionError({ message, cause: castToError(errorResponse) });
     }
 
@@ -93,17 +95,13 @@ export class APIError extends AnthropicError {
   }
 }
 
-export class APIUserAbortError extends APIError {
-  override readonly status: undefined = undefined;
-
+export class APIUserAbortError extends APIError<undefined, undefined, undefined> {
   constructor({ message }: { message?: string } = {}) {
     super(undefined, undefined, message || 'Request was aborted.', undefined);
   }
 }
 
-export class APIConnectionError extends APIError {
-  override readonly status: undefined = undefined;
-
+export class APIConnectionError extends APIError<undefined, undefined, undefined> {
   constructor({ message, cause }: { message?: string | undefined; cause?: Error | undefined }) {
     super(undefined, undefined, message || 'Connection error.', undefined);
     // in some environments the 'cause' property is already declared
@@ -118,32 +116,18 @@ export class APIConnectionTimeoutError extends APIConnectionError {
   }
 }
 
-export class BadRequestError extends APIError {
-  override readonly status: 400 = 400;
-}
+export class BadRequestError extends APIError<400, Headers> {}
 
-export class AuthenticationError extends APIError {
-  override readonly status: 401 = 401;
-}
+export class AuthenticationError extends APIError<401, Headers> {}
 
-export class PermissionDeniedError extends APIError {
-  override readonly status: 403 = 403;
-}
+export class PermissionDeniedError extends APIError<403, Headers> {}
 
-export class NotFoundError extends APIError {
-  override readonly status: 404 = 404;
-}
+export class NotFoundError extends APIError<404, Headers> {}
 
-export class ConflictError extends APIError {
-  override readonly status: 409 = 409;
-}
+export class ConflictError extends APIError<409, Headers> {}
 
-export class UnprocessableEntityError extends APIError {
-  override readonly status: 422 = 422;
-}
+export class UnprocessableEntityError extends APIError<422, Headers> {}
 
-export class RateLimitError extends APIError {
-  override readonly status: 429 = 429;
-}
+export class RateLimitError extends APIError<429, Headers> {}
 
-export class InternalServerError extends APIError {}
+export class InternalServerError extends APIError<number, Headers> {}

package/src/index.ts

@@ -14,14 +14,35 @@ import {
   CompletionCreateParamsStreaming,
   Completions,
 } from "./resources/completions.js";
+import { ModelInfo, ModelInfosPage, ModelListParams, Models } from "./resources/models.js";
 import {
+  AnthropicBeta,
+  Beta,
+  BetaAPIError,
+  BetaAuthenticationError,
+  BetaBillingError,
+  BetaError,
+  BetaErrorResponse,
+  BetaGatewayTimeoutError,
+  BetaInvalidRequestError,
+  BetaNotFoundError,
+  BetaOverloadedError,
+  BetaPermissionError,
+  BetaRateLimitError,
+} from "./resources/beta/beta.js";
+import {
+  Base64PDFSource,
+  CacheControlEphemeral,
   ContentBlock,
   ContentBlockDeltaEvent,
+  ContentBlockParam,
   ContentBlockStartEvent,
   ContentBlockStopEvent,
+  DocumentBlockParam,
   ImageBlockParam,
   InputJSONDelta,
   Message,
+  MessageCountTokensParams,
   MessageCreateParams,
   MessageCreateParamsNonStreaming,
   MessageCreateParamsStreaming,
@@ -32,6 +53,7 @@ import {
   MessageStopEvent,
   MessageStreamEvent,
   MessageStreamParams,
+  MessageTokensCount,
   Messages,
   Metadata,
   Model,
@@ -54,20 +76,7 @@ import {
   ToolUseBlock,
   ToolUseBlockParam,
   Usage,
-} from "./resources/messages.js";
-import {
-  AnthropicBeta,
-  Beta,
-  BetaAPIError,
-  BetaAuthenticationError,
-  BetaError,
-  BetaErrorResponse,
-  BetaInvalidRequestError,
-  BetaNotFoundError,
-  BetaOverloadedError,
-  BetaPermissionError,
-  BetaRateLimitError,
-} from "./resources/beta/beta.js";
+} from "./resources/messages/messages.js";
 
 export interface ClientOptions {
   /**
@@ -181,7 +190,7 @@ export class Anthropic extends Core.APIClient {
 
     if (!options.dangerouslyAllowBrowser && Core.isRunningInBrowser()) {
       throw new Errors.AnthropicError(
-        "It looks like you're running in a browser-like environment.\n\nThis is disabled by default, as it risks exposing your secret API credentials to attackers.\nIf you understand the risks and have appropriate mitigations in place,\nyou can set the `dangerouslyAllowBrowser` option to `true`, e.g.,\n\nnew Anthropic({ apiKey, dangerouslyAllowBrowser: true });\n\nTODO: link!\n",
+        "It looks like you're running in a browser-like environment.\n\nThis is disabled by default, as it risks exposing your secret API credentials to attackers.\nIf you understand the risks and have appropriate mitigations in place,\nyou can set the `dangerouslyAllowBrowser` option to `true`, e.g.,\n\nnew Anthropic({ apiKey, dangerouslyAllowBrowser: true });\n",
       );
     }
 
@@ -201,6 +210,7 @@ export class Anthropic extends Core.APIClient {
 
   completions: API.Completions = new API.Completions(this);
   messages: API.Messages = new API.Messages(this);
+  models: API.Models = new API.Models(this);
   beta: API.Beta = new API.Beta(this);
 
   protected override defaultQuery(): Core.DefaultQuery | undefined {
@@ -289,31 +299,11 @@ export class Anthropic extends Core.APIClient {
   static fileFromPath = Uploads.fileFromPath;
 }
 
-export const { HUMAN_PROMPT, AI_PROMPT } = Anthropic;
-
-export {
-  AnthropicError,
-  APIError,
-  APIConnectionError,
-  APIConnectionTimeoutError,
-  APIUserAbortError,
-  NotFoundError,
-  ConflictError,
-  RateLimitError,
-  BadRequestError,
-  AuthenticationError,
-  InternalServerError,
-  PermissionDeniedError,
-  UnprocessableEntityError,
-} from "./error.js";
-
-export import toFile = Uploads.toFile;
-export import fileFromPath = Uploads.fileFromPath;
-
 Anthropic.Completions = Completions;
 Anthropic.Messages = Messages;
+Anthropic.Models = Models;
+Anthropic.ModelInfosPage = ModelInfosPage;
 Anthropic.Beta = Beta;
-
 export declare namespace Anthropic {
   export type RequestOptions = Core.RequestOptions;
 
@@ -330,10 +320,14 @@ export declare namespace Anthropic {
 
   export {
     Messages as Messages,
+    type Base64PDFSource as Base64PDFSource,
+    type CacheControlEphemeral as CacheControlEphemeral,
     type ContentBlock as ContentBlock,
     type ContentBlockDeltaEvent as ContentBlockDeltaEvent,
+    type ContentBlockParam as ContentBlockParam,
     type ContentBlockStartEvent as ContentBlockStartEvent,
     type ContentBlockStopEvent as ContentBlockStopEvent,
+    type DocumentBlockParam as DocumentBlockParam,
     type ImageBlockParam as ImageBlockParam,
     type InputJSONDelta as InputJSONDelta,
     type Message as Message,
@@ -343,6 +337,7 @@ export declare namespace Anthropic {
     type MessageStartEvent as MessageStartEvent,
     type MessageStopEvent as MessageStopEvent,
     type MessageStreamEvent as MessageStreamEvent,
+    type MessageTokensCount as MessageTokensCount,
     type Metadata as Metadata,
     type Model as Model,
     type RawContentBlockDeltaEvent as RawContentBlockDeltaEvent,
@@ -368,6 +363,14 @@ export declare namespace Anthropic {
     type MessageCreateParamsNonStreaming as MessageCreateParamsNonStreaming,
     type MessageCreateParamsStreaming as MessageCreateParamsStreaming,
     type MessageStreamParams as MessageStreamParams,
+    type MessageCountTokensParams as MessageCountTokensParams,
+  };
+
+  export {
+    Models as Models,
+    type ModelInfo as ModelInfo,
+    ModelInfosPage as ModelInfosPage,
+    type ModelListParams as ModelListParams,
   };
 
   export {
@@ -375,14 +378,46 @@ export declare namespace Anthropic {
     type AnthropicBeta as AnthropicBeta,
     type BetaAPIError as BetaAPIError,
     type BetaAuthenticationError as BetaAuthenticationError,
+    type BetaBillingError as BetaBillingError,
     type BetaError as BetaError,
     type BetaErrorResponse as BetaErrorResponse,
+    type BetaGatewayTimeoutError as BetaGatewayTimeoutError,
     type BetaInvalidRequestError as BetaInvalidRequestError,
     type BetaNotFoundError as BetaNotFoundError,
     type BetaOverloadedError as BetaOverloadedError,
     type BetaPermissionError as BetaPermissionError,
     type BetaRateLimitError as BetaRateLimitError,
   };
+
+  export type APIErrorObject = API.APIErrorObject;
+  export type AuthenticationError = API.AuthenticationError;
+  export type BillingError = API.BillingError;
+  export type ErrorObject = API.ErrorObject;
+  export type ErrorResponse = API.ErrorResponse;
+  export type GatewayTimeoutError = API.GatewayTimeoutError;
+  export type InvalidRequestError = API.InvalidRequestError;
+  export type NotFoundError = API.NotFoundError;
+  export type OverloadedError = API.OverloadedError;
+  export type PermissionError = API.PermissionError;
+  export type RateLimitError = API.RateLimitError;
 }
+export const { HUMAN_PROMPT, AI_PROMPT } = Anthropic;
+
+export { toFile, fileFromPath } from "./uploads.js";
+export {
+  AnthropicError,
+  APIError,
+  APIConnectionError,
+  APIConnectionTimeoutError,
+  APIUserAbortError,
+  NotFoundError,
+  ConflictError,
+  RateLimitError,
+  BadRequestError,
+  AuthenticationError,
+  InternalServerError,
+  PermissionDeniedError,
+  UnprocessableEntityError,
+} from "./error.js";
 
 export default Anthropic;

package/src/resources/beta/beta.ts

@@ -1,6 +1,8 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from "../../resource.js";
+import * as ModelsAPI from "./models.js";
+import { BetaModelInfo, BetaModelInfosPage, ModelListParams, Models } from "./models.js";
 import * as MessagesAPI from "./messages/messages.js";
 import {
   BetaBase64PDFBlock,
@@ -44,12 +46,10 @@ import {
   MessageCreateParamsStreaming,
   Messages,
 } from "./messages/messages.js";
-import * as PromptCachingAPI from "./prompt-caching/prompt-caching.js";
-import { PromptCaching } from "./prompt-caching/prompt-caching.js";
 
 export class Beta extends APIResource {
+  models: ModelsAPI.Models = new ModelsAPI.Models(this._client);
   messages: MessagesAPI.Messages = new MessagesAPI.Messages(this._client);
-  promptCaching: PromptCachingAPI.PromptCaching = new PromptCachingAPI.PromptCaching(this._client);
 }
 
 export type AnthropicBeta =
@@ -72,12 +72,20 @@ export interface BetaAuthenticationError {
   type: 'authentication_error';
 }
 
+export interface BetaBillingError {
+  message: string;
+
+  type: 'billing_error';
+}
+
 export type BetaError =
   | BetaInvalidRequestError
   | BetaAuthenticationError
+  | BetaBillingError
   | BetaPermissionError
   | BetaNotFoundError
   | BetaRateLimitError
+  | BetaGatewayTimeoutError
   | BetaAPIError
   | BetaOverloadedError;
 
@@ -87,6 +95,12 @@ export interface BetaErrorResponse {
   type: 'error';
 }
 
+export interface BetaGatewayTimeoutError {
+  message: string;
+
+  type: 'timeout_error';
+}
+
 export interface BetaInvalidRequestError {
   message: string;
 
@@ -117,16 +131,19 @@ export interface BetaRateLimitError {
   type: 'rate_limit_error';
 }
 
+Beta.Models = Models;
+Beta.BetaModelInfosPage = BetaModelInfosPage;
 Beta.Messages = Messages;
-Beta.PromptCaching = PromptCaching;
 
 export declare namespace Beta {
   export {
     type AnthropicBeta as AnthropicBeta,
     type BetaAPIError as BetaAPIError,
     type BetaAuthenticationError as BetaAuthenticationError,
+    type BetaBillingError as BetaBillingError,
     type BetaError as BetaError,
     type BetaErrorResponse as BetaErrorResponse,
+    type BetaGatewayTimeoutError as BetaGatewayTimeoutError,
     type BetaInvalidRequestError as BetaInvalidRequestError,
     type BetaNotFoundError as BetaNotFoundError,
     type BetaOverloadedError as BetaOverloadedError,
@@ -134,6 +151,13 @@ export declare namespace Beta {
     type BetaRateLimitError as BetaRateLimitError,
   };
 
+  export {
+    Models as Models,
+    type BetaModelInfo as BetaModelInfo,
+    BetaModelInfosPage as BetaModelInfosPage,
+    type ModelListParams as ModelListParams,
+  };
+
   export {
     Messages as Messages,
     type BetaBase64PDFBlock as BetaBase64PDFBlock,
@@ -176,6 +200,4 @@ export declare namespace Beta {
     type MessageCreateParamsStreaming as MessageCreateParamsStreaming,
     type MessageCountTokensParams as MessageCountTokensParams,
   };
-
-  export { PromptCaching as PromptCaching };
 }

package/src/resources/beta/index.ts

@@ -5,14 +5,17 @@ export {
   type AnthropicBeta,
   type BetaAPIError,
   type BetaAuthenticationError,
+  type BetaBillingError,
   type BetaError,
   type BetaErrorResponse,
+  type BetaGatewayTimeoutError,
   type BetaInvalidRequestError,
   type BetaNotFoundError,
   type BetaOverloadedError,
   type BetaPermissionError,
   type BetaRateLimitError,
 } from "./beta.js";
+export { BetaModelInfosPage, Models, type BetaModelInfo, type ModelListParams } from "./models.js";
 export {
   Messages,
   type BetaBase64PDFBlock,
@@ -55,4 +58,3 @@ export {
   type MessageCreateParamsStreaming,
   type MessageCountTokensParams,
 } from "./messages/index.js";
-export { PromptCaching } from "./prompt-caching/index.js";

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

@@ -4,8 +4,8 @@ import { APIResource } from "../../../resource.js";
 import { APIPromise } from "../../../core.js";
 import * as Core from "../../../core.js";
 import * as MessagesMessagesAPI from "./messages.js";
-import * as MessagesAPI from "../../messages.js";
 import * as BetaAPI from "../beta.js";
+import * as MessagesAPI from "../../messages/messages.js";
 import * as BatchesAPI from "./batches.js";
 import {
   BatchCancelParams,