jiva-core 0.3.44 → 0.3.46-dev.478c47b
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Dockerfile +7 -3
- package/cloud-run-deploy.yaml +1 -1
- package/cloud-run.yaml +5 -8
- package/dist/code/tools/bash.d.ts.map +1 -1
- package/dist/code/tools/bash.js +2 -0
- package/dist/code/tools/bash.js.map +1 -1
- package/dist/code/tools/grep.js +1 -1
- package/dist/code/tools/grep.js.map +1 -1
- package/dist/code/tools/read.js +2 -2
- package/dist/core/agent-spawner.js +1 -1
- package/dist/core/client-agent.d.ts +3 -1
- package/dist/core/client-agent.d.ts.map +1 -1
- package/dist/core/client-agent.js +6 -4
- package/dist/core/client-agent.js.map +1 -1
- package/dist/core/config.d.ts +174 -86
- package/dist/core/config.d.ts.map +1 -1
- package/dist/core/config.js +25 -9
- package/dist/core/config.js.map +1 -1
- package/dist/core/dual-agent.d.ts +8 -0
- package/dist/core/dual-agent.d.ts.map +1 -1
- package/dist/core/dual-agent.js +14 -10
- package/dist/core/dual-agent.js.map +1 -1
- package/dist/core/manager-agent.d.ts +3 -1
- package/dist/core/manager-agent.d.ts.map +1 -1
- package/dist/core/manager-agent.js +37 -17
- package/dist/core/manager-agent.js.map +1 -1
- package/dist/core/worker-agent.d.ts +3 -1
- package/dist/core/worker-agent.d.ts.map +1 -1
- package/dist/core/worker-agent.js +23 -9
- package/dist/core/worker-agent.js.map +1 -1
- package/dist/interfaces/cli/index.js +2 -2
- package/dist/interfaces/cli/index.js.map +1 -1
- package/dist/interfaces/http/session-manager.d.ts +7 -1
- package/dist/interfaces/http/session-manager.d.ts.map +1 -1
- package/dist/interfaces/http/session-manager.js +83 -47
- package/dist/interfaces/http/session-manager.js.map +1 -1
- package/dist/models/base.d.ts +8 -0
- package/dist/models/base.d.ts.map +1 -1
- package/dist/models/google-adc.d.ts +26 -0
- package/dist/models/google-adc.d.ts.map +1 -0
- package/dist/models/google-adc.js +118 -0
- package/dist/models/google-adc.js.map +1 -0
- package/dist/models/harmony.d.ts.map +1 -1
- package/dist/models/harmony.js +39 -3
- package/dist/models/harmony.js.map +1 -1
- package/dist/models/model-client.d.ts +19 -2
- package/dist/models/model-client.d.ts.map +1 -1
- package/dist/models/model-client.js +48 -17
- package/dist/models/model-client.js.map +1 -1
- package/dist/storage/factory.d.ts.map +1 -1
- package/dist/storage/factory.js +5 -0
- package/dist/storage/factory.js.map +1 -1
- package/dist/storage/gcp-bucket-provider.d.ts +10 -0
- package/dist/storage/gcp-bucket-provider.d.ts.map +1 -1
- package/dist/storage/gcp-bucket-provider.js +61 -6
- package/dist/storage/gcp-bucket-provider.js.map +1 -1
- package/dist/storage/local-provider.d.ts +7 -0
- package/dist/storage/local-provider.d.ts.map +1 -1
- package/dist/storage/local-provider.js +12 -0
- package/dist/storage/local-provider.js.map +1 -1
- package/dist/storage/provider.d.ts +15 -0
- package/dist/storage/provider.d.ts.map +1 -1
- package/dist/storage/provider.js +19 -0
- package/dist/storage/provider.js.map +1 -1
- package/dist/utils/orchestration-logger.d.ts +16 -4
- package/dist/utils/orchestration-logger.d.ts.map +1 -1
- package/dist/utils/orchestration-logger.js +24 -4
- package/dist/utils/orchestration-logger.js.map +1 -1
- package/package.json +1 -1
- package/scripts/generate-image.js +130 -0
- package/scripts/package.json +7 -0
- package/scripts/post-to-gritsa.js +212 -0
|
@@ -0,0 +1,118 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Google Application Default Credentials (ADC) token provider.
|
|
3
|
+
*
|
|
4
|
+
* Fetches short-lived OAuth2 tokens for calling Google Cloud APIs
|
|
5
|
+
* (e.g. Vertex AI MaaS endpoints) from within Cloud Run or any GCP
|
|
6
|
+
* environment that has a service account attached.
|
|
7
|
+
*
|
|
8
|
+
* Token source priority:
|
|
9
|
+
* 1. GCP metadata server at 169.254.169.254 (Cloud Run, GCE, GKE)
|
|
10
|
+
* — uses the IP directly, not the hostname, because musl libc
|
|
11
|
+
* (node:20-alpine) cannot resolve `metadata.google.internal`.
|
|
12
|
+
* 2. google-auth-library (ADC) — fallback for local development
|
|
13
|
+
* when gcloud application-default credentials are active.
|
|
14
|
+
*
|
|
15
|
+
* Tokens are cached in-process and refreshed 5 minutes before expiry,
|
|
16
|
+
* so there is at most one outbound metadata call per hour.
|
|
17
|
+
*/
|
|
18
|
+
import http from 'http';
|
|
19
|
+
import { logger } from '../utils/logger.js';
|
|
20
|
+
const METADATA_IP = '169.254.169.254';
|
|
21
|
+
const METADATA_PATH = '/computeMetadata/v1/instance/service-accounts/default/token';
|
|
22
|
+
const REFRESH_BUFFER_MS = 5 * 60 * 1000; // refresh 5 min before expiry
|
|
23
|
+
let cached = null;
|
|
24
|
+
let inflight = null;
|
|
25
|
+
function fetchFromMetadataServer() {
|
|
26
|
+
return new Promise((resolve, reject) => {
|
|
27
|
+
const req = http.request({
|
|
28
|
+
host: METADATA_IP,
|
|
29
|
+
port: 80,
|
|
30
|
+
path: METADATA_PATH,
|
|
31
|
+
method: 'GET',
|
|
32
|
+
headers: { 'Metadata-Flavor': 'Google' },
|
|
33
|
+
timeout: 3000,
|
|
34
|
+
}, (res) => {
|
|
35
|
+
if (res.statusCode !== 200) {
|
|
36
|
+
reject(new Error(`Metadata server returned HTTP ${res.statusCode}`));
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
let body = '';
|
|
40
|
+
res.on('data', (chunk) => (body += chunk));
|
|
41
|
+
res.on('end', () => {
|
|
42
|
+
try {
|
|
43
|
+
const parsed = JSON.parse(body);
|
|
44
|
+
cached = {
|
|
45
|
+
access_token: parsed.access_token,
|
|
46
|
+
expires_at: Date.now() + parsed.expires_in * 1000,
|
|
47
|
+
};
|
|
48
|
+
logger.debug(`[GoogleADC] Token refreshed from metadata server, ` +
|
|
49
|
+
`expires in ${Math.round(parsed.expires_in / 60)} min`);
|
|
50
|
+
resolve(cached.access_token);
|
|
51
|
+
}
|
|
52
|
+
catch (e) {
|
|
53
|
+
reject(new Error('Failed to parse metadata token response'));
|
|
54
|
+
}
|
|
55
|
+
});
|
|
56
|
+
});
|
|
57
|
+
req.on('error', reject);
|
|
58
|
+
req.on('timeout', () => {
|
|
59
|
+
req.destroy();
|
|
60
|
+
reject(new Error('Metadata server request timed out'));
|
|
61
|
+
});
|
|
62
|
+
req.end();
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
async function fetchFromGoogleAuthLibrary() {
|
|
66
|
+
const { GoogleAuth } = await import('google-auth-library');
|
|
67
|
+
const auth = new GoogleAuth({
|
|
68
|
+
scopes: ['https://www.googleapis.com/auth/cloud-platform'],
|
|
69
|
+
});
|
|
70
|
+
const token = await auth.getAccessToken();
|
|
71
|
+
if (!token)
|
|
72
|
+
throw new Error('google-auth-library returned null token');
|
|
73
|
+
// Cache for 55 min (library manages its own refresh internally,
|
|
74
|
+
// but we cache to avoid re-instantiating on every call).
|
|
75
|
+
cached = { access_token: token, expires_at: Date.now() + 55 * 60 * 1000 };
|
|
76
|
+
logger.debug('[GoogleADC] Token obtained via google-auth-library (local ADC)');
|
|
77
|
+
return token;
|
|
78
|
+
}
|
|
79
|
+
/**
|
|
80
|
+
* Returns a valid GCP OAuth2 access token, refreshing from the metadata
|
|
81
|
+
* server (Cloud Run) or local ADC (development) as needed.
|
|
82
|
+
*
|
|
83
|
+
* Call this once per model API request — the call is cheap because the
|
|
84
|
+
* token is cached in-process until 5 minutes before expiry.
|
|
85
|
+
*/
|
|
86
|
+
export async function getGoogleADCToken() {
|
|
87
|
+
// Return cached token if still fresh
|
|
88
|
+
if (cached && cached.expires_at - Date.now() > REFRESH_BUFFER_MS) {
|
|
89
|
+
return cached.access_token;
|
|
90
|
+
}
|
|
91
|
+
// Deduplicate concurrent refresh calls
|
|
92
|
+
if (inflight)
|
|
93
|
+
return inflight;
|
|
94
|
+
inflight = (async () => {
|
|
95
|
+
try {
|
|
96
|
+
return await fetchFromMetadataServer();
|
|
97
|
+
}
|
|
98
|
+
catch (metadataErr) {
|
|
99
|
+
logger.debug(`[GoogleADC] Metadata server unavailable (${metadataErr.message}), ` +
|
|
100
|
+
`falling back to google-auth-library`);
|
|
101
|
+
try {
|
|
102
|
+
return await fetchFromGoogleAuthLibrary();
|
|
103
|
+
}
|
|
104
|
+
catch (adcErr) {
|
|
105
|
+
throw new Error(`Google ADC token fetch failed.\n` +
|
|
106
|
+
` Metadata server: ${metadataErr.message}\n` +
|
|
107
|
+
` google-auth-library: ${adcErr.message}\n` +
|
|
108
|
+
`Ensure the service account has the 'aiplatform.endpoints.predict' permission ` +
|
|
109
|
+
`or set useGoogleADC: false and provide a static apiKey.`);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
finally {
|
|
113
|
+
inflight = null;
|
|
114
|
+
}
|
|
115
|
+
})();
|
|
116
|
+
return inflight;
|
|
117
|
+
}
|
|
118
|
+
//# sourceMappingURL=google-adc.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"google-adc.js","sourceRoot":"","sources":["../../src/models/google-adc.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"harmony.d.ts","sourceRoot":"","sources":["../../src/models/harmony.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,QAAQ,GAAG,WAAW,GAAG,MAAM,GAAG,WAAW,GAAG,MAAM,CAAC;IAC7D,OAAO,EAAE,MAAM,GAAG,cAAc,EAAE,CAAC;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE;QACV,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;CACH;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE;QACV,IAAI,EAAE,QAAQ,CAAC;QACf,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAChC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;CACH;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,qBAAqB,EAAE,GAAG,MAAM,CAoD5E;AAED;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,cAAc,EAAE,EAC1B,KAAK,CAAC,EAAE,qBAAqB,EAAE,GAC9B,cAAc,EAAE,CA8BlB;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,qBAAqB,
|
|
1
|
+
{"version":3,"file":"harmony.d.ts","sourceRoot":"","sources":["../../src/models/harmony.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,QAAQ,GAAG,WAAW,GAAG,MAAM,GAAG,WAAW,GAAG,MAAM,CAAC;IAC7D,OAAO,EAAE,MAAM,GAAG,cAAc,EAAE,CAAC;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE;QACV,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;CACH;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE;QACV,IAAI,EAAE,QAAQ,CAAC;QACf,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAChC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;CACH;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,qBAAqB,EAAE,GAAG,MAAM,CAoD5E;AAED;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,cAAc,EAAE,EAC1B,KAAK,CAAC,EAAE,qBAAqB,EAAE,GAC9B,cAAc,EAAE,CA8BlB;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,qBAAqB,CAqJ5E;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAmBhE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,eAAe,EACzB,cAAc,EAAE,qBAAqB,EAAE,GACtC,OAAO,CAyBT;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,GAAG,GACV,cAAc,CAOhB"}
|
package/dist/models/harmony.js
CHANGED
|
@@ -134,7 +134,8 @@ export function parseHarmonyResponse(response) {
|
|
|
134
134
|
}
|
|
135
135
|
}
|
|
136
136
|
// Parse tool calls — Harmony pipe format: <|call|>fn({"k":"v"})<|return|>
|
|
137
|
-
|
|
137
|
+
// Also handles malformed variants where the closing |> is missing: <|return|<|end|>
|
|
138
|
+
const toolCallRegex = /<\|call\|>([\s\S]*?)<\|return\|>?(?=<|\s*$)/g;
|
|
138
139
|
let toolMatch;
|
|
139
140
|
let callId = 0;
|
|
140
141
|
while ((toolMatch = toolCallRegex.exec(response)) !== null) {
|
|
@@ -212,6 +213,36 @@ export function parseHarmonyResponse(response) {
|
|
|
212
213
|
logger.debug(`[Harmony] Parsed XML-format tool call: ${toolName}`);
|
|
213
214
|
}
|
|
214
215
|
}
|
|
216
|
+
// Parse tool calls — Vertex AI Harmony dialect:
|
|
217
|
+
// <|channel|>commentary to=TOOL_NAME <|constrain|>json<|message|>JSON_ARGS<|call|>
|
|
218
|
+
// This dialect is emitted by gpt-oss-120b-maas on Vertex AI MaaS when it uses
|
|
219
|
+
// its native Harmony format. The tool name follows "to=" and args follow <|message|>.
|
|
220
|
+
//
|
|
221
|
+
// Vertex AI prefixes tool names with "functions." (e.g., "functions.tavily-mcp__tavily_search").
|
|
222
|
+
// Strip this prefix so the name matches the registered MCP tool name.
|
|
223
|
+
const vertexChannelRegex = /<\|channel\|>\w+\s+to=([\w.-]+(?:__[\w.-]+)?)\s+<\|constrain\|>json<\|message\|>([\s\S]*?)<\|call\|>/g;
|
|
224
|
+
let vertexMatch;
|
|
225
|
+
while ((vertexMatch = vertexChannelRegex.exec(response)) !== null) {
|
|
226
|
+
// Strip "functions." namespace prefix if present
|
|
227
|
+
const rawToolName = vertexMatch[1].trim();
|
|
228
|
+
const toolName = rawToolName.startsWith('functions.') ? rawToolName.slice('functions.'.length) : rawToolName;
|
|
229
|
+
const argsJson = vertexMatch[2].trim();
|
|
230
|
+
try {
|
|
231
|
+
const parsedArgs = JSON.parse(argsJson);
|
|
232
|
+
result.toolCalls.push({
|
|
233
|
+
id: `call_${callId++}`,
|
|
234
|
+
type: 'function',
|
|
235
|
+
function: {
|
|
236
|
+
name: toolName,
|
|
237
|
+
arguments: JSON.stringify(parsedArgs),
|
|
238
|
+
},
|
|
239
|
+
});
|
|
240
|
+
logger.debug(`[Harmony] Parsed Vertex AI dialect tool call: ${toolName}`);
|
|
241
|
+
}
|
|
242
|
+
catch (e) {
|
|
243
|
+
logger.warn(`[Harmony] Failed to parse Vertex AI dialect args for ${toolName}: ${argsJson}`);
|
|
244
|
+
}
|
|
245
|
+
}
|
|
215
246
|
// If no channels found, treat entire response as final
|
|
216
247
|
if (!result.analysis && !result.commentary && !result.final && result.toolCalls.length === 0) {
|
|
217
248
|
result.final = response.trim();
|
|
@@ -225,10 +256,15 @@ export function parseHarmonyResponse(response) {
|
|
|
225
256
|
export function extractAssistantMessage(response) {
|
|
226
257
|
// Remove channel markers and tool calls to get clean message
|
|
227
258
|
let cleaned = response
|
|
228
|
-
|
|
259
|
+
// Krutrim pipe-format tool calls: <|call|>fn(args)<|return|>
|
|
229
260
|
.replace(/<\|call\|>[\s\S]*?<\|return\|>/g, '')
|
|
230
|
-
|
|
261
|
+
// Vertex AI dialect tool calls: <|channel|>commentary to=fn <|constrain|>json<|message|>{args}<|call|>
|
|
262
|
+
.replace(/<\|channel\|>\w+\s+to=[\w.-]+(?:__[\w.-]+)?\s+<\|constrain\|>json<\|message\|>[\s\S]*?<\|call\|>/g, '')
|
|
263
|
+
// Remaining Harmony control tokens
|
|
264
|
+
.replace(/<\|channel\|>\w+/g, '')
|
|
265
|
+
.replace(/<\|start\|>\w*/g, '')
|
|
231
266
|
.replace(/<\|end\|>/g, '')
|
|
267
|
+
.replace(/<\|constrain\|>\w*/g, '')
|
|
232
268
|
.replace(/<\|message\|>/g, '')
|
|
233
269
|
.trim();
|
|
234
270
|
// Handle malformed patterns like "assistant<|channel|>analysis"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"harmony.js","sourceRoot":"","sources":["../../src/models/harmony.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"harmony.js","sourceRoot":"","sources":["../../src/models/harmony.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,21 +2,38 @@
|
|
|
2
2
|
* OpenAI-Compatible Model Client
|
|
3
3
|
*
|
|
4
4
|
* Generic client for any OpenAI-compatible chat completion API.
|
|
5
|
-
* Supports: Krutrim, Groq, Sarvam, OpenAI, and any other
|
|
6
|
-
* that exposes a /v1/chat/completions endpoint.
|
|
5
|
+
* Supports: Krutrim, Groq, Sarvam, OpenAI, Vertex AI MaaS, and any other
|
|
6
|
+
* provider that exposes a /v1/chat/completions endpoint.
|
|
7
7
|
*
|
|
8
8
|
* Provider-specific behaviour is controlled entirely through config flags:
|
|
9
9
|
* - useHarmonyFormat → Krutrim gpt-oss-120b (Harmony tool format)
|
|
10
10
|
* - reasoningEffortStrategy → how reasoning effort is communicated
|
|
11
11
|
* - defaultMaxTokens → required for reasoning models (e.g. Sarvam-105B)
|
|
12
|
+
* - useGoogleADC → Vertex AI MaaS: fetch short-lived GCP OAuth2 tokens
|
|
13
|
+
* instead of using a static apiKey
|
|
12
14
|
*/
|
|
13
15
|
import { IModel, ChatCompletionOptions, ModelResponse } from './base.js';
|
|
14
16
|
export interface ModelClientConfig {
|
|
15
17
|
endpoint: string;
|
|
18
|
+
/** Static API key. Not required when useGoogleADC is true. */
|
|
16
19
|
apiKey: string;
|
|
17
20
|
model: string;
|
|
18
21
|
defaultModel?: string;
|
|
19
22
|
type: 'reasoning' | 'multimodal' | 'tool-calling';
|
|
23
|
+
/**
|
|
24
|
+
* Use Google Application Default Credentials (ADC) for authentication.
|
|
25
|
+
*
|
|
26
|
+
* When true, a short-lived GCP OAuth2 bearer token is fetched automatically
|
|
27
|
+
* before each request (cached and refreshed every ~55 minutes). Use this for
|
|
28
|
+
* Vertex AI MaaS endpoints (aiplatform.googleapis.com) where no static API
|
|
29
|
+
* key exists — auth is handled by the Cloud Run service account.
|
|
30
|
+
*
|
|
31
|
+
* Token source: GCP metadata server IP 169.254.169.254 (Cloud Run/GCE),
|
|
32
|
+
* with fallback to google-auth-library for local development.
|
|
33
|
+
*
|
|
34
|
+
* Default: false
|
|
35
|
+
*/
|
|
36
|
+
useGoogleADC?: boolean;
|
|
20
37
|
/**
|
|
21
38
|
* Use Harmony format for tool calling.
|
|
22
39
|
* Only needed for Krutrim's gpt-oss-120b model.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-client.d.ts","sourceRoot":"","sources":["../../src/models/model-client.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"model-client.d.ts","sourceRoot":"","sources":["../../src/models/model-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,MAAM,EAAE,qBAAqB,EAAE,aAAa,EAAW,MAAM,WAAW,CAAC;AAYlF,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,8DAA8D;IAC9D,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,WAAW,GAAG,YAAY,GAAG,cAAc,CAAC;IAElD;;;;;;;;;;;;OAYG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;IAEnD;;;;;;;;;;;;;;;;OAgBG;IACH,uBAAuB,CAAC,EAAE,WAAW,GAAG,eAAe,GAAG,MAAM,CAAC;IAEjE;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B;;;;;;;;OAQG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,qBAAa,WAAY,YAAW,MAAM;IACxC,OAAO,CAAC,MAAM,CAAoB;gBAEtB,MAAM,EAAE,iBAAiB;IAIrC,cAAc,IAAI,OAAO;IAIzB,mBAAmB,IAAI,OAAO;IAKxB,IAAI,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,aAAa,CAAC;IAiElE,uFAAuF;IACvF,OAAO,CAAC,cAAc,CAAC,CAAS;YAElB,WAAW;IAuPzB;;OAEG;IACG,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAgCvE;;OAEG;IACG,gBAAgB,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CA0B1F;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,WAAW,CAExE"}
|
|
@@ -2,17 +2,20 @@
|
|
|
2
2
|
* OpenAI-Compatible Model Client
|
|
3
3
|
*
|
|
4
4
|
* Generic client for any OpenAI-compatible chat completion API.
|
|
5
|
-
* Supports: Krutrim, Groq, Sarvam, OpenAI, and any other
|
|
6
|
-
* that exposes a /v1/chat/completions endpoint.
|
|
5
|
+
* Supports: Krutrim, Groq, Sarvam, OpenAI, Vertex AI MaaS, and any other
|
|
6
|
+
* provider that exposes a /v1/chat/completions endpoint.
|
|
7
7
|
*
|
|
8
8
|
* Provider-specific behaviour is controlled entirely through config flags:
|
|
9
9
|
* - useHarmonyFormat → Krutrim gpt-oss-120b (Harmony tool format)
|
|
10
10
|
* - reasoningEffortStrategy → how reasoning effort is communicated
|
|
11
11
|
* - defaultMaxTokens → required for reasoning models (e.g. Sarvam-105B)
|
|
12
|
+
* - useGoogleADC → Vertex AI MaaS: fetch short-lived GCP OAuth2 tokens
|
|
13
|
+
* instead of using a static apiKey
|
|
12
14
|
*/
|
|
13
|
-
import { formatMessagesForHarmony, parseHarmonyResponse } from './harmony.js';
|
|
15
|
+
import { formatMessagesForHarmony, parseHarmonyResponse, extractAssistantMessage } from './harmony.js';
|
|
14
16
|
import { ModelError } from '../utils/errors.js';
|
|
15
17
|
import { logger } from '../utils/logger.js';
|
|
18
|
+
import { getGoogleADCToken } from './google-adc.js';
|
|
16
19
|
export class ModelClient {
|
|
17
20
|
config;
|
|
18
21
|
constructor(config) {
|
|
@@ -170,11 +173,15 @@ export class ModelClient {
|
|
|
170
173
|
logger.debug('API Request:', JSON.stringify(requestBody, null, 2));
|
|
171
174
|
logger.debug('Request size:', JSON.stringify(requestBody).length, 'bytes');
|
|
172
175
|
logger.debug('Message count:', requestBody.messages.length);
|
|
176
|
+
// Resolve auth token — static key or dynamic GCP OAuth2 token
|
|
177
|
+
const authToken = this.config.useGoogleADC
|
|
178
|
+
? await getGoogleADCToken()
|
|
179
|
+
: this.config.apiKey;
|
|
173
180
|
const response = await fetch(this.config.endpoint, {
|
|
174
181
|
method: 'POST',
|
|
175
182
|
headers: {
|
|
176
183
|
'Content-Type': 'application/json',
|
|
177
|
-
'Authorization': `Bearer ${
|
|
184
|
+
'Authorization': `Bearer ${authToken}`,
|
|
178
185
|
'User-Agent': 'Jiva/0.1.0',
|
|
179
186
|
'Accept': 'application/json',
|
|
180
187
|
},
|
|
@@ -217,10 +224,24 @@ export class ModelClient {
|
|
|
217
224
|
// when no tools were requested — the model may still emit tool-call tokens
|
|
218
225
|
// (e.g. <|call|>…<|return|> or <tool_call>…</tool_call>) regardless.
|
|
219
226
|
if (useHarmony && isReasoningModel) {
|
|
220
|
-
// Parse Harmony format response (Krutrim gpt-oss-120b
|
|
227
|
+
// Parse Harmony format response (Krutrim gpt-oss-120b / Vertex AI MaaS)
|
|
221
228
|
const parsed = parseHarmonyResponse(messageContent);
|
|
229
|
+
// Determine the clean display content.
|
|
230
|
+
// Prefer the model's explicit channel outputs (final > commentary > analysis), then
|
|
231
|
+
// fall back to extractAssistantMessage() which strips all Harmony control tokens.
|
|
232
|
+
// Always run extractAssistantMessage() to clean residual Harmony tokens from
|
|
233
|
+
// channel content (e.g. <|message|> tokens that appear as channel body).
|
|
234
|
+
// Never expose raw messageContent — it would leak Harmony tokens to the user.
|
|
235
|
+
const channelContent = parsed.final || parsed.commentary || parsed.analysis || '';
|
|
236
|
+
const cleanContent = extractAssistantMessage(channelContent || messageContent);
|
|
222
237
|
return {
|
|
223
|
-
content
|
|
238
|
+
// Cleaned display content (no Harmony tokens) — shown to the user
|
|
239
|
+
content: cleanContent,
|
|
240
|
+
// Raw Harmony response — must be stored in conversation history as the
|
|
241
|
+
// assistant message content so the model can continue the tool-call
|
|
242
|
+
// sequence on the next turn. Harmony providers (Vertex AI, Krutrim) need
|
|
243
|
+
// to see their own token markers in history.
|
|
244
|
+
rawHarmonyContent: messageContent,
|
|
224
245
|
toolCalls: parsed.toolCalls.length > 0 ? parsed.toolCalls : undefined,
|
|
225
246
|
usage: data.usage ? {
|
|
226
247
|
promptTokens: data.usage.prompt_tokens || 0,
|
|
@@ -236,22 +257,32 @@ export class ModelClient {
|
|
|
236
257
|
else {
|
|
237
258
|
// Standard OpenAI format response
|
|
238
259
|
const nativeToolCalls = choice.message?.tool_calls;
|
|
239
|
-
// Some models
|
|
240
|
-
//
|
|
260
|
+
// Some models emit tool calls in message.content instead of (or in addition to)
|
|
261
|
+
// the native tool_calls field. Two known content-embedded formats:
|
|
262
|
+
// 1. XML: <tool_call>name<arg_key>k</arg_key><arg_value>v</arg_value></tool_call>
|
|
263
|
+
// 2. Harmony tokens: <|call|>fn(args)<|return|> or <|channel|>commentary to=fn ...
|
|
264
|
+
// gpt-oss-120b-maas on Vertex AI leaks Harmony tokens even in standard mode.
|
|
241
265
|
let contentText = messageContent;
|
|
242
|
-
let
|
|
243
|
-
|
|
266
|
+
let embeddedToolCalls;
|
|
267
|
+
const hasHarmonyTokens = messageContent && (messageContent.includes('<|call|>') ||
|
|
268
|
+
messageContent.includes('<|channel|>') ||
|
|
269
|
+
messageContent.includes('<tool_call>'));
|
|
270
|
+
if (hasHarmonyTokens) {
|
|
244
271
|
const parsed = parseHarmonyResponse(messageContent);
|
|
245
272
|
if (parsed.toolCalls.length > 0) {
|
|
246
|
-
|
|
247
|
-
//
|
|
248
|
-
contentText = messageContent
|
|
273
|
+
embeddedToolCalls = parsed.toolCalls;
|
|
274
|
+
// Clean Harmony/XML tokens from the visible content
|
|
275
|
+
contentText = extractAssistantMessage(messageContent);
|
|
276
|
+
}
|
|
277
|
+
else {
|
|
278
|
+
// Tokens present but no tool calls parsed — still clean them from content
|
|
279
|
+
contentText = extractAssistantMessage(messageContent);
|
|
249
280
|
}
|
|
250
281
|
}
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
282
|
+
// Prefer native tool_calls (standard format); fall back to content-embedded calls
|
|
283
|
+
const allToolCalls = nativeToolCalls && nativeToolCalls.length > 0
|
|
284
|
+
? nativeToolCalls
|
|
285
|
+
: (embeddedToolCalls ?? []);
|
|
255
286
|
return {
|
|
256
287
|
content: contentText,
|
|
257
288
|
toolCalls: allToolCalls.length > 0 ? allToolCalls : undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-client.js","sourceRoot":"","sources":["../../src/models/model-client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"model-client.js","sourceRoot":"","sources":["../../src/models/model-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/storage/factory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/storage/factory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAuErF;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CACzC,mBAAmB,CAAC,EAAE,kBAAkB,EACxC,YAAY,CAAC,EAAE,mBAAmB,GACjC,OAAO,CAAC,eAAe,CAAC,CAwC1B;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,oBAAoB,CAAC,CAK/B;AAED;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,iBAAiB,CAAC,CAQ5B;AAED;;;;;;;GAOG;AACH,wBAAsB,gCAAgC,CACpD,OAAO,EAAE,cAAc,EACvB,WAAW,CAAC,EAAE,kBAAkB,EAChC,YAAY,CAAC,EAAE,mBAAmB,GACjC,OAAO,CAAC,eAAe,CAAC,CAI1B"}
|
package/dist/storage/factory.js
CHANGED
|
@@ -51,6 +51,11 @@ function determineProviderType(infraConfig) {
|
|
|
51
51
|
// Explicit environment variable takes precedence
|
|
52
52
|
const envProvider = process.env[ENV_VARS.PROVIDER];
|
|
53
53
|
if (envProvider) {
|
|
54
|
+
// Normalise common aliases so ops can use short names in Cloud Run env vars
|
|
55
|
+
if (envProvider === 'gcp')
|
|
56
|
+
return StorageProviderType.GCP_BUCKET;
|
|
57
|
+
if (envProvider === 's3' || envProvider === 'aws')
|
|
58
|
+
return StorageProviderType.AWS_S3;
|
|
54
59
|
return envProvider;
|
|
55
60
|
}
|
|
56
61
|
// Infer from available configuration
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../src/storage/factory.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../src/storage/factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,16 @@ export declare class GCPBucketProvider extends StorageProvider {
|
|
|
33
33
|
private deleteFile;
|
|
34
34
|
private listFiles;
|
|
35
35
|
private hashWorkspacePath;
|
|
36
|
+
/**
|
|
37
|
+
* Returns a new GCPBucketProvider instance that shares the underlying GCS
|
|
38
|
+
* bucket connection and the per-tenant config cache with this parent, but has
|
|
39
|
+
* its own immutable context (tenantId / sessionId).
|
|
40
|
+
*
|
|
41
|
+
* This means concurrent sessions from different tenants each read/write their
|
|
42
|
+
* own GCS paths without ever touching this.context on the shared singleton.
|
|
43
|
+
*/
|
|
44
|
+
createSessionScoped(context: import('./types.js').StorageContext): GCPBucketProvider;
|
|
45
|
+
setContext(context: import('./types.js').StorageContext): void;
|
|
36
46
|
private loadConfigCache;
|
|
37
47
|
getConfig<T>(key: string): Promise<T | undefined>;
|
|
38
48
|
setConfig<T>(key: string, value: T): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gcp-bucket-provider.d.ts","sourceRoot":"","sources":["../../src/storage/gcp-bucket-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"gcp-bucket-provider.d.ts","sourceRoot":"","sources":["../../src/storage/gcp-bucket-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,oBAAoB,EACpB,SAAS,EACV,MAAM,YAAY,CAAC;AAIpB,qBAAa,iBAAkB,SAAQ,eAAe;IACpD,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,WAAW,CAA+C;gBAEtD,WAAW,EAAE,kBAAkB;IAWrC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;YA8BnB,QAAQ;YAoBR,SAAS;YAST,SAAS;YAST,QAAQ;YAoBR,UAAU;YAUV,SAAS;IAOvB,OAAO,CAAC,iBAAiB;IAQzB;;;;;;;OAOG;IACM,mBAAmB,CAAC,OAAO,EAAE,OAAO,YAAY,EAAE,cAAc,GAAG,iBAAiB;IAiBpF,UAAU,CAAC,OAAO,EAAE,OAAO,YAAY,EAAE,cAAc,GAAG,IAAI;YAgBzD,eAAe;IAmBvB,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAKjD,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAYlD,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAQlD,OAAO,CAAC,yBAAyB;IAI3B,gBAAgB,CAAC,YAAY,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;IAMlE,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAK/D,iBAAiB,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAmBpD,kBAAkB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7C,aAAa,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAOjE,aAAa,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUpE,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBxD,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB1B,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC;IAgBjC,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBlD;;OAEG;IACG,iBAAiB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxD;;OAEG;IACG,iBAAiB,IAAI,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;CAIrD"}
|