@cogitator-ai/core 0.18.6 → 0.19.2
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 +103 -31
- package/dist/agent-tool.d.ts +2 -2
- package/dist/agent-tool.d.ts.map +1 -1
- package/dist/agent-tool.js +3 -2
- package/dist/agent-tool.js.map +1 -1
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +10 -2
- package/dist/agent.js.map +1 -1
- package/dist/cache/cache-key.d.ts.map +1 -1
- package/dist/cache/cache-key.js +3 -0
- package/dist/cache/cache-key.js.map +1 -1
- package/dist/cache/index.d.ts +5 -5
- package/dist/cache/index.js +4 -4
- package/dist/cache/storage/index.d.ts +3 -3
- package/dist/cache/storage/index.js +2 -2
- package/dist/cache/storage/memory.d.ts.map +1 -1
- package/dist/cache/storage/memory.js +3 -1
- package/dist/cache/storage/memory.js.map +1 -1
- package/dist/cache/storage/redis.d.ts +1 -0
- package/dist/cache/storage/redis.d.ts.map +1 -1
- package/dist/cache/storage/redis.js +47 -22
- package/dist/cache/storage/redis.js.map +1 -1
- package/dist/cache/tool-cache.d.ts.map +1 -1
- package/dist/cache/tool-cache.js +14 -7
- package/dist/cache/tool-cache.js.map +1 -1
- package/dist/causal/capabilities/causal-explainer.js +2 -2
- package/dist/causal/capabilities/causal-planner.js +1 -1
- package/dist/causal/causal-reasoner.d.ts +4 -4
- package/dist/causal/causal-reasoner.d.ts.map +1 -1
- package/dist/causal/causal-reasoner.js +17 -13
- package/dist/causal/causal-reasoner.js.map +1 -1
- package/dist/causal/discovery/causal-extractor.js +1 -1
- package/dist/causal/discovery/causal-validator.js +1 -1
- package/dist/causal/discovery/hypothesis-generator.js +1 -1
- package/dist/causal/discovery/prompts.d.ts.map +1 -1
- package/dist/causal/discovery/prompts.js +44 -10
- package/dist/causal/discovery/prompts.js.map +1 -1
- package/dist/causal/graph/causal-graph.d.ts.map +1 -1
- package/dist/causal/graph/causal-graph.js +3 -3
- package/dist/causal/graph/causal-graph.js.map +1 -1
- package/dist/causal/graph/graph-builder.js +1 -1
- package/dist/causal/index.d.ts +27 -27
- package/dist/causal/index.js +17 -17
- package/dist/causal/inference/adjustment.js +1 -1
- package/dist/causal/inference/d-separation.d.ts.map +1 -1
- package/dist/causal/inference/d-separation.js +12 -31
- package/dist/causal/inference/d-separation.js.map +1 -1
- package/dist/causal/inference/inference-engine.d.ts +2 -1
- package/dist/causal/inference/inference-engine.d.ts.map +1 -1
- package/dist/causal/inference/inference-engine.js +55 -10
- package/dist/causal/inference/inference-engine.js.map +1 -1
- package/dist/causal/stores/causal-graph-store.d.ts.map +1 -1
- package/dist/causal/stores/causal-graph-store.js +33 -3
- package/dist/causal/stores/causal-graph-store.js.map +1 -1
- package/dist/causal/stores/causal-pattern-store.d.ts.map +1 -1
- package/dist/causal/stores/causal-pattern-store.js +13 -4
- package/dist/causal/stores/causal-pattern-store.js.map +1 -1
- package/dist/causal/stores/intervention-log.d.ts.map +1 -1
- package/dist/causal/stores/intervention-log.js +17 -3
- package/dist/causal/stores/intervention-log.js.map +1 -1
- package/dist/cogitator/index.d.ts +5 -5
- package/dist/cogitator/index.d.ts.map +1 -1
- package/dist/cogitator/index.js +5 -5
- package/dist/cogitator/index.js.map +1 -1
- package/dist/cogitator/initializers.d.ts +6 -6
- package/dist/cogitator/initializers.js +7 -7
- package/dist/cogitator/initializers.js.map +1 -1
- package/dist/cogitator/message-builder.d.ts +2 -2
- package/dist/cogitator/message-builder.js +1 -1
- package/dist/cogitator/streaming.d.ts +3 -3
- package/dist/cogitator/streaming.d.ts.map +1 -1
- package/dist/cogitator/streaming.js +20 -1
- package/dist/cogitator/streaming.js.map +1 -1
- package/dist/cogitator/tool-executor.d.ts +9 -4
- package/dist/cogitator/tool-executor.d.ts.map +1 -1
- package/dist/cogitator/tool-executor.js +31 -15
- package/dist/cogitator/tool-executor.js.map +1 -1
- package/dist/cogitator.d.ts +1 -1
- package/dist/cogitator.js +1 -1
- package/dist/constitutional/constitutional-ai.d.ts.map +1 -1
- package/dist/constitutional/constitutional-ai.js +17 -9
- package/dist/constitutional/constitutional-ai.js.map +1 -1
- package/dist/constitutional/critique-reviser.js +2 -2
- package/dist/constitutional/index.d.ts +12 -12
- package/dist/constitutional/index.js +7 -7
- package/dist/constitutional/input-filter.d.ts.map +1 -1
- package/dist/constitutional/input-filter.js +18 -11
- package/dist/constitutional/input-filter.js.map +1 -1
- package/dist/constitutional/output-filter.d.ts.map +1 -1
- package/dist/constitutional/output-filter.js +18 -11
- package/dist/constitutional/output-filter.js.map +1 -1
- package/dist/context/context-manager.d.ts.map +1 -1
- package/dist/context/context-manager.js +3 -4
- package/dist/context/context-manager.js.map +1 -1
- package/dist/context/index.d.ts +3 -3
- package/dist/context/index.js +2 -2
- package/dist/context/strategies/hybrid.js +4 -4
- package/dist/context/strategies/index.d.ts +5 -5
- package/dist/context/strategies/index.js +5 -5
- package/dist/context/strategies/sliding-window.js +1 -1
- package/dist/context/strategies/summarize.js +1 -1
- package/dist/context/strategies/truncate.d.ts +3 -0
- package/dist/context/strategies/truncate.d.ts.map +1 -1
- package/dist/context/strategies/truncate.js +61 -1
- package/dist/context/strategies/truncate.js.map +1 -1
- package/dist/cost-routing/budget-enforcer.d.ts +1 -1
- package/dist/cost-routing/cost-estimator.d.ts +1 -1
- package/dist/cost-routing/cost-estimator.d.ts.map +1 -1
- package/dist/cost-routing/cost-estimator.js +5 -15
- package/dist/cost-routing/cost-estimator.js.map +1 -1
- package/dist/cost-routing/cost-router.d.ts +1 -1
- package/dist/cost-routing/cost-router.js +4 -4
- package/dist/cost-routing/index.d.ts +7 -7
- package/dist/cost-routing/index.js +7 -7
- package/dist/cost-routing/model-selector.d.ts.map +1 -1
- package/dist/cost-routing/model-selector.js +6 -12
- package/dist/cost-routing/model-selector.js.map +1 -1
- package/dist/cost-routing/task-analyzer.d.ts.map +1 -1
- package/dist/cost-routing/task-analyzer.js +15 -8
- package/dist/cost-routing/task-analyzer.js.map +1 -1
- package/dist/index.d.ts +42 -39
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +24 -23
- package/dist/index.js.map +1 -1
- package/dist/learning/ab-testing.d.ts +1 -0
- package/dist/learning/ab-testing.d.ts.map +1 -1
- package/dist/learning/ab-testing.js +34 -13
- package/dist/learning/ab-testing.js.map +1 -1
- package/dist/learning/agent-optimizer.d.ts +5 -3
- package/dist/learning/agent-optimizer.d.ts.map +1 -1
- package/dist/learning/agent-optimizer.js +43 -15
- package/dist/learning/agent-optimizer.js.map +1 -1
- package/dist/learning/auto-optimizer.d.ts +4 -4
- package/dist/learning/auto-optimizer.d.ts.map +1 -1
- package/dist/learning/auto-optimizer.js +3 -0
- package/dist/learning/auto-optimizer.js.map +1 -1
- package/dist/learning/demo-selector.d.ts +1 -0
- package/dist/learning/demo-selector.d.ts.map +1 -1
- package/dist/learning/demo-selector.js +20 -11
- package/dist/learning/demo-selector.js.map +1 -1
- package/dist/learning/index.d.ts +23 -23
- package/dist/learning/index.js +12 -12
- package/dist/learning/instruction-optimizer.js +1 -1
- package/dist/learning/metrics.d.ts.map +1 -1
- package/dist/learning/metrics.js +4 -1
- package/dist/learning/metrics.js.map +1 -1
- package/dist/learning/postgres-trace-store.d.ts.map +1 -1
- package/dist/learning/postgres-trace-store.js +73 -20
- package/dist/learning/postgres-trace-store.js.map +1 -1
- package/dist/learning/prompt-logger.d.ts +3 -2
- package/dist/learning/prompt-logger.d.ts.map +1 -1
- package/dist/learning/prompt-logger.js +11 -3
- package/dist/learning/prompt-logger.js.map +1 -1
- package/dist/learning/prompt-monitor.js +2 -2
- package/dist/learning/prompt-monitor.js.map +1 -1
- package/dist/learning/prompts.d.ts.map +1 -1
- package/dist/learning/prompts.js +2 -1
- package/dist/learning/prompts.js.map +1 -1
- package/dist/learning/trace-store.d.ts +2 -0
- package/dist/learning/trace-store.d.ts.map +1 -1
- package/dist/learning/trace-store.js +25 -11
- package/dist/learning/trace-store.js.map +1 -1
- package/dist/llm/anthropic.d.ts +2 -1
- package/dist/llm/anthropic.d.ts.map +1 -1
- package/dist/llm/anthropic.js +35 -9
- package/dist/llm/anthropic.js.map +1 -1
- package/dist/llm/azure.d.ts +1 -1
- package/dist/llm/azure.js +1 -1
- package/dist/llm/bedrock.d.ts +1 -1
- package/dist/llm/bedrock.d.ts.map +1 -1
- package/dist/llm/bedrock.js +25 -8
- package/dist/llm/bedrock.js.map +1 -1
- package/dist/llm/debug.d.ts +1 -0
- package/dist/llm/debug.d.ts.map +1 -1
- package/dist/llm/debug.js +42 -10
- package/dist/llm/debug.js.map +1 -1
- package/dist/llm/errors.d.ts.map +1 -1
- package/dist/llm/errors.js +5 -4
- package/dist/llm/errors.js.map +1 -1
- package/dist/llm/google.d.ts +3 -1
- package/dist/llm/google.d.ts.map +1 -1
- package/dist/llm/google.js +127 -63
- package/dist/llm/google.js.map +1 -1
- package/dist/llm/index.d.ts +11 -11
- package/dist/llm/index.d.ts.map +1 -1
- package/dist/llm/index.js +49 -19
- package/dist/llm/index.js.map +1 -1
- package/dist/llm/ollama.d.ts +1 -1
- package/dist/llm/ollama.d.ts.map +1 -1
- package/dist/llm/ollama.js +97 -47
- package/dist/llm/ollama.js.map +1 -1
- package/dist/llm/openai-compatible-base.d.ts +2 -2
- package/dist/llm/openai-compatible-base.d.ts.map +1 -1
- package/dist/llm/openai-compatible-base.js +27 -8
- package/dist/llm/openai-compatible-base.js.map +1 -1
- package/dist/llm/openai.d.ts +4 -2
- package/dist/llm/openai.d.ts.map +1 -1
- package/dist/llm/openai.js +3 -2
- package/dist/llm/openai.js.map +1 -1
- package/dist/observability/index.d.ts +2 -2
- package/dist/observability/index.js +2 -2
- package/dist/observability/langfuse.d.ts +3 -0
- package/dist/observability/langfuse.d.ts.map +1 -1
- package/dist/observability/langfuse.js +24 -1
- package/dist/observability/langfuse.js.map +1 -1
- package/dist/observability/opentelemetry.d.ts +1 -0
- package/dist/observability/opentelemetry.d.ts.map +1 -1
- package/dist/observability/opentelemetry.js +5 -0
- package/dist/observability/opentelemetry.js.map +1 -1
- package/dist/reasoning/branch-evaluator.d.ts +1 -1
- package/dist/reasoning/branch-evaluator.d.ts.map +1 -1
- package/dist/reasoning/branch-evaluator.js +9 -4
- package/dist/reasoning/branch-evaluator.js.map +1 -1
- package/dist/reasoning/branch-generator.js +1 -1
- package/dist/reasoning/index.d.ts +4 -4
- package/dist/reasoning/index.js +4 -4
- package/dist/reasoning/prompts.d.ts.map +1 -1
- package/dist/reasoning/prompts.js +13 -0
- package/dist/reasoning/prompts.js.map +1 -1
- package/dist/reasoning/thought-tree.d.ts +1 -1
- package/dist/reasoning/thought-tree.js +3 -3
- package/dist/reflection/index.d.ts +3 -3
- package/dist/reflection/index.js +3 -3
- package/dist/reflection/reflection-engine.d.ts.map +1 -1
- package/dist/reflection/reflection-engine.js +10 -4
- package/dist/reflection/reflection-engine.js.map +1 -1
- package/dist/registry.js +1 -1
- package/dist/runtime.d.ts +8 -5
- package/dist/runtime.d.ts.map +1 -1
- package/dist/runtime.js +110 -23
- package/dist/runtime.js.map +1 -1
- package/dist/security/classifiers/index.d.ts +2 -2
- package/dist/security/classifiers/index.js +2 -2
- package/dist/security/classifiers/llm-classifier.d.ts.map +1 -1
- package/dist/security/classifiers/llm-classifier.js +5 -9
- package/dist/security/classifiers/llm-classifier.js.map +1 -1
- package/dist/security/classifiers/local-classifier.d.ts.map +1 -1
- package/dist/security/classifiers/local-classifier.js +3 -1
- package/dist/security/classifiers/local-classifier.js.map +1 -1
- package/dist/security/index.d.ts +4 -4
- package/dist/security/index.js +3 -3
- package/dist/security/patterns.d.ts.map +1 -1
- package/dist/security/patterns.js +2 -0
- package/dist/security/patterns.js.map +1 -1
- package/dist/security/prompt-injection-detector.js +2 -2
- package/dist/skill.d.ts +8 -0
- package/dist/skill.d.ts.map +1 -0
- package/dist/skill.js +77 -0
- package/dist/skill.js.map +1 -0
- package/dist/time-travel/checkpoint-store.d.ts +3 -0
- package/dist/time-travel/checkpoint-store.d.ts.map +1 -1
- package/dist/time-travel/checkpoint-store.js +76 -40
- package/dist/time-travel/checkpoint-store.js.map +1 -1
- package/dist/time-travel/comparator.d.ts.map +1 -1
- package/dist/time-travel/comparator.js +7 -1
- package/dist/time-travel/comparator.js.map +1 -1
- package/dist/time-travel/forker.d.ts +3 -3
- package/dist/time-travel/forker.d.ts.map +1 -1
- package/dist/time-travel/forker.js +4 -1
- package/dist/time-travel/forker.js.map +1 -1
- package/dist/time-travel/index.d.ts +5 -5
- package/dist/time-travel/index.js +5 -5
- package/dist/time-travel/replayer.d.ts +2 -2
- package/dist/time-travel/replayer.d.ts.map +1 -1
- package/dist/time-travel/replayer.js.map +1 -1
- package/dist/time-travel/time-travel.d.ts +2 -2
- package/dist/time-travel/time-travel.d.ts.map +1 -1
- package/dist/time-travel/time-travel.js +13 -13
- package/dist/time-travel/time-travel.js.map +1 -1
- package/dist/tool.d.ts.map +1 -1
- package/dist/tool.js +26 -8
- package/dist/tool.js.map +1 -1
- package/dist/tools/audio-generate.d.ts.map +1 -1
- package/dist/tools/audio-generate.js +33 -16
- package/dist/tools/audio-generate.js.map +1 -1
- package/dist/tools/audio-transcribe.d.ts.map +1 -1
- package/dist/tools/audio-transcribe.js +26 -9
- package/dist/tools/audio-transcribe.js.map +1 -1
- package/dist/tools/base64.d.ts +4 -4
- package/dist/tools/base64.d.ts.map +1 -1
- package/dist/tools/base64.js +22 -7
- package/dist/tools/base64.js.map +1 -1
- package/dist/tools/calculator.d.ts.map +1 -1
- package/dist/tools/calculator.js +13 -2
- package/dist/tools/calculator.js.map +1 -1
- package/dist/tools/capabilities-tool.d.ts +8 -0
- package/dist/tools/capabilities-tool.d.ts.map +1 -0
- package/dist/tools/capabilities-tool.js +35 -0
- package/dist/tools/capabilities-tool.js.map +1 -0
- package/dist/tools/datetime.js +1 -1
- package/dist/tools/device-tools.d.ts +3 -0
- package/dist/tools/device-tools.d.ts.map +1 -0
- package/dist/tools/device-tools.js +91 -0
- package/dist/tools/device-tools.js.map +1 -0
- package/dist/tools/email.d.ts.map +1 -1
- package/dist/tools/email.js +39 -11
- package/dist/tools/email.js.map +1 -1
- package/dist/tools/exec.d.ts +9 -9
- package/dist/tools/exec.d.ts.map +1 -1
- package/dist/tools/exec.js +16 -3
- package/dist/tools/exec.js.map +1 -1
- package/dist/tools/filesystem.js +1 -1
- package/dist/tools/github.d.ts.map +1 -1
- package/dist/tools/github.js +29 -21
- package/dist/tools/github.js.map +1 -1
- package/dist/tools/hash.js +1 -1
- package/dist/tools/http.d.ts.map +1 -1
- package/dist/tools/http.js +9 -8
- package/dist/tools/http.js.map +1 -1
- package/dist/tools/image-analyze.js +1 -1
- package/dist/tools/image-generate.d.ts.map +1 -1
- package/dist/tools/image-generate.js +35 -18
- package/dist/tools/image-generate.js.map +1 -1
- package/dist/tools/index.d.ts +58 -42
- package/dist/tools/index.d.ts.map +1 -1
- package/dist/tools/index.js +45 -40
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/json.js +1 -1
- package/dist/tools/memory-tools.d.ts +50 -0
- package/dist/tools/memory-tools.d.ts.map +1 -0
- package/dist/tools/memory-tools.js +125 -0
- package/dist/tools/memory-tools.js.map +1 -0
- package/dist/tools/random.d.ts +7 -1
- package/dist/tools/random.d.ts.map +1 -1
- package/dist/tools/random.js +11 -4
- package/dist/tools/random.js.map +1 -1
- package/dist/tools/regex.d.ts.map +1 -1
- package/dist/tools/regex.js +4 -1
- package/dist/tools/regex.js.map +1 -1
- package/dist/tools/scheduler-tools.d.ts +32 -0
- package/dist/tools/scheduler-tools.d.ts.map +1 -0
- package/dist/tools/scheduler-tools.js +104 -0
- package/dist/tools/scheduler-tools.js.map +1 -0
- package/dist/tools/self-config.d.ts +9 -0
- package/dist/tools/self-config.d.ts.map +1 -0
- package/dist/tools/self-config.js +62 -0
- package/dist/tools/self-config.js.map +1 -0
- package/dist/tools/self-tools.d.ts +7 -0
- package/dist/tools/self-tools.d.ts.map +1 -0
- package/dist/tools/self-tools.js +172 -0
- package/dist/tools/self-tools.js.map +1 -0
- package/dist/tools/sleep.d.ts +5 -0
- package/dist/tools/sleep.d.ts.map +1 -1
- package/dist/tools/sleep.js +20 -3
- package/dist/tools/sleep.js.map +1 -1
- package/dist/tools/sql-query.d.ts.map +1 -1
- package/dist/tools/sql-query.js +148 -13
- package/dist/tools/sql-query.js.map +1 -1
- package/dist/tools/uuid.js +1 -1
- package/dist/tools/vector-search.d.ts.map +1 -1
- package/dist/tools/vector-search.js +82 -62
- package/dist/tools/vector-search.js.map +1 -1
- package/dist/tools/web-scrape.d.ts.map +1 -1
- package/dist/tools/web-scrape.js +9 -8
- package/dist/tools/web-scrape.js.map +1 -1
- package/dist/tools/web-search.d.ts.map +1 -1
- package/dist/tools/web-search.js +32 -14
- package/dist/tools/web-search.js.map +1 -1
- package/dist/utils/abort.d.ts +9 -0
- package/dist/utils/abort.d.ts.map +1 -0
- package/dist/utils/abort.js +43 -0
- package/dist/utils/abort.js.map +1 -0
- package/dist/utils/audio-fetch.d.ts +5 -1
- package/dist/utils/audio-fetch.d.ts.map +1 -1
- package/dist/utils/audio-fetch.js +13 -6
- package/dist/utils/audio-fetch.js.map +1 -1
- package/dist/utils/fallback.d.ts +2 -2
- package/dist/utils/fallback.js +1 -1
- package/dist/utils/image-fetch.d.ts +4 -0
- package/dist/utils/image-fetch.d.ts.map +1 -1
- package/dist/utils/image-fetch.js +13 -6
- package/dist/utils/image-fetch.js.map +1 -1
- package/dist/utils/index.d.ts +5 -5
- package/dist/utils/index.js +5 -5
- package/dist/utils/retry.d.ts.map +1 -1
- package/dist/utils/retry.js +3 -0
- package/dist/utils/retry.js.map +1 -1
- package/package.json +7 -3
package/dist/llm/ollama.js
CHANGED
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
* Ollama LLM Backend
|
|
3
3
|
*/
|
|
4
4
|
import { nanoid } from 'nanoid';
|
|
5
|
-
import { BaseLLMBackend } from './base';
|
|
6
|
-
import { createLLMError, llmUnavailable, llmInvalidResponse } from './errors';
|
|
7
|
-
import { fetchImageAsBase64 } from '../utils/image-fetch';
|
|
5
|
+
import { BaseLLMBackend } from './base.js';
|
|
6
|
+
import { createLLMError, llmUnavailable, llmInvalidResponse } from './errors.js';
|
|
7
|
+
import { fetchImageAsBase64 } from '../utils/image-fetch.js';
|
|
8
|
+
import { getLogger } from '../logger.js';
|
|
8
9
|
export class OllamaBackend extends BaseLLMBackend {
|
|
9
10
|
provider = 'ollama';
|
|
10
11
|
baseUrl;
|
|
@@ -29,7 +30,7 @@ export class OllamaBackend extends BaseLLMBackend {
|
|
|
29
30
|
model: request.model,
|
|
30
31
|
endpoint,
|
|
31
32
|
};
|
|
32
|
-
const messages = await this.convertMessages(request.messages);
|
|
33
|
+
const messages = await this.convertMessages(request.messages, request.signal);
|
|
33
34
|
let response;
|
|
34
35
|
try {
|
|
35
36
|
response = await fetch(endpoint, {
|
|
@@ -48,6 +49,7 @@ export class OllamaBackend extends BaseLLMBackend {
|
|
|
48
49
|
stop: request.stop,
|
|
49
50
|
},
|
|
50
51
|
}),
|
|
52
|
+
signal: request.signal,
|
|
51
53
|
});
|
|
52
54
|
}
|
|
53
55
|
catch (e) {
|
|
@@ -68,7 +70,7 @@ export class OllamaBackend extends BaseLLMBackend {
|
|
|
68
70
|
model: request.model,
|
|
69
71
|
endpoint,
|
|
70
72
|
};
|
|
71
|
-
const messages = await this.convertMessages(request.messages);
|
|
73
|
+
const messages = await this.convertMessages(request.messages, request.signal);
|
|
72
74
|
let response;
|
|
73
75
|
try {
|
|
74
76
|
response = await fetch(endpoint, {
|
|
@@ -87,6 +89,7 @@ export class OllamaBackend extends BaseLLMBackend {
|
|
|
87
89
|
stop: request.stop,
|
|
88
90
|
},
|
|
89
91
|
}),
|
|
92
|
+
signal: request.signal,
|
|
90
93
|
});
|
|
91
94
|
}
|
|
92
95
|
catch (e) {
|
|
@@ -102,57 +105,94 @@ export class OllamaBackend extends BaseLLMBackend {
|
|
|
102
105
|
const decoder = new TextDecoder();
|
|
103
106
|
let buffer = '';
|
|
104
107
|
const id = this.generateId();
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
108
|
+
let validChunks = 0;
|
|
109
|
+
let parseErrors = 0;
|
|
110
|
+
try {
|
|
111
|
+
for (;;) {
|
|
112
|
+
const { done, value } = await reader.read();
|
|
113
|
+
if (done)
|
|
114
|
+
break;
|
|
115
|
+
buffer += decoder.decode(value, { stream: true });
|
|
116
|
+
const lines = buffer.split('\n');
|
|
117
|
+
buffer = lines.pop() ?? '';
|
|
118
|
+
for (const line of lines) {
|
|
119
|
+
if (!line.trim())
|
|
120
|
+
continue;
|
|
121
|
+
let data;
|
|
122
|
+
try {
|
|
123
|
+
data = JSON.parse(line);
|
|
124
|
+
}
|
|
125
|
+
catch {
|
|
126
|
+
parseErrors++;
|
|
127
|
+
getLogger().warn('Malformed JSON in Ollama stream, skipping line', {
|
|
128
|
+
line: line.slice(0, 200),
|
|
129
|
+
});
|
|
130
|
+
continue;
|
|
131
|
+
}
|
|
132
|
+
validChunks++;
|
|
133
|
+
let finishReason;
|
|
134
|
+
if (data.done) {
|
|
135
|
+
if (data.message.tool_calls) {
|
|
136
|
+
finishReason = 'tool_calls';
|
|
137
|
+
}
|
|
138
|
+
else if (data.done_reason === 'length') {
|
|
139
|
+
finishReason = 'length';
|
|
140
|
+
}
|
|
141
|
+
else {
|
|
142
|
+
finishReason = 'stop';
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
const chunk = {
|
|
146
|
+
id,
|
|
147
|
+
delta: {
|
|
148
|
+
content: data.message.content,
|
|
149
|
+
toolCalls: data.message.tool_calls?.map((tc) => ({
|
|
150
|
+
id: tc.id ?? `call_${nanoid(12)}`,
|
|
151
|
+
name: tc.function.name,
|
|
152
|
+
arguments: tc.function.arguments,
|
|
153
|
+
})),
|
|
154
|
+
},
|
|
155
|
+
finishReason,
|
|
139
156
|
};
|
|
157
|
+
if (data.done && (data.prompt_eval_count || data.eval_count)) {
|
|
158
|
+
chunk.usage = {
|
|
159
|
+
inputTokens: data.prompt_eval_count ?? 0,
|
|
160
|
+
outputTokens: data.eval_count ?? 0,
|
|
161
|
+
totalTokens: (data.prompt_eval_count ?? 0) + (data.eval_count ?? 0),
|
|
162
|
+
};
|
|
163
|
+
}
|
|
164
|
+
yield chunk;
|
|
140
165
|
}
|
|
141
|
-
yield chunk;
|
|
142
166
|
}
|
|
143
167
|
}
|
|
168
|
+
finally {
|
|
169
|
+
reader.releaseLock?.();
|
|
170
|
+
}
|
|
171
|
+
if (validChunks === 0 && parseErrors > 0) {
|
|
172
|
+
throw llmInvalidResponse(ctx, `Ollama stream contained ${parseErrors} malformed JSON line(s) and 0 valid chunks`);
|
|
173
|
+
}
|
|
144
174
|
}
|
|
145
|
-
async convertMessages(messages) {
|
|
175
|
+
async convertMessages(messages, signal) {
|
|
146
176
|
return Promise.all(messages.map(async (m) => {
|
|
147
|
-
const { text, images } = await this.extractContentAndImages(m.content);
|
|
148
|
-
|
|
177
|
+
const { text, images } = await this.extractContentAndImages(m.content, signal);
|
|
178
|
+
const base = {
|
|
149
179
|
role: m.role,
|
|
150
180
|
content: text,
|
|
151
181
|
images: images.length > 0 ? images : undefined,
|
|
152
182
|
};
|
|
183
|
+
if (m.role === 'assistant' && 'toolCalls' in m && Array.isArray(m.toolCalls)) {
|
|
184
|
+
base.tool_calls = m.toolCalls.map((tc) => ({
|
|
185
|
+
id: tc.id,
|
|
186
|
+
function: {
|
|
187
|
+
name: tc.name,
|
|
188
|
+
arguments: tc.arguments,
|
|
189
|
+
},
|
|
190
|
+
}));
|
|
191
|
+
}
|
|
192
|
+
return base;
|
|
153
193
|
}));
|
|
154
194
|
}
|
|
155
|
-
async extractContentAndImages(content) {
|
|
195
|
+
async extractContentAndImages(content, signal) {
|
|
156
196
|
if (typeof content === 'string') {
|
|
157
197
|
return { text: content, images: [] };
|
|
158
198
|
}
|
|
@@ -170,7 +210,7 @@ export class OllamaBackend extends BaseLLMBackend {
|
|
|
170
210
|
images.push(part.image_base64.data);
|
|
171
211
|
break;
|
|
172
212
|
case 'image_url': {
|
|
173
|
-
const fetched = await fetchImageAsBase64(part.image_url.url);
|
|
213
|
+
const fetched = await fetchImageAsBase64(part.image_url.url, { signal });
|
|
174
214
|
images.push(fetched.data);
|
|
175
215
|
break;
|
|
176
216
|
}
|
|
@@ -192,15 +232,25 @@ export class OllamaBackend extends BaseLLMBackend {
|
|
|
192
232
|
}
|
|
193
233
|
convertResponse(data) {
|
|
194
234
|
const toolCalls = data.message.tool_calls?.map((tc) => ({
|
|
195
|
-
id: `call_${nanoid(12)}`,
|
|
235
|
+
id: tc.id ?? `call_${nanoid(12)}`,
|
|
196
236
|
name: tc.function.name,
|
|
197
237
|
arguments: tc.function.arguments,
|
|
198
238
|
}));
|
|
239
|
+
let finishReason;
|
|
240
|
+
if (toolCalls) {
|
|
241
|
+
finishReason = 'tool_calls';
|
|
242
|
+
}
|
|
243
|
+
else if (data.done_reason === 'length') {
|
|
244
|
+
finishReason = 'length';
|
|
245
|
+
}
|
|
246
|
+
else {
|
|
247
|
+
finishReason = 'stop';
|
|
248
|
+
}
|
|
199
249
|
return {
|
|
200
250
|
id: this.generateId(),
|
|
201
251
|
content: data.message.content,
|
|
202
252
|
toolCalls,
|
|
203
|
-
finishReason
|
|
253
|
+
finishReason,
|
|
204
254
|
usage: {
|
|
205
255
|
inputTokens: data.prompt_eval_count ?? 0,
|
|
206
256
|
outputTokens: data.eval_count ?? 0,
|
package/dist/llm/ollama.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.js","sourceRoot":"","sources":["../../src/llm/ollama.ts"],"names":[],"mappings":"AAAA;;GAEG;AAaH,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,kBAAkB,EAAwB,MAAM,UAAU,CAAC;AACpG,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"ollama.js","sourceRoot":"","sources":["../../src/llm/ollama.ts"],"names":[],"mappings":"AAAA;;GAEG;AAaH,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,kBAAkB,EAAwB,MAAM,UAAU,CAAC;AACpG,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AA6CtC,MAAM,OAAO,aAAc,SAAQ,cAAc;IACtC,QAAQ,GAAG,QAAiB,CAAC;IAC9B,OAAO,CAAS;IAChB,MAAM,CAAU;IAExB,YAAY,MAAoB;QAC9B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC9B,CAAC;IAED,IAAY,OAAO;QACjB,MAAM,CAAC,GAA2B,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC;QACzE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,CAAC,CAAC,aAAa,GAAG,UAAU,IAAI,CAAC,MAAM,EAAE,CAAC;QAC5C,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAoB;QAC7B,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;QACtE,MAAM,QAAQ,GAAG,GAAG,IAAI,CAAC,OAAO,WAAW,CAAC;QAC5C,MAAM,GAAG,GAAoB;YAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,QAAQ;SACT,CAAC;QAEF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAE9E,IAAI,QAAkB,CAAC;QACvB,IAAI,CAAC;YACH,QAAQ,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE;gBAC/B,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACnB,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,QAAQ;oBACR,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;oBACnD,MAAM,EAAE,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,cAAc,CAAC;oBAC1D,MAAM,EAAE,KAAK;oBACb,OAAO,EAAE;wBACP,WAAW,EAAE,OAAO,CAAC,WAAW;wBAChC,KAAK,EAAE,OAAO,CAAC,IAAI;wBACnB,WAAW,EAAE,OAAO,CAAC,SAAS;wBAC9B,IAAI,EAAE,OAAO,CAAC,IAAI;qBACnB;iBACF,CAAC;gBACF,MAAM,EAAE,OAAO,CAAC,MAAM;aACvB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,cAAc,CAAC,GAAG,EAAE,6BAA6B,EAAE,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAC/F,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACxC,MAAM,cAAc,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACxD,CAAC;QAED,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAuB,CAAC;QAC3D,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,CAAC,UAAU,CAAC,OAAoB;QACpC,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;QACtE,MAAM,QAAQ,GAAG,GAAG,IAAI,CAAC,OAAO,WAAW,CAAC;QAC5C,MAAM,GAAG,GAAoB;YAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,QAAQ;SACT,CAAC;QAEF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAE9E,IAAI,QAAkB,CAAC;QACvB,IAAI,CAAC;YACH,QAAQ,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE;gBAC/B,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACnB,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,QAAQ;oBACR,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;oBACnD,MAAM,EAAE,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,cAAc,CAAC;oBAC1D,MAAM,EAAE,IAAI;oBACZ,OAAO,EAAE;wBACP,WAAW,EAAE,OAAO,CAAC,WAAW;wBAChC,KAAK,EAAE,OAAO,CAAC,IAAI;wBACnB,WAAW,EAAE,OAAO,CAAC,SAAS;wBAC9B,IAAI,EAAE,OAAO,CAAC,IAAI;qBACnB;iBACF,CAAC;gBACF,MAAM,EAAE,OAAO,CAAC,MAAM;aACvB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,cAAc,CAAC,GAAG,EAAE,6BAA6B,EAAE,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAC/F,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACxC,MAAM,cAAc,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACxD,CAAC;QAED,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC;QAC1C,IAAI,CAAC,MAAM;YAAE,MAAM,kBAAkB,CAAC,GAAG,EAAE,8BAA8B,CAAC,CAAC;QAE3E,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAClC,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAC7B,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,IAAI,WAAW,GAAG,CAAC,CAAC;QAEpB,IAAI,CAAC;YACH,SAAS,CAAC;gBACR,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;gBAC5C,IAAI,IAAI;oBAAE,MAAM;gBAEhB,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;gBAClD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACjC,MAAM,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;gBAE3B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;oBACzB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;wBAAE,SAAS;oBAC3B,IAAI,IAAwB,CAAC;oBAC7B,IAAI,CAAC;wBACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAuB,CAAC;oBAChD,CAAC;oBAAC,MAAM,CAAC;wBACP,WAAW,EAAE,CAAC;wBACd,SAAS,EAAE,CAAC,IAAI,CAAC,gDAAgD,EAAE;4BACjE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;yBACzB,CAAC,CAAC;wBACH,SAAS;oBACX,CAAC;oBACD,WAAW,EAAE,CAAC;oBAEd,IAAI,YAA6C,CAAC;oBAClD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;wBACd,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;4BAC5B,YAAY,GAAG,YAAY,CAAC;wBAC9B,CAAC;6BAAM,IAAI,IAAI,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;4BACzC,YAAY,GAAG,QAAQ,CAAC;wBAC1B,CAAC;6BAAM,CAAC;4BACN,YAAY,GAAG,MAAM,CAAC;wBACxB,CAAC;oBACH,CAAC;oBAED,MAAM,KAAK,GAAoB;wBAC7B,EAAE;wBACF,KAAK,EAAE;4BACL,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO;4BAC7B,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gCAC/C,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,QAAQ,MAAM,CAAC,EAAE,CAAC,EAAE;gCACjC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI;gCACtB,SAAS,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS;6BACjC,CAAC,CAAC;yBACJ;wBACD,YAAY;qBACb,CAAC;oBAEF,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;wBAC7D,KAAK,CAAC,KAAK,GAAG;4BACZ,WAAW,EAAE,IAAI,CAAC,iBAAiB,IAAI,CAAC;4BACxC,YAAY,EAAE,IAAI,CAAC,UAAU,IAAI,CAAC;4BAClC,WAAW,EAAE,CAAC,IAAI,CAAC,iBAAiB,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC;yBACpE,CAAC;oBACJ,CAAC;oBAED,MAAM,KAAK,CAAC;gBACd,CAAC;YACH,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;QACzB,CAAC;QAED,IAAI,WAAW,KAAK,CAAC,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;YACzC,MAAM,kBAAkB,CACtB,GAAG,EACH,2BAA2B,WAAW,4CAA4C,CACnF,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,eAAe,CAC3B,QAAmB,EACnB,MAAoB;QAEpB,OAAO,OAAO,CAAC,GAAG,CAChB,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;YACvB,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC/E,MAAM,IAAI,GAAkB;gBAC1B,IAAI,EAAE,CAAC,CAAC,IAA6B;gBACrC,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;aAC/C,CAAC;YAEF,IAAI,CAAC,CAAC,IAAI,KAAK,WAAW,IAAI,WAAW,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC7E,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAY,EAAE,EAAE,CAAC,CAAC;oBACnD,EAAE,EAAE,EAAE,CAAC,EAAE;oBACT,QAAQ,EAAE;wBACR,IAAI,EAAE,EAAE,CAAC,IAAI;wBACb,SAAS,EAAE,EAAE,CAAC,SAAoC;qBACnD;iBACF,CAAC,CAAC,CAAC;YACN,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,uBAAuB,CACnC,OAAuB,EACvB,MAAoB;QAEpB,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAChC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;QACvC,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;QACrD,CAAC;QAED,MAAM,SAAS,GAAa,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAa,EAAE,CAAC;QAE5B,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;YAC3B,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;gBAClB,KAAK,MAAM;oBACT,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAC1B,MAAM;gBACR,KAAK,cAAc;oBACjB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;oBACpC,MAAM;gBACR,KAAK,WAAW,CAAC,CAAC,CAAC;oBACjB,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;oBACzE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;oBAC1B,MAAM;gBACR,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/C,CAAC;IAEO,YAAY,CAAC,KAA2B;QAC9C,IAAI,CAAC,KAAK;YAAE,OAAO,SAAS,CAAC;QAC7B,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACvB,IAAI,EAAE,UAAmB;YACzB,QAAQ,EAAE;gBACR,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,WAAW,EAAE,CAAC,CAAC,WAAW;gBAC1B,UAAU,EAAE,CAAC,CAAC,UAAU;aACzB;SACF,CAAC,CAAC,CAAC;IACN,CAAC;IAEO,eAAe,CAAC,IAAwB;QAC9C,MAAM,SAAS,GAA2B,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAC9E,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,QAAQ,MAAM,CAAC,EAAE,CAAC,EAAE;YACjC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI;YACtB,SAAS,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS;SACjC,CAAC,CAAC,CAAC;QAEJ,IAAI,YAA0C,CAAC;QAC/C,IAAI,SAAS,EAAE,CAAC;YACd,YAAY,GAAG,YAAY,CAAC;QAC9B,CAAC;aAAM,IAAI,IAAI,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;YACzC,YAAY,GAAG,QAAQ,CAAC;QAC1B,CAAC;aAAM,CAAC;YACN,YAAY,GAAG,MAAM,CAAC;QACxB,CAAC;QAED,OAAO;YACL,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE;YACrB,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO;YAC7B,SAAS;YACT,YAAY;YACZ,KAAK,EAAE;gBACL,WAAW,EAAE,IAAI,CAAC,iBAAiB,IAAI,CAAC;gBACxC,YAAY,EAAE,IAAI,CAAC,UAAU,IAAI,CAAC;gBAClC,WAAW,EAAE,CAAC,IAAI,CAAC,iBAAiB,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC;aACpE;SACF,CAAC;IACJ,CAAC;IAEO,qBAAqB,CAC3B,MAAqC;QAErC,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACtC,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;YAClC,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,OAAO,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC;IAClC,CAAC;IAEO,eAAe,CACrB,KAA+B,EAC/B,MAA8B;QAE9B,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;QACnD,IAAI,CAAC,MAAM,IAAI,MAAM,KAAK,MAAM;YAAE,OAAO,KAAK,CAAC;QAC/C,IAAI,MAAM,KAAK,MAAM;YAAE,OAAO,SAAS,CAAC;QAExC,IAAI,MAAM,KAAK,UAAU;YAAE,OAAO,KAAK,CAAC;QAExC,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC9D,CAAC;CACF"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import OpenAI from 'openai';
|
|
2
2
|
import type { ChatRequest, ChatResponse, ChatStreamChunk, ToolChoice, Message, LLMResponseFormat, MessageContent, ContentPart } from '@cogitator-ai/types';
|
|
3
|
-
import { BaseLLMBackend } from './base';
|
|
4
|
-
import { LLMError, type LLMErrorContext } from './errors';
|
|
3
|
+
import { BaseLLMBackend } from './base.js';
|
|
4
|
+
import { LLMError, type LLMErrorContext } from './errors.js';
|
|
5
5
|
export declare abstract class OpenAICompatibleBackend extends BaseLLMBackend {
|
|
6
6
|
protected abstract client: OpenAI;
|
|
7
7
|
protected resolveModel(request: ChatRequest): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compatible-base.d.ts","sourceRoot":"","sources":["../../src/llm/openai-compatible-base.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,eAAe,EAEf,UAAU,EACV,OAAO,EACP,iBAAiB,EACjB,cAAc,EACd,WAAW,EACZ,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAoC,KAAK,eAAe,EAAE,MAAM,UAAU,CAAC;AAE5F,8BAAsB,uBAAwB,SAAQ,cAAc;IAClE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAElC,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM;IAI9C,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"openai-compatible-base.d.ts","sourceRoot":"","sources":["../../src/llm/openai-compatible-base.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,eAAe,EAEf,UAAU,EACV,OAAO,EACP,iBAAiB,EACjB,cAAc,EACd,WAAW,EACZ,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAoC,KAAK,eAAe,EAAE,MAAM,UAAU,CAAC;AAE5F,8BAAsB,uBAAwB,SAAQ,cAAc;IAClE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAElC,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM;IAI9C,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IAiEhD,UAAU,CAAC,OAAO,EAAE,WAAW,GAAG,cAAc,CAAC,eAAe,CAAC;IA8GxE,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,0BAA0B,EAAE;IAyCxF,SAAS,CAAC,cAAc,CACtB,OAAO,EAAE,cAAc,GACtB,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE;IAQnD,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,yBAAyB;IAsBtF,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM;IAUzD,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,YAAY,CAAC,cAAc,CAAC;IAa9E,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAalF,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,eAAe,GAAG,QAAQ;IAItE,SAAS,CAAC,qBAAqB,CAC7B,MAAM,EAAE,iBAAiB,GAAG,SAAS,GACpC,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,iBAAiB,CAAC;IAqB5D,SAAS,CAAC,iBAAiB,CACzB,MAAM,EAAE,UAAU,GAAG,SAAS,GAC7B,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,aAAa,CAAC;CAYzD"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ErrorCode } from '@cogitator-ai/types';
|
|
2
|
-
import { BaseLLMBackend } from './base';
|
|
3
|
-
import { LLMError, wrapSDKError, llmInvalidResponse } from './errors';
|
|
2
|
+
import { BaseLLMBackend } from './base.js';
|
|
3
|
+
import { LLMError, wrapSDKError, llmInvalidResponse } from './errors.js';
|
|
4
4
|
export class OpenAICompatibleBackend extends BaseLLMBackend {
|
|
5
5
|
resolveModel(request) {
|
|
6
6
|
return request.model;
|
|
@@ -14,7 +14,7 @@ export class OpenAICompatibleBackend extends BaseLLMBackend {
|
|
|
14
14
|
};
|
|
15
15
|
let response;
|
|
16
16
|
try {
|
|
17
|
-
|
|
17
|
+
const params = {
|
|
18
18
|
model,
|
|
19
19
|
messages: this.convertMessages(request.messages),
|
|
20
20
|
tools: request.tools
|
|
@@ -33,7 +33,10 @@ export class OpenAICompatibleBackend extends BaseLLMBackend {
|
|
|
33
33
|
max_tokens: request.maxTokens,
|
|
34
34
|
stop: request.stop,
|
|
35
35
|
response_format: this.convertResponseFormat(request.responseFormat),
|
|
36
|
-
}
|
|
36
|
+
};
|
|
37
|
+
response = request.signal
|
|
38
|
+
? await this.client.chat.completions.create(params, { signal: request.signal })
|
|
39
|
+
: await this.client.chat.completions.create(params);
|
|
37
40
|
}
|
|
38
41
|
catch (e) {
|
|
39
42
|
throw this.wrapAPIError(e, ctx);
|
|
@@ -71,7 +74,7 @@ export class OpenAICompatibleBackend extends BaseLLMBackend {
|
|
|
71
74
|
};
|
|
72
75
|
let stream;
|
|
73
76
|
try {
|
|
74
|
-
|
|
77
|
+
const params = {
|
|
75
78
|
model,
|
|
76
79
|
messages: this.convertMessages(request.messages),
|
|
77
80
|
tools: request.tools
|
|
@@ -92,7 +95,10 @@ export class OpenAICompatibleBackend extends BaseLLMBackend {
|
|
|
92
95
|
stream: true,
|
|
93
96
|
stream_options: { include_usage: true },
|
|
94
97
|
response_format: this.convertResponseFormat(request.responseFormat),
|
|
95
|
-
}
|
|
98
|
+
};
|
|
99
|
+
stream = request.signal
|
|
100
|
+
? await this.client.chat.completions.create(params, { signal: request.signal })
|
|
101
|
+
: await this.client.chat.completions.create(params);
|
|
96
102
|
}
|
|
97
103
|
catch (e) {
|
|
98
104
|
throw this.wrapAPIError(e, ctx);
|
|
@@ -171,11 +177,24 @@ export class OpenAICompatibleBackend extends BaseLLMBackend {
|
|
|
171
177
|
role: 'user',
|
|
172
178
|
content: this.convertContent(m.content),
|
|
173
179
|
};
|
|
174
|
-
case 'assistant':
|
|
175
|
-
|
|
180
|
+
case 'assistant': {
|
|
181
|
+
const assistantMsg = {
|
|
176
182
|
role: 'assistant',
|
|
177
183
|
content: this.getTextContent(m.content),
|
|
178
184
|
};
|
|
185
|
+
const toolCalls = m.toolCalls;
|
|
186
|
+
if (toolCalls && toolCalls.length > 0) {
|
|
187
|
+
assistantMsg.tool_calls = toolCalls.map((tc) => ({
|
|
188
|
+
id: tc.id,
|
|
189
|
+
type: 'function',
|
|
190
|
+
function: {
|
|
191
|
+
name: tc.name,
|
|
192
|
+
arguments: JSON.stringify(tc.arguments),
|
|
193
|
+
},
|
|
194
|
+
}));
|
|
195
|
+
}
|
|
196
|
+
return assistantMsg;
|
|
197
|
+
}
|
|
179
198
|
case 'tool':
|
|
180
199
|
return {
|
|
181
200
|
role: 'tool',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-compatible-base.js","sourceRoot":"","sources":["../../src/llm/openai-compatible-base.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,kBAAkB,EAAwB,MAAM,UAAU,CAAC;AAE5F,MAAM,OAAgB,uBAAwB,SAAQ,cAAc;IAGxD,YAAY,CAAC,OAAoB;QACzC,OAAO,OAAO,CAAC,KAAK,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAoB;QAC7B,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACzC,MAAM,GAAG,GAAoB;YAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,KAAK;YACL,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;SAC9B,CAAC;QAEF,IAAI,QAAoC,CAAC;QACzC,IAAI,CAAC;YACH,
|
|
1
|
+
{"version":3,"file":"openai-compatible-base.js","sourceRoot":"","sources":["../../src/llm/openai-compatible-base.ts"],"names":[],"mappings":"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"}
|
package/dist/llm/openai.d.ts
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import OpenAI from 'openai';
|
|
2
|
-
import {
|
|
2
|
+
import type { LLMProvider } from '@cogitator-ai/types';
|
|
3
|
+
import { OpenAICompatibleBackend } from './openai-compatible-base.js';
|
|
3
4
|
interface OpenAIConfig {
|
|
4
5
|
apiKey: string;
|
|
5
6
|
baseUrl?: string;
|
|
7
|
+
provider?: LLMProvider;
|
|
6
8
|
}
|
|
7
9
|
export declare class OpenAIBackend extends OpenAICompatibleBackend {
|
|
8
|
-
readonly provider:
|
|
10
|
+
readonly provider: LLMProvider;
|
|
9
11
|
protected client: OpenAI;
|
|
10
12
|
constructor(config: OpenAIConfig);
|
|
11
13
|
}
|
package/dist/llm/openai.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/llm/openai.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAEnE,UAAU,YAAY;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/llm/openai.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAEnE,UAAU,YAAY;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,WAAW,CAAC;CACxB;AAED,qBAAa,aAAc,SAAQ,uBAAuB;IACxD,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC;IAC/B,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;gBAEb,MAAM,EAAE,YAAY;CAQjC"}
|
package/dist/llm/openai.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import OpenAI from 'openai';
|
|
2
|
-
import { OpenAICompatibleBackend } from './openai-compatible-base';
|
|
2
|
+
import { OpenAICompatibleBackend } from './openai-compatible-base.js';
|
|
3
3
|
export class OpenAIBackend extends OpenAICompatibleBackend {
|
|
4
|
-
provider
|
|
4
|
+
provider;
|
|
5
5
|
client;
|
|
6
6
|
constructor(config) {
|
|
7
7
|
super();
|
|
8
|
+
this.provider = config.provider ?? 'openai';
|
|
8
9
|
this.client = new OpenAI({
|
|
9
10
|
apiKey: config.apiKey,
|
|
10
11
|
baseURL: config.baseUrl,
|
package/dist/llm/openai.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/llm/openai.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/llm/openai.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAQnE,MAAM,OAAO,aAAc,SAAQ,uBAAuB;IAC/C,QAAQ,CAAc;IACrB,MAAM,CAAS;IAEzB,YAAY,MAAoB;QAC9B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,QAAQ,CAAC;QAC5C,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC;YACvB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,CAAC,CAAC;IACL,CAAC;CACF"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export { LangfuseExporter, createLangfuseExporter, type LangfuseConfig } from './langfuse';
|
|
2
|
-
export { OTLPExporter, createOTLPExporter, type OTLPExporterConfig } from './opentelemetry';
|
|
1
|
+
export { LangfuseExporter, createLangfuseExporter, type LangfuseConfig } from './langfuse.js';
|
|
2
|
+
export { OTLPExporter, createOTLPExporter, type OTLPExporterConfig } from './opentelemetry.js';
|
|
3
3
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export { LangfuseExporter, createLangfuseExporter } from './langfuse';
|
|
2
|
-
export { OTLPExporter, createOTLPExporter } from './opentelemetry';
|
|
1
|
+
export { LangfuseExporter, createLangfuseExporter } from './langfuse.js';
|
|
2
|
+
export { OTLPExporter, createOTLPExporter } from './opentelemetry.js';
|
|
3
3
|
//# sourceMappingURL=index.js.map
|
|
@@ -13,6 +13,8 @@ export declare class LangfuseExporter {
|
|
|
13
13
|
private activeTraces;
|
|
14
14
|
private activeSpans;
|
|
15
15
|
private activeGenerations;
|
|
16
|
+
private spanRunIds;
|
|
17
|
+
private generationRunIds;
|
|
16
18
|
constructor(config: LangfuseConfig);
|
|
17
19
|
init(): Promise<void>;
|
|
18
20
|
onRunStart(options: {
|
|
@@ -42,6 +44,7 @@ export declare class LangfuseExporter {
|
|
|
42
44
|
}): void;
|
|
43
45
|
onToolCall(runId: string, call: ToolCall): void;
|
|
44
46
|
onToolResult(_runId: string, result: ToolResult): void;
|
|
47
|
+
private cleanupRun;
|
|
45
48
|
flush(): Promise<void>;
|
|
46
49
|
shutdown(): Promise<void>;
|
|
47
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"langfuse.d.ts","sourceRoot":"","sources":["../../src/observability/langfuse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE1F,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAsDD,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,MAAM,CAA+B;IAC7C,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,YAAY,CAAoC;IACxD,OAAO,CAAC,WAAW,CAAmC;IACtD,OAAO,CAAC,iBAAiB,CAAyC;
|
|
1
|
+
{"version":3,"file":"langfuse.d.ts","sourceRoot":"","sources":["../../src/observability/langfuse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE1F,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAsDD,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,MAAM,CAA+B;IAC7C,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,YAAY,CAAoC;IACxD,OAAO,CAAC,WAAW,CAAmC;IACtD,OAAO,CAAC,iBAAiB,CAAyC;IAClE,OAAO,CAAC,UAAU,CAA6B;IAC/C,OAAO,CAAC,gBAAgB,CAA6B;gBAEzC,MAAM,EAAE,cAAc;IAI5B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B3B,UAAU,CAAC,OAAO,EAAE;QAClB,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;QAClB,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,GAAG,IAAI;IAkBR,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI;IAetC,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,UAAU,GAAG,QAAQ,CAAC,GAAG,IAAI;IAgBrF,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAY3B,SAAS,CAAC,OAAO,EAAE;QACjB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,OAAO,EAAE,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,GAAG,MAAM;IAsBV,aAAa,CAAC,OAAO,EAAE;QACrB,YAAY,EAAE,MAAM,CAAC;QACrB,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,GAAG,IAAI;IAmBR,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,IAAI;IAc/C,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,IAAI;IAUtD,OAAO,CAAC,UAAU;IAkBZ,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAGhC;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,cAAc,GAAG,gBAAgB,CAE/E"}
|
|
@@ -4,6 +4,8 @@ export class LangfuseExporter {
|
|
|
4
4
|
activeTraces = new Map();
|
|
5
5
|
activeSpans = new Map();
|
|
6
6
|
activeGenerations = new Map();
|
|
7
|
+
spanRunIds = new Map();
|
|
8
|
+
generationRunIds = new Map();
|
|
7
9
|
constructor(config) {
|
|
8
10
|
this.config = config;
|
|
9
11
|
}
|
|
@@ -53,7 +55,7 @@ export class LangfuseExporter {
|
|
|
53
55
|
toolCallCount: result.toolCalls.length,
|
|
54
56
|
},
|
|
55
57
|
});
|
|
56
|
-
this.
|
|
58
|
+
this.cleanupRun(result.runId);
|
|
57
59
|
}
|
|
58
60
|
onSpanStart(runId, span) {
|
|
59
61
|
const trace = this.activeTraces.get(runId);
|
|
@@ -66,6 +68,7 @@ export class LangfuseExporter {
|
|
|
66
68
|
metadata: span.attributes,
|
|
67
69
|
});
|
|
68
70
|
this.activeSpans.set(span.id, langfuseSpan);
|
|
71
|
+
this.spanRunIds.set(span.id, runId);
|
|
69
72
|
}
|
|
70
73
|
onSpanEnd(span) {
|
|
71
74
|
const langfuseSpan = this.activeSpans.get(span.id);
|
|
@@ -75,6 +78,7 @@ export class LangfuseExporter {
|
|
|
75
78
|
output: span.attributes.output,
|
|
76
79
|
});
|
|
77
80
|
this.activeSpans.delete(span.id);
|
|
81
|
+
this.spanRunIds.delete(span.id);
|
|
78
82
|
}
|
|
79
83
|
onLLMCall(options) {
|
|
80
84
|
const trace = this.activeTraces.get(options.runId);
|
|
@@ -92,6 +96,7 @@ export class LangfuseExporter {
|
|
|
92
96
|
},
|
|
93
97
|
});
|
|
94
98
|
this.activeGenerations.set(generation.id, generation);
|
|
99
|
+
this.generationRunIds.set(generation.id, options.runId);
|
|
95
100
|
return generation.id;
|
|
96
101
|
}
|
|
97
102
|
onLLMResponse(options) {
|
|
@@ -109,6 +114,7 @@ export class LangfuseExporter {
|
|
|
109
114
|
},
|
|
110
115
|
});
|
|
111
116
|
this.activeGenerations.delete(options.generationId);
|
|
117
|
+
this.generationRunIds.delete(options.generationId);
|
|
112
118
|
}
|
|
113
119
|
onToolCall(runId, call) {
|
|
114
120
|
const trace = this.activeTraces.get(runId);
|
|
@@ -120,6 +126,7 @@ export class LangfuseExporter {
|
|
|
120
126
|
metadata: { toolCallId: call.id },
|
|
121
127
|
});
|
|
122
128
|
this.activeSpans.set(`tool:${call.id}`, span);
|
|
129
|
+
this.spanRunIds.set(`tool:${call.id}`, runId);
|
|
123
130
|
}
|
|
124
131
|
onToolResult(_runId, result) {
|
|
125
132
|
const spanKey = `tool:${result.callId}`;
|
|
@@ -127,6 +134,22 @@ export class LangfuseExporter {
|
|
|
127
134
|
if (span) {
|
|
128
135
|
span.end({ output: result.result });
|
|
129
136
|
this.activeSpans.delete(spanKey);
|
|
137
|
+
this.spanRunIds.delete(spanKey);
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
cleanupRun(runId) {
|
|
141
|
+
this.activeTraces.delete(runId);
|
|
142
|
+
for (const [spanId, ownerRunId] of this.spanRunIds.entries()) {
|
|
143
|
+
if (ownerRunId === runId) {
|
|
144
|
+
this.activeSpans.delete(spanId);
|
|
145
|
+
this.spanRunIds.delete(spanId);
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
for (const [generationId, ownerRunId] of this.generationRunIds.entries()) {
|
|
149
|
+
if (ownerRunId === runId) {
|
|
150
|
+
this.activeGenerations.delete(generationId);
|
|
151
|
+
this.generationRunIds.delete(generationId);
|
|
152
|
+
}
|
|
130
153
|
}
|
|
131
154
|
}
|
|
132
155
|
async flush() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"langfuse.js","sourceRoot":"","sources":["../../src/observability/langfuse.ts"],"names":[],"mappings":"AA+DA,MAAM,OAAO,gBAAgB;IACnB,MAAM,GAA0B,IAAI,CAAC;IACrC,MAAM,CAAiB;IACvB,YAAY,GAAG,IAAI,GAAG,EAAyB,CAAC;IAChD,WAAW,GAAG,IAAI,GAAG,EAAwB,CAAC;IAC9C,iBAAiB,GAAG,IAAI,GAAG,EAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"langfuse.js","sourceRoot":"","sources":["../../src/observability/langfuse.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,7 @@ export declare class OTLPExporter {
|
|
|
21
21
|
input: string;
|
|
22
22
|
}): void;
|
|
23
23
|
onRunComplete(result: RunResult): void;
|
|
24
|
+
onRunError(_error: Error, runId: string): void;
|
|
24
25
|
exportSpan(runId: string, span: CogitatorSpan): void;
|
|
25
26
|
flush(): Promise<void>;
|
|
26
27
|
private pushBackSpans;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opentelemetry.d.ts","sourceRoot":"","sources":["../../src/observability/opentelemetry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,IAAI,aAAa,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAE5E,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAwCD,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,YAAY,CAAkB;IACtC,OAAO,CAAC,UAAU,CAA+C;IACjE,OAAO,CAAC,QAAQ,CAA6B;gBAEjC,MAAM,EAAE,kBAAkB;IAQtC,KAAK,IAAI,IAAI;
|
|
1
|
+
{"version":3,"file":"opentelemetry.d.ts","sourceRoot":"","sources":["../../src/observability/opentelemetry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,IAAI,aAAa,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAE5E,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAwCD,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,YAAY,CAAkB;IACtC,OAAO,CAAC,UAAU,CAA+C;IACjE,OAAO,CAAC,QAAQ,CAA6B;gBAEjC,MAAM,EAAE,kBAAkB;IAQtC,KAAK,IAAI,IAAI;IASb,IAAI,IAAI,IAAI;IAOZ,UAAU,CAAC,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAO/F,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI;IAItC,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAI9C,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,GAAG,IAAI;IA4C9C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAwC5B,OAAO,CAAC,aAAa;IAarB,OAAO,CAAC,eAAe;CAOxB;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,kBAAkB,GAAG,YAAY,CAE3E"}
|