@loonylabs/llm-middleware 2.5.0 → 2.7.0
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/README.md +13 -2
- package/dist/middleware/services/llm/providers/anthropic-provider.d.ts.map +1 -1
- package/dist/middleware/services/llm/providers/anthropic-provider.js +17 -2
- package/dist/middleware/services/llm/providers/anthropic-provider.js.map +1 -1
- package/dist/middleware/services/llm/providers/ollama-provider.d.ts.map +1 -1
- package/dist/middleware/services/llm/providers/ollama-provider.js +12 -1
- package/dist/middleware/services/llm/providers/ollama-provider.js.map +1 -1
- package/dist/middleware/services/llm/types/anthropic.types.d.ts +5 -0
- package/dist/middleware/services/llm/types/anthropic.types.d.ts.map +1 -1
- package/dist/middleware/services/llm/types/common.types.d.ts +25 -0
- package/dist/middleware/services/llm/types/common.types.d.ts.map +1 -1
- package/dist/middleware/services/llm/types/common.types.js.map +1 -1
- package/dist/middleware/services/model-parameter-manager/model-parameter-manager.service.d.ts +30 -3
- package/dist/middleware/services/model-parameter-manager/model-parameter-manager.service.d.ts.map +1 -1
- package/dist/middleware/services/model-parameter-manager/model-parameter-manager.service.js +6 -1
- package/dist/middleware/services/model-parameter-manager/model-parameter-manager.service.js.map +1 -1
- package/dist/middleware/services/use-case-metrics-logger/use-case-metrics-logger.service.d.ts +4 -0
- package/dist/middleware/services/use-case-metrics-logger/use-case-metrics-logger.service.d.ts.map +1 -1
- package/dist/middleware/services/use-case-metrics-logger/use-case-metrics-logger.service.js +17 -6
- package/dist/middleware/services/use-case-metrics-logger/use-case-metrics-logger.service.js.map +1 -1
- package/dist/middleware/usecases/base/base-ai.usecase.d.ts.map +1 -1
- package/dist/middleware/usecases/base/base-ai.usecase.js +15 -1
- package/dist/middleware/usecases/base/base-ai.usecase.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -380,7 +380,7 @@ console.log(result.withinLimit); // true if ≤ 280 chars
|
|
|
380
380
|
```
|
|
381
381
|
|
|
382
382
|
**Key Features:**
|
|
383
|
-
- 🎯 **Token Limiting**: Uses `
|
|
383
|
+
- 🎯 **Token Limiting**: Uses `maxTokens: 70` to limit output to ~280 characters (provider-agnostic!)
|
|
384
384
|
- 📊 **Character Validation**: Automatically checks if output is within Twitter's limit
|
|
385
385
|
- 🎨 **Marketing Preset**: Optimized parameters for engaging, concise content
|
|
386
386
|
- ✅ **Testable**: Integration test verifies parameter effectiveness
|
|
@@ -389,7 +389,10 @@ console.log(result.withinLimit); // true if ≤ 280 chars
|
|
|
389
389
|
```typescript
|
|
390
390
|
protected getParameterOverrides(): ModelParameterOverrides {
|
|
391
391
|
return {
|
|
392
|
-
|
|
392
|
+
// ✅ NEW in v2.7.0: Provider-agnostic maxTokens (recommended)
|
|
393
|
+
maxTokens: 70, // Works for Anthropic, OpenAI, Ollama, Google
|
|
394
|
+
|
|
395
|
+
// Parameter tuning
|
|
393
396
|
temperatureOverride: 0.7,
|
|
394
397
|
repeatPenalty: 1.3,
|
|
395
398
|
frequencyPenalty: 0.3,
|
|
@@ -399,6 +402,14 @@ protected getParameterOverrides(): ModelParameterOverrides {
|
|
|
399
402
|
repeatLastN: 32
|
|
400
403
|
};
|
|
401
404
|
}
|
|
405
|
+
|
|
406
|
+
// 💡 Legacy Ollama-specific approach (still works):
|
|
407
|
+
protected getParameterOverrides(): ModelParameterOverrides {
|
|
408
|
+
return {
|
|
409
|
+
num_predict: 70, // Ollama-specific (deprecated)
|
|
410
|
+
// ... other params
|
|
411
|
+
};
|
|
412
|
+
}
|
|
402
413
|
```
|
|
403
414
|
|
|
404
415
|
This example demonstrates:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic-provider.d.ts","sourceRoot":"","sources":["../../../../../src/middleware/services/llm/providers/anthropic-provider.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAe,iBAAiB,
|
|
1
|
+
{"version":3,"file":"anthropic-provider.d.ts","sourceRoot":"","sources":["../../../../../src/middleware/services/llm/providers/anthropic-provider.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAe,iBAAiB,EAAc,MAAM,UAAU,CAAC;AACtE,OAAO,EACL,uBAAuB,EAIxB,MAAM,0BAA0B,CAAC;AAIlC;;;;;;GAMG;AACH,qBAAa,iBAAkB,SAAQ,eAAe;IACpD,OAAO,CAAC,cAAc,CAAwB;IAC9C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAgB;IAC5C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;;IAO3D;;;;;;OAMG;IACU,qBAAqB,CAChC,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;CAgUrC;AAGD,eAAO,MAAM,iBAAiB,mBAA0B,CAAC;AAGzD,OAAO,EAAE,iBAAiB,IAAI,gBAAgB,EAAE,CAAC;AACjD,OAAO,EAAE,iBAAiB,IAAI,gBAAgB,EAAE,CAAC"}
|
|
@@ -136,6 +136,19 @@ class AnthropicProvider extends base_llm_provider_1.BaseLLMProvider {
|
|
|
136
136
|
const responseText = apiResponse.content
|
|
137
137
|
.map(block => block.text)
|
|
138
138
|
.join('\n');
|
|
139
|
+
// Normalize token usage to provider-agnostic format
|
|
140
|
+
const tokenUsage = {
|
|
141
|
+
inputTokens: apiResponse.usage.input_tokens,
|
|
142
|
+
outputTokens: apiResponse.usage.output_tokens,
|
|
143
|
+
totalTokens: apiResponse.usage.input_tokens + apiResponse.usage.output_tokens,
|
|
144
|
+
// Include Anthropic-specific cache metadata if present
|
|
145
|
+
...(apiResponse.usage.cache_creation_input_tokens || apiResponse.usage.cache_read_input_tokens ? {
|
|
146
|
+
cacheMetadata: {
|
|
147
|
+
cacheCreationTokens: apiResponse.usage.cache_creation_input_tokens,
|
|
148
|
+
cacheReadTokens: apiResponse.usage.cache_read_input_tokens
|
|
149
|
+
}
|
|
150
|
+
} : {})
|
|
151
|
+
};
|
|
139
152
|
// Normalize to CommonLLMResponse format
|
|
140
153
|
const normalizedResponse = {
|
|
141
154
|
message: {
|
|
@@ -145,10 +158,12 @@ class AnthropicProvider extends base_llm_provider_1.BaseLLMProvider {
|
|
|
145
158
|
metadata: {
|
|
146
159
|
provider: this.providerName,
|
|
147
160
|
model: apiResponse.model,
|
|
148
|
-
tokensUsed:
|
|
161
|
+
tokensUsed: tokenUsage.totalTokens,
|
|
149
162
|
processingTime: requestDuration
|
|
150
163
|
},
|
|
151
|
-
//
|
|
164
|
+
// Standardized token usage
|
|
165
|
+
usage: tokenUsage,
|
|
166
|
+
// Anthropic-specific fields (kept for backward compatibility)
|
|
152
167
|
id: apiResponse.id,
|
|
153
168
|
stop_reason: apiResponse.stop_reason || undefined,
|
|
154
169
|
input_tokens: apiResponse.usage.input_tokens,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic-provider.js","sourceRoot":"","sources":["../../../../../src/middleware/services/llm/providers/anthropic-provider.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,+BAAoC;AACpC,uEAA6D;AAC7D,2DAAsD;AACtD,
|
|
1
|
+
{"version":3,"file":"anthropic-provider.js","sourceRoot":"","sources":["../../../../../src/middleware/services/llm/providers/anthropic-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama-provider.d.ts","sourceRoot":"","sources":["../../../../../src/middleware/services/llm/providers/ollama-provider.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAe,iBAAiB,
|
|
1
|
+
{"version":3,"file":"ollama-provider.d.ts","sourceRoot":"","sources":["../../../../../src/middleware/services/llm/providers/ollama-provider.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAe,iBAAiB,EAAc,MAAM,UAAU,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAI7E;;;;;;;GAOG;AACH,qBAAa,cAAe,SAAQ,eAAe;IACjD,OAAO,CAAC,cAAc,CAAwB;;IAO9C;;;;;;OAMG;IACU,qBAAqB,CAChC,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IA4apC;;OAEG;YACW,wBAAwB;IAkCtC;;OAEG;IACU,8BAA8B,CACzC,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IAIjC;;OAEG;IACU,aAAa,CACxB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;CAGlC;AAGD,eAAO,MAAM,cAAc,gBAAuB,CAAC;AAGnD,OAAO,EAAE,cAAc,IAAI,aAAa,EAAE,CAAC;AAC3C,OAAO,EAAE,cAAc,IAAI,aAAa,EAAE,CAAC"}
|
|
@@ -141,15 +141,26 @@ class OllamaProvider extends base_llm_provider_1.BaseLLMProvider {
|
|
|
141
141
|
const requestDuration = Date.now() - requestStartTime;
|
|
142
142
|
if (response && response.status === 200) {
|
|
143
143
|
const aiResponse = response.data;
|
|
144
|
+
// Normalize token usage to provider-agnostic format
|
|
145
|
+
// Ollama provides prompt_eval_count (input) and eval_count (output)
|
|
146
|
+
const inputTokens = aiResponse.prompt_eval_count || 0;
|
|
147
|
+
const outputTokens = aiResponse.eval_count || 0;
|
|
148
|
+
const tokenUsage = {
|
|
149
|
+
inputTokens: inputTokens,
|
|
150
|
+
outputTokens: outputTokens,
|
|
151
|
+
totalTokens: inputTokens + outputTokens
|
|
152
|
+
};
|
|
144
153
|
// Add session ID to response
|
|
145
154
|
aiResponse.sessionId = sessionId;
|
|
146
155
|
// Add metadata
|
|
147
156
|
aiResponse.metadata = {
|
|
148
157
|
provider: this.providerName,
|
|
149
158
|
model: model,
|
|
150
|
-
tokensUsed:
|
|
159
|
+
tokensUsed: tokenUsage.totalTokens,
|
|
151
160
|
processingTime: requestDuration
|
|
152
161
|
};
|
|
162
|
+
// Add standardized token usage
|
|
163
|
+
aiResponse.usage = tokenUsage;
|
|
153
164
|
// Add response info
|
|
154
165
|
debugInfo.responseTimestamp = new Date();
|
|
155
166
|
debugInfo.response = aiResponse.message.content;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama-provider.js","sourceRoot":"","sources":["../../../../../src/middleware/services/llm/providers/ollama-provider.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ollama-provider.js","sourceRoot":"","sources":["../../../../../src/middleware/services/llm/providers/ollama-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,10 +49,15 @@ export interface AnthropicContentBlock {
|
|
|
49
49
|
}
|
|
50
50
|
/**
|
|
51
51
|
* Anthropic usage information
|
|
52
|
+
* Based on: https://docs.anthropic.com/en/api/messages
|
|
52
53
|
*/
|
|
53
54
|
export interface AnthropicUsage {
|
|
54
55
|
input_tokens: number;
|
|
55
56
|
output_tokens: number;
|
|
57
|
+
/** Tokens used to create ephemeral cache (if prompt caching enabled) */
|
|
58
|
+
cache_creation_input_tokens?: number;
|
|
59
|
+
/** Tokens read from cache (if prompt caching enabled) */
|
|
60
|
+
cache_read_input_tokens?: number;
|
|
56
61
|
}
|
|
57
62
|
/**
|
|
58
63
|
* Anthropic API response format
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic.types.d.ts","sourceRoot":"","sources":["../../../../../src/middleware/services/llm/types/anthropic.types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAErE;;;GAGG;AACH,MAAM,WAAW,uBAAwB,SAAQ,gBAAgB;IAG/D,4DAA4D;IAC5D,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,sDAAsD;IACtD,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,yEAAyE;IACzE,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAE1B,qCAAqC;IACrC,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,wEAAwE;IACxE,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,gBAAgB,EAAE,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED
|
|
1
|
+
{"version":3,"file":"anthropic.types.d.ts","sourceRoot":"","sources":["../../../../../src/middleware/services/llm/types/anthropic.types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAErE;;;GAGG;AACH,MAAM,WAAW,uBAAwB,SAAQ,gBAAgB;IAG/D,4DAA4D;IAC5D,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,sDAAsD;IACtD,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,yEAAyE;IACzE,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAE1B,qCAAqC;IACrC,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,wEAAwE;IACxE,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,gBAAgB,EAAE,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,wEAAwE;IACxE,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,yDAAyD;IACzD,uBAAuB,CAAC,EAAE,MAAM,CAAC;CAClC;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,qBAAqB,EAAE,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,UAAU,GAAG,YAAY,GAAG,eAAe,GAAG,IAAI,CAAC;IAChE,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,KAAK,EAAE,cAAc,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAkB,SAAQ,iBAAiB;IAE1D,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB"}
|
|
@@ -28,6 +28,25 @@ export interface CommonLLMOptions {
|
|
|
28
28
|
/** Provider-specific options (escape hatch) */
|
|
29
29
|
providerSpecific?: Record<string, any>;
|
|
30
30
|
}
|
|
31
|
+
/**
|
|
32
|
+
* Provider-agnostic token usage information
|
|
33
|
+
* Normalized across all LLM providers (Anthropic, Ollama, OpenAI, Google)
|
|
34
|
+
*/
|
|
35
|
+
export interface TokenUsage {
|
|
36
|
+
/** Number of tokens in the input/prompt */
|
|
37
|
+
inputTokens: number;
|
|
38
|
+
/** Number of tokens in the output/completion */
|
|
39
|
+
outputTokens: number;
|
|
40
|
+
/** Total tokens (inputTokens + outputTokens) */
|
|
41
|
+
totalTokens: number;
|
|
42
|
+
/** Cache-related token counts (optional, provider-specific) */
|
|
43
|
+
cacheMetadata?: {
|
|
44
|
+
/** Tokens used to create cache */
|
|
45
|
+
cacheCreationTokens?: number;
|
|
46
|
+
/** Tokens read from cache */
|
|
47
|
+
cacheReadTokens?: number;
|
|
48
|
+
};
|
|
49
|
+
}
|
|
31
50
|
/**
|
|
32
51
|
* Common response format across all providers
|
|
33
52
|
*/
|
|
@@ -42,6 +61,12 @@ export interface CommonLLMResponse {
|
|
|
42
61
|
tokensUsed?: number;
|
|
43
62
|
processingTime?: number;
|
|
44
63
|
};
|
|
64
|
+
/**
|
|
65
|
+
* Standardized token usage information
|
|
66
|
+
* Available when the provider returns actual token counts
|
|
67
|
+
* If not available, tokens will be estimated in metrics calculation
|
|
68
|
+
*/
|
|
69
|
+
usage?: TokenUsage;
|
|
45
70
|
}
|
|
46
71
|
/**
|
|
47
72
|
* Supported LLM providers
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.types.d.ts","sourceRoot":"","sources":["../../../../../src/middleware/services/llm/types/common.types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,sDAAsD;IACtD,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,qEAAqE;IACrE,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,2CAA2C;IAC3C,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,oCAAoC;IACpC,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,yCAAyC;IACzC,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,gCAAgC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,6CAA6C;IAC7C,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,qDAAqD;IACrD,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,kDAAkD;IAClD,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,gDAAgD;IAChD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,+CAA+C;IAC/C,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACxC;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE;QACP,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE;QACT,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;
|
|
1
|
+
{"version":3,"file":"common.types.d.ts","sourceRoot":"","sources":["../../../../../src/middleware/services/llm/types/common.types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,sDAAsD;IACtD,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,qEAAqE;IACrE,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,2CAA2C;IAC3C,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,oCAAoC;IACpC,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,yCAAyC;IACzC,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,gCAAgC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,6CAA6C;IAC7C,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,qDAAqD;IACrD,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,kDAAkD;IAClD,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,gDAAgD;IAChD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,+CAA+C;IAC/C,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACxC;AAED;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB,2CAA2C;IAC3C,WAAW,EAAE,MAAM,CAAC;IACpB,gDAAgD;IAChD,YAAY,EAAE,MAAM,CAAC;IACrB,gDAAgD;IAChD,WAAW,EAAE,MAAM,CAAC;IACpB,+DAA+D;IAC/D,aAAa,CAAC,EAAE;QACd,kCAAkC;QAClC,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,6BAA6B;QAC7B,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,CAAC;CACH;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE;QACP,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE;QACT,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;IACF;;;;OAIG;IACH,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED;;GAEG;AACH,oBAAY,WAAW;IACrB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,SAAS,cAAc;IACvB,MAAM,WAAW;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,IAAI,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,GAAG,CAAC;IAGjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,IAAI,CAAC;IACzB,eAAe,CAAC,EAAE,GAAG,CAAC;IACtB,KAAK,CAAC,EAAE;QACN,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,GAAG,CAAC;KACf,CAAC;IAGF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB,CAAC,EAAE,GAAG,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAGlB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.types.js","sourceRoot":"","sources":["../../../../../src/middleware/services/llm/types/common.types.ts"],"names":[],"mappings":";AAAA;;GAEG;;;
|
|
1
|
+
{"version":3,"file":"common.types.js","sourceRoot":"","sources":["../../../../../src/middleware/services/llm/types/common.types.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAkFH;;GAEG;AACH,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,gCAAiB,CAAA;IACjB,gCAAiB,CAAA;IACjB,sCAAuB,CAAA;IACvB,gCAAiB,CAAA;AACnB,CAAC,EALW,WAAW,2BAAX,WAAW,QAKtB"}
|
package/dist/middleware/services/model-parameter-manager/model-parameter-manager.service.d.ts
CHANGED
|
@@ -64,10 +64,26 @@ export interface ModelParameters {
|
|
|
64
64
|
/**
|
|
65
65
|
* Interface for parameter overrides that can be applied to default model parameters.
|
|
66
66
|
* All parameters are optional - only specify what you want to override.
|
|
67
|
+
*
|
|
68
|
+
* **Provider-Agnostic Design:**
|
|
69
|
+
* - Use `maxTokens` for cross-provider compatibility (recommended)
|
|
70
|
+
* - Provider-specific parameters (num_predict, num_ctx) available for advanced Ollama tuning
|
|
67
71
|
*/
|
|
68
72
|
export interface ModelParameterOverrides {
|
|
69
73
|
/** Override the base temperature setting */
|
|
70
74
|
temperatureOverride?: number;
|
|
75
|
+
/**
|
|
76
|
+
* Maximum number of tokens to generate in the response.
|
|
77
|
+
* **Provider-agnostic** - works across all providers:
|
|
78
|
+
* - Anthropic: Maps to max_tokens
|
|
79
|
+
* - OpenAI: Maps to max_tokens
|
|
80
|
+
* - Ollama: Maps to num_predict
|
|
81
|
+
* - Google: Maps to maxOutputTokens
|
|
82
|
+
*
|
|
83
|
+
* Range: 1+ (provider-specific limits apply)
|
|
84
|
+
* Default: Provider-specific (typically 4096 for Anthropic, 128-2048 for Ollama)
|
|
85
|
+
*/
|
|
86
|
+
maxTokens?: number;
|
|
71
87
|
/** Repeat penalty override */
|
|
72
88
|
repeatPenalty?: number;
|
|
73
89
|
/** Nucleus sampling (top-p) override */
|
|
@@ -80,11 +96,22 @@ export interface ModelParameterOverrides {
|
|
|
80
96
|
presencePenalty?: number;
|
|
81
97
|
/** Repeat last N tokens override */
|
|
82
98
|
repeatLastN?: number;
|
|
83
|
-
/**
|
|
99
|
+
/**
|
|
100
|
+
* @deprecated Prefer `maxTokens` for provider-agnostic code.
|
|
101
|
+
* Maximum tokens to generate (Ollama-specific: num_predict).
|
|
102
|
+
* Only use this if you need Ollama-specific behavior different from maxTokens.
|
|
103
|
+
* If both maxTokens and num_predict are set, num_predict takes precedence for Ollama.
|
|
104
|
+
*/
|
|
84
105
|
num_predict?: number;
|
|
85
|
-
/**
|
|
106
|
+
/**
|
|
107
|
+
* Context window size (Ollama-specific: num_ctx).
|
|
108
|
+
* No provider-agnostic equivalent - use only for Ollama fine-tuning.
|
|
109
|
+
*/
|
|
86
110
|
num_ctx?: number;
|
|
87
|
-
/**
|
|
111
|
+
/**
|
|
112
|
+
* Batch size for parallel processing (Ollama-specific: num_batch).
|
|
113
|
+
* No provider-agnostic equivalent - use only for Ollama performance tuning.
|
|
114
|
+
*/
|
|
88
115
|
num_batch?: number;
|
|
89
116
|
}
|
|
90
117
|
/**
|
package/dist/middleware/services/model-parameter-manager/model-parameter-manager.service.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-parameter-manager.service.d.ts","sourceRoot":"","sources":["../../../../src/middleware/services/model-parameter-manager/model-parameter-manager.service.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;;;OAMG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED
|
|
1
|
+
{"version":3,"file":"model-parameter-manager.service.d.ts","sourceRoot":"","sources":["../../../../src/middleware/services/model-parameter-manager/model-parameter-manager.service.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;;;OAMG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,uBAAuB;IACtC,4CAA4C;IAC5C,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAI7B;;;;;;;;;;OAUG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,8BAA8B;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,wCAAwC;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,8BAA8B;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,iCAAiC;IACjC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gCAAgC;IAChC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oCAAoC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IAIrB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;GAGG;AACH,qBAAa,4BAA4B;IACvC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAO;IAElD;;;;;OAKG;WACW,sBAAsB,CAClC,WAAW,EAAE,WAAW,EACxB,SAAS,GAAE,uBAA4B,GACtC,eAAe;IAoBlB;;;;OAIG;WACW,kBAAkB,CAAC,UAAU,EAAE,eAAe,GAAG,eAAe;IAmE9E;;;;OAIG;WACW,oBAAoB,CAAC,UAAU,EAAE,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAoCpF;;;;OAIG;WACW,eAAe,CAAC,UAAU,EAAE,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAsC/E;;;;;;;;;;;;;;;;;OAiBG;WACW,2BAA2B,CAAC,SAAS,EAAE,MAAM,GAAG,eAAe;IAqG7E;;;;;OAKG;WACW,iBAAiB,CAC7B,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,eAAe,GACvB,MAAM,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,GAAG,CAAC;QAAC,EAAE,EAAE,GAAG,CAAA;KAAE,CAAC;IAoBzC;;;;OAIG;WACW,mBAAmB,CAAC,UAAU,EAAE,eAAe,GAAG,MAAM;CAKvE"}
|
|
@@ -13,6 +13,10 @@ class ModelParameterManagerService {
|
|
|
13
13
|
* @returns Final model parameters to use
|
|
14
14
|
*/
|
|
15
15
|
static getEffectiveParameters(modelConfig, overrides = {}) {
|
|
16
|
+
// For Ollama compatibility: num_predict takes precedence over maxTokens
|
|
17
|
+
// This allows advanced users to have fine-grained Ollama control while
|
|
18
|
+
// still supporting the provider-agnostic maxTokens parameter
|
|
19
|
+
const effectiveNumPredict = overrides.num_predict ?? overrides.maxTokens;
|
|
16
20
|
return {
|
|
17
21
|
temperature: overrides.temperatureOverride ?? modelConfig.temperature ?? this.DEFAULT_TEMPERATURE,
|
|
18
22
|
repeatPenalty: overrides.repeatPenalty,
|
|
@@ -21,7 +25,7 @@ class ModelParameterManagerService {
|
|
|
21
25
|
frequencyPenalty: overrides.frequencyPenalty,
|
|
22
26
|
presencePenalty: overrides.presencePenalty,
|
|
23
27
|
repeatLastN: overrides.repeatLastN,
|
|
24
|
-
numPredict:
|
|
28
|
+
numPredict: effectiveNumPredict,
|
|
25
29
|
numCtx: overrides.num_ctx,
|
|
26
30
|
numBatch: overrides.num_batch
|
|
27
31
|
};
|
|
@@ -80,6 +84,7 @@ class ModelParameterManagerService {
|
|
|
80
84
|
}
|
|
81
85
|
}
|
|
82
86
|
// numPredict should be a positive integer (max tokens to generate)
|
|
87
|
+
// Note: This applies to both provider-agnostic maxTokens and Ollama-specific num_predict
|
|
83
88
|
if (validated.numPredict !== undefined) {
|
|
84
89
|
if (validated.numPredict < 1)
|
|
85
90
|
validated.numPredict = 1;
|
package/dist/middleware/services/model-parameter-manager/model-parameter-manager.service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-parameter-manager.service.js","sourceRoot":"","sources":["../../../../src/middleware/services/model-parameter-manager/model-parameter-manager.service.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"model-parameter-manager.service.js","sourceRoot":"","sources":["../../../../src/middleware/services/model-parameter-manager/model-parameter-manager.service.ts"],"names":[],"mappings":"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"}
|
package/dist/middleware/services/use-case-metrics-logger/use-case-metrics-logger.service.d.ts
CHANGED
|
@@ -74,6 +74,7 @@ export declare class UseCaseMetricsLoggerService {
|
|
|
74
74
|
* @param success Whether execution was successful
|
|
75
75
|
* @param errorMessage Optional error message
|
|
76
76
|
* @param additionalParams Additional parameters
|
|
77
|
+
* @param actualTokens Optional actual token counts from provider (preferred over estimation)
|
|
77
78
|
* @returns Calculated metrics
|
|
78
79
|
*/
|
|
79
80
|
static calculateMetrics(startTime: number, systemMessage: string, userPrompt: string, response: string, thinking: string, modelName: string, success: boolean, errorMessage?: string, additionalParams?: {
|
|
@@ -84,6 +85,9 @@ export declare class UseCaseMetricsLoggerService {
|
|
|
84
85
|
presencePenalty?: number;
|
|
85
86
|
repeatLastN?: number;
|
|
86
87
|
numPredict?: number;
|
|
88
|
+
}, actualTokens?: {
|
|
89
|
+
inputTokens?: number;
|
|
90
|
+
outputTokens?: number;
|
|
87
91
|
}): UseCaseMetrics;
|
|
88
92
|
}
|
|
89
93
|
//# sourceMappingURL=use-case-metrics-logger.service.d.ts.map
|
package/dist/middleware/services/use-case-metrics-logger/use-case-metrics-logger.service.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-case-metrics-logger.service.d.ts","sourceRoot":"","sources":["../../../../src/middleware/services/use-case-metrics-logger/use-case-metrics-logger.service.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,2BAA2B;IAEtC;;;;;;;OAOG;WACW,QAAQ,CACpB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,EACnB,gBAAgB,GAAE;QAChB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;KAChB,GACL,IAAI;IAYP;;;;OAIG;WACW,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI;IA2B/E
|
|
1
|
+
{"version":3,"file":"use-case-metrics-logger.service.d.ts","sourceRoot":"","sources":["../../../../src/middleware/services/use-case-metrics-logger/use-case-metrics-logger.service.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,2BAA2B;IAEtC;;;;;;;OAOG;WACW,QAAQ,CACpB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,EACnB,gBAAgB,GAAE;QAChB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;KAChB,GACL,IAAI;IAYP;;;;OAIG;WACW,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI;IA2B/E;;;;;;;;;;;;;OAaG;WACW,gBAAgB,CAC5B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,YAAY,CAAC,EAAE,MAAM,EACrB,gBAAgB,GAAE;QAChB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;KAChB,EACN,YAAY,CAAC,EAAE;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,GACA,cAAc;CAqClB"}
|
|
@@ -85,15 +85,26 @@ class UseCaseMetricsLoggerService {
|
|
|
85
85
|
* @param success Whether execution was successful
|
|
86
86
|
* @param errorMessage Optional error message
|
|
87
87
|
* @param additionalParams Additional parameters
|
|
88
|
+
* @param actualTokens Optional actual token counts from provider (preferred over estimation)
|
|
88
89
|
* @returns Calculated metrics
|
|
89
90
|
*/
|
|
90
|
-
static calculateMetrics(startTime, systemMessage, userPrompt, response, thinking, modelName, success, errorMessage, additionalParams = {}) {
|
|
91
|
+
static calculateMetrics(startTime, systemMessage, userPrompt, response, thinking, modelName, success, errorMessage, additionalParams = {}, actualTokens) {
|
|
91
92
|
const executionTimeSeconds = (Date.now() - startTime) / 1000;
|
|
92
|
-
//
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
93
|
+
// Use actual token counts from provider if available, otherwise estimate
|
|
94
|
+
let inputTokenCount;
|
|
95
|
+
let outputTokenCount;
|
|
96
|
+
if (actualTokens?.inputTokens !== undefined && actualTokens?.outputTokens !== undefined) {
|
|
97
|
+
// Use actual token counts from provider (accurate)
|
|
98
|
+
inputTokenCount = actualTokens.inputTokens;
|
|
99
|
+
outputTokenCount = actualTokens.outputTokens;
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
// Fallback: Estimate token counts using TokenEstimatorService
|
|
103
|
+
const inputEstimate = token_estimator_service_1.TokenEstimatorService.estimateInputTokens(systemMessage, userPrompt);
|
|
104
|
+
const outputEstimate = token_estimator_service_1.TokenEstimatorService.estimateTokenCount(response);
|
|
105
|
+
inputTokenCount = inputEstimate.estimated;
|
|
106
|
+
outputTokenCount = outputEstimate.estimated;
|
|
107
|
+
}
|
|
97
108
|
const tokensPerSecond = token_estimator_service_1.TokenEstimatorService.calculateTokensPerSecond(outputTokenCount, executionTimeSeconds);
|
|
98
109
|
return {
|
|
99
110
|
executionTimeSeconds,
|
package/dist/middleware/services/use-case-metrics-logger/use-case-metrics-logger.service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-case-metrics-logger.service.js","sourceRoot":"","sources":["../../../../src/middleware/services/use-case-metrics-logger/use-case-metrics-logger.service.ts"],"names":[],"mappings":";;;AAAA,oEAA0D;AAC1D,wFAAmF;AAuBnF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAa,2BAA2B;IAEtC;;;;;;;OAOG;IACI,MAAM,CAAC,QAAQ,CACpB,WAAmB,EACnB,SAAiB,EACjB,YAAoB,EACpB,WAAmB,EACnB,mBAQI,EAAE;QAEN,sBAAM,CAAC,IAAI,CAAC,gCAAgC,EAAE;YAC5C,OAAO,EAAE,WAAW;YACpB,QAAQ,EAAE;gBACR,KAAK,EAAE,SAAS;gBAChB,YAAY;gBACZ,WAAW;gBACX,GAAG,gBAAgB;aACpB;SACF,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,aAAa,CAAC,WAAmB,EAAE,OAAuB;QACtE,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC;QAC/D,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChF,MAAM,sBAAsB,GAAG,OAAO,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAEvE,MAAM,UAAU,GAAG,0BAA0B,WAAW,MAAM,OAAO,CAAC,SAAS,KAAK,UAAU,YAAY,sBAAsB,oBAAoB,OAAO,CAAC,eAAe,oBAAoB,OAAO,CAAC,gBAAgB,YAAY,OAAO,CAAC,eAAe,cAAc,SAAS,EAAE,CAAC;QAEpR,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,sBAAM,CAAC,IAAI,CAAC,UAAU,EAAE;gBACtB,OAAO,EAAE,WAAW;gBACpB,QAAQ,EAAE;oBACR,GAAG,OAAO;oBACV,sBAAsB;iBACvB;aACF,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,sBAAM,CAAC,KAAK,CAAC,UAAU,EAAE;gBACvB,OAAO,EAAE,WAAW;gBACpB,KAAK,EAAE,OAAO,CAAC,YAAY;gBAC3B,QAAQ,EAAE;oBACR,GAAG,OAAO;oBACV,sBAAsB;iBACvB;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED
|
|
1
|
+
{"version":3,"file":"use-case-metrics-logger.service.js","sourceRoot":"","sources":["../../../../src/middleware/services/use-case-metrics-logger/use-case-metrics-logger.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-ai.usecase.d.ts","sourceRoot":"","sources":["../../../../src/middleware/usecases/base/base-ai.usecase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAkB,cAAc,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAE5G,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAEpF,OAAO,EAAgC,uBAAuB,EAAE,MAAM,wEAAwE,CAAC;AAG/I;;;;;;GAMG;AACH,8BAAsB,aAAa,CACjC,OAAO,GAAG,MAAM,EAChB,QAAQ,SAAS,aAAa,CAAC,OAAO,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,EAChE,OAAO,SAAS,YAAY,GAAG,YAAY;IAE3C;;;OAGG;IACH,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAElD;;;OAGG;IACH,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,wBAAwB,EAAE,cAAc,CAAY;IAE9E;;;OAGG;IACH,SAAS,KAAK,cAAc,IAAI,cAAc,CAE7C;IAED;;;;;;;;;;;;;;OAcG;IACH,SAAS,CAAC,sBAAsB,CAAC,GAAG,EAAE,cAAc,GAAG,uBAAuB;IAI9E;;;OAGG;IACH,SAAS,KAAK,WAAW,IAAI,uBAAuB,CAEnD;IAED;;;OAGG;IACH,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM;IAShD;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,eAAe,IAAI,CAAC,eAAe,EAAE,MAAM,KAAK,MAAM;IAEzE;;;;OAIG;IACH,SAAS,CAAC,qBAAqB,IAAI,uBAAuB;IAI1D;;;;OAIG;IACH,SAAS,CAAC,WAAW,IAAI,WAAW;IAIpC;;;;OAIG;IACU,OAAO,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IA+
|
|
1
|
+
{"version":3,"file":"base-ai.usecase.d.ts","sourceRoot":"","sources":["../../../../src/middleware/usecases/base/base-ai.usecase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAkB,cAAc,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAE5G,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAEpF,OAAO,EAAgC,uBAAuB,EAAE,MAAM,wEAAwE,CAAC;AAG/I;;;;;;GAMG;AACH,8BAAsB,aAAa,CACjC,OAAO,GAAG,MAAM,EAChB,QAAQ,SAAS,aAAa,CAAC,OAAO,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,EAChE,OAAO,SAAS,YAAY,GAAG,YAAY;IAE3C;;;OAGG;IACH,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAElD;;;OAGG;IACH,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,wBAAwB,EAAE,cAAc,CAAY;IAE9E;;;OAGG;IACH,SAAS,KAAK,cAAc,IAAI,cAAc,CAE7C;IAED;;;;;;;;;;;;;;OAcG;IACH,SAAS,CAAC,sBAAsB,CAAC,GAAG,EAAE,cAAc,GAAG,uBAAuB;IAI9E;;;OAGG;IACH,SAAS,KAAK,WAAW,IAAI,uBAAuB,CAEnD;IAED;;;OAGG;IACH,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM;IAShD;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,eAAe,IAAI,CAAC,eAAe,EAAE,MAAM,KAAK,MAAM;IAEzE;;;;OAIG;IACH,SAAS,CAAC,qBAAqB,IAAI,uBAAuB;IAI1D;;;;OAIG;IACH,SAAS,CAAC,WAAW,IAAI,WAAW;IAIpC;;;;OAIG;IACU,OAAO,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IA+HzD;;;OAGG;cACa,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IAIrG;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO;CACjG"}
|
|
@@ -112,6 +112,10 @@ class BaseAIUseCase {
|
|
|
112
112
|
authToken: this.modelConfig.bearerToken,
|
|
113
113
|
baseUrl: this.modelConfig.baseUrl,
|
|
114
114
|
provider: provider,
|
|
115
|
+
// Provider-agnostic maxTokens (works for Anthropic, OpenAI, Google, Ollama)
|
|
116
|
+
// Maps from overrides.maxTokens or overrides.num_predict via getEffectiveParameters
|
|
117
|
+
maxTokens: validatedParams.numPredict,
|
|
118
|
+
// Ollama-specific options (includes num_predict, num_ctx, num_batch, etc.)
|
|
115
119
|
...model_parameter_manager_service_1.ModelParameterManagerService.toOllamaOptions(validatedParams),
|
|
116
120
|
debugContext: this.constructor.name
|
|
117
121
|
});
|
|
@@ -122,8 +126,18 @@ class BaseAIUseCase {
|
|
|
122
126
|
const { cleanedJson: processedContent, thinking: extractedThinking } = await response_processor_service_1.ResponseProcessorService.processResponseAsync(result.message.content);
|
|
123
127
|
thinking = extractedThinking;
|
|
124
128
|
success = true;
|
|
129
|
+
// Extract actual token counts from provider response if available
|
|
130
|
+
let actualTokens;
|
|
131
|
+
if (result.usage) {
|
|
132
|
+
// Use standardized usage field (provider-agnostic)
|
|
133
|
+
actualTokens = {
|
|
134
|
+
inputTokens: result.usage.inputTokens,
|
|
135
|
+
outputTokens: result.usage.outputTokens
|
|
136
|
+
};
|
|
137
|
+
}
|
|
125
138
|
// Calculate and log metrics
|
|
126
|
-
const metrics = use_case_metrics_logger_1.UseCaseMetricsLoggerService.calculateMetrics(startTime, this.systemMessage, formattedUserMessage, result.message.content, thinking, this.modelConfig.name, success, errorMessage, definedParams
|
|
139
|
+
const metrics = use_case_metrics_logger_1.UseCaseMetricsLoggerService.calculateMetrics(startTime, this.systemMessage, formattedUserMessage, result.message.content, thinking, this.modelConfig.name, success, errorMessage, definedParams, actualTokens // Pass actual tokens from provider
|
|
140
|
+
);
|
|
127
141
|
// Log completion with metrics
|
|
128
142
|
use_case_metrics_logger_1.UseCaseMetricsLoggerService.logCompletion(this.constructor.name, metrics);
|
|
129
143
|
// Create and return the result
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-ai.usecase.js","sourceRoot":"","sources":["../../../../src/middleware/usecases/base/base-ai.usecase.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"base-ai.usecase.js","sourceRoot":"","sources":["../../../../src/middleware/usecases/base/base-ai.usecase.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loonylabs/llm-middleware",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.7.0",
|
|
4
4
|
"description": "Complete middleware infrastructure for LLM-based backends with multi-provider support (Ollama, Anthropic, OpenAI, Google)",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|