@f5-sales-demo/pi-ai 21.5.0 → 21.5.1

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5-sales-demo/pi-ai",
-	"version": "21.5.0",
+	"version": "21.5.1",
 	"description": "Unified LLM API with automatic model discovery and provider configuration",
 	"homepage": "https://github.com/f5-sales-demo/xcsh",
 	"author": "Can Boluk",
@@ -46,7 +46,7 @@
 		"@anthropic-ai/sdk": "^0.115",
 		"@aws-sdk/client-bedrock-runtime": "^3",
 		"@bufbuild/protobuf": "^2.11",
-		"@f5-sales-demo/pi-utils": "21.5.0",
+		"@f5-sales-demo/pi-utils": "21.5.1",
 		"@google/genai": "^2.15",
 		"@sinclair/typebox": "^0.34",
 		"@smithy/node-http-handler": "^4.4",

package/src/provider-models/google.ts

@@ -35,8 +35,8 @@ export function googleModelManagerOptions(
 export function googleVertexModelManagerOptions(
 	_config?: GoogleVertexModelManagerConfig,
 ): ModelManagerOptions<"google-vertex"> {
-	// Vertex AI uses Application Default Credentials (ADC) for authentication,
-	// which is handled at stream time rather than during model discovery.
+	// Vertex authentication is handled at stream time rather than during model
+	// discovery (standalone OAuth in xcsh, or explicit credentials for SDK users).
 	// Dynamic model discovery is not yet implemented for this provider.
 	return {
 		providerId: "google-vertex",

package/src/providers/google-vertex.ts

@@ -106,8 +106,8 @@ export const streamGoogleVertex: StreamFunction<"google-vertex"> = (
 		let rawRequestDump: RawHttpRequestDump | undefined;
 
 		try {
-			// Corporate Vertex is deliberately ADC-only.  In particular, do not let the
-			// generic agent API-key plumbing turn this route into Gemini consumer auth.
+			// apiKey is an isolated, short-lived OAuth bearer token for the Corporate
+			// Vertex route. It is never sourced from Gemini consumer credentials.
 			const project = await resolveGoogleVertexProject(options);
 			const location = resolveGoogleVertexLocation(options);
 			const client = createClient(model, project, location, options?.apiKey);

package/src/stream.ts

@@ -1,6 +1,3 @@
-import * as fs from "node:fs";
-import * as os from "node:os";
-import * as path from "node:path";
 import { $env, $pickenv } from "@f5-sales-demo/pi-utils";
 import { getCustomApi } from "./api-registry";
 import type { Effort } from "./model-thinking";
@@ -37,22 +34,6 @@ import type {
 	ToolChoice,
 } from "./types";
 
-let cachedVertexAdcCredentialsExists: boolean | null = null;
-
-function hasVertexAdcCredentials(): boolean {
-	if (cachedVertexAdcCredentialsExists === null) {
-		const gacPath = $env.GOOGLE_APPLICATION_CREDENTIALS;
-		if (gacPath) {
-			cachedVertexAdcCredentialsExists = fs.existsSync(gacPath);
-		} else {
-			cachedVertexAdcCredentialsExists = fs.existsSync(
-				path.join(os.homedir(), ".config", "gcloud", "application_default_credentials.json"),
-			);
-		}
-	}
-	return cachedVertexAdcCredentialsExists;
-}
-
 type KeyResolver = string | (() => string | undefined);
 
 function isFoundryEnabled(): boolean {
@@ -97,8 +78,6 @@ const serviceProviderMap: Record<string, KeyResolver> = {
 			? $pickenv("ANTHROPIC_FOUNDRY_API_KEY", "ANTHROPIC_OAUTH_TOKEN", "ANTHROPIC_API_KEY")
 			: $pickenv("ANTHROPIC_OAUTH_TOKEN", "ANTHROPIC_API_KEY"),
 	"gitlab-duo": "GITLAB_TOKEN",
-	// Corporate Vertex uses Application Default Credentials only.
-	"google-vertex": () => (hasVertexAdcCredentials() ? "<authenticated>" : undefined),
 	// Amazon Bedrock supports multiple credential sources:
 	// 1. AWS_PROFILE - named profile from ~/.aws/credentials
 	// 2. AWS_ACCESS_KEY_ID + AWS_SECRET_ACCESS_KEY - standard IAM keys
@@ -402,7 +381,7 @@ function resolveOpenAiReasoningEffort<TApi extends Api>(
 
 const castApi = <TApi extends Api>(api: OptionsForApi<TApi>): OptionsForApi<Api> => api as OptionsForApi<Api>;
 
-function mapOptionsForApi<TApi extends Api>(
+export function mapOptionsForApi<TApi extends Api>(
 	model: Model<TApi>,
 	options?: SimpleStreamOptions,
 	apiKey?: string,
@@ -647,11 +626,16 @@ function mapOptionsForApi<TApi extends Api>(
 		}
 
 		case "google-vertex": {
+			const vertexBase = {
+				...base,
+				project: options?.project,
+				location: options?.location,
+			};
 			// Explicitly disable thinking when reasoning is not specified or model doesn't support it
 			const reasoning = options?.reasoning;
 			if (!reasoning || !model.reasoning) {
 				return castApi<"google-vertex">({
-					...base,
+					...vertexBase,
 					thinking: { enabled: false },
 					toolChoice: mapGoogleToolChoice(options?.toolChoice),
 				});
@@ -663,7 +647,7 @@ function mapOptionsForApi<TApi extends Api>(
 
 			if (geminiModel.thinking?.mode === "google-level") {
 				return castApi<"google-vertex">({
-					...base,
+					...vertexBase,
 					thinking: {
 						enabled: true,
 						level: mapEffortToGoogleThinkingLevel(geminiModel, effort),
@@ -673,7 +657,7 @@ function mapOptionsForApi<TApi extends Api>(
 			}
 
 			return castApi<"google-vertex">({
-				...base,
+				...vertexBase,
 				thinking: {
 					enabled: true,
 					budgetTokens: getGoogleBudget(geminiModel, effort, options?.thinkingBudgets),

package/src/types.ts

@@ -227,6 +227,10 @@ export interface StreamOptions {
 
 // Unified options with reasoning passed to streamSimple() and completeSimple()
 export interface SimpleStreamOptions extends StreamOptions {
+	/** Confirmed Google Cloud project for the Corporate Vertex transport. */
+	project?: string;
+	/** Google Cloud location for the Corporate Vertex transport. */
+	location?: string;
 	reasoning?: Effort;
 	/** Custom token budgets for thinking levels (token-based providers only) */
 	thinkingBudgets?: ThinkingBudgets;