agent-nuvira 1.82.2 → 1.82.4
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/dist/example.d.ts +1 -0
- package/dist/example.d.ts.map +1 -0
- package/dist/example.js +3 -0
- package/dist/example.js.map +1 -0
- package/dist/inference/anthropic-adapter.d.ts.map +1 -1
- package/dist/inference/anthropic-adapter.js +13 -2
- package/dist/inference/anthropic-adapter.js.map +1 -1
- package/dist/inference/groq-adapter.d.ts.map +1 -1
- package/dist/inference/groq-adapter.js +55 -5
- package/dist/inference/groq-adapter.js.map +1 -1
- package/dist/inference/nim-adapter.d.ts.map +1 -1
- package/dist/inference/nim-adapter.js +23 -4
- package/dist/inference/nim-adapter.js.map +1 -1
- package/dist/inference/openai-compat-adapter.d.ts.map +1 -1
- package/dist/inference/openai-compat-adapter.js +24 -4
- package/dist/inference/openai-compat-adapter.js.map +1 -1
- package/dist/inference/openrouter-adapter.d.ts.map +1 -1
- package/dist/inference/openrouter-adapter.js +24 -4
- package/dist/inference/openrouter-adapter.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
//# sourceMappingURL=example.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"example.d.ts","sourceRoot":"","sources":["../src/example.ts"],"names":[],"mappings":""}
|
package/dist/example.js
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"example.js","sourceRoot":"","sources":["../src/example.ts"],"names":[],"mappings":";AAAA,qCAAqC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic-adapter.d.ts","sourceRoot":"","sources":["../../src/inference/anthropic-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"anthropic-adapter.d.ts","sourceRoot":"","sources":["../../src/inference/anthropic-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAuDtE,qBAAa,gBAAiB,YAAW,iBAAiB;IACxD,QAAQ,CAAC,IAAI,eAAe;IAC5B,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,OAAO,CAAS;gBAEZ,MAAM,EAAE,cAAc;IAKlC,OAAO,CAAC,OAAO;IAUT,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC;IAsDrE,cAAc,CAClB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,gBAAgB,GAAG,SAAS,EACrC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAC/B,OAAO,CAAC,MAAM,CAAC;IA4EZ,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAYrC,OAAO,IAAI,MAAM;IAQX,UAAU,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;CAmB/C"}
|
|
@@ -21,6 +21,17 @@ import { getCostTracker, recordCallWithUsage } from '../learning/cost-tracker.js
|
|
|
21
21
|
import { attachHttpContext } from './http-error.js';
|
|
22
22
|
const ANTHROPIC_BASE_URL = 'https://api.anthropic.com';
|
|
23
23
|
const ANTHROPIC_VERSION = '2023-06-01';
|
|
24
|
+
/**
|
|
25
|
+
* Per-model max_tokens for Anthropic. Claude 3 Haiku has a 8192 limit;
|
|
26
|
+
* Claude 3.5 Sonnet/Opus support higher. Fallback 4096.
|
|
27
|
+
*/
|
|
28
|
+
function anthropicModelMaxTokens(model) {
|
|
29
|
+
if (/haiku/i.test(model))
|
|
30
|
+
return 8192;
|
|
31
|
+
if (/sonnet|opus/i.test(model))
|
|
32
|
+
return 8192;
|
|
33
|
+
return 4096;
|
|
34
|
+
}
|
|
24
35
|
/** Parse an Anthropic SSE line → text delta (content_block_delta) or null. */
|
|
25
36
|
function parseAnthropicSSE(line) {
|
|
26
37
|
if (!line.startsWith('data: '))
|
|
@@ -70,7 +81,7 @@ export class AnthropicAdapter {
|
|
|
70
81
|
}
|
|
71
82
|
async generate(prompt, options) {
|
|
72
83
|
const model = options?.model || this.config.model || 'default';
|
|
73
|
-
const maxTokens = options?.maxTokens ?? this.config.maxTokens ?? 4096;
|
|
84
|
+
const maxTokens = Math.min(options?.maxTokens ?? this.config.maxTokens ?? 4096, anthropicModelMaxTokens(model));
|
|
74
85
|
const temperature = options?.temperature ?? this.config.temperature ?? 0.7;
|
|
75
86
|
logger.debug(`Anthropic: Generating with model=${model} via ${this.baseUrl}`);
|
|
76
87
|
const response = await fetch(`${this.baseUrl}/v1/messages`, {
|
|
@@ -108,7 +119,7 @@ export class AnthropicAdapter {
|
|
|
108
119
|
}
|
|
109
120
|
async generateStream(prompt, options, onToken) {
|
|
110
121
|
const model = options?.model || this.config.model || 'default';
|
|
111
|
-
const maxTokens = options?.maxTokens ?? this.config.maxTokens ?? 4096;
|
|
122
|
+
const maxTokens = Math.min(options?.maxTokens ?? this.config.maxTokens ?? 4096, anthropicModelMaxTokens(model));
|
|
112
123
|
const temperature = options?.temperature ?? this.config.temperature ?? 0.7;
|
|
113
124
|
logger.debug(`Anthropic: Streaming with model=${model} via ${this.baseUrl}`);
|
|
114
125
|
const response = await fetch(`${this.baseUrl}/v1/messages`, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic-adapter.js","sourceRoot":"","sources":["../../src/inference/anthropic-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAIH,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,MAAM,kBAAkB,GAAG,2BAA2B,CAAC;AACvD,MAAM,iBAAiB,GAAG,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"anthropic-adapter.js","sourceRoot":"","sources":["../../src/inference/anthropic-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"groq-adapter.d.ts","sourceRoot":"","sources":["../../src/inference/groq-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,gBAAgB,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC/G,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"groq-adapter.d.ts","sourceRoot":"","sources":["../../src/inference/groq-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,gBAAgB,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC/G,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAsEtE;;;GAGG;AACH,qBAAa,WAAY,YAAW,iBAAiB;IACnD,QAAQ,CAAC,IAAI,UAAU;IACvB,OAAO,CAAC,MAAM,CAAiB;gBAEnB,MAAM,EAAE,cAAc;IAI5B,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC;IAyD3E,gEAAgE;IAC1D,aAAa,CACjB,QAAQ,EAAE,WAAW,EAAE,EACvB,KAAK,EAAE,UAAU,EAAE,EACnB,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,gBAAgB,CAAC;IAyB5B;;;OAGG;IACG,mBAAmB,CACvB,QAAQ,EAAE,WAAW,EAAE,EACvB,KAAK,EAAE,UAAU,EAAE,EACnB,OAAO,EAAE,gBAAgB,GAAG,SAAS,EACrC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAC/B,OAAO,CAAC,gBAAgB,CAAC;IA8BtB,cAAc,CAClB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,gBAAgB,GAAG,SAAS,EACrC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAC/B,OAAO,CAAC,MAAM,CAAC;IAqCZ,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IASrC,OAAO,IAAI,MAAM;IAIX,UAAU,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;CAgC/C"}
|
|
@@ -6,6 +6,57 @@ import { getModelTags } from './model-catalog.js';
|
|
|
6
6
|
import { getCostTracker, recordCallWithUsage } from '../learning/cost-tracker.js';
|
|
7
7
|
import { requireAdapterModel } from '../learning/model-selection.js';
|
|
8
8
|
const GROQ_BASE_URL = 'https://api.groq.com/openai/v1';
|
|
9
|
+
/**
|
|
10
|
+
* Per-model max output tokens (max_tokens).
|
|
11
|
+
* Groq enforces strict per-model limits — exceeding them returns 400.
|
|
12
|
+
* Fallback default (4096) applies only to models NOT listed here.
|
|
13
|
+
* Source: https://console.groq.com/docs/models
|
|
14
|
+
*/
|
|
15
|
+
const GROQ_MODEL_MAX_TOKENS = {
|
|
16
|
+
// Gemma 2 — small context, small output
|
|
17
|
+
'gemma2-9b-it': 512,
|
|
18
|
+
'gemma2-2b-it': 512,
|
|
19
|
+
// Gemma 3
|
|
20
|
+
'gemma3-1b-it': 512,
|
|
21
|
+
'gemma3-4b-it': 8192,
|
|
22
|
+
'gemma3-12b-it': 8192,
|
|
23
|
+
'gemma3-27b-it': 8192,
|
|
24
|
+
// Llama 3.3 — 70B is the workhorse, generous output
|
|
25
|
+
'llama-3.3-70b-versatile': 32768,
|
|
26
|
+
// Llama 3.1
|
|
27
|
+
'llama-3.1-8b-instant': 8192,
|
|
28
|
+
'llama-3.1-70b-versatile': 8192,
|
|
29
|
+
// Llama 3.2
|
|
30
|
+
'llama-3.2-1b-preview': 8192,
|
|
31
|
+
'llama-3.2-3b-preview': 8192,
|
|
32
|
+
'llama-3.2-11b-vision-preview': 8192,
|
|
33
|
+
'llama-3.2-90b-vision-preview': 8192,
|
|
34
|
+
// Llama 3
|
|
35
|
+
'llama3-8b-8192': 8192,
|
|
36
|
+
'llama3-70b-8192': 8192,
|
|
37
|
+
'llama3-8b-instruct': 8192,
|
|
38
|
+
'llama3-70b-instruct': 8192,
|
|
39
|
+
'llama3-8b-instruct-8192': 8192,
|
|
40
|
+
'llama3-70b-instruct-8192': 8192,
|
|
41
|
+
// Mixtral
|
|
42
|
+
'mixtral-8x7b-32768': 32768,
|
|
43
|
+
'mixtral-8x32b-32768': 32768,
|
|
44
|
+
// Qwen
|
|
45
|
+
'qwen-qwq-32b': 32768,
|
|
46
|
+
// DeepSeek
|
|
47
|
+
'deepseek-r1-distill-llama-70b': 32768,
|
|
48
|
+
// Gemma 4
|
|
49
|
+
'gemma4-1b-it': 8192,
|
|
50
|
+
'gemma4-12b-it': 8192,
|
|
51
|
+
'gemma4-27b-it': 8192,
|
|
52
|
+
// Command R
|
|
53
|
+
'command-r': 4096,
|
|
54
|
+
'command-r-plus': 4096,
|
|
55
|
+
};
|
|
56
|
+
/** Resolve max_tokens for a Groq model with safe fallback. */
|
|
57
|
+
function groqModelMaxTokens(model) {
|
|
58
|
+
return GROQ_MODEL_MAX_TOKENS[model] ?? 4096;
|
|
59
|
+
}
|
|
9
60
|
/**
|
|
10
61
|
* Groq Adapter
|
|
11
62
|
* Connects to Groq's OpenAI-compatible API for fast inference
|
|
@@ -24,7 +75,7 @@ export class GroqAdapter {
|
|
|
24
75
|
}
|
|
25
76
|
const model = options?.model || requireAdapterModel('groq', this.config.model);
|
|
26
77
|
const temperature = options?.temperature ?? this.config.temperature ?? 0.7;
|
|
27
|
-
const maxTokens = options?.maxTokens ?? this.config.maxTokens ?? 4096;
|
|
78
|
+
const maxTokens = Math.min(options?.maxTokens ?? this.config.maxTokens ?? 4096, groqModelMaxTokens(model));
|
|
28
79
|
logger.debug(`Groq: Generating with model=${model}, temperature=${temperature}, maxTokens=${maxTokens}`);
|
|
29
80
|
const response = await fetch(`${GROQ_BASE_URL}/chat/completions`, {
|
|
30
81
|
method: 'POST',
|
|
@@ -68,8 +119,7 @@ export class GroqAdapter {
|
|
|
68
119
|
model,
|
|
69
120
|
messages,
|
|
70
121
|
tools,
|
|
71
|
-
temperature: options?.temperature ?? this.config.temperature ?? 0.7,
|
|
72
|
-
maxTokens: options?.maxTokens ?? this.config.maxTokens ?? 4096,
|
|
122
|
+
temperature: options?.temperature ?? this.config.temperature ?? 0.7, maxTokens: Math.min(options?.maxTokens ?? this.config.maxTokens ?? 4096, groqModelMaxTokens(model)),
|
|
73
123
|
timeoutMs: this.config.timeoutMs ?? 30_000,
|
|
74
124
|
// P4 — external cancellation (the dashboard Cancel button).
|
|
75
125
|
signal: options?.signal,
|
|
@@ -100,7 +150,7 @@ export class GroqAdapter {
|
|
|
100
150
|
messages,
|
|
101
151
|
tools,
|
|
102
152
|
temperature: options?.temperature ?? this.config.temperature ?? 0.7,
|
|
103
|
-
maxTokens: options?.maxTokens ?? this.config.maxTokens ?? 4096,
|
|
153
|
+
maxTokens: Math.min(options?.maxTokens ?? this.config.maxTokens ?? 4096, groqModelMaxTokens(model)),
|
|
104
154
|
timeoutMs: this.config.timeoutMs ?? 30_000,
|
|
105
155
|
// P4 — external cancellation (the dashboard Cancel button).
|
|
106
156
|
signal: options?.signal,
|
|
@@ -123,7 +173,7 @@ export class GroqAdapter {
|
|
|
123
173
|
}
|
|
124
174
|
const model = options?.model || requireAdapterModel('groq', this.config.model);
|
|
125
175
|
const temperature = options?.temperature ?? this.config.temperature ?? 0.7;
|
|
126
|
-
const maxTokens = options?.maxTokens ?? this.config.maxTokens ?? 4096;
|
|
176
|
+
const maxTokens = Math.min(options?.maxTokens ?? this.config.maxTokens ?? 4096, groqModelMaxTokens(model));
|
|
127
177
|
logger.debug(`Groq: Streaming with model=${model}, temperature=${temperature}, maxTokens=${maxTokens}`);
|
|
128
178
|
// M2.2: capture the endpoint-reported usage from the final SSE chunk
|
|
129
179
|
// (OpenAI stream_options.include_usage convention) for measured cost.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"groq-adapter.js","sourceRoot":"","sources":["../../src/inference/groq-adapter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,wBAAwB,EAAE,8BAA8B,EAAE,MAAM,YAAY,CAAC;AACtF,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClF,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE,MAAM,aAAa,GAAG,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"groq-adapter.js","sourceRoot":"","sources":["../../src/inference/groq-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nim-adapter.d.ts","sourceRoot":"","sources":["../../src/inference/nim-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,gBAAgB,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC/G,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"nim-adapter.d.ts","sourceRoot":"","sources":["../../src/inference/nim-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,gBAAgB,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC/G,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAsCtE;;;GAGG;AACH,qBAAa,UAAW,YAAW,iBAAiB;IAClD,QAAQ,CAAC,IAAI,gBAAgB;IAC7B,OAAO,CAAC,MAAM,CAAiB;gBAEnB,MAAM,EAAE,cAAc;IAI5B,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC;IA6D3E,gEAAgE;IAC1D,aAAa,CACjB,QAAQ,EAAE,WAAW,EAAE,EACvB,KAAK,EAAE,UAAU,EAAE,EACnB,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,gBAAgB,CAAC;IA0B5B;;;OAGG;IACG,mBAAmB,CACvB,QAAQ,EAAE,WAAW,EAAE,EACvB,KAAK,EAAE,UAAU,EAAE,EACnB,OAAO,EAAE,gBAAgB,GAAG,SAAS,EACrC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAC/B,OAAO,CAAC,gBAAgB,CAAC;IA6BtB,cAAc,CAClB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,gBAAgB,GAAG,SAAS,EACrC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAC/B,OAAO,CAAC,MAAM,CAAC;IAuCZ,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IASrC,OAAO,IAAI,MAAM;IAIX,UAAU,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;CAqC/C"}
|
|
@@ -6,6 +6,25 @@ import { getModelTags } from './model-catalog.js';
|
|
|
6
6
|
import { getCostTracker, recordCallWithUsage } from '../learning/cost-tracker.js';
|
|
7
7
|
import { requireAdapterModel } from '../learning/model-selection.js';
|
|
8
8
|
const DEFAULT_NIM_BASE_URL = 'https://integrate.api.nvidia.com/v1';
|
|
9
|
+
/**
|
|
10
|
+
* Per-model max output tokens for NIM (NVIDIA restricts smaller models).
|
|
11
|
+
* Fallback default (4096) applies to unlisted models.
|
|
12
|
+
*/
|
|
13
|
+
const NIM_MODEL_MAX_TOKENS = {
|
|
14
|
+
'meta/llama-3.1-8b-instruct': 4096,
|
|
15
|
+
'meta/llama-3.1-70b-instruct': 4096,
|
|
16
|
+
'meta/llama-3.3-70b-instruct': 4096,
|
|
17
|
+
'nvidia/llama-3.1-nemotron-70b-instruct': 4096,
|
|
18
|
+
'meta/llama-3.2-1b-instruct': 2048,
|
|
19
|
+
'meta/llama-3.2-3b-instruct': 2048,
|
|
20
|
+
'google/gemma-2-2b-it': 512,
|
|
21
|
+
'google/gemma-2-9b-it': 512,
|
|
22
|
+
'mistralai/mistral-7b-instruct-v0.3': 4096,
|
|
23
|
+
'mistralai/mixtral-8x7b-instruct-v0.1': 4096,
|
|
24
|
+
};
|
|
25
|
+
function nimModelMaxTokens(model) {
|
|
26
|
+
return NIM_MODEL_MAX_TOKENS[model] ?? 4096;
|
|
27
|
+
}
|
|
9
28
|
/**
|
|
10
29
|
* NVIDIA NIM Adapter
|
|
11
30
|
* Connects to NVIDIA NIM OpenAI-compatible API
|
|
@@ -24,7 +43,7 @@ export class NIMAdapter {
|
|
|
24
43
|
}
|
|
25
44
|
const model = options?.model || requireAdapterModel('nim', this.config.model);
|
|
26
45
|
const temperature = options?.temperature ?? this.config.temperature ?? 0.7;
|
|
27
|
-
const maxTokens = options?.maxTokens ?? this.config.maxTokens ?? 4096;
|
|
46
|
+
const maxTokens = Math.min(options?.maxTokens ?? this.config.maxTokens ?? 4096, nimModelMaxTokens(model));
|
|
28
47
|
logger.debug(`NIM: Generating with model=${model}, temperature=${temperature}, maxTokens=${maxTokens}`);
|
|
29
48
|
const baseUrl = this.config.baseUrl || DEFAULT_NIM_BASE_URL;
|
|
30
49
|
const url = `${baseUrl}/chat/completions`;
|
|
@@ -72,7 +91,7 @@ export class NIMAdapter {
|
|
|
72
91
|
messages,
|
|
73
92
|
tools,
|
|
74
93
|
temperature: options?.temperature ?? this.config.temperature ?? 0.7,
|
|
75
|
-
maxTokens: options?.maxTokens ?? this.config.maxTokens ?? 4096,
|
|
94
|
+
maxTokens: Math.min(options?.maxTokens ?? this.config.maxTokens ?? 4096, nimModelMaxTokens(model)),
|
|
76
95
|
timeoutMs: this.config.timeoutMs ?? 30_000,
|
|
77
96
|
// P4 — external cancellation (the dashboard Cancel button).
|
|
78
97
|
signal: options?.signal,
|
|
@@ -103,7 +122,7 @@ export class NIMAdapter {
|
|
|
103
122
|
messages,
|
|
104
123
|
tools,
|
|
105
124
|
temperature: options?.temperature ?? this.config.temperature ?? 0.7,
|
|
106
|
-
maxTokens: options?.maxTokens ?? this.config.maxTokens ?? 4096,
|
|
125
|
+
maxTokens: Math.min(options?.maxTokens ?? this.config.maxTokens ?? 4096, nimModelMaxTokens(model)),
|
|
107
126
|
timeoutMs: this.config.timeoutMs ?? 30_000,
|
|
108
127
|
// P4 — external cancellation (the dashboard Cancel button).
|
|
109
128
|
signal: options?.signal,
|
|
@@ -126,7 +145,7 @@ export class NIMAdapter {
|
|
|
126
145
|
}
|
|
127
146
|
const model = options?.model || requireAdapterModel('nim', this.config.model);
|
|
128
147
|
const temperature = options?.temperature ?? this.config.temperature ?? 0.7;
|
|
129
|
-
const maxTokens = options?.maxTokens ?? this.config.maxTokens ?? 4096;
|
|
148
|
+
const maxTokens = Math.min(options?.maxTokens ?? this.config.maxTokens ?? 4096, nimModelMaxTokens(model));
|
|
130
149
|
logger.debug(`NIM: Streaming with model=${model}, temperature=${temperature}, maxTokens=${maxTokens}`);
|
|
131
150
|
const baseUrl = this.config.baseUrl || DEFAULT_NIM_BASE_URL;
|
|
132
151
|
// M2.2: capture the endpoint-reported usage from the final SSE chunk
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nim-adapter.js","sourceRoot":"","sources":["../../src/inference/nim-adapter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,wBAAwB,EAAE,8BAA8B,EAAE,MAAM,YAAY,CAAC;AACtF,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClF,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE,MAAM,oBAAoB,GAAG,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"nim-adapter.js","sourceRoot":"","sources":["../../src/inference/nim-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compat-adapter.d.ts","sourceRoot":"","sources":["../../src/inference/openai-compat-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,gBAAgB,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC/G,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAUtE,gFAAgF;AAChF,MAAM,WAAW,gBAAgB;IAC/B,qEAAqE;IACrE,UAAU,EAAE,MAAM,CAAC;IACnB,oCAAoC;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,mDAAmD;IACnD,cAAc,EAAE,MAAM,CAAC;IACvB,wEAAwE;IACxE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,uEAAuE;IACvE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oDAAoD;IACpD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;
|
|
1
|
+
{"version":3,"file":"openai-compat-adapter.d.ts","sourceRoot":"","sources":["../../src/inference/openai-compat-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,gBAAgB,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC/G,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAUtE,gFAAgF;AAChF,MAAM,WAAW,gBAAgB;IAC/B,qEAAqE;IACrE,UAAU,EAAE,MAAM,CAAC;IACnB,oCAAoC;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,mDAAmD;IACnD,cAAc,EAAE,MAAM,CAAC;IACvB,wEAAwE;IACxE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,uEAAuE;IACvE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oDAAoD;IACpD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AA4HD,qBAAa,mBAAoB,YAAW,iBAAiB;IAC3D,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,IAAI,CAAmB;gBAEnB,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,gBAAgB;IAUpD,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC;IAkE3E,gEAAgE;IAC1D,aAAa,CACjB,QAAQ,EAAE,WAAW,EAAE,EACvB,KAAK,EAAE,UAAU,EAAE,EACnB,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,gBAAgB,CAAC;IAiC5B;;;OAGG;IACG,mBAAmB,CACvB,QAAQ,EAAE,WAAW,EAAE,EACvB,KAAK,EAAE,UAAU,EAAE,EACnB,OAAO,EAAE,gBAAgB,GAAG,SAAS,EACrC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAC/B,OAAO,CAAC,gBAAgB,CAAC;IAiCtB,cAAc,CAClB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,gBAAgB,GAAG,SAAS,EACrC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAC/B,OAAO,CAAC,MAAM,CAAC;IAyDZ,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAgBrC,OAAO,IAAI,MAAM;IAQX,UAAU,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;CAwB/C"}
|
|
@@ -116,6 +116,26 @@ function modelsUrl(baseUrl, meta) {
|
|
|
116
116
|
const q = meta.apiVersionQuery ? `?${meta.apiVersionQuery}` : '';
|
|
117
117
|
return meta.azureDeployments ? `${baseUrl}/openai/models${q}` : `${baseUrl}/models${q}`;
|
|
118
118
|
}
|
|
119
|
+
/**
|
|
120
|
+
* Universal small-model detector: catches models with low max_output_tokens
|
|
121
|
+
* across ALL OpenAI-compatible providers. Only models ≤2B params (known to
|
|
122
|
+
* have max_tokens ≤1024) are matched — larger models safely get 4096.
|
|
123
|
+
*/
|
|
124
|
+
const SMALL_MODEL_PATTERNS = [
|
|
125
|
+
/gemma-?2-?[12]b/i,
|
|
126
|
+
/gemma-?3-?1b/i,
|
|
127
|
+
/llama-?3[._-]?2-?[12]b/i,
|
|
128
|
+
/phi-?3-mini/i,
|
|
129
|
+
/qwen-?2-?0.5b/i,
|
|
130
|
+
/tinyllama/i,
|
|
131
|
+
];
|
|
132
|
+
/** Cap max_tokens for known small models on generic OpenAI-compat providers. */
|
|
133
|
+
function compatMaxTokens(model, configured, providerDefault) {
|
|
134
|
+
const base = configured ?? providerDefault ?? 4096;
|
|
135
|
+
if (SMALL_MODEL_PATTERNS.some((rx) => rx.test(model)))
|
|
136
|
+
return Math.min(base, 1024);
|
|
137
|
+
return base;
|
|
138
|
+
}
|
|
119
139
|
export class OpenAICompatAdapter {
|
|
120
140
|
name;
|
|
121
141
|
config;
|
|
@@ -133,7 +153,7 @@ export class OpenAICompatAdapter {
|
|
|
133
153
|
async generate(prompt, options) {
|
|
134
154
|
const model = options?.model || this.config.model || 'default';
|
|
135
155
|
const temperature = options?.temperature ?? this.config.temperature ?? 0.7;
|
|
136
|
-
const maxTokens = options?.maxTokens
|
|
156
|
+
const maxTokens = compatMaxTokens(model, options?.maxTokens, this.config.maxTokens);
|
|
137
157
|
logger.debug(`${this.meta.label}: Generating with model=${model} via ${this.baseUrl}`);
|
|
138
158
|
const headers = {
|
|
139
159
|
'Content-Type': 'application/json',
|
|
@@ -196,7 +216,7 @@ export class OpenAICompatAdapter {
|
|
|
196
216
|
messages,
|
|
197
217
|
tools,
|
|
198
218
|
temperature: options?.temperature ?? this.config.temperature ?? 0.7,
|
|
199
|
-
maxTokens: options?.maxTokens
|
|
219
|
+
maxTokens: compatMaxTokens(model, options?.maxTokens, this.config.maxTokens),
|
|
200
220
|
timeoutMs: this.config.timeoutMs ?? 30_000,
|
|
201
221
|
// P4 — external cancellation (the dashboard Cancel button).
|
|
202
222
|
signal: options?.signal,
|
|
@@ -232,7 +252,7 @@ export class OpenAICompatAdapter {
|
|
|
232
252
|
messages,
|
|
233
253
|
tools,
|
|
234
254
|
temperature: options?.temperature ?? this.config.temperature ?? 0.7,
|
|
235
|
-
maxTokens: options?.maxTokens
|
|
255
|
+
maxTokens: compatMaxTokens(model, options?.maxTokens, this.config.maxTokens),
|
|
236
256
|
timeoutMs: this.config.timeoutMs ?? 30_000,
|
|
237
257
|
// P4 — external cancellation (the dashboard Cancel button).
|
|
238
258
|
signal: options?.signal,
|
|
@@ -250,7 +270,7 @@ export class OpenAICompatAdapter {
|
|
|
250
270
|
async generateStream(prompt, options, onToken) {
|
|
251
271
|
const model = options?.model || this.config.model || 'default';
|
|
252
272
|
const temperature = options?.temperature ?? this.config.temperature ?? 0.7;
|
|
253
|
-
const maxTokens = options?.maxTokens
|
|
273
|
+
const maxTokens = compatMaxTokens(model, options?.maxTokens, this.config.maxTokens);
|
|
254
274
|
logger.debug(`${this.meta.label}: Streaming with model=${model} via ${this.baseUrl}`);
|
|
255
275
|
const headers = {
|
|
256
276
|
...extraHeaders(this.config),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compat-adapter.js","sourceRoot":"","sources":["../../src/inference/openai-compat-adapter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"openai-compat-adapter.js","sourceRoot":"","sources":["../../src/inference/openai-compat-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openrouter-adapter.d.ts","sourceRoot":"","sources":["../../src/inference/openrouter-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,gBAAgB,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC/G,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"openrouter-adapter.d.ts","sourceRoot":"","sources":["../../src/inference/openrouter-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,gBAAgB,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC/G,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAoCtE;;;GAGG;AACH,qBAAa,iBAAkB,YAAW,iBAAiB;IACzD,QAAQ,CAAC,IAAI,gBAAgB;IAC7B,OAAO,CAAC,MAAM,CAAiB;gBAEnB,MAAM,EAAE,cAAc;IAI5B,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC;IA+C3E,gEAAgE;IAC1D,aAAa,CACjB,QAAQ,EAAE,WAAW,EAAE,EACvB,KAAK,EAAE,UAAU,EAAE,EACnB,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,gBAAgB,CAAC;IA8B5B;;;OAGG;IACG,mBAAmB,CACvB,QAAQ,EAAE,WAAW,EAAE,EACvB,KAAK,EAAE,UAAU,EAAE,EACnB,OAAO,EAAE,gBAAgB,GAAG,SAAS,EACrC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAC/B,OAAO,CAAC,gBAAgB,CAAC;IAiCtB,cAAc,CAClB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,gBAAgB,GAAG,SAAS,EACrC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAC/B,OAAO,CAAC,MAAM,CAAC;IAmCZ,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAIrC,OAAO,IAAI,MAAM;IAIX,UAAU,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;CA6B/C"}
|
|
@@ -4,6 +4,26 @@ import { chatCompletionsWithTools, chatCompletionsWithToolsStream } from './tool
|
|
|
4
4
|
import { getModelTags } from './model-catalog.js';
|
|
5
5
|
import { getCostTracker } from '../learning/cost-tracker.js';
|
|
6
6
|
const OPENROUTER_BASE_URL = 'https://openrouter.ai/api/v1';
|
|
7
|
+
/**
|
|
8
|
+
* Common small models on OpenRouter that have low max_tokens.
|
|
9
|
+
* OpenRouter exposes hundreds of models; for safety, we only cap known
|
|
10
|
+
* small ones (≤2B params) and leave the default (4096) for larger models.
|
|
11
|
+
*/
|
|
12
|
+
const OPENROUTER_LOW_OUTPUT_MODELS = [
|
|
13
|
+
/gemma-?2-?[12]b/i,
|
|
14
|
+
/gemma-?3-?1b/i,
|
|
15
|
+
/llama-?3[._-]?2-?[12]b/i,
|
|
16
|
+
/phi-?3-mini/i,
|
|
17
|
+
/qwen-?2-?0.5b/i,
|
|
18
|
+
/tinyllama/i,
|
|
19
|
+
/starcoderbase/i,
|
|
20
|
+
];
|
|
21
|
+
/** Cap max_tokens for known small models on OpenRouter. */
|
|
22
|
+
function openRouterModelMaxTokens(model) {
|
|
23
|
+
if (OPENROUTER_LOW_OUTPUT_MODELS.some((rx) => rx.test(model)))
|
|
24
|
+
return 1024;
|
|
25
|
+
return 4096;
|
|
26
|
+
}
|
|
7
27
|
/**
|
|
8
28
|
* OpenRouter Adapter
|
|
9
29
|
* Routes requests through OpenRouter's multi-provider API
|
|
@@ -21,7 +41,7 @@ export class OpenRouterAdapter {
|
|
|
21
41
|
}
|
|
22
42
|
const model = options?.model || this.config.model || 'mistralai/mistral-7b-instruct';
|
|
23
43
|
const temperature = options?.temperature ?? this.config.temperature ?? 0.7;
|
|
24
|
-
const maxTokens = options?.maxTokens ?? this.config.maxTokens ?? 4096;
|
|
44
|
+
const maxTokens = Math.min(options?.maxTokens ?? this.config.maxTokens ?? 4096, openRouterModelMaxTokens(model));
|
|
25
45
|
logger.debug(`OpenRouter: Generating with model=${model}, temperature=${temperature}, maxTokens=${maxTokens}`);
|
|
26
46
|
const response = await fetch(`${OPENROUTER_BASE_URL}/chat/completions`, {
|
|
27
47
|
method: 'POST',
|
|
@@ -68,7 +88,7 @@ export class OpenRouterAdapter {
|
|
|
68
88
|
messages,
|
|
69
89
|
tools,
|
|
70
90
|
temperature: options?.temperature ?? this.config.temperature ?? 0.7,
|
|
71
|
-
maxTokens: options?.maxTokens ?? this.config.maxTokens ?? 4096,
|
|
91
|
+
maxTokens: Math.min(options?.maxTokens ?? this.config.maxTokens ?? 4096, openRouterModelMaxTokens(model)),
|
|
72
92
|
timeoutMs: this.config.timeoutMs ?? 30_000,
|
|
73
93
|
// P4 — external cancellation (the dashboard Cancel button).
|
|
74
94
|
signal: options?.signal,
|
|
@@ -103,7 +123,7 @@ export class OpenRouterAdapter {
|
|
|
103
123
|
messages,
|
|
104
124
|
tools,
|
|
105
125
|
temperature: options?.temperature ?? this.config.temperature ?? 0.7,
|
|
106
|
-
maxTokens: options?.maxTokens ?? this.config.maxTokens ?? 4096,
|
|
126
|
+
maxTokens: Math.min(options?.maxTokens ?? this.config.maxTokens ?? 4096, openRouterModelMaxTokens(model)),
|
|
107
127
|
timeoutMs: this.config.timeoutMs ?? 30_000,
|
|
108
128
|
// P4 — external cancellation (the dashboard Cancel button).
|
|
109
129
|
signal: options?.signal,
|
|
@@ -125,7 +145,7 @@ export class OpenRouterAdapter {
|
|
|
125
145
|
}
|
|
126
146
|
const model = options?.model || this.config.model || 'mistralai/mistral-7b-instruct';
|
|
127
147
|
const temperature = options?.temperature ?? this.config.temperature ?? 0.7;
|
|
128
|
-
const maxTokens = options?.maxTokens ?? this.config.maxTokens ?? 4096;
|
|
148
|
+
const maxTokens = Math.min(options?.maxTokens ?? this.config.maxTokens ?? 4096, openRouterModelMaxTokens(model));
|
|
129
149
|
logger.debug(`OpenRouter: Streaming with model=${model}, temperature=${temperature}, maxTokens=${maxTokens}`);
|
|
130
150
|
// OpenRouter uses OpenAI-compatible streaming SSE, same as Groq/NIM
|
|
131
151
|
const fullContent = await streamCompletion(`${OPENROUTER_BASE_URL}/chat/completions`, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openrouter-adapter.js","sourceRoot":"","sources":["../../src/inference/openrouter-adapter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,wBAAwB,EAAE,8BAA8B,EAAE,MAAM,YAAY,CAAC;AACtF,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,MAAM,mBAAmB,GAAG,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"openrouter-adapter.js","sourceRoot":"","sources":["../../src/inference/openrouter-adapter.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "agent-nuvira",
|
|
3
|
-
"version": "1.82.
|
|
3
|
+
"version": "1.82.4",
|
|
4
4
|
"description": "Agent-Nuvira: Multi-agent AI coding CLI — plan, write, review, test, and publish code with local models (Ollama) or cloud APIs (Groq, NVIDIA NIM, Google Gemini, OpenRouter)",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|