@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/tools/sql-query.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
-
import { tool } from '../tool';
|
|
2
|
+
import { tool } from '../tool.js';
|
|
3
3
|
const sqlQueryParams = z.object({
|
|
4
4
|
query: z.string().min(1).describe('SQL query to execute'),
|
|
5
5
|
database: z
|
|
@@ -23,10 +23,137 @@ const sqlQueryParams = z.object({
|
|
|
23
23
|
.describe('Maximum rows to return (default: 100, max: 1000)'),
|
|
24
24
|
readOnly: z.boolean().optional().describe('Only allow SELECT queries (default: true for safety)'),
|
|
25
25
|
});
|
|
26
|
+
function stripSqlLiteralsAndComments(query) {
|
|
27
|
+
let output = '';
|
|
28
|
+
let index = 0;
|
|
29
|
+
while (index < query.length) {
|
|
30
|
+
const char = query[index];
|
|
31
|
+
const next = query[index + 1];
|
|
32
|
+
if (char === '-' && next === '-') {
|
|
33
|
+
output += ' ';
|
|
34
|
+
index += 2;
|
|
35
|
+
while (index < query.length && query[index] !== '\n') {
|
|
36
|
+
output += ' ';
|
|
37
|
+
index++;
|
|
38
|
+
}
|
|
39
|
+
continue;
|
|
40
|
+
}
|
|
41
|
+
if (char === '/' && next === '*') {
|
|
42
|
+
output += ' ';
|
|
43
|
+
index += 2;
|
|
44
|
+
while (index < query.length && !(query[index] === '*' && query[index + 1] === '/')) {
|
|
45
|
+
output += ' ';
|
|
46
|
+
index++;
|
|
47
|
+
}
|
|
48
|
+
if (index < query.length) {
|
|
49
|
+
output += ' ';
|
|
50
|
+
index += 2;
|
|
51
|
+
}
|
|
52
|
+
continue;
|
|
53
|
+
}
|
|
54
|
+
const dollarQuote = /^\$[A-Za-z_][A-Za-z0-9_]*\$|^\$\$/.exec(query.slice(index));
|
|
55
|
+
if (dollarQuote) {
|
|
56
|
+
const tag = dollarQuote[0];
|
|
57
|
+
output += ' '.repeat(tag.length);
|
|
58
|
+
index += tag.length;
|
|
59
|
+
const end = query.indexOf(tag, index);
|
|
60
|
+
const contentEnd = end === -1 ? query.length : end;
|
|
61
|
+
output += ' '.repeat(contentEnd - index);
|
|
62
|
+
index = contentEnd;
|
|
63
|
+
if (end !== -1) {
|
|
64
|
+
output += ' '.repeat(tag.length);
|
|
65
|
+
index += tag.length;
|
|
66
|
+
}
|
|
67
|
+
continue;
|
|
68
|
+
}
|
|
69
|
+
if (char === "'") {
|
|
70
|
+
output += ' ';
|
|
71
|
+
index++;
|
|
72
|
+
while (index < query.length) {
|
|
73
|
+
output += ' ';
|
|
74
|
+
if (query[index] === "'" && query[index + 1] === "'") {
|
|
75
|
+
output += ' ';
|
|
76
|
+
index += 2;
|
|
77
|
+
continue;
|
|
78
|
+
}
|
|
79
|
+
if (query[index] === "'") {
|
|
80
|
+
index++;
|
|
81
|
+
break;
|
|
82
|
+
}
|
|
83
|
+
index++;
|
|
84
|
+
}
|
|
85
|
+
continue;
|
|
86
|
+
}
|
|
87
|
+
if (char === '"') {
|
|
88
|
+
output += ' ';
|
|
89
|
+
index++;
|
|
90
|
+
while (index < query.length) {
|
|
91
|
+
output += ' ';
|
|
92
|
+
if (query[index] === '"' && query[index + 1] === '"') {
|
|
93
|
+
output += ' ';
|
|
94
|
+
index += 2;
|
|
95
|
+
continue;
|
|
96
|
+
}
|
|
97
|
+
if (query[index] === '"') {
|
|
98
|
+
index++;
|
|
99
|
+
break;
|
|
100
|
+
}
|
|
101
|
+
index++;
|
|
102
|
+
}
|
|
103
|
+
continue;
|
|
104
|
+
}
|
|
105
|
+
output += char;
|
|
106
|
+
index++;
|
|
107
|
+
}
|
|
108
|
+
return output;
|
|
109
|
+
}
|
|
110
|
+
function firstSqlKeyword(query) {
|
|
111
|
+
return /^[A-Z]+/.exec(stripSqlLiteralsAndComments(query).trim().toUpperCase())?.[0];
|
|
112
|
+
}
|
|
113
|
+
function hasMultipleStatements(query) {
|
|
114
|
+
const statements = stripSqlLiteralsAndComments(query)
|
|
115
|
+
.split(';')
|
|
116
|
+
.filter((statement) => statement.trim().length > 0);
|
|
117
|
+
return statements.length > 1;
|
|
118
|
+
}
|
|
119
|
+
function hasTopLevelKeyword(query, keyword) {
|
|
120
|
+
const normalized = stripSqlLiteralsAndComments(query).toUpperCase();
|
|
121
|
+
let depth = 0;
|
|
122
|
+
for (let index = 0; index < normalized.length; index++) {
|
|
123
|
+
const char = normalized[index];
|
|
124
|
+
if (char === '(') {
|
|
125
|
+
depth++;
|
|
126
|
+
continue;
|
|
127
|
+
}
|
|
128
|
+
if (char === ')') {
|
|
129
|
+
depth = Math.max(0, depth - 1);
|
|
130
|
+
continue;
|
|
131
|
+
}
|
|
132
|
+
if (depth === 0 &&
|
|
133
|
+
normalized.startsWith(keyword, index) &&
|
|
134
|
+
!/[A-Z0-9_]/.test(normalized[index - 1] ?? '') &&
|
|
135
|
+
!/[A-Z0-9_]/.test(normalized[index + keyword.length] ?? '')) {
|
|
136
|
+
return true;
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
return false;
|
|
140
|
+
}
|
|
141
|
+
function trimTrailingSqlTerminator(query) {
|
|
142
|
+
const stripped = stripSqlLiteralsAndComments(query);
|
|
143
|
+
let index = stripped.length - 1;
|
|
144
|
+
while (index >= 0 && /\s/.test(stripped[index])) {
|
|
145
|
+
index--;
|
|
146
|
+
}
|
|
147
|
+
if (stripped[index] !== ';') {
|
|
148
|
+
return query.replace(/\s*$/, '');
|
|
149
|
+
}
|
|
150
|
+
return `${query.slice(0, index)}${query.slice(index + 1)}`.replace(/\s*$/, '');
|
|
151
|
+
}
|
|
26
152
|
function isReadOnlyQuery(query) {
|
|
27
|
-
const normalized = query.trim().toUpperCase();
|
|
153
|
+
const normalized = stripSqlLiteralsAndComments(query).trim().toUpperCase();
|
|
154
|
+
const firstKeyword = firstSqlKeyword(query);
|
|
28
155
|
const allowedPrefixes = ['SELECT', 'WITH', 'SHOW', 'DESCRIBE', 'EXPLAIN'];
|
|
29
|
-
if (!
|
|
156
|
+
if (!firstKeyword || !allowedPrefixes.includes(firstKeyword)) {
|
|
30
157
|
return false;
|
|
31
158
|
}
|
|
32
159
|
const dangerousKeywords = [
|
|
@@ -43,17 +170,29 @@ function isReadOnlyQuery(query) {
|
|
|
43
170
|
'EXECUTE',
|
|
44
171
|
'CALL',
|
|
45
172
|
];
|
|
46
|
-
|
|
47
|
-
const statements = withoutStrings.split(';').filter((s) => s.trim().length > 0);
|
|
48
|
-
if (statements.length > 1)
|
|
173
|
+
if (hasMultipleStatements(query))
|
|
49
174
|
return false;
|
|
50
175
|
for (const keyword of dangerousKeywords) {
|
|
51
176
|
const regex = new RegExp(`\\b${keyword}\\b`);
|
|
52
|
-
if (regex.test(
|
|
177
|
+
if (regex.test(normalized))
|
|
53
178
|
return false;
|
|
54
179
|
}
|
|
180
|
+
if (/\bFOR\s+(NO\s+KEY\s+)?UPDATE\b/.test(normalized))
|
|
181
|
+
return false;
|
|
182
|
+
if (/\bFOR\s+(KEY\s+)?SHARE\b/.test(normalized))
|
|
183
|
+
return false;
|
|
55
184
|
return true;
|
|
56
185
|
}
|
|
186
|
+
function withRowLimit(query, maxRows) {
|
|
187
|
+
const firstKeyword = firstSqlKeyword(query);
|
|
188
|
+
if (firstKeyword !== 'SELECT' && firstKeyword !== 'WITH') {
|
|
189
|
+
return query;
|
|
190
|
+
}
|
|
191
|
+
if (hasTopLevelKeyword(query, 'LIMIT') || hasTopLevelKeyword(query, 'FETCH')) {
|
|
192
|
+
return query;
|
|
193
|
+
}
|
|
194
|
+
return `${trimTrailingSqlTerminator(query)}\nLIMIT ${maxRows + 1}`;
|
|
195
|
+
}
|
|
57
196
|
async function queryPostgres(connectionString, query, params, maxRows) {
|
|
58
197
|
let pg;
|
|
59
198
|
try {
|
|
@@ -66,9 +205,7 @@ async function queryPostgres(connectionString, query, params, maxRows) {
|
|
|
66
205
|
const start = Date.now();
|
|
67
206
|
try {
|
|
68
207
|
await client.connect();
|
|
69
|
-
const limitedQuery = query
|
|
70
|
-
? query
|
|
71
|
-
: `${query.replace(/;?\s*$/, '')} LIMIT ${maxRows + 1}`;
|
|
208
|
+
const limitedQuery = withRowLimit(query, maxRows);
|
|
72
209
|
const result = await client.query(limitedQuery, params);
|
|
73
210
|
const executionTime = Date.now() - start;
|
|
74
211
|
const truncated = result.rows.length > maxRows;
|
|
@@ -97,9 +234,7 @@ async function querySqlite(filePath, query, params, maxRows, readOnly = true) {
|
|
|
97
234
|
const db = new Database(filePath, { readonly: readOnly });
|
|
98
235
|
const start = Date.now();
|
|
99
236
|
try {
|
|
100
|
-
const limitedQuery = query
|
|
101
|
-
? query
|
|
102
|
-
: `${query.replace(/;?\s*$/, '')} LIMIT ${maxRows + 1}`;
|
|
237
|
+
const limitedQuery = withRowLimit(query, maxRows);
|
|
103
238
|
const stmt = db.prepare(limitedQuery);
|
|
104
239
|
const rows = stmt.all(...params);
|
|
105
240
|
const executionTime = Date.now() - start;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql-query.js","sourceRoot":"","sources":["../../src/tools/sql-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,sBAAsB,CAAC;IACzD,QAAQ,EAAE,CAAC;SACR,IAAI,CAAC,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;SAC5B,QAAQ,EAAE;SACV,QAAQ,CAAC,sEAAsE,CAAC;IACnF,gBAAgB,EAAE,CAAC;SAChB,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CACP,gIAAgI,CACjI;IACH,MAAM,EAAE,CAAC;SACN,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;SAClB,QAAQ,EAAE;SACV,QAAQ,CAAC,qEAAqE,CAAC;IAClF,OAAO,EAAE,CAAC;SACP,MAAM,EAAE;SACR,GAAG,EAAE;SACL,GAAG,CAAC,CAAC,CAAC;SACN,GAAG,CAAC,IAAI,CAAC;SACT,QAAQ,EAAE;SACV,QAAQ,CAAC,kDAAkD,CAAC;IAC/D,QAAQ,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,sDAAsD,CAAC;CAClG,CAAC,CAAC;AAUH,SAAS,
|
|
1
|
+
{"version":3,"file":"sql-query.js","sourceRoot":"","sources":["../../src/tools/sql-query.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/uuid.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vector-search.d.ts","sourceRoot":"","sources":["../../src/tools/vector-search.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"vector-search.d.ts","sourceRoot":"","sources":["../../src/tools/vector-search.ts"],"names":[],"mappings":"AAqCA,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,kBAAkB,EAAE,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf;AAgLD,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;EA0DvB,CAAC"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
-
import { tool } from '../tool';
|
|
2
|
+
import { tool } from '../tool.js';
|
|
3
|
+
import { createLinkedAbortController, getAbortErrorMessage } from '../utils/abort.js';
|
|
4
|
+
const EMBEDDING_TIMEOUT_MS = 30_000;
|
|
3
5
|
const vectorSearchParams = z.object({
|
|
4
6
|
query: z.string().min(1).describe('Search query (will be converted to embedding)'),
|
|
5
7
|
collection: z.string().optional().describe('Collection/table name (default: "documents")'),
|
|
@@ -30,68 +32,86 @@ const vectorSearchParams = z.object({
|
|
|
30
32
|
.optional()
|
|
31
33
|
.describe('PostgreSQL connection string with pgvector. Defaults to DATABASE_URL env var.'),
|
|
32
34
|
});
|
|
33
|
-
async function getEmbedding(text, provider, model) {
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
throw new Error('OPENAI_API_KEY not set');
|
|
39
|
-
const response = await fetch('https://api.openai.com/v1/embeddings', {
|
|
40
|
-
method: 'POST',
|
|
41
|
-
headers: {
|
|
42
|
-
'Content-Type': 'application/json',
|
|
43
|
-
Authorization: `Bearer ${apiKey}`,
|
|
44
|
-
},
|
|
45
|
-
body: JSON.stringify({
|
|
46
|
-
input: text,
|
|
47
|
-
model: model ?? 'text-embedding-3-small',
|
|
48
|
-
}),
|
|
49
|
-
});
|
|
50
|
-
if (!response.ok) {
|
|
51
|
-
const err = await response.text();
|
|
52
|
-
throw new Error(`OpenAI embedding error: ${err}`);
|
|
53
|
-
}
|
|
54
|
-
const data = (await response.json());
|
|
55
|
-
return data.data[0].embedding;
|
|
35
|
+
async function getEmbedding(text, provider, model, signal) {
|
|
36
|
+
const abort = createLinkedAbortController(signal, EMBEDDING_TIMEOUT_MS);
|
|
37
|
+
const fetchEmbedding = async (url, init) => {
|
|
38
|
+
try {
|
|
39
|
+
return await fetch(url, { ...init, signal: abort.signal });
|
|
56
40
|
}
|
|
57
|
-
|
|
58
|
-
const
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
headers: { 'Content-Type': 'application/json' },
|
|
62
|
-
body: JSON.stringify({
|
|
63
|
-
model: model ?? 'nomic-embed-text',
|
|
64
|
-
prompt: text,
|
|
65
|
-
}),
|
|
66
|
-
});
|
|
67
|
-
if (!response.ok) {
|
|
68
|
-
const err = await response.text();
|
|
69
|
-
throw new Error(`Ollama embedding error: ${err}`);
|
|
41
|
+
catch (err) {
|
|
42
|
+
const error = err;
|
|
43
|
+
if (error.name === 'AbortError') {
|
|
44
|
+
throw new Error(getAbortErrorMessage(`${provider} embedding request`, abort, EMBEDDING_TIMEOUT_MS));
|
|
70
45
|
}
|
|
71
|
-
|
|
72
|
-
return data.embedding;
|
|
46
|
+
throw err;
|
|
73
47
|
}
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
48
|
+
};
|
|
49
|
+
try {
|
|
50
|
+
switch (provider) {
|
|
51
|
+
case 'openai': {
|
|
52
|
+
const apiKey = process.env.OPENAI_API_KEY;
|
|
53
|
+
if (!apiKey)
|
|
54
|
+
throw new Error('OPENAI_API_KEY not set');
|
|
55
|
+
const response = await fetchEmbedding('https://api.openai.com/v1/embeddings', {
|
|
56
|
+
method: 'POST',
|
|
57
|
+
headers: {
|
|
58
|
+
'Content-Type': 'application/json',
|
|
59
|
+
Authorization: `Bearer ${apiKey}`,
|
|
60
|
+
},
|
|
61
|
+
body: JSON.stringify({
|
|
62
|
+
input: text,
|
|
63
|
+
model: model ?? 'text-embedding-3-small',
|
|
64
|
+
}),
|
|
65
|
+
});
|
|
66
|
+
if (!response.ok) {
|
|
67
|
+
const err = await response.text();
|
|
68
|
+
throw new Error(`OpenAI embedding error: ${err}`);
|
|
69
|
+
}
|
|
70
|
+
const data = (await response.json());
|
|
71
|
+
return data.data[0].embedding;
|
|
72
|
+
}
|
|
73
|
+
case 'ollama': {
|
|
74
|
+
const baseUrl = process.env.OLLAMA_BASE_URL ?? 'http://localhost:11434';
|
|
75
|
+
const response = await fetchEmbedding(`${baseUrl}/api/embeddings`, {
|
|
76
|
+
method: 'POST',
|
|
77
|
+
headers: { 'Content-Type': 'application/json' },
|
|
78
|
+
body: JSON.stringify({
|
|
79
|
+
model: model ?? 'nomic-embed-text',
|
|
80
|
+
prompt: text,
|
|
81
|
+
}),
|
|
82
|
+
});
|
|
83
|
+
if (!response.ok) {
|
|
84
|
+
const err = await response.text();
|
|
85
|
+
throw new Error(`Ollama embedding error: ${err}`);
|
|
86
|
+
}
|
|
87
|
+
const data = (await response.json());
|
|
88
|
+
return data.embedding;
|
|
89
|
+
}
|
|
90
|
+
case 'google': {
|
|
91
|
+
const apiKey = process.env.GOOGLE_API_KEY;
|
|
92
|
+
if (!apiKey)
|
|
93
|
+
throw new Error('GOOGLE_API_KEY not set');
|
|
94
|
+
const modelId = model ?? 'text-embedding-004';
|
|
95
|
+
const response = await fetchEmbedding(`https://generativelanguage.googleapis.com/v1beta/models/${modelId}:embedContent?key=${apiKey}`, {
|
|
96
|
+
method: 'POST',
|
|
97
|
+
headers: { 'Content-Type': 'application/json' },
|
|
98
|
+
body: JSON.stringify({
|
|
99
|
+
model: `models/${modelId}`,
|
|
100
|
+
content: { parts: [{ text }] },
|
|
101
|
+
}),
|
|
102
|
+
});
|
|
103
|
+
if (!response.ok) {
|
|
104
|
+
const err = await response.text();
|
|
105
|
+
throw new Error(`Google embedding error: ${err}`);
|
|
106
|
+
}
|
|
107
|
+
const data = (await response.json());
|
|
108
|
+
return data.embedding.values;
|
|
90
109
|
}
|
|
91
|
-
const data = (await response.json());
|
|
92
|
-
return data.embedding.values;
|
|
93
110
|
}
|
|
94
111
|
}
|
|
112
|
+
finally {
|
|
113
|
+
abort.cleanup();
|
|
114
|
+
}
|
|
95
115
|
}
|
|
96
116
|
function detectEmbeddingProvider() {
|
|
97
117
|
if (process.env.OPENAI_API_KEY)
|
|
@@ -119,11 +139,11 @@ async function searchPgVector(connectionString, embedding, collection, topK, thr
|
|
|
119
139
|
await client.connect();
|
|
120
140
|
const vectorStr = `[${embedding.join(',')}]`;
|
|
121
141
|
let filterClause = '';
|
|
122
|
-
const params = [vectorStr, topK];
|
|
142
|
+
const params = [vectorStr, topK, threshold];
|
|
123
143
|
if (filter && Object.keys(filter).length > 0) {
|
|
124
144
|
const conditions = Object.entries(filter).map(([key, value], idx) => {
|
|
125
145
|
params.push(JSON.stringify({ [key]: value }));
|
|
126
|
-
return `metadata @> $${idx +
|
|
146
|
+
return `metadata @> $${idx + 4}::jsonb`;
|
|
127
147
|
});
|
|
128
148
|
filterClause = `AND ${conditions.join(' AND ')}`;
|
|
129
149
|
}
|
|
@@ -134,7 +154,7 @@ async function searchPgVector(connectionString, embedding, collection, topK, thr
|
|
|
134
154
|
metadata,
|
|
135
155
|
1 - (embedding <=> $1::vector) as similarity
|
|
136
156
|
FROM ${collection}
|
|
137
|
-
WHERE 1 - (embedding <=> $1::vector) >= $
|
|
157
|
+
WHERE 1 - (embedding <=> $1::vector) >= $3
|
|
138
158
|
${filterClause}
|
|
139
159
|
ORDER BY embedding <=> $1::vector
|
|
140
160
|
LIMIT $2
|
|
@@ -157,7 +177,7 @@ export const vectorSearch = tool({
|
|
|
157
177
|
parameters: vectorSearchParams,
|
|
158
178
|
category: 'database',
|
|
159
179
|
tags: ['search', 'vector', 'embedding', 'semantic', 'similarity'],
|
|
160
|
-
execute: async ({ query, collection = 'documents', topK = 5, threshold = 0.7, filter, embeddingProvider, embeddingModel, connectionString, }) => {
|
|
180
|
+
execute: async ({ query, collection = 'documents', topK = 5, threshold = 0.7, filter, embeddingProvider, embeddingModel, connectionString, }, context) => {
|
|
161
181
|
const provider = embeddingProvider ?? detectEmbeddingProvider();
|
|
162
182
|
if (!provider) {
|
|
163
183
|
return {
|
|
@@ -171,7 +191,7 @@ export const vectorSearch = tool({
|
|
|
171
191
|
};
|
|
172
192
|
}
|
|
173
193
|
try {
|
|
174
|
-
const embedding = await getEmbedding(query, provider, embeddingModel);
|
|
194
|
+
const embedding = await getEmbedding(query, provider, embeddingModel, context?.signal ?? new AbortController().signal);
|
|
175
195
|
const results = await searchPgVector(connStr, embedding, collection, topK, threshold, filter);
|
|
176
196
|
const response = {
|
|
177
197
|
query,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vector-search.js","sourceRoot":"","sources":["../../src/tools/vector-search.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"vector-search.js","sourceRoot":"","sources":["../../src/tools/vector-search.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-scrape.d.ts","sourceRoot":"","sources":["../../src/tools/web-scrape.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"web-scrape.d.ts","sourceRoot":"","sources":["../../src/tools/web-scrape.ts"],"names":[],"mappings":"AA6BA,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,aAAa,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,cAAc,EAAE,CAAC;CAC3B;AAmLD,eAAO,MAAM,SAAS;;;;;;;;;;;EAiGpB,CAAC"}
|
package/dist/tools/web-scrape.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
-
import { tool } from '../tool';
|
|
2
|
+
import { tool } from '../tool.js';
|
|
3
|
+
import { createLinkedAbortController, getAbortErrorMessage } from '../utils/abort.js';
|
|
3
4
|
const webScrapeParams = z.object({
|
|
4
5
|
url: z.string().url().describe('URL to scrape'),
|
|
5
6
|
selector: z
|
|
@@ -188,18 +189,16 @@ export const webScrape = tool({
|
|
|
188
189
|
category: 'web',
|
|
189
190
|
tags: ['scrape', 'web', 'extract', 'html'],
|
|
190
191
|
sideEffects: ['network'],
|
|
191
|
-
execute: async ({ url, selector, format = 'text', maxLength = 50000, timeout = 30000, includeLinks = false, includeImages = false, }) => {
|
|
192
|
-
const
|
|
193
|
-
const timeoutId = setTimeout(() => controller.abort(), timeout);
|
|
192
|
+
execute: async ({ url, selector, format = 'text', maxLength = 50000, timeout = 30000, includeLinks = false, includeImages = false, }, context) => {
|
|
193
|
+
const abort = createLinkedAbortController(context?.signal, timeout);
|
|
194
194
|
try {
|
|
195
195
|
const response = await fetch(url, {
|
|
196
196
|
headers: {
|
|
197
197
|
'User-Agent': 'Mozilla/5.0 (compatible; CogitatorBot/1.0; +https://github.com/cogitator-ai/Cogitator-AI)',
|
|
198
198
|
Accept: 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
|
|
199
199
|
},
|
|
200
|
-
signal:
|
|
200
|
+
signal: abort.signal,
|
|
201
201
|
});
|
|
202
|
-
clearTimeout(timeoutId);
|
|
203
202
|
if (!response.ok) {
|
|
204
203
|
return { error: `HTTP ${response.status}: ${response.statusText}`, url };
|
|
205
204
|
}
|
|
@@ -248,13 +247,15 @@ export const webScrape = tool({
|
|
|
248
247
|
return result;
|
|
249
248
|
}
|
|
250
249
|
catch (err) {
|
|
251
|
-
clearTimeout(timeoutId);
|
|
252
250
|
const error = err;
|
|
253
251
|
if (error.name === 'AbortError') {
|
|
254
|
-
return { error:
|
|
252
|
+
return { error: getAbortErrorMessage('Request', abort, timeout), url };
|
|
255
253
|
}
|
|
256
254
|
return { error: error.message, url };
|
|
257
255
|
}
|
|
256
|
+
finally {
|
|
257
|
+
abort.cleanup();
|
|
258
|
+
}
|
|
258
259
|
},
|
|
259
260
|
});
|
|
260
261
|
//# sourceMappingURL=web-scrape.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-scrape.js","sourceRoot":"","sources":["../../src/tools/web-scrape.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"web-scrape.js","sourceRoot":"","sources":["../../src/tools/web-scrape.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-search.d.ts","sourceRoot":"","sources":["../../src/tools/web-search.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"web-search.d.ts","sourceRoot":"","sources":["../../src/tools/web-search.ts"],"names":[],"mappings":"AA6BA,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAyLD,eAAO,MAAM,SAAS;;;;;;;;;;;;;;EAuEpB,CAAC"}
|