@steipete/summarize 0.10.0 → 0.11.1
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 +80 -28
- package/README.md +115 -30
- package/dist/cli.js +1 -1
- package/dist/esm/cache.js +67 -65
- 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 +310 -166
- 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 +165 -164
- package/dist/esm/daemon/agent.js.map +1 -1
- 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 +16 -14
- 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 +63 -87
- 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 -31
- package/dist/esm/daemon/env-snapshot.js.map +1 -1
- package/dist/esm/daemon/flow-context.js +59 -28
- package/dist/esm/daemon/flow-context.js.map +1 -1
- package/dist/esm/daemon/launchd.js +100 -55
- 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 +15 -15
- package/dist/esm/daemon/process-registry.js.map +1 -1
- package/dist/esm/daemon/schtasks.js +42 -42
- package/dist/esm/daemon/schtasks.js.map +1 -1
- package/dist/esm/daemon/server.js +248 -244
- 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 +29 -29
- package/dist/esm/daemon/summarize.js.map +1 -1
- package/dist/esm/daemon/systemd.js +47 -47
- 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 +32 -32
- 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 +35 -34
- 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 +39 -39
- package/dist/esm/media-cache.js.map +1 -1
- 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 +1 -1
- package/dist/esm/processes.js.map +1 -1
- 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 +26 -26
- 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 +24 -24
- 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 +68 -68
- package/dist/esm/run/finish-line.js.map +1 -1
- package/dist/esm/run/flows/asset/extract.js +15 -15
- package/dist/esm/run/flows/asset/extract.js.map +1 -1
- package/dist/esm/run/flows/asset/input.js +47 -66
- package/dist/esm/run/flows/asset/input.js.map +1 -1
- package/dist/esm/run/flows/asset/media-policy.js +1 -1
- package/dist/esm/run/flows/asset/media-policy.js.map +1 -1
- package/dist/esm/run/flows/asset/media.js +49 -40
- package/dist/esm/run/flows/asset/media.js.map +1 -1
- package/dist/esm/run/flows/asset/output.js +12 -12
- package/dist/esm/run/flows/asset/output.js.map +1 -1
- 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 +173 -106
- package/dist/esm/run/flows/asset/summary.js.map +1 -1
- package/dist/esm/run/flows/url/extract.js +26 -26
- package/dist/esm/run/flows/url/extract.js.map +1 -1
- package/dist/esm/run/flows/url/flow.js +104 -98
- package/dist/esm/run/flows/url/flow.js.map +1 -1
- package/dist/esm/run/flows/url/markdown.js +57 -57
- package/dist/esm/run/flows/url/markdown.js.map +1 -1
- package/dist/esm/run/flows/url/slides-output.js +61 -59
- package/dist/esm/run/flows/url/slides-output.js.map +1 -1
- package/dist/esm/run/flows/url/slides-text.js +85 -85
- package/dist/esm/run/flows/url/slides-text.js.map +1 -1
- package/dist/esm/run/flows/url/summary.js +174 -107
- 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 +141 -135
- package/dist/esm/run/help.js.map +1 -1
- package/dist/esm/run/logging.js +10 -10
- 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 +5 -5
- package/dist/esm/run/media-cache-state.js.map +1 -1
- 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 +1 -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 +83 -34
- 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 +166 -127
- package/dist/esm/run/runner.js.map +1 -1
- package/dist/esm/run/slides-cli.js +43 -42
- package/dist/esm/run/slides-cli.js.map +1 -1
- package/dist/esm/run/slides-render.js +36 -36
- package/dist/esm/run/slides-render.js.map +1 -1
- 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 +7 -7
- 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 +57 -51
- 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 +49 -49
- package/dist/esm/run/transcriber-cli.js.map +1 -1
- 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 -16
- 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 +258 -249
- package/dist/esm/slides/extract.js.map +1 -1
- package/dist/esm/slides/index.js +3 -3
- package/dist/esm/slides/index.js.map +1 -1
- package/dist/esm/slides/settings.js +14 -14
- package/dist/esm/slides/settings.js.map +1 -1
- package/dist/esm/slides/store.js +9 -9
- package/dist/esm/slides/store.js.map +1 -1
- package/dist/esm/tty/format.js +13 -13
- package/dist/esm/tty/format.js.map +1 -1
- package/dist/esm/tty/osc-progress.js +1 -1
- package/dist/esm/tty/osc-progress.js.map +1 -1
- package/dist/esm/tty/progress/fetch-html.js +14 -14
- package/dist/esm/tty/progress/fetch-html.js.map +1 -1
- package/dist/esm/tty/progress/transcript.js +70 -62
- package/dist/esm/tty/progress/transcript.js.map +1 -1
- package/dist/esm/tty/spinner.js +20 -9
- package/dist/esm/tty/spinner.js.map +1 -1
- package/dist/esm/tty/theme.js +92 -92
- package/dist/esm/tty/theme.js.map +1 -1
- package/dist/esm/tty/website-progress.js +32 -32
- 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 +6 -6
- package/dist/types/config.d.ts +49 -7
- 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 +1 -1
- package/dist/types/daemon/auto-mode.d.ts +3 -3
- package/dist/types/daemon/chat.d.ts +2 -2
- 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 +7 -7
- package/dist/types/daemon/launchd.d.ts +8 -0
- package/dist/types/daemon/models.d.ts +6 -2
- package/dist/types/daemon/process-registry.d.ts +5 -5
- 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 +7 -7
- package/dist/types/firecrawl.d.ts +1 -1
- package/dist/types/flags.d.ts +11 -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 +2 -2
- 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 -1
- 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 +2 -2
- 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 +5 -5
- package/dist/types/run/flows/asset/extract.d.ts +4 -4
- package/dist/types/run/flows/asset/input.d.ts +9 -3
- package/dist/types/run/flows/asset/media.d.ts +1 -1
- package/dist/types/run/flows/asset/output.d.ts +5 -5
- package/dist/types/run/flows/asset/preprocess.d.ts +23 -17
- package/dist/types/run/flows/asset/summary.d.ts +19 -17
- package/dist/types/run/flows/url/extract.d.ts +1 -1
- 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 +7 -7
- package/dist/types/run/flows/url/slides-text.d.ts +9 -9
- package/dist/types/run/flows/url/summary.d.ts +11 -11
- package/dist/types/run/flows/url/types.d.ts +26 -22
- package/dist/types/run/format.d.ts +3 -3
- package/dist/types/run/help.d.ts +1 -1
- package/dist/types/run/media-cache-state.d.ts +2 -2
- package/dist/types/run/model-attempts.d.ts +1 -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 +15 -6
- package/dist/types/run/run-stream.d.ts +2 -2
- package/dist/types/run/runner.d.ts +3 -2
- package/dist/types/run/slides-render.d.ts +4 -4
- package/dist/types/run/stdin-temp-file.d.ts +9 -0
- package/dist/types/run/stream-output.d.ts +1 -1
- package/dist/types/run/streaming.d.ts +4 -4
- package/dist/types/run/summary-engine.d.ts +11 -11
- package/dist/types/run/summary-llm.d.ts +5 -5
- 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 +9 -9
- package/dist/types/slides/extract.d.ts +5 -4
- package/dist/types/slides/index.d.ts +5 -5
- package/dist/types/slides/store.d.ts +2 -2
- package/dist/types/slides/types.d.ts +2 -2
- package/dist/types/tty/osc-progress.d.ts +5 -5
- package/dist/types/tty/progress/fetch-html.d.ts +3 -3
- package/dist/types/tty/progress/transcript.d.ts +3 -3
- package/dist/types/tty/spinner.d.ts +2 -2
- package/dist/types/tty/theme.d.ts +2 -2
- package/dist/types/tty/website-progress.d.ts +3 -3
- package/dist/types/version.d.ts +1 -1
- package/docs/agent.md +38 -4
- package/docs/assets/site.js +46 -46
- package/docs/chrome-extension.md +11 -5
- package/docs/cli.md +59 -13
- package/docs/config.md +59 -10
- package/docs/extract-only.md +2 -0
- package/docs/index.html +33 -14
- package/docs/llm.md +7 -4
- package/docs/media.md +5 -4
- package/docs/model-auto.md +3 -2
- package/docs/nvidia-onnx-transcription.md +3 -3
- package/docs/openai.md +1 -1
- package/docs/releasing.md +3 -0
- package/docs/site/404.html +4 -1
- package/docs/site/assets/site.js +46 -46
- package/docs/site/docs/chrome-extension.html +18 -6
- package/docs/site/docs/config.html +29 -8
- package/docs/site/docs/extract-only.html +16 -4
- package/docs/site/docs/firecrawl.html +12 -3
- package/docs/site/docs/index.html +35 -6
- package/docs/site/docs/llm.html +19 -5
- package/docs/site/docs/openai.html +18 -5
- package/docs/site/docs/website.html +29 -9
- package/docs/site/docs/youtube.html +12 -3
- package/docs/site/index.html +33 -14
- package/docs/slides.md +13 -5
- package/docs/smoketest.md +29 -20
- package/docs/timestamps.md +21 -0
- package/docs/website.md +2 -1
- package/docs/youtube.md +4 -0
- package/package.json +36 -35
|
@@ -1,18 +1,18 @@
|
|
|
1
|
-
import { createSyntheticModel, resolveBaseUrlOverride, tryGetModel, wantsImages } from
|
|
1
|
+
import { createSyntheticModel, resolveBaseUrlOverride, tryGetModel, wantsImages, } from "./shared.js";
|
|
2
2
|
export function resolveOpenAiModel({ modelId, context, openaiConfig, }) {
|
|
3
3
|
const allowImages = wantsImages(context);
|
|
4
|
-
const base = tryGetModel(
|
|
5
|
-
const api = openaiConfig.useChatCompletions ?
|
|
6
|
-
const baseUrl = openaiConfig.baseURL ?? base?.baseUrl ??
|
|
4
|
+
const base = tryGetModel("openai", modelId);
|
|
5
|
+
const api = openaiConfig.useChatCompletions ? "openai-completions" : "openai-responses";
|
|
6
|
+
const baseUrl = openaiConfig.baseURL ?? base?.baseUrl ?? "https://api.openai.com/v1";
|
|
7
7
|
const headers = openaiConfig.isOpenRouter
|
|
8
8
|
? {
|
|
9
9
|
...(base?.headers ?? {}),
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
"HTTP-Referer": "https://github.com/steipete/summarize",
|
|
11
|
+
"X-Title": "summarize",
|
|
12
12
|
}
|
|
13
13
|
: base?.headers;
|
|
14
14
|
return {
|
|
15
|
-
...(base ?? createSyntheticModel({ provider:
|
|
15
|
+
...(base ?? createSyntheticModel({ provider: "openai", modelId, api, baseUrl, allowImages })),
|
|
16
16
|
api,
|
|
17
17
|
baseUrl,
|
|
18
18
|
...(headers ? { headers } : {}),
|
|
@@ -20,27 +20,27 @@ export function resolveOpenAiModel({ modelId, context, openaiConfig, }) {
|
|
|
20
20
|
}
|
|
21
21
|
export function resolveZaiModel({ modelId, context, openaiBaseUrlOverride, }) {
|
|
22
22
|
const allowImages = wantsImages(context);
|
|
23
|
-
const base = tryGetModel(
|
|
24
|
-
const api =
|
|
25
|
-
const baseUrl = openaiBaseUrlOverride ?? base?.baseUrl ??
|
|
23
|
+
const base = tryGetModel("zai", modelId);
|
|
24
|
+
const api = "openai-completions";
|
|
25
|
+
const baseUrl = openaiBaseUrlOverride ?? base?.baseUrl ?? "https://api.z.ai/api/paas/v4";
|
|
26
26
|
return {
|
|
27
|
-
...(base ?? createSyntheticModel({ provider:
|
|
27
|
+
...(base ?? createSyntheticModel({ provider: "zai", modelId, api, baseUrl, allowImages })),
|
|
28
28
|
api,
|
|
29
29
|
baseUrl,
|
|
30
|
-
input: allowImages ? [
|
|
30
|
+
input: allowImages ? ["text", "image"] : ["text"],
|
|
31
31
|
};
|
|
32
32
|
}
|
|
33
33
|
export function resolveXaiModel({ modelId, context, xaiBaseUrlOverride, }) {
|
|
34
34
|
const allowImages = wantsImages(context);
|
|
35
|
-
const base = tryGetModel(
|
|
35
|
+
const base = tryGetModel("xai", modelId);
|
|
36
36
|
const override = resolveBaseUrlOverride(xaiBaseUrlOverride);
|
|
37
37
|
if (override) {
|
|
38
38
|
return {
|
|
39
39
|
...(base ??
|
|
40
40
|
createSyntheticModel({
|
|
41
|
-
provider:
|
|
41
|
+
provider: "xai",
|
|
42
42
|
modelId,
|
|
43
|
-
api:
|
|
43
|
+
api: "openai-completions",
|
|
44
44
|
baseUrl: override,
|
|
45
45
|
allowImages,
|
|
46
46
|
})),
|
|
@@ -49,24 +49,24 @@ export function resolveXaiModel({ modelId, context, xaiBaseUrlOverride, }) {
|
|
|
49
49
|
}
|
|
50
50
|
return (base ??
|
|
51
51
|
createSyntheticModel({
|
|
52
|
-
provider:
|
|
52
|
+
provider: "xai",
|
|
53
53
|
modelId,
|
|
54
|
-
api:
|
|
55
|
-
baseUrl:
|
|
54
|
+
api: "openai-completions",
|
|
55
|
+
baseUrl: "https://api.x.ai/v1",
|
|
56
56
|
allowImages,
|
|
57
57
|
}));
|
|
58
58
|
}
|
|
59
59
|
export function resolveGoogleModel({ modelId, context, googleBaseUrlOverride, }) {
|
|
60
60
|
const allowImages = wantsImages(context);
|
|
61
|
-
const base = tryGetModel(
|
|
61
|
+
const base = tryGetModel("google", modelId);
|
|
62
62
|
const override = resolveBaseUrlOverride(googleBaseUrlOverride);
|
|
63
63
|
if (override) {
|
|
64
64
|
return {
|
|
65
65
|
...(base ??
|
|
66
66
|
createSyntheticModel({
|
|
67
|
-
provider:
|
|
67
|
+
provider: "google",
|
|
68
68
|
modelId,
|
|
69
|
-
api:
|
|
69
|
+
api: "google-generative-ai",
|
|
70
70
|
baseUrl: override,
|
|
71
71
|
allowImages,
|
|
72
72
|
})),
|
|
@@ -75,24 +75,24 @@ export function resolveGoogleModel({ modelId, context, googleBaseUrlOverride, })
|
|
|
75
75
|
}
|
|
76
76
|
return (base ??
|
|
77
77
|
createSyntheticModel({
|
|
78
|
-
provider:
|
|
78
|
+
provider: "google",
|
|
79
79
|
modelId,
|
|
80
|
-
api:
|
|
81
|
-
baseUrl:
|
|
80
|
+
api: "google-generative-ai",
|
|
81
|
+
baseUrl: "https://generativelanguage.googleapis.com/v1beta",
|
|
82
82
|
allowImages,
|
|
83
83
|
}));
|
|
84
84
|
}
|
|
85
85
|
export function resolveAnthropicModel({ modelId, context, anthropicBaseUrlOverride, }) {
|
|
86
86
|
const allowImages = wantsImages(context);
|
|
87
|
-
const base = tryGetModel(
|
|
87
|
+
const base = tryGetModel("anthropic", modelId);
|
|
88
88
|
const override = resolveBaseUrlOverride(anthropicBaseUrlOverride);
|
|
89
89
|
if (override) {
|
|
90
90
|
return {
|
|
91
91
|
...(base ??
|
|
92
92
|
createSyntheticModel({
|
|
93
|
-
provider:
|
|
93
|
+
provider: "anthropic",
|
|
94
94
|
modelId,
|
|
95
|
-
api:
|
|
95
|
+
api: "anthropic-messages",
|
|
96
96
|
baseUrl: override,
|
|
97
97
|
allowImages,
|
|
98
98
|
})),
|
|
@@ -101,10 +101,10 @@ export function resolveAnthropicModel({ modelId, context, anthropicBaseUrlOverri
|
|
|
101
101
|
}
|
|
102
102
|
return (base ??
|
|
103
103
|
createSyntheticModel({
|
|
104
|
-
provider:
|
|
104
|
+
provider: "anthropic",
|
|
105
105
|
modelId,
|
|
106
|
-
api:
|
|
107
|
-
baseUrl:
|
|
106
|
+
api: "anthropic-messages",
|
|
107
|
+
baseUrl: "https://api.anthropic.com",
|
|
108
108
|
allowImages,
|
|
109
109
|
}));
|
|
110
110
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../../src/llm/providers/models.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../../src/llm/providers/models.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
|
-
import { completeSimple } from
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
1
|
+
import { completeSimple } from "@mariozechner/pi-ai";
|
|
2
|
+
import { isOpenRouterBaseUrl, normalizeBaseUrl } from "@steipete/summarize-core";
|
|
3
|
+
import { createUnsupportedFunctionalityError } from "../errors.js";
|
|
4
|
+
import { normalizeOpenAiUsage, normalizeTokenUsage } from "../usage.js";
|
|
5
|
+
import { resolveOpenAiModel } from "./models.js";
|
|
6
|
+
import { bytesToBase64 } from "./shared.js";
|
|
6
7
|
export function resolveOpenAiClientConfig({ apiKeys, forceOpenRouter, openaiBaseUrlOverride, forceChatCompletions, }) {
|
|
7
8
|
const baseUrlRaw = openaiBaseUrlOverride ??
|
|
8
|
-
(typeof process !==
|
|
9
|
-
const baseUrl =
|
|
10
|
-
const isOpenRouterViaBaseUrl = baseUrl ?
|
|
9
|
+
(typeof process !== "undefined" ? process.env.OPENAI_BASE_URL : undefined);
|
|
10
|
+
const baseUrl = normalizeBaseUrl(baseUrlRaw);
|
|
11
|
+
const isOpenRouterViaBaseUrl = baseUrl ? isOpenRouterBaseUrl(baseUrl) : false;
|
|
11
12
|
const hasOpenRouterKey = apiKeys.openrouterApiKey != null;
|
|
12
13
|
const hasOpenAiKey = apiKeys.openaiApiKey != null;
|
|
13
14
|
const isOpenRouter = Boolean(forceOpenRouter) ||
|
|
@@ -18,18 +19,18 @@ export function resolveOpenAiClientConfig({ apiKeys, forceOpenRouter, openaiBase
|
|
|
18
19
|
: apiKeys.openaiApiKey;
|
|
19
20
|
if (!apiKey) {
|
|
20
21
|
throw new Error(isOpenRouter
|
|
21
|
-
?
|
|
22
|
-
:
|
|
22
|
+
? "Missing OPENROUTER_API_KEY (or OPENAI_API_KEY) for OpenRouter"
|
|
23
|
+
: "Missing OPENAI_API_KEY for openai/... model");
|
|
23
24
|
}
|
|
24
25
|
const baseURL = forceOpenRouter
|
|
25
|
-
?
|
|
26
|
-
: (baseUrl ?? (isOpenRouter ?
|
|
26
|
+
? "https://openrouter.ai/api/v1"
|
|
27
|
+
: (baseUrl ?? (isOpenRouter ? "https://openrouter.ai/api/v1" : undefined));
|
|
27
28
|
const isCustomBaseURL = (() => {
|
|
28
29
|
if (!baseURL)
|
|
29
30
|
return false;
|
|
30
31
|
try {
|
|
31
32
|
const url = new URL(baseURL);
|
|
32
|
-
return url.host !==
|
|
33
|
+
return url.host !== "api.openai.com" && url.host !== "openrouter.ai";
|
|
33
34
|
}
|
|
34
35
|
catch {
|
|
35
36
|
return false;
|
|
@@ -45,7 +46,7 @@ export function resolveOpenAiClientConfig({ apiKeys, forceOpenRouter, openaiBase
|
|
|
45
46
|
}
|
|
46
47
|
function resolveOpenAiResponsesUrl(baseUrl) {
|
|
47
48
|
const url = new URL(baseUrl);
|
|
48
|
-
const path = url.pathname.replace(/\/$/,
|
|
49
|
+
const path = url.pathname.replace(/\/$/, "");
|
|
49
50
|
if (/\/responses$/.test(path)) {
|
|
50
51
|
url.pathname = path;
|
|
51
52
|
return url;
|
|
@@ -58,72 +59,72 @@ function resolveOpenAiResponsesUrl(baseUrl) {
|
|
|
58
59
|
return url;
|
|
59
60
|
}
|
|
60
61
|
function extractOpenAiResponseText(payload) {
|
|
61
|
-
if (typeof payload.output_text ===
|
|
62
|
+
if (typeof payload.output_text === "string")
|
|
62
63
|
return payload.output_text.trim();
|
|
63
64
|
const output = Array.isArray(payload.output) ? payload.output : [];
|
|
64
65
|
const text = output
|
|
65
66
|
.flatMap((item) => (Array.isArray(item.content) ? item.content : []))
|
|
66
|
-
.map((block) => (typeof block.text ===
|
|
67
|
-
.join(
|
|
67
|
+
.map((block) => (typeof block.text === "string" ? block.text : ""))
|
|
68
|
+
.join("")
|
|
68
69
|
.trim();
|
|
69
70
|
return text;
|
|
70
71
|
}
|
|
71
72
|
export async function completeOpenAiText({ modelId, openaiConfig, context, temperature, maxOutputTokens, signal, }) {
|
|
72
73
|
const model = resolveOpenAiModel({ modelId, context, openaiConfig });
|
|
73
74
|
const result = await completeSimple(model, context, {
|
|
74
|
-
...(typeof temperature ===
|
|
75
|
-
...(typeof maxOutputTokens ===
|
|
75
|
+
...(typeof temperature === "number" ? { temperature } : {}),
|
|
76
|
+
...(typeof maxOutputTokens === "number" ? { maxTokens: maxOutputTokens } : {}),
|
|
76
77
|
apiKey: openaiConfig.apiKey,
|
|
77
78
|
signal,
|
|
78
79
|
});
|
|
79
80
|
const text = result.content
|
|
80
|
-
.filter((c) => c.type ===
|
|
81
|
+
.filter((c) => c.type === "text")
|
|
81
82
|
.map((c) => c.text)
|
|
82
|
-
.join(
|
|
83
|
+
.join("")
|
|
83
84
|
.trim();
|
|
84
85
|
if (!text)
|
|
85
86
|
throw new Error(`LLM returned an empty summary (model openai/${modelId}).`);
|
|
86
87
|
return { text, usage: normalizeTokenUsage(result.usage) };
|
|
87
88
|
}
|
|
88
89
|
export async function completeOpenAiDocument({ modelId, openaiConfig, promptText, document, maxOutputTokens, temperature, timeoutMs, fetchImpl, }) {
|
|
89
|
-
if (document.kind !==
|
|
90
|
-
throw new Error(
|
|
90
|
+
if (document.kind !== "document") {
|
|
91
|
+
throw new Error("Internal error: expected a document attachment for OpenAI.");
|
|
91
92
|
}
|
|
92
93
|
if (openaiConfig.isOpenRouter) {
|
|
93
|
-
throw createUnsupportedFunctionalityError(
|
|
94
|
+
throw createUnsupportedFunctionalityError("OpenRouter does not support PDF attachments for openai/... models");
|
|
94
95
|
}
|
|
95
|
-
const baseUrl = openaiConfig.baseURL ??
|
|
96
|
+
const baseUrl = openaiConfig.baseURL ?? "https://api.openai.com/v1";
|
|
96
97
|
const host = new URL(baseUrl).host;
|
|
97
|
-
if (host !==
|
|
98
|
+
if (host !== "api.openai.com") {
|
|
98
99
|
throw createUnsupportedFunctionalityError(`Document attachments require api.openai.com; got ${host}`);
|
|
99
100
|
}
|
|
100
101
|
const url = resolveOpenAiResponsesUrl(baseUrl);
|
|
101
102
|
const controller = new AbortController();
|
|
102
103
|
const timeout = setTimeout(() => controller.abort(), timeoutMs);
|
|
103
|
-
const filename = document.filename?.trim() ||
|
|
104
|
+
const filename = document.filename?.trim() || "document.pdf";
|
|
104
105
|
const payload = {
|
|
105
106
|
model: modelId,
|
|
106
107
|
input: [
|
|
107
108
|
{
|
|
108
|
-
role:
|
|
109
|
+
role: "user",
|
|
109
110
|
content: [
|
|
110
111
|
{
|
|
111
|
-
type:
|
|
112
|
+
type: "input_file",
|
|
112
113
|
filename,
|
|
113
114
|
file_data: `data:${document.mediaType};base64,${bytesToBase64(document.bytes)}`,
|
|
114
115
|
},
|
|
115
|
-
{ type:
|
|
116
|
+
{ type: "input_text", text: promptText },
|
|
116
117
|
],
|
|
117
118
|
},
|
|
118
119
|
],
|
|
119
|
-
...(typeof maxOutputTokens ===
|
|
120
|
-
...(typeof temperature ===
|
|
120
|
+
...(typeof maxOutputTokens === "number" ? { max_output_tokens: maxOutputTokens } : {}),
|
|
121
|
+
...(typeof temperature === "number" ? { temperature } : {}),
|
|
121
122
|
};
|
|
122
123
|
try {
|
|
123
124
|
const response = await fetchImpl(url, {
|
|
124
|
-
method:
|
|
125
|
+
method: "POST",
|
|
125
126
|
headers: {
|
|
126
|
-
|
|
127
|
+
"content-type": "application/json",
|
|
127
128
|
authorization: `Bearer ${openaiConfig.apiKey}`,
|
|
128
129
|
},
|
|
129
130
|
body: JSON.stringify(payload),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../../../src/llm/providers/openai.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,
|
|
1
|
+
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../../../src/llm/providers/openai.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,22 +1,22 @@
|
|
|
1
|
-
import { getModel } from
|
|
1
|
+
import { getModel } from "@mariozechner/pi-ai";
|
|
2
2
|
export function resolveBaseUrlOverride(raw) {
|
|
3
|
-
const trimmed = typeof raw ===
|
|
3
|
+
const trimmed = typeof raw === "string" ? raw.trim() : "";
|
|
4
4
|
return trimmed.length > 0 ? trimmed : null;
|
|
5
5
|
}
|
|
6
6
|
export function bytesToBase64(bytes) {
|
|
7
|
-
return Buffer.from(bytes).toString(
|
|
7
|
+
return Buffer.from(bytes).toString("base64");
|
|
8
8
|
}
|
|
9
9
|
export function extractText(message) {
|
|
10
10
|
const text = message.content
|
|
11
|
-
.filter((c) => c.type ===
|
|
11
|
+
.filter((c) => c.type === "text")
|
|
12
12
|
.map((c) => c.text)
|
|
13
|
-
.join(
|
|
13
|
+
.join("");
|
|
14
14
|
return text.trim();
|
|
15
15
|
}
|
|
16
16
|
export function wantsImages(context) {
|
|
17
17
|
for (const msg of context.messages) {
|
|
18
|
-
if (msg.role ===
|
|
19
|
-
if (Array.isArray(msg.content) && msg.content.some((c) => c.type ===
|
|
18
|
+
if (msg.role === "user" || msg.role === "toolResult") {
|
|
19
|
+
if (Array.isArray(msg.content) && msg.content.some((c) => c.type === "image"))
|
|
20
20
|
return true;
|
|
21
21
|
}
|
|
22
22
|
}
|
|
@@ -38,7 +38,7 @@ export function createSyntheticModel({ provider, modelId, api, baseUrl, allowIma
|
|
|
38
38
|
provider,
|
|
39
39
|
baseUrl,
|
|
40
40
|
reasoning: false,
|
|
41
|
-
input: allowImages ? [
|
|
41
|
+
input: allowImages ? ["text", "image"] : ["text"],
|
|
42
42
|
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
|
|
43
43
|
contextWindow: 128_000,
|
|
44
44
|
maxTokens: 16_384,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../src/llm/providers/shared.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../src/llm/providers/shared.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,MAAM,UAAU,sBAAsB,CAAC,GAA8B;IACnE,MAAM,OAAO,GAAG,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1D,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,KAAiB;IAC7C,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,OAAyB;IACnD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO;SACzB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC;SAChC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;SAClB,IAAI,CAAC,EAAE,CAAC,CAAC;IACZ,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,OAAgB;IAC1C,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACnC,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,IAAI,GAAG,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;YACrD,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC;gBAAE,OAAO,IAAI,CAAC;QAC7F,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,QAAuB,EAAE,OAAe;IAClE,IAAI,CAAC;QACH,OAAO,QAAQ,CAAC,QAAQ,EAAE,OAAgB,CAA0B,CAAC;IACvE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,EACnC,QAAQ,EACR,OAAO,EACP,GAAG,EACH,OAAO,EACP,WAAW,EACX,OAAO,GAQR;IACC,OAAO;QACL,EAAE,EAAE,OAAO;QACX,IAAI,EAAE,GAAG,QAAQ,IAAI,OAAO,EAAE;QAC9B,GAAG;QACH,QAAQ;QACR,OAAO;QACP,SAAS,EAAE,KAAK;QAChB,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QACjD,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE;QAC1D,aAAa,EAAE,OAAO;QACtB,SAAS,EAAE,MAAM;QACjB,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAChC,CAAC;AACJ,CAAC"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { formatOutputLanguageInstruction } from "../language.js";
|
|
2
|
+
import { generateTextWithModelId } from "./generate-text.js";
|
|
2
3
|
const MAX_TRANSCRIPT_INPUT_CHARACTERS = 200_000;
|
|
3
|
-
function buildTranscriptToMarkdownPrompt({ title, source, transcript, }) {
|
|
4
|
+
function buildTranscriptToMarkdownPrompt({ title, source, transcript, outputLanguage, }) {
|
|
5
|
+
const languageInstruction = formatOutputLanguageInstruction(outputLanguage ?? { kind: "auto" });
|
|
4
6
|
const system = `You convert raw transcripts into clean GitHub-Flavored Markdown.
|
|
5
7
|
|
|
6
8
|
Rules:
|
|
@@ -10,9 +12,10 @@ Rules:
|
|
|
10
12
|
- Light cleanup: remove filler words (um, uh, you know) and false starts
|
|
11
13
|
- Do not invent content or change meaning
|
|
12
14
|
- Preserve technical terms, names, and quotes accurately
|
|
15
|
+
- ${languageInstruction}
|
|
13
16
|
- Output ONLY Markdown (no JSON, no explanations, no code fences wrapping the output)`;
|
|
14
|
-
const prompt = `Title: ${title ??
|
|
15
|
-
Source: ${source ??
|
|
17
|
+
const prompt = `Title: ${title ?? "unknown"}
|
|
18
|
+
Source: ${source ?? "unknown"}
|
|
16
19
|
|
|
17
20
|
Transcript:
|
|
18
21
|
"""
|
|
@@ -21,7 +24,7 @@ ${transcript}
|
|
|
21
24
|
return { system, prompt };
|
|
22
25
|
}
|
|
23
26
|
export function createTranscriptToMarkdownConverter({ modelId, forceOpenRouter, xaiApiKey, googleApiKey, openaiApiKey, openaiBaseUrlOverride, anthropicBaseUrlOverride, googleBaseUrlOverride, xaiBaseUrlOverride, anthropicApiKey, openrouterApiKey, fetchImpl, forceChatCompletions, retries = 0, onRetry, onUsage, }) {
|
|
24
|
-
return async ({ title, source, transcript, timeoutMs }) => {
|
|
27
|
+
return async ({ title, source, transcript, timeoutMs, outputLanguage }) => {
|
|
25
28
|
const trimmedTranscript = transcript.length > MAX_TRANSCRIPT_INPUT_CHARACTERS
|
|
26
29
|
? transcript.slice(0, MAX_TRANSCRIPT_INPUT_CHARACTERS)
|
|
27
30
|
: transcript;
|
|
@@ -29,6 +32,7 @@ export function createTranscriptToMarkdownConverter({ modelId, forceOpenRouter,
|
|
|
29
32
|
title,
|
|
30
33
|
source,
|
|
31
34
|
transcript: trimmedTranscript,
|
|
35
|
+
outputLanguage,
|
|
32
36
|
});
|
|
33
37
|
const result = await generateTextWithModelId({
|
|
34
38
|
modelId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transcript-to-markdown.js","sourceRoot":"","sources":["../../../src/llm/transcript-to-markdown.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"transcript-to-markdown.js","sourceRoot":"","sources":["../../../src/llm/transcript-to-markdown.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,+BAA+B,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,MAAM,+BAA+B,GAAG,OAAO,CAAC;AAEhD,SAAS,+BAA+B,CAAC,EACvC,KAAK,EACL,MAAM,EACN,UAAU,EACV,cAAc,GAMf;IACC,MAAM,mBAAmB,GAAG,+BAA+B,CAAC,cAAc,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAEhG,MAAM,MAAM,GAAG;;;;;;;;;IASb,mBAAmB;sFAC+D,CAAC;IAErF,MAAM,MAAM,GAAG,UAAU,KAAK,IAAI,SAAS;UACnC,MAAM,IAAI,SAAS;;;;EAI3B,UAAU;IACR,CAAC;IAEH,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAC5B,CAAC;AAUD,MAAM,UAAU,mCAAmC,CAAC,EAClD,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,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,cAAc,EAAE,EAAE,EAAE;QACxE,MAAM,iBAAiB,GACrB,UAAU,CAAC,MAAM,GAAG,+BAA+B;YACjD,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,+BAA+B,CAAC;YACtD,CAAC,CAAC,UAAU,CAAC;QACjB,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,+BAA+B,CAAC;YACzD,KAAK;YACL,MAAM;YACN,UAAU,EAAE,iBAAiB;YAC7B,cAAc;SACf,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;YACR,KAAK,EAAE,MAAM,CAAC,gBAAgB;YAC9B,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,IAAI;SAC5B,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,IAAI,CAAC;IACrB,CAAC,CAAC;AACJ,CAAC"}
|
package/dist/esm/llm/usage.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
export function normalizeTokenUsage(raw) {
|
|
2
|
-
if (!raw || typeof raw !==
|
|
2
|
+
if (!raw || typeof raw !== "object")
|
|
3
3
|
return null;
|
|
4
4
|
const usage = raw;
|
|
5
|
-
const promptTokens = typeof usage.input ===
|
|
6
|
-
const completionTokens = typeof usage.output ===
|
|
7
|
-
const totalTokens = typeof usage.totalTokens ===
|
|
5
|
+
const promptTokens = typeof usage.input === "number" && Number.isFinite(usage.input) ? usage.input : null;
|
|
6
|
+
const completionTokens = typeof usage.output === "number" && Number.isFinite(usage.output) ? usage.output : null;
|
|
7
|
+
const totalTokens = typeof usage.totalTokens === "number" && Number.isFinite(usage.totalTokens)
|
|
8
8
|
? usage.totalTokens
|
|
9
9
|
: null;
|
|
10
10
|
if (promptTokens === null && completionTokens === null && totalTokens === null)
|
|
@@ -12,16 +12,16 @@ export function normalizeTokenUsage(raw) {
|
|
|
12
12
|
return { promptTokens, completionTokens, totalTokens };
|
|
13
13
|
}
|
|
14
14
|
export function normalizeAnthropicUsage(raw) {
|
|
15
|
-
if (!raw || typeof raw !==
|
|
15
|
+
if (!raw || typeof raw !== "object")
|
|
16
16
|
return null;
|
|
17
17
|
const usage = raw;
|
|
18
|
-
const promptTokens = typeof usage.input_tokens ===
|
|
18
|
+
const promptTokens = typeof usage.input_tokens === "number" && Number.isFinite(usage.input_tokens)
|
|
19
19
|
? usage.input_tokens
|
|
20
20
|
: null;
|
|
21
|
-
const completionTokens = typeof usage.output_tokens ===
|
|
21
|
+
const completionTokens = typeof usage.output_tokens === "number" && Number.isFinite(usage.output_tokens)
|
|
22
22
|
? usage.output_tokens
|
|
23
23
|
: null;
|
|
24
|
-
const totalTokens = typeof promptTokens ===
|
|
24
|
+
const totalTokens = typeof promptTokens === "number" && typeof completionTokens === "number"
|
|
25
25
|
? promptTokens + completionTokens
|
|
26
26
|
: null;
|
|
27
27
|
if (promptTokens === null && completionTokens === null && totalTokens === null)
|
|
@@ -29,18 +29,18 @@ export function normalizeAnthropicUsage(raw) {
|
|
|
29
29
|
return { promptTokens, completionTokens, totalTokens };
|
|
30
30
|
}
|
|
31
31
|
export function normalizeOpenAiUsage(raw) {
|
|
32
|
-
if (!raw || typeof raw !==
|
|
32
|
+
if (!raw || typeof raw !== "object")
|
|
33
33
|
return null;
|
|
34
34
|
const usage = raw;
|
|
35
|
-
const promptTokens = typeof usage.input_tokens ===
|
|
35
|
+
const promptTokens = typeof usage.input_tokens === "number" && Number.isFinite(usage.input_tokens)
|
|
36
36
|
? usage.input_tokens
|
|
37
37
|
: null;
|
|
38
|
-
const completionTokens = typeof usage.output_tokens ===
|
|
38
|
+
const completionTokens = typeof usage.output_tokens === "number" && Number.isFinite(usage.output_tokens)
|
|
39
39
|
? usage.output_tokens
|
|
40
40
|
: null;
|
|
41
|
-
const totalTokens = typeof usage.total_tokens ===
|
|
41
|
+
const totalTokens = typeof usage.total_tokens === "number" && Number.isFinite(usage.total_tokens)
|
|
42
42
|
? usage.total_tokens
|
|
43
|
-
: typeof promptTokens ===
|
|
43
|
+
: typeof promptTokens === "number" && typeof completionTokens === "number"
|
|
44
44
|
? promptTokens + completionTokens
|
|
45
45
|
: null;
|
|
46
46
|
if (promptTokens === null && completionTokens === null && totalTokens === null)
|
|
@@ -48,18 +48,18 @@ export function normalizeOpenAiUsage(raw) {
|
|
|
48
48
|
return { promptTokens, completionTokens, totalTokens };
|
|
49
49
|
}
|
|
50
50
|
export function normalizeGoogleUsage(raw) {
|
|
51
|
-
if (!raw || typeof raw !==
|
|
51
|
+
if (!raw || typeof raw !== "object")
|
|
52
52
|
return null;
|
|
53
53
|
const usage = raw;
|
|
54
|
-
const promptTokens = typeof usage.promptTokenCount ===
|
|
54
|
+
const promptTokens = typeof usage.promptTokenCount === "number" && Number.isFinite(usage.promptTokenCount)
|
|
55
55
|
? usage.promptTokenCount
|
|
56
56
|
: null;
|
|
57
|
-
const completionTokens = typeof usage.candidatesTokenCount ===
|
|
57
|
+
const completionTokens = typeof usage.candidatesTokenCount === "number" && Number.isFinite(usage.candidatesTokenCount)
|
|
58
58
|
? usage.candidatesTokenCount
|
|
59
59
|
: null;
|
|
60
|
-
const totalTokens = typeof usage.totalTokenCount ===
|
|
60
|
+
const totalTokens = typeof usage.totalTokenCount === "number" && Number.isFinite(usage.totalTokenCount)
|
|
61
61
|
? usage.totalTokenCount
|
|
62
|
-
: typeof promptTokens ===
|
|
62
|
+
: typeof promptTokens === "number" && typeof completionTokens === "number"
|
|
63
63
|
? promptTokens + completionTokens
|
|
64
64
|
: null;
|
|
65
65
|
if (promptTokens === null && completionTokens === null && totalTokens === null)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage.js","sourceRoot":"","sources":["../../../src/llm/usage.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,mBAAmB,CAAC,GAAY;IAC9C,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,IAAI,
|
|
1
|
+
{"version":3,"file":"usage.js","sourceRoot":"","sources":["../../../src/llm/usage.ts"],"names":[],"mappings":"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"}
|