@hebo-ai/gateway 0.4.1 → 0.5.0-beta.0

package/src/providers/bedrock/middleware.ts

@@ -0,0 +1,43 @@
+import type { LanguageModelMiddleware } from "ai";
+
+import { modelMiddlewareMatcher } from "../../middleware/matcher";
+
+export const bedrockAnthropicReasoningMiddleware: LanguageModelMiddleware = {
+  specificationVersion: "v3",
+  // eslint-disable-next-line require-await
+  transformParams: async ({ params, model }) => {
+    if (!model.modelId.includes("claude")) return params;
+
+    const bedrock = params.providerOptions?.["bedrock"];
+    if (!bedrock || typeof bedrock !== "object") return params;
+
+    const bedrockOptions = bedrock as Record<string, unknown>;
+    const thinking = bedrockOptions["thinking"];
+    const effort = bedrockOptions["effort"];
+
+    if (!thinking && effort === undefined) return params;
+
+    const target = (bedrockOptions["reasoningConfig"] ??= {}) as Record<string, unknown>;
+
+    if (thinking && typeof thinking === "object") {
+      const thinkingOptions = thinking as Record<string, unknown>;
+      if (thinkingOptions["type"] !== undefined) {
+        target["type"] = thinkingOptions["type"];
+      }
+      if (thinkingOptions["budgetTokens"] !== undefined) {
+        target["budgetTokens"] = thinkingOptions["budgetTokens"];
+      }
+    }
+
+    if (effort !== undefined) target["maxReasoningEffort"] = effort;
+
+    delete bedrockOptions["thinking"];
+    delete bedrockOptions["effort"];
+
+    return params;
+  },
+};
+
+modelMiddlewareMatcher.useForProvider("amazon-bedrock", {
+  language: [bedrockAnthropicReasoningMiddleware],
+});

package/src/telemetry/http.ts

@@ -1,5 +1,4 @@
 import { type TelemetrySignalLevel } from "../types";
-import { resolveRequestId } from "../utils/headers";
 
 const headerArr = (h: Headers, k: string) => (h.has(k) ? [h.get(k)!] : undefined);
 
@@ -29,8 +28,6 @@ export const getRequestAttributes = (request: Request, signalLevel?: TelemetrySi
 
   if (signalLevel !== "required") {
     Object.assign(attrs, {
-      // FUTURE: does ElysiaJS and other frameworks attach request id?
-      "http.request.id": resolveRequestId(request),
       "user_agent.original": request.headers.get("user-agent") ?? undefined,
     });
   }

package/src/types.ts

@@ -12,20 +12,6 @@ import type { Logger, LoggerConfig } from "./logger";
 import type { ModelCatalog, ModelId } from "./models/types";
 import type { ProviderId, ProviderRegistry } from "./providers/types";
 
-/**
- * Request overrides returned from the `onRequest` hook.
- */
-export type RequestPatch = {
-  /**
-   * Headers to merge into the incoming request.
-   */
-  headers?: HeadersInit;
-  /**
-   * Body to replace on the incoming request.
-   */
-  body?: BodyInit;
-};
-
 /**
  * Per-request context shared across handlers and hooks.
  */
@@ -46,6 +32,10 @@ export type GatewayContext = {
    * Incoming request for the handler.
    */
   request: Request;
+  /**
+   * Resolved request ID for logging and telemetry.
+   */
+  requestId: string;
   /**
    * Parsed body from the request.
    */
@@ -95,13 +85,22 @@ export type HookContext = Omit<Readonly<GatewayContext>, "state"> & {
 type RequiredHookContext<K extends keyof GatewayContext> = Omit<HookContext, K> &
   Required<Pick<HookContext, K>>;
 export type OnRequestHookContext = RequiredHookContext<"request">;
-export type BeforeHookContext = RequiredHookContext<"request" | "body" | "operation">;
-export type ResolveModelHookContext = RequiredHookContext<"request" | "body" | "modelId">;
+export type BeforeHookContext = RequiredHookContext<"request" | "operation" | "body">;
+export type ResolveModelHookContext = RequiredHookContext<
+  "request" | "operation" | "body" | "modelId"
+>;
 export type ResolveProviderHookContext = RequiredHookContext<
-  "request" | "body" | "modelId" | "resolvedModelId" | "operation"
+  "request" | "operation" | "body" | "modelId" | "resolvedModelId"
 >;
 export type AfterHookContext = RequiredHookContext<
-  "request" | "result" | "provider" | "resolvedModelId" | "operation"
+  | "request"
+  | "operation"
+  | "body"
+  | "modelId"
+  | "resolvedModelId"
+  | "provider"
+  | "resolvedProviderId"
+  | "result"
 >;
 export type OnResponseHookContext = RequiredHookContext<"request" | "response">;
 
@@ -111,12 +110,9 @@ export type OnResponseHookContext = RequiredHookContext<"request" | "response">;
 export type GatewayHooks = {
   /**
    * Runs before any endpoint handler logic.
-   * @returns Optional RequestPatch to merge into headers / override body,
-   * or Response to short-circuit the request.
+   * @returns Optional Response to short-circuit the request.
    */
-  onRequest?: (
-    ctx: OnRequestHookContext,
-  ) => void | RequestPatch | Response | Promise<void | RequestPatch | Response>;
+  onRequest?: (ctx: OnRequestHookContext) => void | Response | Promise<void | Response>;
   /**
    * Runs after request JSON is parsed and validated for chat completions / embeddings.
    * @returns Replacement parsed body, or undefined to keep original.

package/src/utils/request.ts

@@ -1,22 +1,13 @@
-import type { RequestPatch } from "../types";
-
 import pkg from "../../package.json" with { type: "json" };
-import { REQUEST_ID_HEADER } from "./headers";
+import { resolveRequestId } from "./headers";
 
 const GATEWAY_VERSION = pkg.version;
 
-export const prepareRequestHeaders = (request: Request) => {
-  const existingRequestId = request.headers.get(REQUEST_ID_HEADER);
-  if (existingRequestId) return;
-
-  const requestId =
-    "req_" + crypto.getRandomValues(new Uint32Array(2)).reduce((s, n) => s + n.toString(36), "");
+const createRequestId = () =>
+  "req_" + crypto.getRandomValues(new Uint32Array(2)).reduce((s, n) => s + n.toString(36), "");
 
-  const headers = new Headers(request.headers);
-  headers.set(REQUEST_ID_HEADER, requestId);
-
-  return headers;
-};
+export const resolveOrCreateRequestId = (request: Request) =>
+  resolveRequestId(request) ?? createRequestId();
 
 export const prepareForwardHeaders = (request: Request): Record<string, string> => {
   const userAgent = request.headers.get("user-agent");
@@ -28,22 +19,3 @@ export const prepareForwardHeaders = (request: Request): Record<string, string>
     "user-agent": appendedUserAgent,
   };
 };
-
-export const maybeApplyRequestPatch = (request: Request, patch: RequestPatch) => {
-  if (!patch.headers && patch.body === undefined) return request;
-
-  if (!patch.headers) {
-    // eslint-disable-next-line no-invalid-fetch-options
-    return new Request(request, { body: patch.body });
-  }
-
-  const headers = new Headers(request.headers);
-  for (const [key, value] of new Headers(patch.headers)) {
-    headers.set(key, value);
-  }
-
-  const init: RequestInit = { headers };
-  if (patch.body !== undefined) init.body = patch.body;
-
-  return new Request(request, init);
-};

package/src/utils/response.ts

@@ -1,4 +1,4 @@
-import { REQUEST_ID_HEADER, resolveRequestId } from "./headers";
+import { REQUEST_ID_HEADER } from "./headers";
 
 const TEXT_ENCODER = new TextEncoder();
 
@@ -15,8 +15,8 @@ class JsonToSseTransformStream extends TransformStream<unknown, string> {
   }
 }
 
-export const prepareResponseInit = (request: Request): ResponseInit => ({
-  headers: { [REQUEST_ID_HEADER]: resolveRequestId(request)! },
+export const prepareResponseInit = (requestId: string): ResponseInit => ({
+  headers: { [REQUEST_ID_HEADER]: requestId },
 });
 
 export const mergeResponseInit = (