@steipete/summarize 0.9.0 → 0.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +121 -0
- package/LICENSE +1 -1
- package/README.md +391 -183
- package/dist/cli.js +1 -1
- package/dist/esm/cache.js +134 -64
- package/dist/esm/cache.js.map +1 -1
- package/dist/esm/cli-main.js +27 -27
- package/dist/esm/cli-main.js.map +1 -1
- package/dist/esm/cli.js +2 -2
- package/dist/esm/cli.js.map +1 -1
- package/dist/esm/config.js +396 -126
- package/dist/esm/config.js.map +1 -1
- package/dist/esm/content/asset.js +53 -50
- package/dist/esm/content/asset.js.map +1 -1
- package/dist/esm/content/index.js +1 -1
- package/dist/esm/content/index.js.map +1 -1
- package/dist/esm/costs.js +1 -1
- package/dist/esm/costs.js.map +1 -1
- package/dist/esm/daemon/agent.js +548 -0
- package/dist/esm/daemon/agent.js.map +1 -0
- package/dist/esm/daemon/auto-mode.js +3 -3
- package/dist/esm/daemon/auto-mode.js.map +1 -1
- package/dist/esm/daemon/chat.js +88 -178
- package/dist/esm/daemon/chat.js.map +1 -1
- package/dist/esm/daemon/cli-entrypoint.js +72 -0
- package/dist/esm/daemon/cli-entrypoint.js.map +1 -0
- package/dist/esm/daemon/cli.js +91 -83
- package/dist/esm/daemon/cli.js.map +1 -1
- package/dist/esm/daemon/config.js +15 -15
- package/dist/esm/daemon/config.js.map +1 -1
- package/dist/esm/daemon/constants.js +6 -6
- package/dist/esm/daemon/constants.js.map +1 -1
- package/dist/esm/daemon/env-merge.js.map +1 -1
- package/dist/esm/daemon/env-snapshot.js +36 -28
- package/dist/esm/daemon/env-snapshot.js.map +1 -1
- package/dist/esm/daemon/flow-context.js +86 -32
- package/dist/esm/daemon/flow-context.js.map +1 -1
- package/dist/esm/daemon/launchd.js +119 -47
- package/dist/esm/daemon/launchd.js.map +1 -1
- package/dist/esm/daemon/meta.js +5 -5
- package/dist/esm/daemon/meta.js.map +1 -1
- package/dist/esm/daemon/models.js +54 -31
- package/dist/esm/daemon/models.js.map +1 -1
- package/dist/esm/daemon/process-registry.js +206 -0
- package/dist/esm/daemon/process-registry.js.map +1 -0
- package/dist/esm/daemon/schtasks.js +96 -32
- package/dist/esm/daemon/schtasks.js.map +1 -1
- package/dist/esm/daemon/server.js +832 -158
- package/dist/esm/daemon/server.js.map +1 -1
- package/dist/esm/daemon/summarize-progress.js +11 -11
- package/dist/esm/daemon/summarize-progress.js.map +1 -1
- package/dist/esm/daemon/summarize.js +61 -32
- package/dist/esm/daemon/summarize.js.map +1 -1
- package/dist/esm/daemon/systemd.js +96 -35
- package/dist/esm/daemon/systemd.js.map +1 -1
- package/dist/esm/firecrawl.js +12 -12
- package/dist/esm/firecrawl.js.map +1 -1
- package/dist/esm/flags.js +55 -31
- package/dist/esm/flags.js.map +1 -1
- package/dist/esm/index.js +3 -3
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/language.js +1 -1
- package/dist/esm/language.js.map +1 -1
- package/dist/esm/llm/cli.js +128 -64
- package/dist/esm/llm/cli.js.map +1 -1
- package/dist/esm/llm/errors.js +1 -1
- package/dist/esm/llm/errors.js.map +1 -1
- package/dist/esm/llm/generate-text.js +107 -98
- package/dist/esm/llm/generate-text.js.map +1 -1
- package/dist/esm/llm/google-models.js +17 -17
- package/dist/esm/llm/google-models.js.map +1 -1
- package/dist/esm/llm/html-to-markdown.js +3 -3
- package/dist/esm/llm/html-to-markdown.js.map +1 -1
- package/dist/esm/llm/model-id.js +38 -16
- package/dist/esm/llm/model-id.js.map +1 -1
- package/dist/esm/llm/prompt.js +5 -5
- package/dist/esm/llm/prompt.js.map +1 -1
- package/dist/esm/llm/providers/anthropic.js +33 -33
- package/dist/esm/llm/providers/anthropic.js.map +1 -1
- package/dist/esm/llm/providers/google.js +19 -19
- package/dist/esm/llm/providers/google.js.map +1 -1
- package/dist/esm/llm/providers/models.js +30 -30
- package/dist/esm/llm/providers/models.js.map +1 -1
- package/dist/esm/llm/providers/openai.js +36 -35
- package/dist/esm/llm/providers/openai.js.map +1 -1
- package/dist/esm/llm/providers/shared.js +8 -8
- package/dist/esm/llm/providers/shared.js.map +1 -1
- package/dist/esm/llm/transcript-to-markdown.js +9 -5
- package/dist/esm/llm/transcript-to-markdown.js.map +1 -1
- package/dist/esm/llm/usage.js +18 -18
- package/dist/esm/llm/usage.js.map +1 -1
- package/dist/esm/logging/daemon.js +21 -21
- package/dist/esm/logging/daemon.js.map +1 -1
- package/dist/esm/logging/ring-file.js +5 -5
- package/dist/esm/logging/ring-file.js.map +1 -1
- package/dist/esm/markitdown.js +21 -19
- package/dist/esm/markitdown.js.map +1 -1
- package/dist/esm/media-cache.js +251 -0
- package/dist/esm/media-cache.js.map +1 -0
- package/dist/esm/model-auto.js +175 -106
- package/dist/esm/model-auto.js.map +1 -1
- package/dist/esm/model-spec.js +52 -42
- package/dist/esm/model-spec.js.map +1 -1
- package/dist/esm/pricing/litellm.js +4 -4
- package/dist/esm/pricing/litellm.js.map +1 -1
- package/dist/esm/processes.js +2 -0
- package/dist/esm/processes.js.map +1 -0
- package/dist/esm/prompts/index.js +1 -1
- package/dist/esm/prompts/index.js.map +1 -1
- package/dist/esm/refresh-free.js +81 -81
- package/dist/esm/refresh-free.js.map +1 -1
- package/dist/esm/run/attachments.js +47 -44
- package/dist/esm/run/attachments.js.map +1 -1
- package/dist/esm/run/bird.js +125 -12
- package/dist/esm/run/bird.js.map +1 -1
- package/dist/esm/run/cache-state.js +7 -7
- package/dist/esm/run/cache-state.js.map +1 -1
- package/dist/esm/run/cli-fallback-state.js +45 -0
- package/dist/esm/run/cli-fallback-state.js.map +1 -0
- package/dist/esm/run/cli-preflight.js +40 -22
- package/dist/esm/run/cli-preflight.js.map +1 -1
- package/dist/esm/run/constants.js +12 -12
- package/dist/esm/run/constants.js.map +1 -1
- package/dist/esm/run/cookies/twitter.js +47 -47
- package/dist/esm/run/cookies/twitter.js.map +1 -1
- package/dist/esm/run/env.js +21 -15
- package/dist/esm/run/env.js.map +1 -1
- package/dist/esm/run/fetch-with-timeout.js +4 -4
- package/dist/esm/run/fetch-with-timeout.js.map +1 -1
- package/dist/esm/run/finish-line.js +78 -71
- package/dist/esm/run/finish-line.js.map +1 -1
- package/dist/esm/run/flows/asset/extract.js +70 -0
- package/dist/esm/run/flows/asset/extract.js.map +1 -0
- package/dist/esm/run/flows/asset/input.js +202 -37
- package/dist/esm/run/flows/asset/input.js.map +1 -1
- package/dist/esm/run/flows/asset/media-policy.js +3 -0
- package/dist/esm/run/flows/asset/media-policy.js.map +1 -0
- package/dist/esm/run/flows/asset/media.js +233 -0
- package/dist/esm/run/flows/asset/media.js.map +1 -0
- package/dist/esm/run/flows/asset/output.js +98 -0
- package/dist/esm/run/flows/asset/output.js.map +1 -0
- package/dist/esm/run/flows/asset/preprocess.js +79 -44
- package/dist/esm/run/flows/asset/preprocess.js.map +1 -1
- package/dist/esm/run/flows/asset/summary.js +306 -89
- package/dist/esm/run/flows/asset/summary.js.map +1 -1
- package/dist/esm/run/flows/url/extract.js +31 -31
- package/dist/esm/run/flows/url/extract.js.map +1 -1
- package/dist/esm/run/flows/url/flow.js +388 -82
- package/dist/esm/run/flows/url/flow.js.map +1 -1
- package/dist/esm/run/flows/url/markdown.js +61 -56
- package/dist/esm/run/flows/url/markdown.js.map +1 -1
- package/dist/esm/run/flows/url/slides-output.js +487 -0
- package/dist/esm/run/flows/url/slides-output.js.map +1 -0
- package/dist/esm/run/flows/url/slides-text.js +628 -0
- package/dist/esm/run/flows/url/slides-text.js.map +1 -0
- package/dist/esm/run/flows/url/summary.js +493 -152
- package/dist/esm/run/flows/url/summary.js.map +1 -1
- package/dist/esm/run/format.js +10 -10
- package/dist/esm/run/format.js.map +1 -1
- package/dist/esm/run/help.js +179 -84
- package/dist/esm/run/help.js.map +1 -1
- package/dist/esm/run/logging.js +20 -12
- package/dist/esm/run/logging.js.map +1 -1
- package/dist/esm/run/markdown.js +12 -12
- package/dist/esm/run/markdown.js.map +1 -1
- package/dist/esm/run/media-cache-state.js +33 -0
- package/dist/esm/run/media-cache-state.js.map +1 -0
- package/dist/esm/run/model-attempts.js.map +1 -1
- package/dist/esm/run/openrouter.js +11 -11
- package/dist/esm/run/openrouter.js.map +1 -1
- package/dist/esm/run/progress.js +19 -1
- package/dist/esm/run/progress.js.map +1 -1
- package/dist/esm/run/run-config.js +16 -16
- package/dist/esm/run/run-config.js.map +1 -1
- package/dist/esm/run/run-context.js +2 -2
- package/dist/esm/run/run-context.js.map +1 -1
- package/dist/esm/run/run-env.js +55 -54
- package/dist/esm/run/run-env.js.map +1 -1
- package/dist/esm/run/run-input.js +3 -3
- package/dist/esm/run/run-input.js.map +1 -1
- package/dist/esm/run/run-metrics.js +16 -16
- package/dist/esm/run/run-metrics.js.map +1 -1
- package/dist/esm/run/run-models.js +28 -23
- package/dist/esm/run/run-models.js.map +1 -1
- package/dist/esm/run/run-output.js +3 -3
- package/dist/esm/run/run-output.js.map +1 -1
- package/dist/esm/run/run-settings.js +108 -21
- package/dist/esm/run/run-settings.js.map +1 -1
- package/dist/esm/run/run-stream.js +4 -4
- package/dist/esm/run/run-stream.js.map +1 -1
- package/dist/esm/run/runner.js +327 -100
- package/dist/esm/run/runner.js.map +1 -1
- package/dist/esm/run/slides-cli.js +226 -0
- package/dist/esm/run/slides-cli.js.map +1 -0
- package/dist/esm/run/slides-render.js +163 -0
- package/dist/esm/run/slides-render.js.map +1 -0
- package/dist/esm/run/stdin-temp-file.js +77 -0
- package/dist/esm/run/stdin-temp-file.js.map +1 -0
- package/dist/esm/run/stream-output.js +17 -10
- package/dist/esm/run/stream-output.js.map +1 -1
- package/dist/esm/run/streaming.js +16 -16
- package/dist/esm/run/streaming.js.map +1 -1
- package/dist/esm/run/summary-engine.js +89 -57
- package/dist/esm/run/summary-engine.js.map +1 -1
- package/dist/esm/run/summary-llm.js +3 -3
- package/dist/esm/run/summary-llm.js.map +1 -1
- package/dist/esm/run/terminal.js +4 -4
- package/dist/esm/run/terminal.js.map +1 -1
- package/dist/esm/run/tips.js +2 -2
- package/dist/esm/run/tips.js.map +1 -1
- package/dist/esm/run/transcriber-cli.js +148 -0
- package/dist/esm/run/transcriber-cli.js.map +1 -0
- package/dist/esm/run.js +1 -1
- package/dist/esm/run.js.map +1 -1
- package/dist/esm/shared/contracts.js +1 -1
- package/dist/esm/shared/contracts.js.map +1 -1
- package/dist/esm/shared/sse-events.js +16 -12
- package/dist/esm/shared/sse-events.js.map +1 -1
- package/dist/esm/shared/streaming-merge.js +3 -3
- package/dist/esm/shared/streaming-merge.js.map +1 -1
- package/dist/esm/slides/extract.js +1951 -0
- package/dist/esm/slides/extract.js.map +1 -0
- package/dist/esm/slides/index.js +4 -0
- package/dist/esm/slides/index.js.map +1 -0
- package/dist/esm/slides/settings.js +73 -0
- package/dist/esm/slides/settings.js.map +1 -0
- package/dist/esm/slides/store.js +111 -0
- package/dist/esm/slides/store.js.map +1 -0
- package/dist/esm/slides/types.js +2 -0
- package/dist/esm/slides/types.js.map +1 -0
- package/dist/esm/tty/format.js +13 -13
- package/dist/esm/tty/format.js.map +1 -1
- package/dist/esm/tty/osc-progress.js +22 -2
- package/dist/esm/tty/osc-progress.js.map +1 -1
- package/dist/esm/tty/progress/fetch-html.js +20 -16
- package/dist/esm/tty/progress/fetch-html.js.map +1 -1
- package/dist/esm/tty/progress/transcript.js +127 -68
- package/dist/esm/tty/progress/transcript.js.map +1 -1
- package/dist/esm/tty/spinner.js +21 -10
- package/dist/esm/tty/spinner.js.map +1 -1
- package/dist/esm/tty/theme.js +189 -0
- package/dist/esm/tty/theme.js.map +1 -0
- package/dist/esm/tty/website-progress.js +38 -34
- package/dist/esm/tty/website-progress.js.map +1 -1
- package/dist/esm/version.js +29 -29
- package/dist/esm/version.js.map +1 -1
- package/dist/types/cache.d.ts +19 -7
- package/dist/types/config.d.ts +71 -6
- package/dist/types/content/asset.d.ts +8 -6
- package/dist/types/content/index.d.ts +1 -1
- package/dist/types/costs.d.ts +3 -3
- package/dist/types/daemon/agent.d.ts +25 -0
- package/dist/types/daemon/auto-mode.d.ts +3 -3
- package/dist/types/daemon/chat.d.ts +10 -18
- package/dist/types/daemon/cli-entrypoint.d.ts +2 -0
- package/dist/types/daemon/config.d.ts +2 -2
- package/dist/types/daemon/env-merge.d.ts +1 -1
- package/dist/types/daemon/env-snapshot.d.ts +1 -1
- package/dist/types/daemon/flow-context.d.ts +24 -4
- package/dist/types/daemon/launchd.d.ts +12 -0
- package/dist/types/daemon/models.d.ts +6 -2
- package/dist/types/daemon/process-registry.d.ts +73 -0
- package/dist/types/daemon/schtasks.d.ts +4 -0
- package/dist/types/daemon/server.d.ts +2 -2
- package/dist/types/daemon/summarize-progress.d.ts +1 -1
- package/dist/types/daemon/summarize.d.ts +38 -7
- package/dist/types/daemon/systemd.d.ts +4 -0
- package/dist/types/firecrawl.d.ts +1 -1
- package/dist/types/flags.d.ts +12 -11
- package/dist/types/index.d.ts +4 -4
- package/dist/types/language.d.ts +1 -1
- package/dist/types/llm/attachments.d.ts +1 -1
- package/dist/types/llm/cli.d.ts +3 -3
- package/dist/types/llm/generate-text.d.ts +7 -7
- package/dist/types/llm/html-to-markdown.d.ts +3 -3
- package/dist/types/llm/model-id.d.ts +1 -1
- package/dist/types/llm/prompt.d.ts +2 -2
- package/dist/types/llm/providers/anthropic.d.ts +3 -3
- package/dist/types/llm/providers/google.d.ts +3 -3
- package/dist/types/llm/providers/models.d.ts +2 -2
- package/dist/types/llm/providers/openai.d.ts +4 -4
- package/dist/types/llm/providers/shared.d.ts +2 -2
- package/dist/types/llm/transcript-to-markdown.d.ts +4 -2
- package/dist/types/llm/usage.d.ts +1 -1
- package/dist/types/logging/daemon.d.ts +4 -4
- package/dist/types/markitdown.d.ts +1 -1
- package/dist/types/media-cache.d.ts +22 -0
- package/dist/types/model-auto.d.ts +14 -4
- package/dist/types/model-spec.d.ts +10 -10
- package/dist/types/pricing/litellm.d.ts +1 -1
- package/dist/types/processes.d.ts +1 -0
- package/dist/types/prompts/index.d.ts +1 -1
- package/dist/types/run/attachments.d.ts +7 -7
- package/dist/types/run/bird.d.ts +7 -0
- package/dist/types/run/cache-state.d.ts +2 -2
- package/dist/types/run/cli-fallback-state.d.ts +6 -0
- package/dist/types/run/constants.d.ts +1 -1
- package/dist/types/run/cookies/twitter.d.ts +1 -1
- package/dist/types/run/env.d.ts +1 -1
- package/dist/types/run/finish-line.d.ts +7 -6
- package/dist/types/run/flows/asset/extract.d.ts +18 -0
- package/dist/types/run/flows/asset/input.d.ts +19 -3
- package/dist/types/run/flows/asset/media-policy.d.ts +2 -0
- package/dist/types/run/flows/asset/media.d.ts +21 -0
- package/dist/types/run/flows/asset/output.d.ts +42 -0
- package/dist/types/run/flows/asset/preprocess.d.ts +23 -17
- package/dist/types/run/flows/asset/summary.d.ts +24 -16
- package/dist/types/run/flows/url/extract.d.ts +3 -2
- package/dist/types/run/flows/url/flow.d.ts +1 -1
- package/dist/types/run/flows/url/markdown.d.ts +6 -6
- package/dist/types/run/flows/url/slides-output.d.ts +66 -0
- package/dist/types/run/flows/url/slides-text.d.ts +87 -0
- package/dist/types/run/flows/url/summary.d.ts +18 -10
- package/dist/types/run/flows/url/types.d.ts +52 -21
- package/dist/types/run/format.d.ts +3 -3
- package/dist/types/run/help.d.ts +4 -1
- package/dist/types/run/logging.d.ts +3 -2
- package/dist/types/run/media-cache-state.d.ts +7 -0
- package/dist/types/run/model-attempts.d.ts +1 -1
- package/dist/types/run/progress.d.ts +2 -1
- package/dist/types/run/run-config.d.ts +4 -4
- package/dist/types/run/run-context.d.ts +3 -1
- package/dist/types/run/run-env.d.ts +3 -1
- package/dist/types/run/run-input.d.ts +2 -2
- package/dist/types/run/run-metrics.d.ts +3 -3
- package/dist/types/run/run-models.d.ts +3 -2
- package/dist/types/run/run-output.d.ts +1 -1
- package/dist/types/run/run-settings.d.ts +20 -5
- package/dist/types/run/run-stream.d.ts +2 -2
- package/dist/types/run/runner.d.ts +3 -2
- package/dist/types/run/slides-cli.d.ts +9 -0
- package/dist/types/run/slides-render.d.ts +30 -0
- package/dist/types/run/stdin-temp-file.d.ts +9 -0
- package/dist/types/run/stream-output.d.ts +3 -2
- package/dist/types/run/streaming.d.ts +4 -4
- package/dist/types/run/summary-engine.d.ts +22 -12
- package/dist/types/run/summary-llm.d.ts +5 -5
- package/dist/types/run/transcriber-cli.d.ts +8 -0
- package/dist/types/run/types.d.ts +4 -4
- package/dist/types/run.d.ts +1 -1
- package/dist/types/shared/contracts.d.ts +2 -2
- package/dist/types/shared/sse-events.d.ts +26 -6
- package/dist/types/slides/extract.d.ts +43 -0
- package/dist/types/slides/index.d.ts +5 -0
- package/dist/types/slides/settings.d.ts +20 -0
- package/dist/types/slides/store.d.ts +15 -0
- package/dist/types/slides/types.d.ts +40 -0
- package/dist/types/tty/osc-progress.d.ts +5 -5
- package/dist/types/tty/progress/fetch-html.d.ts +5 -3
- package/dist/types/tty/progress/transcript.d.ts +5 -3
- package/dist/types/tty/spinner.d.ts +3 -1
- package/dist/types/tty/theme.d.ts +44 -0
- package/dist/types/tty/website-progress.d.ts +5 -3
- package/dist/types/version.d.ts +1 -1
- package/docs/README.md +1 -1
- package/docs/_config.yml +26 -0
- package/docs/_layouts/default.html +60 -0
- package/docs/agent.md +367 -0
- package/docs/assets/site.css +748 -0
- package/docs/assets/site.js +72 -0
- package/docs/assets/summarize-cli.png +0 -0
- package/docs/assets/summarize-extension.png +0 -0
- package/docs/assets/youtube-slides.png +0 -0
- package/docs/cache.md +29 -3
- package/docs/chrome-extension.md +72 -16
- package/docs/cli.md +59 -13
- package/docs/config.md +109 -12
- package/docs/extract-only.md +10 -0
- package/docs/index.html +224 -0
- package/docs/index.md +25 -0
- package/docs/llm.md +18 -5
- package/docs/manual-tests.md +2 -0
- package/docs/media.md +6 -2
- package/docs/model-auto.md +3 -2
- package/docs/nvidia-onnx-transcription.md +55 -0
- package/docs/openai.md +1 -1
- package/docs/releasing.md +3 -0
- package/docs/site/404.html +4 -1
- package/docs/site/assets/site.css +399 -228
- package/docs/site/assets/site.js +46 -46
- package/docs/site/assets/summarize-cli.png +0 -0
- package/docs/site/assets/summarize-extension.png +0 -0
- package/docs/site/docs/chrome-extension.html +101 -0
- package/docs/site/docs/config.html +30 -8
- package/docs/site/docs/extract-only.html +17 -4
- package/docs/site/docs/firecrawl.html +13 -3
- package/docs/site/docs/index.html +40 -6
- package/docs/site/docs/llm.html +20 -5
- package/docs/site/docs/openai.html +19 -5
- package/docs/site/docs/website.html +30 -9
- package/docs/site/docs/youtube.html +13 -3
- package/docs/site/index.html +168 -85
- package/docs/slides.md +82 -0
- package/docs/smoketest.md +29 -20
- package/docs/timestamps.md +124 -0
- package/docs/website.md +13 -0
- package/docs/youtube.md +20 -0
- package/package.json +57 -48
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
function normalizeModelId(id) {
|
|
2
2
|
const trimmed = id.trim();
|
|
3
|
-
if (trimmed.startsWith(
|
|
4
|
-
return trimmed.slice(
|
|
3
|
+
if (trimmed.startsWith("models/"))
|
|
4
|
+
return trimmed.slice("models/".length);
|
|
5
5
|
return trimmed;
|
|
6
6
|
}
|
|
7
7
|
function isProbablyUnstableGoogleModelId(modelId) {
|
|
8
8
|
const id = modelId.toLowerCase();
|
|
9
|
-
if (id.includes(
|
|
9
|
+
if (id.includes("preview"))
|
|
10
10
|
return true;
|
|
11
|
-
if (id.includes(
|
|
11
|
+
if (id.includes("exp"))
|
|
12
12
|
return true;
|
|
13
|
-
if (id.includes(
|
|
13
|
+
if (id.includes("alpha"))
|
|
14
14
|
return true;
|
|
15
|
-
if (id.includes(
|
|
15
|
+
if (id.includes("beta"))
|
|
16
16
|
return true;
|
|
17
|
-
if (id.startsWith(
|
|
17
|
+
if (id.startsWith("gemini-3"))
|
|
18
18
|
return true;
|
|
19
19
|
return false;
|
|
20
20
|
}
|
|
@@ -28,15 +28,15 @@ async function listGoogleModels({ apiKey, fetchImpl, timeoutMs, }) {
|
|
|
28
28
|
try {
|
|
29
29
|
const res = await fetchImpl(`https://generativelanguage.googleapis.com/v1beta/models?key=${encodeURIComponent(apiKey)}`, { signal });
|
|
30
30
|
if (!res.ok) {
|
|
31
|
-
let bodyText =
|
|
31
|
+
let bodyText = "";
|
|
32
32
|
try {
|
|
33
33
|
bodyText = await res.text();
|
|
34
34
|
}
|
|
35
35
|
catch {
|
|
36
|
-
bodyText =
|
|
36
|
+
bodyText = "";
|
|
37
37
|
}
|
|
38
38
|
const snippet = bodyText.trim().slice(0, 200);
|
|
39
|
-
const suffix = snippet.length > 0 ? `: ${snippet}` :
|
|
39
|
+
const suffix = snippet.length > 0 ? `: ${snippet}` : "";
|
|
40
40
|
throw new Error(`Google ListModels failed (${res.status} ${res.statusText})${suffix}`);
|
|
41
41
|
}
|
|
42
42
|
const json = (await res.json());
|
|
@@ -54,9 +54,9 @@ function pickSuggestions(models, limit) {
|
|
|
54
54
|
.sort((a, b) => {
|
|
55
55
|
const aa = prefer(a);
|
|
56
56
|
const bb = prefer(b);
|
|
57
|
-
const score = (id) => (id.includes(
|
|
58
|
-
(id.includes(
|
|
59
|
-
(id.includes(
|
|
57
|
+
const score = (id) => (id.includes("flash") ? 0 : 10) +
|
|
58
|
+
(id.includes("3.0") || id.includes("3") ? 0 : 5) +
|
|
59
|
+
(id.includes("preview") ? 2 : 0);
|
|
60
60
|
return score(aa) - score(bb);
|
|
61
61
|
});
|
|
62
62
|
return ids.slice(0, Math.max(1, limit));
|
|
@@ -81,8 +81,8 @@ export async function resolveGoogleModelForUsage({ requestedModelId, apiKey, fet
|
|
|
81
81
|
byId.set(normalizeModelId(model.name), model);
|
|
82
82
|
}
|
|
83
83
|
const exact = byId.get(requested);
|
|
84
|
-
const strippedPreview = requested.endsWith(
|
|
85
|
-
? requested.slice(0, -
|
|
84
|
+
const strippedPreview = requested.endsWith("-preview")
|
|
85
|
+
? requested.slice(0, -"-preview".length)
|
|
86
86
|
: null;
|
|
87
87
|
const noPreview = strippedPreview ? byId.get(strippedPreview) : null;
|
|
88
88
|
const candidate = exact ?? noPreview;
|
|
@@ -105,8 +105,8 @@ export async function resolveGoogleModelForUsage({ requestedModelId, apiKey, fet
|
|
|
105
105
|
}
|
|
106
106
|
const suggestions = pickSuggestions(models, 5);
|
|
107
107
|
const hint = suggestions.length > 0
|
|
108
|
-
? `Try one of: ${suggestions.map((id) => `google/${id}`).join(
|
|
109
|
-
:
|
|
108
|
+
? `Try one of: ${suggestions.map((id) => `google/${id}`).join(", ")}`
|
|
109
|
+
: "Run ListModels to see available models for your key.";
|
|
110
110
|
throw new Error(`Google model ${requestedModelId} is not available via the Gemini API (v1beta) for this API key. ${hint}`);
|
|
111
111
|
}
|
|
112
112
|
//# sourceMappingURL=google-models.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google-models.js","sourceRoot":"","sources":["../../../src/llm/google-models.ts"],"names":[],"mappings":"AAUA,SAAS,gBAAgB,CAAC,EAAU;IAClC,MAAM,OAAO,GAAG,EAAE,CAAC,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"google-models.js","sourceRoot":"","sources":["../../../src/llm/google-models.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { generateTextWithModelId } from
|
|
1
|
+
import { generateTextWithModelId } from "./generate-text.js";
|
|
2
2
|
const MAX_HTML_INPUT_CHARACTERS = 200_000;
|
|
3
3
|
function buildHtmlToMarkdownPrompt({ url, title, siteName, html, }) {
|
|
4
4
|
const system = `You convert HTML into clean GitHub-Flavored Markdown.
|
|
@@ -10,8 +10,8 @@ Rules:
|
|
|
10
10
|
- Remove navigation, cookie banners, footers, and unrelated page chrome.
|
|
11
11
|
- Do not invent content.`;
|
|
12
12
|
const prompt = `URL: ${url}
|
|
13
|
-
Site: ${siteName ??
|
|
14
|
-
Title: ${title ??
|
|
13
|
+
Site: ${siteName ?? "unknown"}
|
|
14
|
+
Title: ${title ?? "unknown"}
|
|
15
15
|
|
|
16
16
|
HTML:
|
|
17
17
|
"""
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"html-to-markdown.js","sourceRoot":"","sources":["../../../src/llm/html-to-markdown.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,
|
|
1
|
+
{"version":3,"file":"html-to-markdown.js","sourceRoot":"","sources":["../../../src/llm/html-to-markdown.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,MAAM,yBAAyB,GAAG,OAAO,CAAC;AAE1C,SAAS,yBAAyB,CAAC,EACjC,GAAG,EACH,KAAK,EACL,QAAQ,EACR,IAAI,GAML;IACC,MAAM,MAAM,GAAG;;;;;;;yBAOQ,CAAC;IAExB,MAAM,MAAM,GAAG,QAAQ,GAAG;QACpB,QAAQ,IAAI,SAAS;SACpB,KAAK,IAAI,SAAS;;;;EAIzB,IAAI;;CAEL,CAAC;IAEA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,EAC5C,OAAO,EACP,eAAe,EACf,SAAS,EACT,YAAY,EACZ,YAAY,EACZ,qBAAqB,EACrB,wBAAwB,EACxB,qBAAqB,EACrB,kBAAkB,EAClB,eAAe,EACf,gBAAgB,EAChB,SAAS,EACT,oBAAoB,EACpB,OAAO,GAAG,CAAC,EACX,OAAO,EACP,OAAO,GA2BR;IACC,OAAO,KAAK,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;QACzD,MAAM,WAAW,GACf,IAAI,CAAC,MAAM,GAAG,yBAAyB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,yBAAyB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC5F,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,yBAAyB,CAAC;YACnD,GAAG;YACH,KAAK;YACL,QAAQ;YACR,IAAI,EAAE,WAAW;SAClB,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC;YAC3C,OAAO;YACP,OAAO,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE;YACrF,eAAe;YACf,qBAAqB;YACrB,wBAAwB;YACxB,qBAAqB;YACrB,kBAAkB;YAClB,oBAAoB;YACpB,MAAM,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE;YACpC,SAAS;YACT,SAAS;YACT,OAAO;YACP,OAAO;SACR,CAAC,CAAC;QACH,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,gBAAgB,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;QAC9F,OAAO,MAAM,CAAC,IAAI,CAAC;IACrB,CAAC,CAAC;AACJ,CAAC"}
|
package/dist/esm/llm/model-id.js
CHANGED
|
@@ -1,27 +1,49 @@
|
|
|
1
|
-
const PROVIDERS = [
|
|
1
|
+
const PROVIDERS = ["xai", "openai", "google", "anthropic", "zai"];
|
|
2
|
+
/**
|
|
3
|
+
* Anthropic short model aliases that are NOT valid API model identifiers.
|
|
4
|
+
*
|
|
5
|
+
* The Anthropic Messages API accepts dated ids (e.g. `claude-sonnet-4-20250514`)
|
|
6
|
+
* and versioned aliases (e.g. `claude-sonnet-4-0`) but does NOT accept bare
|
|
7
|
+
* generation names like `claude-sonnet-4`. Users naturally try the shortest
|
|
8
|
+
* form, so we map them to the `-0` versioned alias which always points to the
|
|
9
|
+
* latest point-release for that generation.
|
|
10
|
+
*/
|
|
11
|
+
const ANTHROPIC_MODEL_ALIASES = {
|
|
12
|
+
"claude-sonnet-4": "claude-sonnet-4-0",
|
|
13
|
+
"claude-opus-4": "claude-opus-4-0",
|
|
14
|
+
};
|
|
2
15
|
export function normalizeGatewayStyleModelId(raw) {
|
|
3
16
|
const trimmed = raw.trim();
|
|
4
17
|
if (trimmed.length === 0) {
|
|
5
|
-
throw new Error(
|
|
18
|
+
throw new Error("Missing model id");
|
|
6
19
|
}
|
|
7
20
|
const normalized = trimmed.toLowerCase();
|
|
8
21
|
// Common historical alias (used in prompts/docs earlier)
|
|
9
|
-
if (normalized ===
|
|
10
|
-
return
|
|
11
|
-
if (normalized ===
|
|
12
|
-
return
|
|
13
|
-
if (normalized ===
|
|
14
|
-
return
|
|
15
|
-
if (normalized ===
|
|
16
|
-
return
|
|
17
|
-
|
|
22
|
+
if (normalized === "grok-4-1-fast-non-reasoning")
|
|
23
|
+
return "xai/grok-4-fast-non-reasoning";
|
|
24
|
+
if (normalized === "grok-4.1-fast-non-reasoning")
|
|
25
|
+
return "xai/grok-4-fast-non-reasoning";
|
|
26
|
+
if (normalized === "xai/grok-4-1-fast-non-reasoning")
|
|
27
|
+
return "xai/grok-4-fast-non-reasoning";
|
|
28
|
+
if (normalized === "xai/grok-4.1-fast-non-reasoning")
|
|
29
|
+
return "xai/grok-4-fast-non-reasoning";
|
|
30
|
+
// Anthropic short aliases → versioned alias (e.g. claude-sonnet-4 → claude-sonnet-4-0)
|
|
31
|
+
const anthropicAlias = ANTHROPIC_MODEL_ALIASES[normalized];
|
|
32
|
+
if (anthropicAlias)
|
|
33
|
+
return `anthropic/${anthropicAlias}`;
|
|
34
|
+
const anthropicPrefixed = normalized.startsWith("anthropic/")
|
|
35
|
+
? ANTHROPIC_MODEL_ALIASES[normalized.slice("anthropic/".length)]
|
|
36
|
+
: null;
|
|
37
|
+
if (anthropicPrefixed)
|
|
38
|
+
return `anthropic/${anthropicPrefixed}`;
|
|
39
|
+
const slash = normalized.indexOf("/");
|
|
18
40
|
if (slash === -1) {
|
|
19
41
|
// Best-effort inference for backwards-compat CLI usage.
|
|
20
|
-
if (normalized.startsWith(
|
|
42
|
+
if (normalized.startsWith("grok-"))
|
|
21
43
|
return `xai/${normalized}`;
|
|
22
|
-
if (normalized.startsWith(
|
|
44
|
+
if (normalized.startsWith("gemini-"))
|
|
23
45
|
return `google/${normalized}`;
|
|
24
|
-
if (normalized.startsWith(
|
|
46
|
+
if (normalized.startsWith("claude-"))
|
|
25
47
|
return `anthropic/${normalized}`;
|
|
26
48
|
return `openai/${normalized}`;
|
|
27
49
|
}
|
|
@@ -31,13 +53,13 @@ export function normalizeGatewayStyleModelId(raw) {
|
|
|
31
53
|
throw new Error(`Unsupported model provider "${provider}". Use xai/..., openai/..., google/..., anthropic/..., or zai/...`);
|
|
32
54
|
}
|
|
33
55
|
if (model.trim().length === 0) {
|
|
34
|
-
throw new Error(
|
|
56
|
+
throw new Error("Missing model id after provider prefix");
|
|
35
57
|
}
|
|
36
58
|
return `${provider}/${model}`;
|
|
37
59
|
}
|
|
38
60
|
export function parseGatewayStyleModelId(raw) {
|
|
39
61
|
const canonical = normalizeGatewayStyleModelId(raw);
|
|
40
|
-
const slash = canonical.indexOf(
|
|
62
|
+
const slash = canonical.indexOf("/");
|
|
41
63
|
const provider = canonical.slice(0, slash);
|
|
42
64
|
const model = canonical.slice(slash + 1);
|
|
43
65
|
return { provider, model, canonical };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-id.js","sourceRoot":"","sources":["../../../src/llm/model-id.ts"],"names":[],"mappings":"AAcA,MAAM,SAAS,GAAkB,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"model-id.js","sourceRoot":"","sources":["../../../src/llm/model-id.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/llm/prompt.js
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
export function userTextMessage(text, timestamp = Date.now()) {
|
|
2
|
-
return { role:
|
|
2
|
+
return { role: "user", content: text, timestamp };
|
|
3
3
|
}
|
|
4
4
|
function bytesToBase64(bytes) {
|
|
5
|
-
return Buffer.from(bytes).toString(
|
|
5
|
+
return Buffer.from(bytes).toString("base64");
|
|
6
6
|
}
|
|
7
7
|
export function userTextAndImageMessage({ text, imageBytes, mimeType, timestamp = Date.now(), }) {
|
|
8
8
|
const parts = [
|
|
9
|
-
{ type:
|
|
10
|
-
{ type:
|
|
9
|
+
{ type: "text", text },
|
|
10
|
+
{ type: "image", data: bytesToBase64(imageBytes), mimeType },
|
|
11
11
|
];
|
|
12
|
-
return { role:
|
|
12
|
+
return { role: "user", content: parts, timestamp };
|
|
13
13
|
}
|
|
14
14
|
//# sourceMappingURL=prompt.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../src/llm/prompt.ts"],"names":[],"mappings":"AASA,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE;IAClE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../src/llm/prompt.ts"],"names":[],"mappings":"AASA,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE;IAClE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;AACpD,CAAC;AAED,SAAS,aAAa,CAAC,KAAiB;IACtC,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,EACtC,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,GAMvB;IACC,MAAM,KAAK,GAAsC;QAC/C,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;QACtB,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE;KAC7D,CAAC;IACF,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;AACrD,CAAC"}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
|
-
import { completeSimple } from
|
|
2
|
-
import { normalizeAnthropicUsage, normalizeTokenUsage } from
|
|
3
|
-
import { resolveAnthropicModel } from
|
|
4
|
-
import { bytesToBase64, extractText, resolveBaseUrlOverride } from
|
|
1
|
+
import { completeSimple } from "@mariozechner/pi-ai";
|
|
2
|
+
import { normalizeAnthropicUsage, normalizeTokenUsage } from "../usage.js";
|
|
3
|
+
import { resolveAnthropicModel } from "./models.js";
|
|
4
|
+
import { bytesToBase64, extractText, resolveBaseUrlOverride } from "./shared.js";
|
|
5
5
|
function parseAnthropicErrorPayload(responseBody) {
|
|
6
6
|
try {
|
|
7
7
|
const parsed = JSON.parse(responseBody);
|
|
8
|
-
if (parsed?.type !==
|
|
8
|
+
if (parsed?.type !== "error")
|
|
9
9
|
return null;
|
|
10
10
|
const error = parsed.error;
|
|
11
|
-
if (!error || typeof error !==
|
|
11
|
+
if (!error || typeof error !== "object")
|
|
12
12
|
return null;
|
|
13
|
-
const errorType = typeof error.type ===
|
|
14
|
-
const errorMessage = typeof error.message ===
|
|
13
|
+
const errorType = typeof error.type === "string" ? error.type : null;
|
|
14
|
+
const errorMessage = typeof error.message === "string" ? error.message : null;
|
|
15
15
|
if (!errorType || !errorMessage)
|
|
16
16
|
return null;
|
|
17
17
|
return { type: errorType, message: errorMessage };
|
|
@@ -21,24 +21,24 @@ function parseAnthropicErrorPayload(responseBody) {
|
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
export function normalizeAnthropicModelAccessError(error, modelId) {
|
|
24
|
-
if (!error || typeof error !==
|
|
24
|
+
if (!error || typeof error !== "object")
|
|
25
25
|
return null;
|
|
26
26
|
const maybe = error;
|
|
27
|
-
const statusCode = typeof maybe.statusCode ===
|
|
28
|
-
const responseBody = typeof maybe.responseBody ===
|
|
27
|
+
const statusCode = typeof maybe.statusCode === "number" ? maybe.statusCode : null;
|
|
28
|
+
const responseBody = typeof maybe.responseBody === "string" ? maybe.responseBody : null;
|
|
29
29
|
const payload = responseBody ? parseAnthropicErrorPayload(responseBody) : null;
|
|
30
30
|
const payloadType = payload?.type ?? null;
|
|
31
31
|
const payloadMessage = payload?.message ?? null;
|
|
32
|
-
const message = typeof maybe.message ===
|
|
32
|
+
const message = typeof maybe.message === "string" ? maybe.message : "";
|
|
33
33
|
const combinedMessage = (payloadMessage ?? message).trim();
|
|
34
34
|
const hasModelMessage = /^model:\s*\S+/i.test(combinedMessage);
|
|
35
35
|
const isAccessStatus = statusCode === 401 || statusCode === 403 || statusCode === 404;
|
|
36
|
-
const isAccessType = payloadType ===
|
|
37
|
-
payloadType ===
|
|
38
|
-
payloadType ===
|
|
36
|
+
const isAccessType = payloadType === "not_found_error" ||
|
|
37
|
+
payloadType === "permission_error" ||
|
|
38
|
+
payloadType === "authentication_error";
|
|
39
39
|
if (!hasModelMessage && !isAccessStatus && !isAccessType)
|
|
40
40
|
return null;
|
|
41
|
-
const modelLabel = hasModelMessage ? combinedMessage.replace(/^model:\s*/i,
|
|
41
|
+
const modelLabel = hasModelMessage ? combinedMessage.replace(/^model:\s*/i, "").trim() : modelId;
|
|
42
42
|
const hint = `Anthropic API rejected model "${modelLabel}". Your ANTHROPIC_API_KEY likely lacks access to this model or it is unavailable for your account. Try another anthropic/... model or request access.`;
|
|
43
43
|
return new Error(hint, { cause: error instanceof Error ? error : undefined });
|
|
44
44
|
}
|
|
@@ -49,8 +49,8 @@ export async function completeAnthropicText({ modelId, apiKey, context, temperat
|
|
|
49
49
|
anthropicBaseUrlOverride,
|
|
50
50
|
});
|
|
51
51
|
const result = await completeSimple(model, context, {
|
|
52
|
-
...(typeof temperature ===
|
|
53
|
-
...(typeof maxOutputTokens ===
|
|
52
|
+
...(typeof temperature === "number" ? { temperature } : {}),
|
|
53
|
+
...(typeof maxOutputTokens === "number" ? { maxTokens: maxOutputTokens } : {}),
|
|
54
54
|
apiKey,
|
|
55
55
|
signal,
|
|
56
56
|
});
|
|
@@ -60,11 +60,11 @@ export async function completeAnthropicText({ modelId, apiKey, context, temperat
|
|
|
60
60
|
return { text, usage: normalizeTokenUsage(result.usage) };
|
|
61
61
|
}
|
|
62
62
|
export async function completeAnthropicDocument({ modelId, apiKey, promptText, document, system, maxOutputTokens, timeoutMs, fetchImpl, anthropicBaseUrlOverride, }) {
|
|
63
|
-
if (document.kind !==
|
|
64
|
-
throw new Error(
|
|
63
|
+
if (document.kind !== "document") {
|
|
64
|
+
throw new Error("Internal error: expected a document attachment for Anthropic.");
|
|
65
65
|
}
|
|
66
|
-
const baseUrl = resolveBaseUrlOverride(anthropicBaseUrlOverride) ??
|
|
67
|
-
const url = new URL(
|
|
66
|
+
const baseUrl = resolveBaseUrlOverride(anthropicBaseUrlOverride) ?? "https://api.anthropic.com";
|
|
67
|
+
const url = new URL("/v1/messages", baseUrl);
|
|
68
68
|
const controller = new AbortController();
|
|
69
69
|
const timeout = setTimeout(() => controller.abort(), timeoutMs);
|
|
70
70
|
const payload = {
|
|
@@ -73,28 +73,28 @@ export async function completeAnthropicDocument({ modelId, apiKey, promptText, d
|
|
|
73
73
|
...(system ? { system } : {}),
|
|
74
74
|
messages: [
|
|
75
75
|
{
|
|
76
|
-
role:
|
|
76
|
+
role: "user",
|
|
77
77
|
content: [
|
|
78
78
|
{
|
|
79
|
-
type:
|
|
79
|
+
type: "document",
|
|
80
80
|
source: {
|
|
81
|
-
type:
|
|
81
|
+
type: "base64",
|
|
82
82
|
media_type: document.mediaType,
|
|
83
83
|
data: bytesToBase64(document.bytes),
|
|
84
84
|
},
|
|
85
85
|
},
|
|
86
|
-
{ type:
|
|
86
|
+
{ type: "text", text: promptText },
|
|
87
87
|
],
|
|
88
88
|
},
|
|
89
89
|
],
|
|
90
90
|
};
|
|
91
91
|
try {
|
|
92
92
|
const response = await fetchImpl(url, {
|
|
93
|
-
method:
|
|
93
|
+
method: "POST",
|
|
94
94
|
headers: {
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
95
|
+
"content-type": "application/json",
|
|
96
|
+
"x-api-key": apiKey,
|
|
97
|
+
"anthropic-version": "2023-06-01",
|
|
98
98
|
},
|
|
99
99
|
body: JSON.stringify(payload),
|
|
100
100
|
signal: controller.signal,
|
|
@@ -109,11 +109,11 @@ export async function completeAnthropicDocument({ modelId, apiKey, promptText, d
|
|
|
109
109
|
const data = JSON.parse(bodyText);
|
|
110
110
|
const text = Array.isArray(data.content)
|
|
111
111
|
? data.content
|
|
112
|
-
.filter((block) => block.type ===
|
|
112
|
+
.filter((block) => block.type === "text" && typeof block.text === "string")
|
|
113
113
|
.map((block) => block.text)
|
|
114
|
-
.join(
|
|
114
|
+
.join("")
|
|
115
115
|
.trim()
|
|
116
|
-
:
|
|
116
|
+
: "";
|
|
117
117
|
if (!text) {
|
|
118
118
|
throw new Error(`LLM returned an empty summary (model anthropic/${modelId}).`);
|
|
119
119
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../../../../src/llm/providers/anthropic.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,
|
|
1
|
+
{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../../../../src/llm/providers/anthropic.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,32 +1,32 @@
|
|
|
1
|
-
import { completeSimple } from
|
|
2
|
-
import { normalizeGoogleUsage, normalizeTokenUsage } from
|
|
3
|
-
import { resolveGoogleModel } from
|
|
4
|
-
import { bytesToBase64, resolveBaseUrlOverride } from
|
|
1
|
+
import { completeSimple } from "@mariozechner/pi-ai";
|
|
2
|
+
import { normalizeGoogleUsage, normalizeTokenUsage } from "../usage.js";
|
|
3
|
+
import { resolveGoogleModel } from "./models.js";
|
|
4
|
+
import { bytesToBase64, resolveBaseUrlOverride } from "./shared.js";
|
|
5
5
|
export async function completeGoogleText({ modelId, apiKey, context, temperature, maxOutputTokens, signal, googleBaseUrlOverride, }) {
|
|
6
6
|
const model = resolveGoogleModel({ modelId, context, googleBaseUrlOverride });
|
|
7
7
|
const result = await completeSimple(model, context, {
|
|
8
|
-
...(typeof temperature ===
|
|
9
|
-
...(typeof maxOutputTokens ===
|
|
8
|
+
...(typeof temperature === "number" ? { temperature } : {}),
|
|
9
|
+
...(typeof maxOutputTokens === "number" ? { maxTokens: maxOutputTokens } : {}),
|
|
10
10
|
apiKey,
|
|
11
11
|
signal,
|
|
12
12
|
});
|
|
13
13
|
const text = result.content
|
|
14
|
-
.filter((c) => c.type ===
|
|
14
|
+
.filter((c) => c.type === "text")
|
|
15
15
|
.map((c) => c.text)
|
|
16
|
-
.join(
|
|
16
|
+
.join("")
|
|
17
17
|
.trim();
|
|
18
18
|
if (!text)
|
|
19
19
|
throw new Error(`LLM returned an empty summary (model google/${modelId}).`);
|
|
20
20
|
return { text, usage: normalizeTokenUsage(result.usage) };
|
|
21
21
|
}
|
|
22
22
|
export async function completeGoogleDocument({ modelId, apiKey, promptText, document, maxOutputTokens, temperature, timeoutMs, fetchImpl, googleBaseUrlOverride, }) {
|
|
23
|
-
if (document.kind !==
|
|
24
|
-
throw new Error(
|
|
23
|
+
if (document.kind !== "document") {
|
|
24
|
+
throw new Error("Internal error: expected a document attachment for Google.");
|
|
25
25
|
}
|
|
26
26
|
const baseUrl = resolveBaseUrlOverride(googleBaseUrlOverride) ??
|
|
27
|
-
|
|
28
|
-
const url = new URL(`${baseUrl.replace(/\/$/,
|
|
29
|
-
url.searchParams.set(
|
|
27
|
+
"https://generativelanguage.googleapis.com/v1beta";
|
|
28
|
+
const url = new URL(`${baseUrl.replace(/\/$/, "")}/models/${modelId}:generateContent`);
|
|
29
|
+
url.searchParams.set("key", apiKey);
|
|
30
30
|
const controller = new AbortController();
|
|
31
31
|
const timeout = setTimeout(() => controller.abort(), timeoutMs);
|
|
32
32
|
const payload = {
|
|
@@ -43,13 +43,13 @@ export async function completeGoogleDocument({ modelId, apiKey, promptText, docu
|
|
|
43
43
|
],
|
|
44
44
|
},
|
|
45
45
|
],
|
|
46
|
-
...(typeof maxOutputTokens ===
|
|
47
|
-
...(typeof temperature ===
|
|
46
|
+
...(typeof maxOutputTokens === "number" ? { maxOutputTokens } : {}),
|
|
47
|
+
...(typeof temperature === "number" ? { temperature } : {}),
|
|
48
48
|
};
|
|
49
49
|
try {
|
|
50
50
|
const response = await fetchImpl(url, {
|
|
51
|
-
method:
|
|
52
|
-
headers: {
|
|
51
|
+
method: "POST",
|
|
52
|
+
headers: { "content-type": "application/json" },
|
|
53
53
|
body: JSON.stringify(payload),
|
|
54
54
|
signal: controller.signal,
|
|
55
55
|
});
|
|
@@ -63,8 +63,8 @@ export async function completeGoogleDocument({ modelId, apiKey, promptText, docu
|
|
|
63
63
|
const data = JSON.parse(bodyText);
|
|
64
64
|
const text = (data.candidates ?? [])
|
|
65
65
|
.flatMap((candidate) => candidate.content?.parts ?? [])
|
|
66
|
-
.map((part) => (typeof part.text ===
|
|
67
|
-
.join(
|
|
66
|
+
.map((part) => (typeof part.text === "string" ? part.text : ""))
|
|
67
|
+
.join("")
|
|
68
68
|
.trim();
|
|
69
69
|
if (!text) {
|
|
70
70
|
throw new Error(`LLM returned an empty summary (model google/${modelId}).`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google.js","sourceRoot":"","sources":["../../../../src/llm/providers/google.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,
|
|
1
|
+
{"version":3,"file":"google.js","sourceRoot":"","sources":["../../../../src/llm/providers/google.ts"],"names":[],"mappings":"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"}
|