@openrouter/sdk 0.0.0-beta.7 → 0.0.0-beta.8

package/src/funcs/modelsGetModelsUser.ts

@@ -6,7 +6,7 @@ import { OpenRouterCore } from "../core.js";
 import * as M from "../lib/matchers.js";
 import { compactMap } from "../lib/primitives.js";
 import { RequestOptions } from "../lib/sdks.js";
-import { extractSecurity, resolveGlobalSecurity } from "../lib/security.js";
+import { resolveSecurity } from "../lib/security.js";
 import { pathToFunc } from "../lib/url.js";
 import {
   ConnectionError,
@@ -15,6 +15,7 @@ import {
   RequestTimeoutError,
   UnexpectedClientError,
 } from "../models/errors/httpclienterrors.js";
+import * as errors from "../models/errors/index.js";
 import { OpenRouterError } from "../models/errors/openroutererror.js";
 import { ResponseValidationError } from "../models/errors/responsevalidationerror.js";
 import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
@@ -27,10 +28,12 @@ import { Result } from "../types/fp.js";
  */
 export function modelsGetModelsUser(
   client: OpenRouterCore,
+  security: operations.GetModelsUserSecurity,
   options?: RequestOptions,
 ): APIPromise<
   Result<
     operations.GetModelsUserResponse,
+    | errors.ErrorResponse
     | OpenRouterError
     | ResponseValidationError
     | ConnectionError
@@ -43,17 +46,20 @@ export function modelsGetModelsUser(
 > {
   return new APIPromise($do(
     client,
+    security,
     options,
   ));
 }
 
 async function $do(
   client: OpenRouterCore,
+  security: operations.GetModelsUserSecurity,
   options?: RequestOptions,
 ): Promise<
   [
     Result<
       operations.GetModelsUserResponse,
+      | errors.ErrorResponse
       | OpenRouterError
       | ResponseValidationError
       | ConnectionError
@@ -72,18 +78,25 @@ async function $do(
     Accept: "application/json",
   }));
 
-  const securityInput = await extractSecurity(client._options.security);
-  const requestSecurity = resolveGlobalSecurity(securityInput);
+  const requestSecurity = resolveSecurity(
+    [
+      {
+        fieldName: "Authorization",
+        type: "apiKey:header",
+        value: security?.bearer,
+      },
+    ],
+  );
 
   const context = {
     options: client._options,
     baseURL: options?.serverURL ?? client._baseURL ?? "",
     operationID: "get_/models/user",
-    oAuth2Scopes: [],
+    oAuth2Scopes: null,
 
     resolvedSecurity: requestSecurity,
 
-    securitySource: client._options.security,
+    securitySource: security,
     retryConfig: options?.retries
       || client._options.retryConfig
       || { strategy: "none" },
@@ -115,8 +128,13 @@ async function $do(
   }
   const response = doResult.value;
 
+  const responseFields = {
+    HttpMeta: { Response: response, Request: req },
+  };
+
   const [result] = await M.match<
     operations.GetModelsUserResponse,
+    | errors.ErrorResponse
     | OpenRouterError
     | ResponseValidationError
     | ConnectionError
@@ -127,10 +145,9 @@ async function $do(
     | SDKValidationError
   >(
     M.json(200, operations.GetModelsUserResponse$inboundSchema),
-    M.fail("4XX"),
-    M.fail("5XX"),
-    M.json("default", operations.GetModelsUserResponse$inboundSchema),
-  )(response, req);
+    M.jsonErr("4XX", errors.ErrorResponse$inboundSchema),
+    M.jsonErr("5XX", errors.ErrorResponse$inboundSchema),
+  )(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }

package/src/funcs/oAuthPostAuthKeys.ts

@@ -0,0 +1,171 @@
+/*
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ */
+
+import { OpenRouterCore } from "../core.js";
+import { encodeJSON } from "../lib/encodings.js";
+import * as M from "../lib/matchers.js";
+import { compactMap } from "../lib/primitives.js";
+import { safeParse } from "../lib/schemas.js";
+import { RequestOptions } from "../lib/sdks.js";
+import { extractSecurity, resolveGlobalSecurity } from "../lib/security.js";
+import { pathToFunc } from "../lib/url.js";
+import {
+  ConnectionError,
+  InvalidRequestError,
+  RequestAbortedError,
+  RequestTimeoutError,
+  UnexpectedClientError,
+} from "../models/errors/httpclienterrors.js";
+import * as errors from "../models/errors/index.js";
+import { OpenRouterError } from "../models/errors/openroutererror.js";
+import { ResponseValidationError } from "../models/errors/responsevalidationerror.js";
+import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
+import * as operations from "../models/operations/index.js";
+import { APICall, APIPromise } from "../types/async.js";
+import { Result } from "../types/fp.js";
+
+/**
+ * Exchange authorization code for API key
+ *
+ * @remarks
+ * Exchange an authorization code from the PKCE flow for a user-controlled API key
+ */
+export function oAuthPostAuthKeys(
+  client: OpenRouterCore,
+  request?: operations.PostAuthKeysRequest | undefined,
+  options?: RequestOptions,
+): APIPromise<
+  Result<
+    operations.PostAuthKeysResponse,
+    | errors.ErrorResponse
+    | OpenRouterError
+    | ResponseValidationError
+    | ConnectionError
+    | RequestAbortedError
+    | RequestTimeoutError
+    | InvalidRequestError
+    | UnexpectedClientError
+    | SDKValidationError
+  >
+> {
+  return new APIPromise($do(
+    client,
+    request,
+    options,
+  ));
+}
+
+async function $do(
+  client: OpenRouterCore,
+  request?: operations.PostAuthKeysRequest | undefined,
+  options?: RequestOptions,
+): Promise<
+  [
+    Result<
+      operations.PostAuthKeysResponse,
+      | errors.ErrorResponse
+      | OpenRouterError
+      | ResponseValidationError
+      | ConnectionError
+      | RequestAbortedError
+      | RequestTimeoutError
+      | InvalidRequestError
+      | UnexpectedClientError
+      | SDKValidationError
+    >,
+    APICall,
+  ]
+> {
+  const parsed = safeParse(
+    request,
+    (value) =>
+      operations.PostAuthKeysRequest$outboundSchema.optional().parse(value),
+    "Input validation failed",
+  );
+  if (!parsed.ok) {
+    return [parsed, { status: "invalid" }];
+  }
+  const payload = parsed.value;
+  const body = payload === undefined
+    ? null
+    : encodeJSON("body", payload, { explode: true });
+
+  const path = pathToFunc("/auth/keys")();
+
+  const headers = new Headers(compactMap({
+    "Content-Type": "application/json",
+    Accept: "application/json",
+  }));
+
+  const secConfig = await extractSecurity(client._options.apiKey);
+  const securityInput = secConfig == null ? {} : { apiKey: secConfig };
+  const requestSecurity = resolveGlobalSecurity(securityInput);
+
+  const context = {
+    options: client._options,
+    baseURL: options?.serverURL ?? client._baseURL ?? "",
+    operationID: "post_/auth/keys",
+    oAuth2Scopes: [],
+
+    resolvedSecurity: requestSecurity,
+
+    securitySource: client._options.apiKey,
+    retryConfig: options?.retries
+      || client._options.retryConfig
+      || { strategy: "none" },
+    retryCodes: options?.retryCodes || ["429", "500", "502", "503", "504"],
+  };
+
+  const requestRes = client._createRequest(context, {
+    security: requestSecurity,
+    method: "POST",
+    baseURL: options?.serverURL,
+    path: path,
+    headers: headers,
+    body: body,
+    userAgent: client._options.userAgent,
+    timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1,
+  }, options);
+  if (!requestRes.ok) {
+    return [requestRes, { status: "invalid" }];
+  }
+  const req = requestRes.value;
+
+  const doResult = await client._do(req, {
+    context,
+    errorCodes: ["4XX", "5XX"],
+    retryConfig: context.retryConfig,
+    retryCodes: context.retryCodes,
+  });
+  if (!doResult.ok) {
+    return [doResult, { status: "request-error", request: req }];
+  }
+  const response = doResult.value;
+
+  const responseFields = {
+    HttpMeta: { Response: response, Request: req },
+  };
+
+  const [result] = await M.match<
+    operations.PostAuthKeysResponse,
+    | errors.ErrorResponse
+    | OpenRouterError
+    | ResponseValidationError
+    | ConnectionError
+    | RequestAbortedError
+    | RequestTimeoutError
+    | InvalidRequestError
+    | UnexpectedClientError
+    | SDKValidationError
+  >(
+    M.json(200, operations.PostAuthKeysResponse$inboundSchema),
+    M.jsonErr("4XX", errors.ErrorResponse$inboundSchema),
+    M.jsonErr("5XX", errors.ErrorResponse$inboundSchema),
+  )(response, req, { extraFields: responseFields });
+  if (!result.ok) {
+    return [result, { status: "complete", request: req, response }];
+  }
+
+  return [result, { status: "complete", request: req, response }];
+}

package/src/funcs/oAuthPostAuthKeysCode.ts

@@ -0,0 +1,171 @@
+/*
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ */
+
+import { OpenRouterCore } from "../core.js";
+import { encodeJSON } from "../lib/encodings.js";
+import * as M from "../lib/matchers.js";
+import { compactMap } from "../lib/primitives.js";
+import { safeParse } from "../lib/schemas.js";
+import { RequestOptions } from "../lib/sdks.js";
+import { extractSecurity, resolveGlobalSecurity } from "../lib/security.js";
+import { pathToFunc } from "../lib/url.js";
+import {
+  ConnectionError,
+  InvalidRequestError,
+  RequestAbortedError,
+  RequestTimeoutError,
+  UnexpectedClientError,
+} from "../models/errors/httpclienterrors.js";
+import * as errors from "../models/errors/index.js";
+import { OpenRouterError } from "../models/errors/openroutererror.js";
+import { ResponseValidationError } from "../models/errors/responsevalidationerror.js";
+import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
+import * as operations from "../models/operations/index.js";
+import { APICall, APIPromise } from "../types/async.js";
+import { Result } from "../types/fp.js";
+
+/**
+ * Create authorization code
+ *
+ * @remarks
+ * Create an authorization code for the PKCE flow to generate a user-controlled API key
+ */
+export function oAuthPostAuthKeysCode(
+  client: OpenRouterCore,
+  request?: operations.PostAuthKeysCodeRequest | undefined,
+  options?: RequestOptions,
+): APIPromise<
+  Result<
+    operations.PostAuthKeysCodeResponse,
+    | errors.ErrorResponse
+    | OpenRouterError
+    | ResponseValidationError
+    | ConnectionError
+    | RequestAbortedError
+    | RequestTimeoutError
+    | InvalidRequestError
+    | UnexpectedClientError
+    | SDKValidationError
+  >
+> {
+  return new APIPromise($do(
+    client,
+    request,
+    options,
+  ));
+}
+
+async function $do(
+  client: OpenRouterCore,
+  request?: operations.PostAuthKeysCodeRequest | undefined,
+  options?: RequestOptions,
+): Promise<
+  [
+    Result<
+      operations.PostAuthKeysCodeResponse,
+      | errors.ErrorResponse
+      | OpenRouterError
+      | ResponseValidationError
+      | ConnectionError
+      | RequestAbortedError
+      | RequestTimeoutError
+      | InvalidRequestError
+      | UnexpectedClientError
+      | SDKValidationError
+    >,
+    APICall,
+  ]
+> {
+  const parsed = safeParse(
+    request,
+    (value) =>
+      operations.PostAuthKeysCodeRequest$outboundSchema.optional().parse(value),
+    "Input validation failed",
+  );
+  if (!parsed.ok) {
+    return [parsed, { status: "invalid" }];
+  }
+  const payload = parsed.value;
+  const body = payload === undefined
+    ? null
+    : encodeJSON("body", payload, { explode: true });
+
+  const path = pathToFunc("/auth/keys/code")();
+
+  const headers = new Headers(compactMap({
+    "Content-Type": "application/json",
+    Accept: "application/json",
+  }));
+
+  const secConfig = await extractSecurity(client._options.apiKey);
+  const securityInput = secConfig == null ? {} : { apiKey: secConfig };
+  const requestSecurity = resolveGlobalSecurity(securityInput);
+
+  const context = {
+    options: client._options,
+    baseURL: options?.serverURL ?? client._baseURL ?? "",
+    operationID: "post_/auth/keys/code",
+    oAuth2Scopes: [],
+
+    resolvedSecurity: requestSecurity,
+
+    securitySource: client._options.apiKey,
+    retryConfig: options?.retries
+      || client._options.retryConfig
+      || { strategy: "none" },
+    retryCodes: options?.retryCodes || ["429", "500", "502", "503", "504"],
+  };
+
+  const requestRes = client._createRequest(context, {
+    security: requestSecurity,
+    method: "POST",
+    baseURL: options?.serverURL,
+    path: path,
+    headers: headers,
+    body: body,
+    userAgent: client._options.userAgent,
+    timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1,
+  }, options);
+  if (!requestRes.ok) {
+    return [requestRes, { status: "invalid" }];
+  }
+  const req = requestRes.value;
+
+  const doResult = await client._do(req, {
+    context,
+    errorCodes: ["4XX", "5XX"],
+    retryConfig: context.retryConfig,
+    retryCodes: context.retryCodes,
+  });
+  if (!doResult.ok) {
+    return [doResult, { status: "request-error", request: req }];
+  }
+  const response = doResult.value;
+
+  const responseFields = {
+    HttpMeta: { Response: response, Request: req },
+  };
+
+  const [result] = await M.match<
+    operations.PostAuthKeysCodeResponse,
+    | errors.ErrorResponse
+    | OpenRouterError
+    | ResponseValidationError
+    | ConnectionError
+    | RequestAbortedError
+    | RequestTimeoutError
+    | InvalidRequestError
+    | UnexpectedClientError
+    | SDKValidationError
+  >(
+    M.json(200, operations.PostAuthKeysCodeResponse$inboundSchema),
+    M.jsonErr("4XX", errors.ErrorResponse$inboundSchema),
+    M.jsonErr("5XX", errors.ErrorResponse$inboundSchema),
+  )(response, req, { extraFields: responseFields });
+  if (!result.ok) {
+    return [result, { status: "complete", request: req, response }];
+  }
+
+  return [result, { status: "complete", request: req, response }];
+}

package/src/funcs/{getProviders.ts → providersGetProviders.ts}

@@ -23,7 +23,10 @@ import * as operations from "../models/operations/index.js";
 import { APICall, APIPromise } from "../types/async.js";
 import { Result } from "../types/fp.js";
 
-export function getProviders(
+/**
+ * List all available model providers
+ */
+export function providersGetProviders(
   client: OpenRouterCore,
   options?: RequestOptions,
 ): APIPromise<
@@ -72,7 +75,8 @@ async function $do(
     Accept: "application/json",
   }));
 
-  const securityInput = await extractSecurity(client._options.security);
+  const secConfig = await extractSecurity(client._options.apiKey);
+  const securityInput = secConfig == null ? {} : { apiKey: secConfig };
   const requestSecurity = resolveGlobalSecurity(securityInput);
 
   const context = {
@@ -83,7 +87,7 @@ async function $do(
 
     resolvedSecurity: requestSecurity,
 
-    securitySource: client._options.security,
+    securitySource: client._options.apiKey,
     retryConfig: options?.retries
       || client._options.retryConfig
       || { strategy: "none" },

package/src/lib/config.ts

@@ -2,7 +2,6 @@
  * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
  */
 
-import * as models from "../models/index.js";
 import { HTTPClient } from "./http.js";
 import { Logger } from "./logger.js";
 import { RetryConfig } from "./retries.js";
@@ -20,10 +19,7 @@ export const ServerList = {
 } as const;
 
 export type SDKOptions = {
-  /**
-   * The security details required to authenticate the SDK
-   */
-  security?: models.Security | (() => Promise<models.Security>) | undefined;
+  apiKey?: string | (() => Promise<string>) | undefined;
 
   httpClient?: HTTPClient;
   /**
@@ -63,8 +59,8 @@ export function serverURLFromOptions(options: SDKOptions): URL | null {
 export const SDK_METADATA = {
   language: "typescript",
   openapiDocVersion: "1.0.0",
-  sdkVersion: "0.0.0-beta.7",
+  sdkVersion: "0.0.0-beta.8",
   genVersion: "2.715.0",
   userAgent:
-    "speakeasy-sdk/typescript 0.0.0-beta.7 2.715.0 1.0.0 @openrouter/sdk",
+    "speakeasy-sdk/typescript 0.0.0-beta.8 2.715.0 1.0.0 @openrouter/sdk",
 } as const;

package/src/lib/env.ts

@@ -7,15 +7,13 @@ import { dlv } from "./dlv.js";
 import * as z from "zod";
 
 export interface Env {
-  OPENROUTER_API_KEY_AUTH?: string | undefined;
-  OPENROUTER_BEARER_AUTH?: string | undefined;
+  OPENROUTER_API_KEY?: string | undefined;
 
   OPENROUTER_DEBUG?: boolean | undefined;
 }
 
 export const envSchema: z.ZodType<Env, z.ZodTypeDef, unknown> = z.object({
-  OPENROUTER_API_KEY_AUTH: z.string().optional(),
-  OPENROUTER_BEARER_AUTH: z.string().optional(),
+  OPENROUTER_API_KEY: z.string().optional(),
 
   OPENROUTER_DEBUG: z.coerce.boolean().optional(),
 });

package/src/lib/security.ts

@@ -243,18 +243,11 @@ export function resolveGlobalSecurity(
   security: Partial<models.Security> | null | undefined,
 ): SecurityState | null {
   return resolveSecurity(
-    [
-      {
-        fieldName: "Authorization",
-        type: "apiKey:header",
-        value: security?.apiKeyAuth ?? env().OPENROUTER_API_KEY_AUTH,
-      },
-    ],
     [
       {
         fieldName: "Authorization",
         type: "http:bearer",
-        value: security?.bearerAuth ?? env().OPENROUTER_BEARER_AUTH,
+        value: security?.apiKey ?? env().OPENROUTER_API_KEY,
       },
     ],
   );

package/src/models/chaterror.ts

@@ -0,0 +1,120 @@
+/*
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ */
+
+import * as z from "zod";
+import { safeParse } from "../lib/schemas.js";
+import { Result as SafeParseResult } from "../types/fp.js";
+import { SDKValidationError } from "./errors/sdkvalidationerror.js";
+
+export type ChatErrorCode = string | number;
+
+export type ChatErrorError = {
+  code: string | number | null;
+  message: string;
+  param: string | null;
+  type: string;
+};
+
+/** @internal */
+export const ChatErrorCode$inboundSchema: z.ZodType<
+  ChatErrorCode,
+  z.ZodTypeDef,
+  unknown
+> = z.union([z.string(), z.number()]);
+
+/** @internal */
+export type ChatErrorCode$Outbound = string | number;
+
+/** @internal */
+export const ChatErrorCode$outboundSchema: z.ZodType<
+  ChatErrorCode$Outbound,
+  z.ZodTypeDef,
+  ChatErrorCode
+> = z.union([z.string(), z.number()]);
+
+/**
+ * @internal
+ * @deprecated This namespace will be removed in future versions. Use schemas and types that are exported directly from this module.
+ */
+export namespace ChatErrorCode$ {
+  /** @deprecated use `ChatErrorCode$inboundSchema` instead. */
+  export const inboundSchema = ChatErrorCode$inboundSchema;
+  /** @deprecated use `ChatErrorCode$outboundSchema` instead. */
+  export const outboundSchema = ChatErrorCode$outboundSchema;
+  /** @deprecated use `ChatErrorCode$Outbound` instead. */
+  export type Outbound = ChatErrorCode$Outbound;
+}
+
+export function chatErrorCodeToJSON(chatErrorCode: ChatErrorCode): string {
+  return JSON.stringify(ChatErrorCode$outboundSchema.parse(chatErrorCode));
+}
+
+export function chatErrorCodeFromJSON(
+  jsonString: string,
+): SafeParseResult<ChatErrorCode, SDKValidationError> {
+  return safeParse(
+    jsonString,
+    (x) => ChatErrorCode$inboundSchema.parse(JSON.parse(x)),
+    `Failed to parse 'ChatErrorCode' from JSON`,
+  );
+}
+
+/** @internal */
+export const ChatErrorError$inboundSchema: z.ZodType<
+  ChatErrorError,
+  z.ZodTypeDef,
+  unknown
+> = z.object({
+  code: z.nullable(z.union([z.string(), z.number()])),
+  message: z.string(),
+  param: z.nullable(z.string()),
+  type: z.string(),
+});
+
+/** @internal */
+export type ChatErrorError$Outbound = {
+  code: string | number | null;
+  message: string;
+  param: string | null;
+  type: string;
+};
+
+/** @internal */
+export const ChatErrorError$outboundSchema: z.ZodType<
+  ChatErrorError$Outbound,
+  z.ZodTypeDef,
+  ChatErrorError
+> = z.object({
+  code: z.nullable(z.union([z.string(), z.number()])),
+  message: z.string(),
+  param: z.nullable(z.string()),
+  type: z.string(),
+});
+
+/**
+ * @internal
+ * @deprecated This namespace will be removed in future versions. Use schemas and types that are exported directly from this module.
+ */
+export namespace ChatErrorError$ {
+  /** @deprecated use `ChatErrorError$inboundSchema` instead. */
+  export const inboundSchema = ChatErrorError$inboundSchema;
+  /** @deprecated use `ChatErrorError$outboundSchema` instead. */
+  export const outboundSchema = ChatErrorError$outboundSchema;
+  /** @deprecated use `ChatErrorError$Outbound` instead. */
+  export type Outbound = ChatErrorError$Outbound;
+}
+
+export function chatErrorErrorToJSON(chatErrorError: ChatErrorError): string {
+  return JSON.stringify(ChatErrorError$outboundSchema.parse(chatErrorError));
+}
+
+export function chatErrorErrorFromJSON(
+  jsonString: string,
+): SafeParseResult<ChatErrorError, SDKValidationError> {
+  return safeParse(
+    jsonString,
+    (x) => ChatErrorError$inboundSchema.parse(JSON.parse(x)),
+    `Failed to parse 'ChatErrorError' from JSON`,
+  );
+}