@rheonic/sdk 0.1.0-beta.10 → 0.1.0-beta.12

package/CHANGELOG.md

@@ -4,9 +4,13 @@ All notable changes to `@rheonic/sdk` will be documented in this file.
 
 ## Unreleased
 
+### Changed
+- Google provider instrumentation and examples now align with the current official Google Gen AI JavaScript SDK shape: `@google/genai` with `ai.models.generateContent({...})`.
+
 ### Fixed
 - SDK debug logs now always emit non-empty `trace_id` and `span_id`, including warmup, token-estimation, and protect preflight paths.
 - Provider instrumentation now keeps the full protected call lifecycle under one trace so SDK debug logs correlate cleanly with backend requests.
+- Quickstart and README examples now use the published `@rheonic/sdk` package name consistently and show the current Anthropic and Google instrumentation patterns.
 
 ## 0.1.0-beta.7
 

package/README.md

@@ -69,14 +69,18 @@ Anthropic:
 
 ```ts
 import Anthropic from "@anthropic-ai/sdk";
-import { createClient, RHEONICBlockedError } from "@rheonic/sdk";
+import { createClient, instrumentAnthropic, RHEONICBlockedError } from "@rheonic/sdk";
 
 const rheonic = createClient({
   baseUrl: process.env.RHEONIC_BASE_URL!,
   ingestKey: process.env.RHEONIC_INGEST_KEY!,
 });
 
-const anthropic = rheonic.instrumentAnthropic(new Anthropic({ apiKey: process.env.ANTHROPIC_API_KEY! }));
+const anthropic = instrumentAnthropic(new Anthropic({ apiKey: process.env.ANTHROPIC_API_KEY! }), {
+  client: rheonic,
+  endpoint: "/v1/messages",
+  feature: "assistant",
+});
 
 try {
   await anthropic.messages.create({
@@ -100,19 +104,28 @@ try {
 Google:
 
 ```ts
-import { GoogleGenerativeAI } from "@google/generative-ai";
-import { createClient, RHEONICBlockedError } from "@rheonic/sdk";
+import { GoogleGenAI } from "@google/genai";
+import { createClient, instrumentGoogle, RHEONICBlockedError } from "@rheonic/sdk";
 
 const rheonic = createClient({
   baseUrl: process.env.RHEONIC_BASE_URL!,
   ingestKey: process.env.RHEONIC_INGEST_KEY!,
 });
 
-const genAI = new GoogleGenerativeAI(process.env.GOOGLE_API_KEY!);
-const model = rheonic.instrumentGoogle(genAI.getGenerativeModel({ model: "gemini-1.5-pro" }));
+const ai = instrumentGoogle(new GoogleGenAI({ apiKey: process.env.GOOGLE_API_KEY! }), {
+  client: rheonic,
+  endpoint: "/v1beta/models/generateContent",
+  feature: "assistant",
+});
 
 try {
-  await model.generateContent("hello");
+  await ai.models.generateContent({
+    model: "gemini-1.5-pro",
+    contents: "hello",
+    config: {
+      maxOutputTokens: 256,
+    },
+  });
 } catch (error) {
   if (error instanceof RHEONICBlockedError) {
     console.log(JSON.stringify({

package/dist/eventBuilder.d.ts

@@ -1,6 +1,7 @@
 export interface EventRequest {
     endpoint?: string;
     feature?: string;
+    request_fingerprint?: string;
     input_tokens?: number;
     input_tokens_estimate?: number;
     token_explosion_tokens?: number;
@@ -17,14 +18,16 @@ export interface EventResponse {
 export interface EventPayload {
     ts: string;
     provider: string;
-    model: string | null;
+    requested_model: string | null;
+    resolved_model: string | null;
     environment: string;
     request: EventRequest;
     response: EventResponse;
 }
 export interface BuildEventInput {
     provider: string;
-    model?: string | null;
+    requested_model?: string | null;
+    resolved_model?: string | null;
     environment?: string;
     ts?: string;
     request?: EventRequest;

package/dist/eventBuilder.js

@@ -2,7 +2,8 @@ export function buildEvent(input) {
     return {
         ts: input.ts ?? new Date().toISOString(),
         provider: input.provider,
-        model: input.model ?? null,
+        requested_model: input.requested_model ?? null,
+        resolved_model: input.resolved_model ?? null,
         environment: input.environment ?? "dev",
         request: input.request ?? {},
         response: input.response ?? {},

package/dist/protectEngine.d.ts

@@ -2,7 +2,7 @@ export type ProtectDecision = "allow" | "clamp" | "block";
 export type ProtectFailMode = "open" | "closed";
 export interface ProtectContext {
     provider: string;
-    model?: string | null;
+    requested_model?: string | null;
     feature?: string;
     max_output_tokens?: number;
     input_tokens_estimate?: number;

package/dist/protectEngine.js

@@ -90,7 +90,7 @@ export class ProtectEngine {
                         status_code: response.status,
                         latency_ms: Date.now() - startedAt,
                     });
-                    void this.reportDecisionUnavailable(context.provider, typeof context.model === "string" ? context.model : undefined, requestId, traceId);
+                    void this.reportDecisionUnavailable(context.provider, typeof context.requested_model === "string" ? context.requested_model : undefined, requestId, traceId);
                     return this.fallbackEvaluation(traceId, requestId);
                 }
                 const parsed = (await response.json());
@@ -140,7 +140,7 @@ export class ProtectEngine {
                         latency_ms: Date.now() - startedAt,
                         timeout_ms: timeoutMs,
                     });
-                    void this.reportDecisionTimeout(context.provider, typeof context.model === "string" ? context.model : undefined, requestId, traceId);
+                    void this.reportDecisionTimeout(context.provider, typeof context.requested_model === "string" ? context.requested_model : undefined, requestId, traceId);
                 }
                 else {
                     this.debugLog?.("Protect preflight failed", {
@@ -148,7 +148,7 @@ export class ProtectEngine {
                         latency_ms: Date.now() - startedAt,
                         error_type: extractErrorType(error),
                     });
-                    void this.reportDecisionUnavailable(context.provider, typeof context.model === "string" ? context.model : undefined, requestId, traceId);
+                    void this.reportDecisionUnavailable(context.provider, typeof context.requested_model === "string" ? context.requested_model : undefined, requestId, traceId);
                 }
                 return this.fallbackEvaluation(traceId, requestId);
             }
@@ -189,7 +189,7 @@ export class ProtectEngine {
             // Best effort only; keep local defaults if bootstrap fails.
         }
     }
-    async reportDecisionTimeout(provider, model, requestId, traceId) {
+    async reportDecisionTimeout(provider, requestedModel, requestId, traceId) {
         try {
             await requestJson(`${this.baseUrl}/api/v1/protect/decision-timeout`, {
                 method: "POST",
@@ -200,14 +200,19 @@ export class ProtectEngine {
                     "X-Span-ID": generateSpanId(),
                     "X-Rheonic-Protect-Request-Id": requestId,
                 },
-                body: JSON.stringify({ environment: this.environment, provider, model, request_id: requestId }),
+                body: JSON.stringify({
+                    environment: this.environment,
+                    provider,
+                    requested_model: requestedModel,
+                    request_id: requestId,
+                }),
             });
         }
         catch {
             // Swallow timeout reporting errors; protect evaluation must never throw here.
         }
     }
-    async reportDecisionUnavailable(provider, model, requestId, traceId) {
+    async reportDecisionUnavailable(provider, requestedModel, requestId, traceId) {
         try {
             await requestJson(`${this.baseUrl}/api/v1/protect/decision-unavailable`, {
                 method: "POST",
@@ -218,7 +223,12 @@ export class ProtectEngine {
                     "X-Span-ID": generateSpanId(),
                     "X-Rheonic-Protect-Request-Id": requestId,
                 },
-                body: JSON.stringify({ environment: this.environment, provider, model, request_id: requestId }),
+                body: JSON.stringify({
+                    environment: this.environment,
+                    provider,
+                    requested_model: requestedModel,
+                    request_id: requestId,
+                }),
             });
         }
         catch {

package/dist/providers/anthropicAdapter.js

@@ -36,7 +36,7 @@ export function instrumentAnthropic(anthropicClient, options) {
             });
             const protectPayload = {
                 provider: "anthropic",
-                model: requestedModel,
+                requested_model: requestedModel,
                 environment: options.environment ?? options.client.environment,
                 feature: options.feature,
                 max_output_tokens: extractMaxOutputTokens(args),
@@ -56,7 +56,8 @@ export function instrumentAnthropic(anthropicClient, options) {
                 const response = await originalCreate(...callArgs);
                 await options.client.captureEventAndFlush(buildEvent({
                     provider: "anthropic",
-                    model: extractResponseModel(response) ?? requestedModel,
+                    requested_model: requestedModel,
+                    resolved_model: extractResponseModel(response),
                     environment: options.environment ?? options.client.environment,
                     request: {
                         endpoint: options.endpoint,
@@ -77,7 +78,8 @@ export function instrumentAnthropic(anthropicClient, options) {
             catch (error) {
                 await options.client.captureEventAndFlush(buildEvent({
                     provider: "anthropic",
-                    model: requestedModel,
+                    requested_model: requestedModel,
+                    resolved_model: null,
                     environment: options.environment ?? options.client.environment,
                     request: {
                         endpoint: options.endpoint,

package/dist/providers/googleAdapter.js

@@ -8,17 +8,17 @@ export function __setInputTokenEstimatorForTests(estimator) {
     estimatorOverrideForTests = estimator;
 }
 export function instrumentGoogle(googleModel, options) {
-    const targetGenerate = googleModel?.generateContent;
-    if (typeof targetGenerate !== "function") {
+    const targetGenerate = resolveGenerateTarget(googleModel);
+    if (!targetGenerate) {
         return googleModel;
     }
-    const originalGenerate = targetGenerate.bind(googleModel);
-    googleModel.generateContent = async (...args) => {
+    const originalGenerate = targetGenerate.fn.bind(targetGenerate.owner);
+    targetGenerate.owner[targetGenerate.key] = async (...args) => {
         const traceId = generateTraceId();
         const spanId = generateSpanId();
         return bindTraceContext(traceId, spanId, async () => {
             const startedAt = Date.now();
-            const requestedModel = extractRequestedModel(googleModel);
+            const requestedModel = extractRequestedModel(googleModel, args);
             validateProviderModel("google", requestedModel);
             const requestPayload = extractRequestPayload(args, requestedModel);
             let estimatedInputTokens = null;
@@ -36,7 +36,7 @@ export function instrumentGoogle(googleModel, options) {
             });
             const protectPayload = {
                 provider: "google",
-                model: requestedModel,
+                requested_model: requestedModel,
                 environment: options.environment ?? options.client.environment,
                 feature: options.feature,
                 max_output_tokens: extractMaxOutputTokens(args),
@@ -56,7 +56,8 @@ export function instrumentGoogle(googleModel, options) {
                 const response = await originalGenerate(...callArgs);
                 await options.client.captureEventAndFlush(buildEvent({
                     provider: "google",
-                    model: requestedModel,
+                    requested_model: requestedModel,
+                    resolved_model: extractResponseModel(response),
                     environment: options.environment ?? options.client.environment,
                     request: {
                         endpoint: options.endpoint,
@@ -77,7 +78,8 @@ export function instrumentGoogle(googleModel, options) {
             catch (error) {
                 await options.client.captureEventAndFlush(buildEvent({
                     provider: "google",
-                    model: requestedModel,
+                    requested_model: requestedModel,
+                    resolved_model: null,
                     environment: options.environment ?? options.client.environment,
                     request: {
                         endpoint: options.endpoint,
@@ -99,6 +101,26 @@ export function instrumentGoogle(googleModel, options) {
     };
     return googleModel;
 }
+function resolveGenerateTarget(googleModel) {
+    const directGenerate = googleModel?.generateContent;
+    if (typeof directGenerate === "function") {
+        return {
+            owner: googleModel,
+            fn: directGenerate,
+            key: "generateContent",
+        };
+    }
+    const models = googleModel?.models;
+    const nestedGenerate = models?.generateContent;
+    if (models && typeof nestedGenerate === "function") {
+        return {
+            owner: models,
+            fn: nestedGenerate,
+            key: "generateContent",
+        };
+    }
+    return null;
+}
 function extractRequestPayload(args, model) {
     const firstArg = args[0];
     if (typeof firstArg === "string") {
@@ -109,8 +131,13 @@ function extractRequestPayload(args, model) {
     }
     return null;
 }
-function extractRequestedModel(googleModel) {
+function extractRequestedModel(googleModel, args) {
     if (!googleModel || typeof googleModel !== "object") {
+        const firstArg = args[0];
+        if (firstArg && typeof firstArg === "object" && "model" in firstArg) {
+            const payloadModel = firstArg.model;
+            return typeof payloadModel === "string" ? payloadModel : null;
+        }
         return null;
     }
     const withModel = googleModel;
@@ -120,16 +147,35 @@ function extractRequestedModel(googleModel) {
     if (typeof withModel.modelName === "string") {
         return withModel.modelName;
     }
+    const firstArg = args[0];
+    if (firstArg && typeof firstArg === "object" && "model" in firstArg) {
+        const payloadModel = firstArg.model;
+        return typeof payloadModel === "string" ? payloadModel : null;
+    }
     return null;
 }
 function extractMaxOutputTokens(args) {
     const firstArg = args[0];
     if (!firstArg || typeof firstArg !== "object") {
-        return undefined;
+        const secondArg = args[1];
+        if (!secondArg || typeof secondArg !== "object") {
+            return undefined;
+        }
+        const options = secondArg;
+        const optionsGenerationMax = options.generationConfig?.maxOutputTokens;
+        if (typeof optionsGenerationMax === "number") {
+            return optionsGenerationMax;
+        }
+        const optionsConfigMax = options.config?.maxOutputTokens;
+        return typeof optionsConfigMax === "number" ? optionsConfigMax : undefined;
     }
     const payload = firstArg;
-    const maxOutput = payload.generationConfig?.maxOutputTokens;
-    return typeof maxOutput === "number" ? maxOutput : undefined;
+    const generationMax = payload.generationConfig?.maxOutputTokens;
+    if (typeof generationMax === "number") {
+        return generationMax;
+    }
+    const configMax = payload.config?.maxOutputTokens;
+    return typeof configMax === "number" ? configMax : undefined;
 }
 function extractTotalTokens(response) {
     if (!response || typeof response !== "object") {
@@ -149,6 +195,23 @@ function extractTotalTokens(response) {
     const total = prompt + candidates;
     return total > 0 ? total : undefined;
 }
+function extractResponseModel(response) {
+    if (!response || typeof response !== "object") {
+        return null;
+    }
+    const topLevelModel = response.model;
+    if (typeof topLevelModel === "string" && topLevelModel.trim()) {
+        return topLevelModel;
+    }
+    const nestedResponse = response.response;
+    if (typeof nestedResponse?.modelVersion === "string" && nestedResponse.modelVersion.trim()) {
+        return nestedResponse.modelVersion;
+    }
+    if (typeof nestedResponse?.model === "string" && nestedResponse.model.trim()) {
+        return nestedResponse.model;
+    }
+    return null;
+}
 function extractErrorType(error) {
     if (error && typeof error === "object" && "name" in error) {
         const name = error.name;
@@ -189,11 +252,13 @@ function maybeApplyGoogleClamp(args, decision) {
     const firstArg = nextArgs[0];
     if (firstArg && typeof firstArg === "object") {
         const payload = { ...firstArg };
-        const existingConfig = payload.generationConfig && typeof payload.generationConfig === "object"
-            ? payload.generationConfig
+        const useModernConfig = "config" in payload || "contents" in payload || "model" in payload;
+        const configKey = useModernConfig ? "config" : "generationConfig";
+        const existingConfig = payload[configKey] && typeof payload[configKey] === "object"
+            ? payload[configKey]
             : {};
         const existingMax = existingConfig.maxOutputTokens;
-        payload.generationConfig = {
+        payload[configKey] = {
             ...existingConfig,
             maxOutputTokens: typeof existingMax === "number" ? Math.min(existingMax, recommended) : recommended,
         };
@@ -201,14 +266,15 @@ function maybeApplyGoogleClamp(args, decision) {
         return nextArgs;
     }
     const secondArg = nextArgs[1];
-    const existingConfig = secondArg && typeof secondArg === "object" ? { ...secondArg } : {};
-    const generationConfig = existingConfig.generationConfig && typeof existingConfig.generationConfig === "object"
-        ? { ...existingConfig.generationConfig }
+    const existingOptions = secondArg && typeof secondArg === "object" ? { ...secondArg } : {};
+    const configKey = existingOptions.config && typeof existingOptions.config === "object" ? "config" : "generationConfig";
+    const generationConfig = existingOptions[configKey] && typeof existingOptions[configKey] === "object"
+        ? { ...existingOptions[configKey] }
         : {};
     const existingMax = generationConfig.maxOutputTokens;
     generationConfig.maxOutputTokens = typeof existingMax === "number" ? Math.min(existingMax, recommended) : recommended;
-    existingConfig.generationConfig = generationConfig;
-    nextArgs[1] = existingConfig;
+    existingOptions[configKey] = generationConfig;
+    nextArgs[1] = existingOptions;
     return nextArgs;
 }
 function markClampAppliedIfChanged(decision, originalMaxTokens, appliedMaxTokens) {

package/dist/providers/openaiAdapter.js

@@ -35,7 +35,7 @@ export function instrumentOpenAI(openaiClient, options) {
             });
             const protectPayload = {
                 provider: "openai",
-                model,
+                requested_model: model,
                 environment: options.environment ?? options.client.environment,
                 feature: options.feature,
                 max_output_tokens: extractMaxOutputTokens(args),
@@ -57,7 +57,8 @@ export function instrumentOpenAI(openaiClient, options) {
                 const response = await originalCreate(...callArgs);
                 await options.client.captureEventAndFlush(buildEvent({
                     provider: "openai",
-                    model: extractResponseModel(response) ?? model,
+                    requested_model: model,
+                    resolved_model: extractResponseModel(response),
                     environment: options.environment ?? options.client.environment,
                     request: {
                         endpoint: options.endpoint,
@@ -77,7 +78,8 @@ export function instrumentOpenAI(openaiClient, options) {
             catch (error) {
                 await options.client.captureEventAndFlush(buildEvent({
                     provider: "openai",
-                    model,
+                    requested_model: model,
+                    resolved_model: null,
                     environment: options.environment ?? options.client.environment,
                     request: {
                         endpoint: options.endpoint,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rheonic/sdk",
-  "version": "0.1.0-beta.10",
+  "version": "0.1.0-beta.12",
   "description": "Node.js SDK for Rheonic observability and protect preflight enforcement.",
   "author": "Rheonic <founder@rheonic.dev>",
   "license": "MIT",