@unkey/api 2.0.0-alpha.5 → 2.0.0-alpha.7

package/src/funcs/ratelimitSetOverride.ts

@@ -31,9 +31,11 @@ export function ratelimitSetOverride(
 ): APIPromise<
   Result<
     components.V2RatelimitSetOverrideResponseBody,
-    | errors.BadRequestError
-    | errors.BaseError
-    | errors.BaseError
+    | errors.BadRequestErrorResponse
+    | errors.UnauthorizedErrorResponse
+    | errors.ForbiddenErrorResponse
+    | errors.NotFoundErrorResponse
+    | errors.InternalServerErrorResponse
     | APIError
     | SDKValidationError
     | UnexpectedClientError
@@ -58,9 +60,11 @@ async function $do(
   [
     Result<
       components.V2RatelimitSetOverrideResponseBody,
-      | errors.BadRequestError
-      | errors.BaseError
-      | errors.BaseError
+      | errors.BadRequestErrorResponse
+      | errors.UnauthorizedErrorResponse
+      | errors.ForbiddenErrorResponse
+      | errors.NotFoundErrorResponse
+      | errors.InternalServerErrorResponse
       | APIError
       | SDKValidationError
       | UnexpectedClientError
@@ -150,9 +154,11 @@ async function $do(
 
   const [result] = await M.match<
     components.V2RatelimitSetOverrideResponseBody,
-    | errors.BadRequestError
-    | errors.BaseError
-    | errors.BaseError
+    | errors.BadRequestErrorResponse
+    | errors.UnauthorizedErrorResponse
+    | errors.ForbiddenErrorResponse
+    | errors.NotFoundErrorResponse
+    | errors.InternalServerErrorResponse
     | APIError
     | SDKValidationError
     | UnexpectedClientError
@@ -162,15 +168,11 @@ async function $do(
     | ConnectionError
   >(
     M.json(200, components.V2RatelimitSetOverrideResponseBody$inboundSchema),
-    M.jsonErr(400, errors.BadRequestError$inboundSchema, {
-      ctype: "application/problem+json",
-    }),
-    M.jsonErr([401, 403, 404], errors.BaseError$inboundSchema, {
-      ctype: "application/problem+json",
-    }),
-    M.jsonErr(500, errors.BaseError$inboundSchema, {
-      ctype: "application/problem+json",
-    }),
+    M.jsonErr(400, errors.BadRequestErrorResponse$inboundSchema),
+    M.jsonErr(401, errors.UnauthorizedErrorResponse$inboundSchema),
+    M.jsonErr(403, errors.ForbiddenErrorResponse$inboundSchema),
+    M.jsonErr(404, errors.NotFoundErrorResponse$inboundSchema),
+    M.jsonErr(500, errors.InternalServerErrorResponse$inboundSchema),
     M.fail("4XX"),
     M.fail("5XX"),
   )(response, { extraFields: responseFields });

package/src/lib/config.ts

@@ -54,7 +54,7 @@ export function serverURLFromOptions(options: SDKOptions): URL | null {
 export const SDK_METADATA = {
   language: "typescript",
   openapiDocVersion: "2.0.0",
-  sdkVersion: "2.0.0-alpha.5",
-  genVersion: "2.564.5",
-  userAgent: "speakeasy-sdk/typescript 2.0.0-alpha.5 2.564.5 2.0.0 @unkey/api",
+  sdkVersion: "2.0.0-alpha.7",
+  genVersion: "2.578.0",
+  userAgent: "speakeasy-sdk/typescript 2.0.0-alpha.7 2.578.0 2.0.0 @unkey/api",
 } as const;

package/src/lib/matchers.ts

@@ -10,6 +10,7 @@ import { isPlainObject } from "./is-plain-object.js";
 import { safeParse } from "./schemas.js";
 
 export type Encoding =
+  | "jsonl"
   | "json"
   | "text"
   | "bytes"
@@ -19,6 +20,7 @@ export type Encoding =
   | "fail";
 
 const DEFAULT_CONTENT_TYPES: Record<Encoding, string> = {
+  jsonl: "application/jsonl",
   json: "application/json",
   text: "text/plain",
   bytes: "application/octet-stream",
@@ -72,6 +74,21 @@ export function json<T>(
   return { ...options, enc: "json", codes, schema };
 }
 
+export function jsonl<T>(
+  codes: StatusCodePredicate,
+  schema: Schema<T>,
+  options?: MatchOptions,
+): ValueMatcher<T> {
+  return { ...options, enc: "jsonl", codes, schema };
+}
+
+export function jsonlErr<E>(
+  codes: StatusCodePredicate,
+  schema: Schema<E>,
+  options?: MatchOptions,
+): ErrorMatcher<E> {
+  return { ...options, err: true, enc: "jsonl", codes, schema };
+}
 export function textErr<E>(
   codes: StatusCodePredicate,
   schema: Schema<E>,
@@ -204,6 +221,9 @@ export function match<T, E>(
       case "json":
         raw = await response.json();
         break;
+      case "jsonl":
+        raw = response.body;
+        break;
       case "bytes":
         raw = new Uint8Array(await response.arrayBuffer());
         break;

package/src/lib/sdks.ts

@@ -302,7 +302,9 @@ export class ClientSDK {
   }
 }
 
-const jsonLikeContentTypeRE = /^application\/(?:.{0,100}\+)?json/;
+const jsonLikeContentTypeRE = /(application|text)\/.*?\+*json.*/;
+const jsonlLikeContentTypeRE =
+  /(application|text)\/(.*?\+*\bjsonl\b.*|.*?\+*\bx-ndjson\b.*)/;
 async function logRequest(logger: Logger | undefined, req: Request) {
   if (!logger) {
     return;
@@ -368,9 +370,13 @@ async function logResponse(
   logger.group("Body:");
   switch (true) {
     case matchContentType(res, "application/json")
-      || jsonLikeContentTypeRE.test(ct):
+      || jsonLikeContentTypeRE.test(ct) && !jsonlLikeContentTypeRE.test(ct):
       logger.log(await res.clone().json());
       break;
+    case matchContentType(res, "application/jsonl")
+      || jsonlLikeContentTypeRE.test(ct):
+      logger.log(await res.clone().text());
+      break;
     case matchContentType(res, "text/event-stream"):
       logger.log(`<${contentType}>`);
       break;

package/src/mcp-server/mcp-server.ts

@@ -19,7 +19,7 @@ const routes = buildRouteMap({
 export const app = buildApplication(routes, {
   name: "mcp",
   versionInfo: {
-    currentVersion: "2.0.0-alpha.5",
+    currentVersion: "2.0.0-alpha.7",
   },
 });
 

package/src/mcp-server/prompts.ts

@@ -74,7 +74,14 @@ export function createRegisterPrompt(
     prompt: PromptDefinition<A>,
   ): void => {
     const scopes = prompt.scopes ?? [];
-    if (!scopes.every((s: MCPScope) => allowedScopes.has(s))) {
+    if (allowedScopes.size > 0 && scopes.length === 0) {
+      return;
+    }
+
+    if (
+      allowedScopes.size > 0
+      && !scopes.every((s: MCPScope) => allowedScopes.has(s))
+    ) {
       return;
     }
 

package/src/mcp-server/resources.ts

@@ -109,7 +109,14 @@ export function createRegisterResource(
 ): (resource: ResourceDefinition) => void {
   return (resource: ResourceDefinition): void => {
     const scopes = resource.scopes ?? [];
-    if (!scopes.every((s: MCPScope) => allowedScopes.has(s))) {
+    if (allowedScopes.size > 0 && scopes.length === 0) {
+      return;
+    }
+
+    if (
+      allowedScopes.size > 0
+      && !scopes.every((s: MCPScope) => allowedScopes.has(s))
+    ) {
       return;
     }
 
@@ -137,7 +144,14 @@ export function createRegisterResourceTemplate(
 ): (resource: ResourceTemplateDefinition) => void {
   return (resource: ResourceTemplateDefinition): void => {
     const scopes = resource.scopes ?? [];
-    if (!scopes.every((s: MCPScope) => allowedScopes.has(s))) {
+    if (allowedScopes.size > 0 && scopes.length === 0) {
+      return;
+    }
+
+    if (
+      allowedScopes.size > 0
+      && !scopes.every((s: MCPScope) => allowedScopes.has(s))
+    ) {
       return;
     }
 

package/src/mcp-server/server.ts

@@ -11,12 +11,15 @@ import {
   createRegisterResource,
   createRegisterResourceTemplate,
 } from "./resources.js";
-import { MCPScope, mcpScopes } from "./scopes.js";
+import { MCPScope } from "./scopes.js";
 import { createRegisterTool } from "./tools.js";
-import { tool$livenessCheck } from "./tools/livenessCheck.js";
+import { tool$apisCreateApi } from "./tools/apisCreateApi.js";
+import { tool$identitiesCreateIdentity } from "./tools/identitiesCreateIdentity.js";
+import { tool$livenessLiveness } from "./tools/livenessLiveness.js";
 import { tool$ratelimitDeleteOverride } from "./tools/ratelimitDeleteOverride.js";
 import { tool$ratelimitGetOverride } from "./tools/ratelimitGetOverride.js";
 import { tool$ratelimitLimit } from "./tools/ratelimitLimit.js";
+import { tool$ratelimitListOverrides } from "./tools/ratelimitListOverrides.js";
 import { tool$ratelimitSetOverride } from "./tools/ratelimitSetOverride.js";
 
 export function createMCPServer(deps: {
@@ -29,7 +32,7 @@ export function createMCPServer(deps: {
 }) {
   const server = new McpServer({
     name: "Unkey",
-    version: "2.0.0-alpha.5",
+    version: "2.0.0-alpha.7",
   });
 
   const client = new UnkeyCore({
@@ -38,7 +41,7 @@ export function createMCPServer(deps: {
     serverIdx: deps.serverIdx,
   });
 
-  const scopes = new Set(deps.scopes ?? mcpScopes);
+  const scopes = new Set(deps.scopes);
 
   const allowedTools = deps.allowedTools && new Set(deps.allowedTools);
   const tool = createRegisterTool(
@@ -62,8 +65,11 @@ export function createMCPServer(deps: {
   tool(tool$ratelimitLimit);
   tool(tool$ratelimitSetOverride);
   tool(tool$ratelimitGetOverride);
+  tool(tool$ratelimitListOverrides);
   tool(tool$ratelimitDeleteOverride);
-  tool(tool$livenessCheck);
+  tool(tool$identitiesCreateIdentity);
+  tool(tool$apisCreateApi);
+  tool(tool$livenessLiveness);
 
   return server;
 }

package/src/mcp-server/tools/apisCreateApi.ts

@@ -0,0 +1,35 @@
+/*
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ */
+
+import { apisCreateApi } from "../../funcs/apisCreateApi.js";
+import * as components from "../../models/components/index.js";
+import { formatResult, ToolDefinition } from "../tools.js";
+
+const args = {
+  request: components.V2ApisCreateApiRequestBody$inboundSchema,
+};
+
+export const tool$apisCreateApi: ToolDefinition<typeof args> = {
+  name: "apis-create-api",
+  description: ``,
+  args,
+  tool: async (client, args, ctx) => {
+    const [result, apiCall] = await apisCreateApi(
+      client,
+      args.request,
+      { fetchOptions: { signal: ctx.signal } },
+    ).$inspect();
+
+    if (!result.ok) {
+      return {
+        content: [{ type: "text", text: result.error.message }],
+        isError: true,
+      };
+    }
+
+    const value = result.value;
+
+    return formatResult(value, apiCall);
+  },
+};

package/src/mcp-server/tools/identitiesCreateIdentity.ts

@@ -0,0 +1,35 @@
+/*
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ */
+
+import { identitiesCreateIdentity } from "../../funcs/identitiesCreateIdentity.js";
+import * as components from "../../models/components/index.js";
+import { formatResult, ToolDefinition } from "../tools.js";
+
+const args = {
+  request: components.V2IdentitiesCreateIdentityRequestBody$inboundSchema,
+};
+
+export const tool$identitiesCreateIdentity: ToolDefinition<typeof args> = {
+  name: "identities-create-identity",
+  description: ``,
+  args,
+  tool: async (client, args, ctx) => {
+    const [result, apiCall] = await identitiesCreateIdentity(
+      client,
+      args.request,
+      { fetchOptions: { signal: ctx.signal } },
+    ).$inspect();
+
+    if (!result.ok) {
+      return {
+        content: [{ type: "text", text: result.error.message }],
+        isError: true,
+      };
+    }
+
+    const value = result.value;
+
+    return formatResult(value, apiCall);
+  },
+};

package/src/mcp-server/tools/{livenessCheck.ts → livenessLiveness.ts}

@@ -2,16 +2,16 @@
  * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
  */
 
-import { livenessCheck } from "../../funcs/livenessCheck.js";
+import { livenessLiveness } from "../../funcs/livenessLiveness.js";
 import { formatResult, ToolDefinition } from "../tools.js";
 
-export const tool$livenessCheck: ToolDefinition = {
-  name: "liveness-check",
+export const tool$livenessLiveness: ToolDefinition = {
+  name: "liveness-liveness",
   description: `Liveness check
 
 This endpoint checks if the service is alive.`,
   tool: async (client, ctx) => {
-    const [result, apiCall] = await livenessCheck(
+    const [result, apiCall] = await livenessLiveness(
       client,
       { fetchOptions: { signal: ctx.signal } },
     ).$inspect();

package/src/mcp-server/tools/ratelimitLimit.ts

@@ -12,7 +12,7 @@ const args = {
 
 export const tool$ratelimitLimit: ToolDefinition<typeof args> = {
   name: "ratelimit-limit",
-  description: `TODO`,
+  description: ``,
   args,
   tool: async (client, args, ctx) => {
     const [result, apiCall] = await ratelimitLimit(

package/src/mcp-server/tools/ratelimitListOverrides.ts

@@ -0,0 +1,35 @@
+/*
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ */
+
+import { ratelimitListOverrides } from "../../funcs/ratelimitListOverrides.js";
+import * as components from "../../models/components/index.js";
+import { formatResult, ToolDefinition } from "../tools.js";
+
+const args = {
+  request: components.V2RatelimitListOverridesRequestBody$inboundSchema,
+};
+
+export const tool$ratelimitListOverrides: ToolDefinition<typeof args> = {
+  name: "ratelimit-list-overrides",
+  description: ``,
+  args,
+  tool: async (client, args, ctx) => {
+    const [result, apiCall] = await ratelimitListOverrides(
+      client,
+      args.request,
+      { fetchOptions: { signal: ctx.signal } },
+    ).$inspect();
+
+    if (!result.ok) {
+      return {
+        content: [{ type: "text", text: result.error.message }],
+        isError: true,
+      };
+    }
+
+    const value = result.value;
+
+    return formatResult(value, apiCall);
+  },
+};

package/src/mcp-server/tools.ts

@@ -102,12 +102,15 @@ export function createRegisterTool(
       return;
     }
 
-    const toolScopes = tool.scopes ?? [];
-    if (allowedScopes.size > 0 && toolScopes.length === 0) {
+    const scopes = tool.scopes ?? [];
+    if (allowedScopes.size > 0 && scopes.length === 0) {
       return;
     }
 
-    if (!toolScopes.every((s) => allowedScopes.has(s))) {
+    if (
+      allowedScopes.size > 0
+      && !scopes.every((s: MCPScope) => allowedScopes.has(s))
+    ) {
       return;
     }
 

package/src/models/components/apiscreateapiresponsedata.ts

@@ -0,0 +1,76 @@
+/*
+ * 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 ApisCreateApiResponseData = {
+  /**
+   * The id of the API
+   */
+  apiId: string;
+  /**
+   * The name of the API
+   */
+  name: string;
+};
+
+/** @internal */
+export const ApisCreateApiResponseData$inboundSchema: z.ZodType<
+  ApisCreateApiResponseData,
+  z.ZodTypeDef,
+  unknown
+> = z.object({
+  apiId: z.string(),
+  name: z.string(),
+});
+
+/** @internal */
+export type ApisCreateApiResponseData$Outbound = {
+  apiId: string;
+  name: string;
+};
+
+/** @internal */
+export const ApisCreateApiResponseData$outboundSchema: z.ZodType<
+  ApisCreateApiResponseData$Outbound,
+  z.ZodTypeDef,
+  ApisCreateApiResponseData
+> = z.object({
+  apiId: z.string(),
+  name: 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 ApisCreateApiResponseData$ {
+  /** @deprecated use `ApisCreateApiResponseData$inboundSchema` instead. */
+  export const inboundSchema = ApisCreateApiResponseData$inboundSchema;
+  /** @deprecated use `ApisCreateApiResponseData$outboundSchema` instead. */
+  export const outboundSchema = ApisCreateApiResponseData$outboundSchema;
+  /** @deprecated use `ApisCreateApiResponseData$Outbound` instead. */
+  export type Outbound = ApisCreateApiResponseData$Outbound;
+}
+
+export function apisCreateApiResponseDataToJSON(
+  apisCreateApiResponseData: ApisCreateApiResponseData,
+): string {
+  return JSON.stringify(
+    ApisCreateApiResponseData$outboundSchema.parse(apisCreateApiResponseData),
+  );
+}
+
+export function apisCreateApiResponseDataFromJSON(
+  jsonString: string,
+): SafeParseResult<ApisCreateApiResponseData, SDKValidationError> {
+  return safeParse(
+    jsonString,
+    (x) => ApisCreateApiResponseData$inboundSchema.parse(JSON.parse(x)),
+    `Failed to parse 'ApisCreateApiResponseData' from JSON`,
+  );
+}

package/src/models/components/badrequesterrordetails.ts

@@ -0,0 +1,110 @@
+/*
+ * 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";
+import {
+  ValidationError,
+  ValidationError$inboundSchema,
+  ValidationError$Outbound,
+  ValidationError$outboundSchema,
+} from "./validationerror.js";
+
+export type BadRequestErrorDetails = {
+  /**
+   * A human-readable explanation specific to this occurrence of the problem.
+   */
+  detail: string;
+  /**
+   * A URI reference that identifies the specific occurrence of the problem.
+   */
+  instance?: string | undefined;
+  /**
+   * HTTP status code
+   */
+  status: number;
+  /**
+   * A short, human-readable summary of the problem type. This value should not change between occurrences of the error.
+   */
+  title: string;
+  /**
+   * A URI reference to human-readable documentation for the error.
+   */
+  type: string;
+  /**
+   * Optional list of individual error details
+   */
+  errors: Array<ValidationError>;
+};
+
+/** @internal */
+export const BadRequestErrorDetails$inboundSchema: z.ZodType<
+  BadRequestErrorDetails,
+  z.ZodTypeDef,
+  unknown
+> = z.object({
+  detail: z.string(),
+  instance: z.string().optional(),
+  status: z.number().int(),
+  title: z.string(),
+  type: z.string(),
+  errors: z.array(ValidationError$inboundSchema),
+});
+
+/** @internal */
+export type BadRequestErrorDetails$Outbound = {
+  detail: string;
+  instance?: string | undefined;
+  status: number;
+  title: string;
+  type: string;
+  errors: Array<ValidationError$Outbound>;
+};
+
+/** @internal */
+export const BadRequestErrorDetails$outboundSchema: z.ZodType<
+  BadRequestErrorDetails$Outbound,
+  z.ZodTypeDef,
+  BadRequestErrorDetails
+> = z.object({
+  detail: z.string(),
+  instance: z.string().optional(),
+  status: z.number().int(),
+  title: z.string(),
+  type: z.string(),
+  errors: z.array(ValidationError$outboundSchema),
+});
+
+/**
+ * @internal
+ * @deprecated This namespace will be removed in future versions. Use schemas and types that are exported directly from this module.
+ */
+export namespace BadRequestErrorDetails$ {
+  /** @deprecated use `BadRequestErrorDetails$inboundSchema` instead. */
+  export const inboundSchema = BadRequestErrorDetails$inboundSchema;
+  /** @deprecated use `BadRequestErrorDetails$outboundSchema` instead. */
+  export const outboundSchema = BadRequestErrorDetails$outboundSchema;
+  /** @deprecated use `BadRequestErrorDetails$Outbound` instead. */
+  export type Outbound = BadRequestErrorDetails$Outbound;
+}
+
+export function badRequestErrorDetailsToJSON(
+  badRequestErrorDetails: BadRequestErrorDetails,
+): string {
+  return JSON.stringify(
+    BadRequestErrorDetails$outboundSchema.parse(badRequestErrorDetails),
+  );
+}
+
+export function badRequestErrorDetailsFromJSON(
+  jsonString: string,
+): SafeParseResult<BadRequestErrorDetails, SDKValidationError> {
+  return safeParse(
+    jsonString,
+    (x) => BadRequestErrorDetails$inboundSchema.parse(JSON.parse(x)),
+    `Failed to parse 'BadRequestErrorDetails' from JSON`,
+  );
+}