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

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;

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;
@@ -99,6 +99,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 +129,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 +145,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") {
@@ -189,11 +233,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 +247,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/package.json

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