@juspay/neurolink 10.12.9 → 11.1.0

package/dist/lib/providers/googleAiStudio/client.js

@@ -6,6 +6,7 @@ import { ATTR, tracers, withClientSpan, withClientStreamSpan, withSpan, } from "
 import { AuthenticationError, InvalidModelError, NetworkError, ProviderError, RateLimitError, } from "../../types/index.js";
 import { ERROR_CODES, NeuroLinkError } from "../../utils/errorHandling.js";
 import { logger } from "../../utils/logger.js";
+import { isToolsSchemaExclusionInForce } from "../../core/modules/structuredOutputPolicy.js";
 import { GEMINI_ELISION_NOTE, planGeminiLoopReclaim, previewGeminiToolResponseText, } from "../../context/geminiLoopGuard.js";
 import { getAvailableInputTokens, getContextWindowSize, } from "../../constants/contextWindows.js";
 import { composeAbortSignals, createTimeoutController, TimeoutError, } from "../../utils/timeout.js";
@@ -18,7 +19,7 @@ import { createProxyFetch } from "../../proxy/proxyFetch.js";
 // Google AI Live API types now imported from ../types/providerSpecific.js
 // Import proper types for multimodal message handling
 // Create Google GenAI client
-async function createGoogleGenAIClient(apiKey) {
+async function createGoogleGenAIClient(apiKey, baseURL) {
     const mod = await import("@google/genai");
     const ctor = mod.GoogleGenAI;
     if (!ctor) {
@@ -32,11 +33,17 @@ async function createGoogleGenAIClient(apiKey) {
         });
     }
     const Ctor = ctor;
-    // Include httpOptions with proxy fetch for corporate network support
+    // Include httpOptions with proxy fetch for corporate network support.
+    // baseUrl is only included when resolved — verified against
+    // @google/genai's ApiClient (dist/node/index.cjs) that it falls back to
+    // its own default whenever httpOptions.baseUrl is undefined, so omitting
+    // the key and passing `baseUrl: undefined` behave identically; the key is
+    // still omitted outright for a cleaner outbound config object.
     return new Ctor({
         apiKey,
         httpOptions: {
             fetch: createProxyFetch(),
+            ...(baseURL ? { baseUrl: baseURL } : {}),
         },
     });
 }
@@ -256,7 +263,7 @@ export class GoogleAIStudioProvider extends BaseProvider {
         // Use the @google/genai client for image generation
         let client;
         try {
-            client = await createGoogleGenAIClient(apiKey);
+            client = await createGoogleGenAIClient(apiKey, this.getBaseURL());
         }
         catch {
             throw new AuthenticationError("Missing '@google/genai'. Install with: npm install @google/genai", this.providerName);
@@ -563,7 +570,7 @@ export class GoogleAIStudioProvider extends BaseProvider {
         // generate() does, or attached files are dropped on this path alone.
         await this.preprocessNativeFileInput(options);
         // Structured output (analysisSchema, JSON format, or schema) is incompatible with tools on Gemini.
-        const wantsStructuredOutput = analysisSchema || options.output?.format === "json" || options.schema;
+        const wantsStructuredOutput = Boolean(analysisSchema || options.output?.format === "json" || options.schema);
         // Tool filter (a0269210): trust options.tools — caller (BaseProvider.stream)
         // already merged MCP/built-in tools with user tools and applied any
         // enabledToolNames filter. Re-attaching getAllTools() here would clobber
@@ -575,12 +582,10 @@ export class GoogleAIStudioProvider extends BaseProvider {
             ...options,
             tools: optionTools,
         };
-        // Check for tools + JSON schema conflict (Gemini limitation)
+        // Tools + JSON conflict (Gemini), via the shared predicate.
         const wantsJsonOutput = options.output?.format === "json" || options.schema;
-        if (wantsJsonOutput &&
-            mergedOptions.tools &&
-            Object.keys(mergedOptions.tools).length > 0 &&
-            !mergedOptions.disableTools) {
+        const exclusionInForce = isToolsSchemaExclusionInForce(this.providerName, modelName, !mergedOptions.disableTools, Object.keys(mergedOptions.tools ?? {}).length);
+        if (wantsJsonOutput && exclusionInForce) {
             logger.warn("[GoogleAIStudio] Gemini does not support tools and JSON schema output simultaneously. Disabling tools for this request.");
             mergedOptions = { ...mergedOptions, disableTools: true, tools: {} };
         }
@@ -618,7 +623,7 @@ export class GoogleAIStudioProvider extends BaseProvider {
             const timeoutController = createTimeoutController(timeout, this.providerName, "stream");
             try {
                 const apiKey = this.getApiKey();
-                const client = await createGoogleGenAIClient(apiKey);
+                const client = await createGoogleGenAIClient(apiKey, this.getBaseURL());
                 logger.debug("[GoogleAIStudio] Using native @google/genai for Gemini 3", {
                     model: modelName,
                     hasTools: !!options.tools && Object.keys(options.tools).length > 0,
@@ -956,7 +961,7 @@ export class GoogleAIStudioProvider extends BaseProvider {
             const timeoutController = createTimeoutController(timeout, this.providerName, "generate");
             try {
                 const apiKey = this.getApiKey();
-                const client = await createGoogleGenAIClient(apiKey);
+                const client = await createGoogleGenAIClient(apiKey, this.getBaseURL());
                 logger.debug("[GoogleAIStudio] Using native @google/genai for Gemini 3 generate", {
                     model: modelName,
                     hasTools: !!options.tools && Object.keys(options.tools).length > 0,
@@ -985,7 +990,16 @@ export class GoogleAIStudioProvider extends BaseProvider {
                 let originalNameMap = new Map();
                 let declarationsResult;
                 const shouldUseTools = !options.disableTools;
-                if (shouldUseTools) {
+                // Structured output (JSON format or schema) is incompatible with
+                // tools on Gemini — routed through the shared predicate so this
+                // decision matches stream()'s orchestrator (previously this path
+                // had no proactive check and silently dropped the schema instead).
+                const wantsNativeJsonRequested = Boolean(options.output?.format === "json" || options.schema);
+                const exclusionInForce = isToolsSchemaExclusionInForce(this.providerName, modelName, shouldUseTools, Object.keys(options.tools || {}).length);
+                if (wantsNativeJsonRequested && exclusionInForce) {
+                    logger.warn("[GoogleAIStudio] Gemini does not support tools and JSON schema output simultaneously. Disabling tools for this request (generate()).");
+                }
+                if (shouldUseTools && !exclusionInForce) {
                     const tools = options.tools || {};
                     if (Object.keys(tools).length > 0) {
                         const result = buildNativeToolDeclarations(tools);
@@ -1002,8 +1016,7 @@ export class GoogleAIStudioProvider extends BaseProvider {
                 // Native JSON / schema enforcement (generate path). Mirrors the
                 // stream block above; only set when no tools are being sent
                 // because Gemini cannot combine function calling with JSON mime.
-                const wantsNativeJson = !toolsConfig &&
-                    (options.output?.format === "json" || !!options.schema);
+                const wantsNativeJson = !toolsConfig && wantsNativeJsonRequested;
                 const nativeResponseSchema = wantsNativeJson && options.schema
                     ? buildGeminiResponseSchema(options.schema)
                     : undefined;
@@ -1332,7 +1345,7 @@ export class GoogleAIStudioProvider extends BaseProvider {
         // Dynamic import to avoid hard dependency unless audio streaming is used
         let client;
         try {
-            client = await createGoogleGenAIClient(apiKey);
+            client = await createGoogleGenAIClient(apiKey, this.getBaseURL());
         }
         catch {
             throw new AuthenticationError("Missing '@google/genai'. Install with: pnpm add @google/genai", this.providerName);
@@ -1522,7 +1535,7 @@ export class GoogleAIStudioProvider extends BaseProvider {
         });
         try {
             const apiKey = this.getApiKey();
-            const client = await createGoogleGenAIClient(apiKey);
+            const client = await createGoogleGenAIClient(apiKey, this.getBaseURL());
             const result = await client.models.embedContent({
                 model: embeddingModelName,
                 contents: [text],
@@ -1562,7 +1575,7 @@ export class GoogleAIStudioProvider extends BaseProvider {
         });
         try {
             const apiKey = this.getApiKey();
-            const client = await createGoogleGenAIClient(apiKey);
+            const client = await createGoogleGenAIClient(apiKey, this.getBaseURL());
             const result = await client.models.embedContent({
                 model: embeddingModelName,
                 contents: texts,
@@ -1594,6 +1607,15 @@ export class GoogleAIStudioProvider extends BaseProvider {
         }
         return apiKey;
     }
+    // Mirrors mistral.ts's baseURL precedence (credentials override, then env,
+    // then unset — the SDK's own default applies when unset). Blank/whitespace
+    // values are treated as unset so an empty override can't accidentally
+    // clobber the default.
+    getBaseURL() {
+        const baseURL = this.credentials?.baseURL?.trim() ||
+            process.env.GOOGLE_AI_BASE_URL?.trim();
+        return baseURL && baseURL.length > 0 ? baseURL : undefined;
+    }
 }
 export default GoogleAIStudioProvider;
 //# sourceMappingURL=client.js.map

package/dist/lib/providers/googleAiStudio/index.d.ts

@@ -1,2 +1 @@
 export * from "./client.js";
-export * from "./utils.js";

package/dist/lib/providers/googleAiStudio/index.js

@@ -1,3 +1,2 @@
 export * from "./client.js";
-export * from "./utils.js";
 //# sourceMappingURL=index.js.map

package/dist/lib/providers/googleNativeGemini3/index.d.ts

@@ -1,2 +1 @@
-export * from "./constants.js";
 export * from "./utils.js";

package/dist/lib/providers/googleNativeGemini3/index.js

@@ -1,3 +1,2 @@
-export * from "./constants.js";
 export * from "./utils.js";
 //# sourceMappingURL=index.js.map

package/dist/lib/providers/googleVertex/client.d.ts

@@ -70,28 +70,6 @@ export declare class GoogleVertexProvider extends BaseProvider {
      * Creates fresh model instances for each request
      */
     protected getAISDKModel(): Promise<LanguageModel>;
-    /**
-     * Initialize model creation tracking
-     */
-    private initializeModelCreationLogging;
-    /**
-     * Check if model is Anthropic-based and attempt creation
-     */
-    private attemptAnthropicModelCreation;
-    /**
-     * Create Google Vertex model with comprehensive logging and error handling
-     */
-    private createGoogleVertexModel;
-    /**
-     * @deprecated This method is no longer used. All models now use native SDKs.
-     */
-    private createVertexInstance;
-    /**
-     * Gets the appropriate model instance (Google or Anthropic)
-     * Uses dual provider architecture for proper model routing
-     * Creates fresh instances for each request to ensure proper authentication
-     */
-    private getModel;
     /**
      * Validate stream options
      */
@@ -320,35 +298,6 @@ export declare class GoogleVertexProvider extends BaseProvider {
      * @returns Promise<boolean> indicating if Anthropic support is available
      */
     hasAnthropicSupport(): Promise<boolean>;
-    /**
-     * @deprecated This method is no longer used. Claude models now use native @anthropic-ai/vertex-sdk
-     * via executeNativeAnthropicStream and executeNativeAnthropicGenerate.
-     */
-    createAnthropicModel(_modelName: string): Promise<LanguageModel | null>;
-    /**
-     * Validate Vertex AI authentication configuration
-     */
-    private validateVertexAuthentication;
-    /**
-     * Validate Vertex AI project configuration
-     */
-    private validateVertexProjectConfiguration;
-    /**
-     * Check if the specified region supports Anthropic models
-     */
-    private checkVertexRegionalSupport;
-    /**
-     * Validate Anthropic model name format and availability
-     */
-    private validateAnthropicModelName;
-    /**
-     * Analyze Anthropic model creation errors for detailed troubleshooting
-     */
-    private analyzeAnthropicCreationError;
-    /**
-     * Get detailed troubleshooting steps based on error analysis
-     */
-    private getAnthropicTroubleshootingSteps;
     /**
      * Register a tool with the AI provider
      * @param name The name of the tool