Skip to content

Supercharge your AI agents with data from the web and beyond. Building the library for superintelligence. 🔥

feat(api): support ambient Google credentials for Vertex and Pub/Sub (#5743)

tomsideguide62c0bcacda0a
diff --git a/apps/api/src/config.ts b/apps/api/src/config.ts
index 6a2e7fcec..d660286da 100644
--- a/apps/api/src/config.ts
+++ b/apps/api/src/config.ts
@@ -395,6 +395,8 @@ const configSchema = z.object({
// Google Cloud Pub/Sub
PUBSUB_CREDENTIALS: z.string().optional(),
+ // Publishes with ambient credentials when PUBSUB_CREDENTIALS is unset.
+ PUBSUB_PROJECT_ID: emptyStringAsUndefined(z.string().trim().min(1)),
// Prepended to every log topic name. Production leaves it unset and
// publishes to `<table>`; staging sets `staging-` so its rows land in the
// `staging-<table>` topics and the staging ClickHouse database instead of
@@ -720,6 +722,8 @@ const configSchema = z.object({
MODEL_EMBEDDING_NAME: z.string().optional(),
OLLAMA_BASE_URL: z.string().optional(),
VERTEX_CREDENTIALS: z.string().optional(),
+ // Uses Vertex with ambient credentials when VERTEX_CREDENTIALS is unset.
+ VERTEX_USE_ADC: z.stringbool().default(false),
// LangSmith (tracing for interact agent)
LANGSMITH_API_KEY: z.string().optional(),
diff --git a/apps/api/src/lib/generic-ai.ts b/apps/api/src/lib/generic-ai.ts
index 26c9d9e6c..26cf34f47 100644
--- a/apps/api/src/lib/generic-ai.ts
+++ b/apps/api/src/lib/generic-ai.ts
@@ -30,9 +30,11 @@ const vertexAuthOptions = config.VERTEX_CREDENTIALS
? {
credentials: JSON.parse(atob(config.VERTEX_CREDENTIALS)),
}
- : {
- keyFile: "./gke-key.json",
- };
+ : config.VERTEX_USE_ADC
+ ? undefined
+ : {
+ keyFile: "./gke-key.json",
+ };
const providerList: Record<Provider, any> = {
openai: createOpenAI({
diff --git a/apps/api/src/lib/mcp-action-log-config.ts b/apps/api/src/lib/mcp-action-log-config.ts
index a717bc9b1..8e9cf0fbd 100644
--- a/apps/api/src/lib/mcp-action-log-config.ts
+++ b/apps/api/src/lib/mcp-action-log-config.ts
@@ -3,6 +3,7 @@ type McpActionLogConfigInput = {
MCP_ACTION_LOG_WRITES_ENABLED?: boolean;
MCP_ACTION_LOG_SECRET?: string;
PUBSUB_CREDENTIALS?: string;
+ PUBSUB_PROJECT_ID?: string;
USE_DB_AUTHENTICATION?: boolean;
};
@@ -42,7 +43,8 @@ export function getMcpActionLogConfigErrors(config: McpActionLogConfigInput) {
}
if (
config.MCP_ACTION_LOG_WRITES_ENABLED === true &&
- !config.PUBSUB_CREDENTIALS?.trim()
+ !config.PUBSUB_CREDENTIALS?.trim() &&
+ !config.PUBSUB_PROJECT_ID?.trim()
) {
errors.push({
path: "PUBSUB_CREDENTIALS",
diff --git a/apps/api/src/lib/scrape-interact/browser-agent.ts b/apps/api/src/lib/scrape-interact/browser-agent.ts
index 0d5964ff3..0174bb39d 100644
--- a/apps/api/src/lib/scrape-interact/browser-agent.ts
+++ b/apps/api/src/lib/scrape-interact/browser-agent.ts
@@ -27,7 +27,7 @@ const SNAPSHOT_MAX_CHARS = 40_000;
// labels; the GenAI (Gemini) API is only a fallback when Vertex credentials
// aren't configured (e.g. self-hosted). Mirrors services/monitoring/search/tuning.ts.
function hasVertex(): boolean {
- return Boolean(config.VERTEX_CREDENTIALS);
+ return Boolean(config.VERTEX_CREDENTIALS) || config.VERTEX_USE_ADC;
}
// ---------------------------------------------------------------------------
diff --git a/apps/api/src/scraper/scrapeURL/transformers/query.ts b/apps/api/src/scraper/scrapeURL/transformers/query.ts
index ac0ea9a5e..b3105ce0f 100644
--- a/apps/api/src/scraper/scrapeURL/transformers/query.ts
+++ b/apps/api/src/scraper/scrapeURL/transformers/query.ts
@@ -23,7 +23,7 @@ function escapePromptTags(text: string): string {
// labels; the GenAI (Gemini) API is only a fallback when Vertex credentials
// aren't configured (e.g. self-hosted). Mirrors services/monitoring/search/tuning.ts.
function hasVertex(): boolean {
- return Boolean(config.VERTEX_CREDENTIALS);
+ return Boolean(config.VERTEX_CREDENTIALS) || config.VERTEX_USE_ADC;
}
const DIRECT_QUOTE_MODEL = {
diff --git a/apps/api/src/services/logging/log_job.ts b/apps/api/src/services/logging/log_job.ts
index 09e37cabc..5f465c650 100644
--- a/apps/api/src/services/logging/log_job.ts
+++ b/apps/api/src/services/logging/log_job.ts
@@ -170,7 +170,11 @@ let lastDropWarningAt = 0;
function getPubSubClient(logger: Logger): PubSub | null {
if (pubSubClient !== undefined) return pubSubClient;
- if (!config.PUBSUB_CREDENTIALS) return (pubSubClient = null);
+ if (!config.PUBSUB_CREDENTIALS?.trim()) {
+ return (pubSubClient = config.PUBSUB_PROJECT_ID
+ ? new PubSub({ projectId: config.PUBSUB_PROJECT_ID })
+ : null);
+ }
try {
const credentials = JSON.parse(
@@ -228,7 +232,7 @@ async function publishLog(table: string, data: any, logger: Logger) {
}
const client = getPubSubClient(logger);
if (!client) {
- if (config.PUBSUB_CREDENTIALS) {
+ if (config.PUBSUB_CREDENTIALS?.trim() || config.PUBSUB_PROJECT_ID) {
throw new Error("Pub/Sub log publisher initialization failed");
}
setSpanAttributes(span, {
diff --git a/apps/api/src/services/monitoring/search/tuning.ts b/apps/api/src/services/monitoring/search/tuning.ts
index 029207f7e..95ee1c073 100644
--- a/apps/api/src/services/monitoring/search/tuning.ts
+++ b/apps/api/src/services/monitoring/search/tuning.ts
@@ -39,7 +39,7 @@ function geminiApiKey(): string | undefined {
// labels; the GenAI (Gemini) API is only a fallback when Vertex credentials
// aren't configured (e.g. self-hosted).
function hasVertex(): boolean {
- return Boolean(config.VERTEX_CREDENTIALS);
+ return Boolean(config.VERTEX_CREDENTIALS) || config.VERTEX_USE_ADC;
}
export function hasLlmProvider(): boolean {