@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
package/dist/esm/run/run-env.js
CHANGED
|
@@ -1,88 +1,87 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
const trimmed = typeof raw === 'string' ? raw.trim() : '';
|
|
4
|
-
return trimmed.length > 0 ? trimmed : null;
|
|
5
|
-
}
|
|
1
|
+
import { isOpenRouterBaseUrl, resolveConfiguredBaseUrl } from "@steipete/summarize-core";
|
|
2
|
+
import { resolveCliAvailability, resolveExecutableInPath } from "./env.js";
|
|
6
3
|
export function resolveEnvState({ env, envForRun, configForCli, }) {
|
|
7
|
-
const xaiKeyRaw = typeof envForRun.XAI_API_KEY ===
|
|
8
|
-
const openaiBaseUrl = (
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
})
|
|
20
|
-
const
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
})();
|
|
26
|
-
const xaiBaseUrl = (() => {
|
|
27
|
-
const envValue = normalizeBaseUrl(envForRun.XAI_BASE_URL);
|
|
28
|
-
if (envValue)
|
|
29
|
-
return envValue;
|
|
30
|
-
return normalizeBaseUrl(configForCli?.xai?.baseUrl);
|
|
31
|
-
})();
|
|
32
|
-
const zaiKeyRaw = typeof envForRun.Z_AI_API_KEY === 'string'
|
|
4
|
+
const xaiKeyRaw = typeof envForRun.XAI_API_KEY === "string" ? envForRun.XAI_API_KEY : null;
|
|
5
|
+
const openaiBaseUrl = resolveConfiguredBaseUrl({
|
|
6
|
+
envValue: envForRun.OPENAI_BASE_URL,
|
|
7
|
+
configValue: configForCli?.openai?.baseUrl,
|
|
8
|
+
});
|
|
9
|
+
const anthropicBaseUrl = resolveConfiguredBaseUrl({
|
|
10
|
+
envValue: envForRun.ANTHROPIC_BASE_URL,
|
|
11
|
+
configValue: configForCli?.anthropic?.baseUrl,
|
|
12
|
+
});
|
|
13
|
+
const googleBaseUrl = resolveConfiguredBaseUrl({
|
|
14
|
+
envValue: envForRun.GOOGLE_BASE_URL ?? envForRun.GEMINI_BASE_URL,
|
|
15
|
+
configValue: configForCli?.google?.baseUrl,
|
|
16
|
+
});
|
|
17
|
+
const xaiBaseUrl = resolveConfiguredBaseUrl({
|
|
18
|
+
envValue: envForRun.XAI_BASE_URL,
|
|
19
|
+
configValue: configForCli?.xai?.baseUrl,
|
|
20
|
+
});
|
|
21
|
+
const zaiKeyRaw = typeof envForRun.Z_AI_API_KEY === "string"
|
|
33
22
|
? envForRun.Z_AI_API_KEY
|
|
34
|
-
: typeof envForRun.ZAI_API_KEY ===
|
|
23
|
+
: typeof envForRun.ZAI_API_KEY === "string"
|
|
35
24
|
? envForRun.ZAI_API_KEY
|
|
36
25
|
: null;
|
|
37
|
-
const zaiBaseUrlRaw = typeof envForRun.Z_AI_BASE_URL ===
|
|
26
|
+
const zaiBaseUrlRaw = typeof envForRun.Z_AI_BASE_URL === "string"
|
|
38
27
|
? envForRun.Z_AI_BASE_URL
|
|
39
|
-
: typeof envForRun.ZAI_BASE_URL ===
|
|
28
|
+
: typeof envForRun.ZAI_BASE_URL === "string"
|
|
40
29
|
? envForRun.ZAI_BASE_URL
|
|
41
30
|
: null;
|
|
42
|
-
const openRouterKeyRaw = typeof envForRun.OPENROUTER_API_KEY ===
|
|
43
|
-
const openaiKeyRaw = typeof envForRun.OPENAI_API_KEY ===
|
|
44
|
-
const apiKey = typeof openaiBaseUrl ===
|
|
31
|
+
const openRouterKeyRaw = typeof envForRun.OPENROUTER_API_KEY === "string" ? envForRun.OPENROUTER_API_KEY : null;
|
|
32
|
+
const openaiKeyRaw = typeof envForRun.OPENAI_API_KEY === "string" ? envForRun.OPENAI_API_KEY : null;
|
|
33
|
+
const apiKey = typeof openaiBaseUrl === "string" && isOpenRouterBaseUrl(openaiBaseUrl)
|
|
45
34
|
? (openRouterKeyRaw ?? openaiKeyRaw)
|
|
46
35
|
: openaiKeyRaw;
|
|
47
|
-
const apifyToken = typeof envForRun.APIFY_API_TOKEN ===
|
|
36
|
+
const apifyToken = typeof envForRun.APIFY_API_TOKEN === "string" ? envForRun.APIFY_API_TOKEN : null;
|
|
48
37
|
const ytDlpPath = (() => {
|
|
49
|
-
const explicit = typeof envForRun.YT_DLP_PATH ===
|
|
38
|
+
const explicit = typeof envForRun.YT_DLP_PATH === "string" ? envForRun.YT_DLP_PATH.trim() : "";
|
|
50
39
|
if (explicit.length > 0)
|
|
51
40
|
return explicit;
|
|
52
|
-
return resolveExecutableInPath(
|
|
41
|
+
return resolveExecutableInPath("yt-dlp", envForRun);
|
|
42
|
+
})();
|
|
43
|
+
const ytDlpCookiesFromBrowser = (() => {
|
|
44
|
+
const raw = typeof envForRun.SUMMARIZE_YT_DLP_COOKIES_FROM_BROWSER === "string"
|
|
45
|
+
? envForRun.SUMMARIZE_YT_DLP_COOKIES_FROM_BROWSER
|
|
46
|
+
: typeof envForRun.YT_DLP_COOKIES_FROM_BROWSER === "string"
|
|
47
|
+
? envForRun.YT_DLP_COOKIES_FROM_BROWSER
|
|
48
|
+
: "";
|
|
49
|
+
const value = raw.trim();
|
|
50
|
+
return value.length > 0 ? value : null;
|
|
53
51
|
})();
|
|
54
|
-
const
|
|
55
|
-
const
|
|
56
|
-
const
|
|
57
|
-
const
|
|
52
|
+
const groqApiKey = typeof envForRun.GROQ_API_KEY === "string" ? envForRun.GROQ_API_KEY.trim() || null : null;
|
|
53
|
+
const falApiKey = typeof envForRun.FAL_KEY === "string" ? envForRun.FAL_KEY : null;
|
|
54
|
+
const firecrawlKey = typeof envForRun.FIRECRAWL_API_KEY === "string" ? envForRun.FIRECRAWL_API_KEY : null;
|
|
55
|
+
const anthropicKeyRaw = typeof envForRun.ANTHROPIC_API_KEY === "string" ? envForRun.ANTHROPIC_API_KEY : null;
|
|
56
|
+
const googleKeyRaw = typeof envForRun.GEMINI_API_KEY === "string"
|
|
58
57
|
? envForRun.GEMINI_API_KEY
|
|
59
|
-
: typeof envForRun.GOOGLE_GENERATIVE_AI_API_KEY ===
|
|
58
|
+
: typeof envForRun.GOOGLE_GENERATIVE_AI_API_KEY === "string"
|
|
60
59
|
? envForRun.GOOGLE_GENERATIVE_AI_API_KEY
|
|
61
|
-
: typeof envForRun.GOOGLE_API_KEY ===
|
|
60
|
+
: typeof envForRun.GOOGLE_API_KEY === "string"
|
|
62
61
|
? envForRun.GOOGLE_API_KEY
|
|
63
62
|
: null;
|
|
64
63
|
const firecrawlApiKey = firecrawlKey && firecrawlKey.trim().length > 0 ? firecrawlKey : null;
|
|
65
64
|
const firecrawlConfigured = firecrawlApiKey !== null;
|
|
66
65
|
const xaiApiKey = xaiKeyRaw?.trim() ?? null;
|
|
67
66
|
const zaiApiKey = zaiKeyRaw?.trim() ?? null;
|
|
68
|
-
const zaiBaseUrl = (zaiBaseUrlRaw?.trim() ??
|
|
67
|
+
const zaiBaseUrl = (zaiBaseUrlRaw?.trim() ?? "") || "https://api.z.ai/api/paas/v4";
|
|
69
68
|
const googleApiKey = googleKeyRaw?.trim() ?? null;
|
|
70
69
|
const anthropicApiKey = anthropicKeyRaw?.trim() ?? null;
|
|
71
70
|
const openrouterApiKey = (() => {
|
|
72
|
-
const explicit = openRouterKeyRaw?.trim() ??
|
|
71
|
+
const explicit = openRouterKeyRaw?.trim() ?? "";
|
|
73
72
|
if (explicit.length > 0)
|
|
74
73
|
return explicit;
|
|
75
|
-
const baseUrl = openaiBaseUrl ??
|
|
76
|
-
const openaiKey = openaiKeyRaw?.trim() ??
|
|
77
|
-
if (baseUrl.length > 0 &&
|
|
74
|
+
const baseUrl = openaiBaseUrl ?? "";
|
|
75
|
+
const openaiKey = openaiKeyRaw?.trim() ?? "";
|
|
76
|
+
if (baseUrl.length > 0 && isOpenRouterBaseUrl(baseUrl) && openaiKey.length > 0) {
|
|
78
77
|
return openaiKey;
|
|
79
78
|
}
|
|
80
79
|
return null;
|
|
81
80
|
})();
|
|
82
81
|
const openaiTranscriptionKey = openaiKeyRaw?.trim() ?? null;
|
|
83
|
-
const googleConfigured = typeof googleApiKey ===
|
|
84
|
-
const anthropicConfigured = typeof anthropicApiKey ===
|
|
85
|
-
const openrouterConfigured = typeof openrouterApiKey ===
|
|
82
|
+
const googleConfigured = typeof googleApiKey === "string" && googleApiKey.length > 0;
|
|
83
|
+
const anthropicConfigured = typeof anthropicApiKey === "string" && anthropicApiKey.length > 0;
|
|
84
|
+
const openrouterConfigured = typeof openrouterApiKey === "string" && openrouterApiKey.length > 0;
|
|
86
85
|
const cliAvailability = resolveCliAvailability({ env, config: configForCli });
|
|
87
86
|
const envForAuto = openrouterApiKey ? { ...env, OPENROUTER_API_KEY: openrouterApiKey } : env;
|
|
88
87
|
const providerBaseUrls = {
|
|
@@ -95,6 +94,7 @@ export function resolveEnvState({ env, envForRun, configForCli, }) {
|
|
|
95
94
|
apiKey: apiKey?.trim() ?? null,
|
|
96
95
|
openrouterApiKey,
|
|
97
96
|
openrouterConfigured,
|
|
97
|
+
groqApiKey,
|
|
98
98
|
openaiTranscriptionKey,
|
|
99
99
|
xaiApiKey,
|
|
100
100
|
googleApiKey,
|
|
@@ -107,6 +107,7 @@ export function resolveEnvState({ env, envForRun, configForCli, }) {
|
|
|
107
107
|
anthropicConfigured,
|
|
108
108
|
apifyToken,
|
|
109
109
|
ytDlpPath,
|
|
110
|
+
ytDlpCookiesFromBrowser,
|
|
110
111
|
falApiKey,
|
|
111
112
|
cliAvailability,
|
|
112
113
|
envForAuto,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-env.js","sourceRoot":"","sources":["../../../src/run/run-env.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run-env.js","sourceRoot":"","sources":["../../../src/run/run-env.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { resolveInputTarget } from
|
|
2
|
-
import { buildConciseHelp } from
|
|
1
|
+
import { resolveInputTarget } from "../content/asset.js";
|
|
2
|
+
import { buildConciseHelp } from "./help.js";
|
|
3
3
|
export function resolveRunInput({ program, cliFlagPresent, cliProviderArgRaw, stdout, }) {
|
|
4
4
|
let rawInput = program.args[0];
|
|
5
5
|
let resolvedCliProviderArgRaw = cliProviderArgRaw;
|
|
@@ -19,7 +19,7 @@ export function resolveRunInput({ program, cliFlagPresent, cliProviderArgRaw, st
|
|
|
19
19
|
throw new Error(help);
|
|
20
20
|
}
|
|
21
21
|
const inputTarget = resolveInputTarget(rawInput);
|
|
22
|
-
const url = inputTarget.kind ===
|
|
22
|
+
const url = inputTarget.kind === "url" ? inputTarget.url : null;
|
|
23
23
|
return { inputTarget, url, cliProviderArgRaw: resolvedCliProviderArgRaw };
|
|
24
24
|
}
|
|
25
25
|
//# sourceMappingURL=run-input.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-input.js","sourceRoot":"","sources":["../../../src/run/run-input.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,
|
|
1
|
+
{"version":3,"file":"run-input.js","sourceRoot":"","sources":["../../../src/run/run-input.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAQ7C,MAAM,UAAU,eAAe,CAAC,EAC9B,OAAO,EACP,cAAc,EACd,iBAAiB,EACjB,MAAM,GAMP;IACC,IAAI,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC/B,IAAI,yBAAyB,GAAG,iBAAiB,CAAC;IAClD,IAAI,CAAC,QAAQ,IAAI,cAAc,IAAI,yBAAyB,EAAE,CAAC;QAC7D,IAAI,CAAC;YACH,kBAAkB,CAAC,yBAAyB,CAAC,CAAC;YAC9C,QAAQ,GAAG,yBAAyB,CAAC;YACrC,yBAAyB,GAAG,IAAI,CAAC;QACnC,CAAC;QAAC,MAAM,CAAC;YACP,sBAAsB;QACxB,CAAC;IACH,CAAC;IACD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,GAAG,gBAAgB,EAAE,CAAC;QAChC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IAED,MAAM,WAAW,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACjD,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;IAEhE,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,CAAC;AAC5E,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { normalizeTokenUsage, tallyCosts } from
|
|
2
|
-
import { buildRunMetricsReport } from
|
|
3
|
-
import { loadLiteLlmCatalog, resolveLiteLlmMaxInputTokensForModelId, resolveLiteLlmMaxOutputTokensForModelId, resolveLiteLlmPricingForModelId, } from
|
|
1
|
+
import { normalizeTokenUsage, tallyCosts } from "tokentally";
|
|
2
|
+
import { buildRunMetricsReport } from "../costs.js";
|
|
3
|
+
import { loadLiteLlmCatalog, resolveLiteLlmMaxInputTokensForModelId, resolveLiteLlmMaxOutputTokensForModelId, resolveLiteLlmPricingForModelId, } from "../pricing/litellm.js";
|
|
4
4
|
export function createRunMetrics({ env, fetchImpl, maxOutputTokensArg, }) {
|
|
5
5
|
const llmCalls = [];
|
|
6
6
|
let firecrawlRequests = 0;
|
|
@@ -29,13 +29,13 @@ export function createRunMetrics({ env, fetchImpl, maxOutputTokensArg, }) {
|
|
|
29
29
|
if (!catalog)
|
|
30
30
|
return requested;
|
|
31
31
|
const limit = resolveLiteLlmMaxOutputTokensForModelId(catalog, modelId);
|
|
32
|
-
if (typeof limit ===
|
|
32
|
+
if (typeof limit === "number" && Number.isFinite(limit) && limit > 0) {
|
|
33
33
|
return Math.min(requested, limit);
|
|
34
34
|
}
|
|
35
35
|
return requested;
|
|
36
36
|
};
|
|
37
37
|
const resolveMaxOutputTokensForCall = async (modelId) => {
|
|
38
|
-
if (typeof maxOutputTokensArg !==
|
|
38
|
+
if (typeof maxOutputTokensArg !== "number")
|
|
39
39
|
return null;
|
|
40
40
|
return capMaxOutputTokensForModel({ modelId, requested: maxOutputTokensArg });
|
|
41
41
|
};
|
|
@@ -44,31 +44,31 @@ export function createRunMetrics({ env, fetchImpl, maxOutputTokensArg, }) {
|
|
|
44
44
|
if (!catalog)
|
|
45
45
|
return null;
|
|
46
46
|
const limit = resolveLiteLlmMaxInputTokensForModelId(catalog, modelId);
|
|
47
|
-
if (typeof limit ===
|
|
47
|
+
if (typeof limit === "number" && Number.isFinite(limit) && limit > 0) {
|
|
48
48
|
return limit;
|
|
49
49
|
}
|
|
50
50
|
return null;
|
|
51
51
|
};
|
|
52
52
|
const estimateCostUsd = async () => {
|
|
53
53
|
const extraCosts = [
|
|
54
|
-
typeof transcriptionCost.value ===
|
|
54
|
+
typeof transcriptionCost.value === "number" && Number.isFinite(transcriptionCost.value)
|
|
55
55
|
? transcriptionCost.value
|
|
56
56
|
: null,
|
|
57
|
-
].filter((value) => typeof value ===
|
|
57
|
+
].filter((value) => typeof value === "number");
|
|
58
58
|
const extraTotal = extraCosts.length > 0 ? extraCosts.reduce((sum, value) => sum + value, 0) : 0;
|
|
59
59
|
const hasExtra = extraCosts.length > 0;
|
|
60
60
|
const explicitCosts = llmCalls
|
|
61
|
-
.map((call) => typeof call.costUsd ===
|
|
62
|
-
.filter((value) => typeof value ===
|
|
61
|
+
.map((call) => typeof call.costUsd === "number" && Number.isFinite(call.costUsd) ? call.costUsd : null)
|
|
62
|
+
.filter((value) => typeof value === "number");
|
|
63
63
|
const explicitTotal = explicitCosts.length > 0 ? explicitCosts.reduce((sum, value) => sum + value, 0) : 0;
|
|
64
64
|
const calls = llmCalls
|
|
65
|
-
.filter((call) => !(typeof call.costUsd ===
|
|
65
|
+
.filter((call) => !(typeof call.costUsd === "number" && Number.isFinite(call.costUsd)))
|
|
66
66
|
.map((call) => {
|
|
67
67
|
const promptTokens = call.usage?.promptTokens ?? null;
|
|
68
68
|
const completionTokens = call.usage?.completionTokens ?? null;
|
|
69
|
-
const hasTokens = typeof promptTokens ===
|
|
69
|
+
const hasTokens = typeof promptTokens === "number" &&
|
|
70
70
|
Number.isFinite(promptTokens) &&
|
|
71
|
-
typeof completionTokens ===
|
|
71
|
+
typeof completionTokens === "number" &&
|
|
72
72
|
Number.isFinite(completionTokens);
|
|
73
73
|
const usage = hasTokens
|
|
74
74
|
? normalizeTokenUsage({
|
|
@@ -103,7 +103,7 @@ export function createRunMetrics({ env, fetchImpl, maxOutputTokensArg, }) {
|
|
|
103
103
|
return buildRunMetricsReport({ llmCalls, firecrawlRequests, apifyRequests });
|
|
104
104
|
};
|
|
105
105
|
const trackedFetch = async (input, init) => {
|
|
106
|
-
const url = typeof input ===
|
|
106
|
+
const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
|
|
107
107
|
let hostname = null;
|
|
108
108
|
try {
|
|
109
109
|
hostname = new URL(url).hostname.toLowerCase();
|
|
@@ -111,10 +111,10 @@ export function createRunMetrics({ env, fetchImpl, maxOutputTokensArg, }) {
|
|
|
111
111
|
catch {
|
|
112
112
|
hostname = null;
|
|
113
113
|
}
|
|
114
|
-
if (hostname ===
|
|
114
|
+
if (hostname === "api.firecrawl.dev") {
|
|
115
115
|
firecrawlRequests += 1;
|
|
116
116
|
}
|
|
117
|
-
else if (hostname ===
|
|
117
|
+
else if (hostname === "api.apify.com") {
|
|
118
118
|
apifyRequests += 1;
|
|
119
119
|
}
|
|
120
120
|
return fetchImpl(input, init);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-metrics.js","sourceRoot":"","sources":["../../../src/run/run-metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"run-metrics.js","sourceRoot":"","sources":["../../../src/run/run-metrics.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { parseRequestedModelId } from
|
|
2
|
-
import { BUILTIN_MODELS } from
|
|
1
|
+
import { parseRequestedModelId } from "../model-spec.js";
|
|
2
|
+
import { BUILTIN_MODELS } from "./constants.js";
|
|
3
3
|
export function resolveModelSelection({ config, configForCli, configPath, envForRun, explicitModelArg, }) {
|
|
4
4
|
const modelMap = (() => {
|
|
5
5
|
const out = new Map();
|
|
@@ -14,32 +14,35 @@ export function resolveModelSelection({ config, configForCli, configPath, envFor
|
|
|
14
14
|
}
|
|
15
15
|
return out;
|
|
16
16
|
})();
|
|
17
|
-
const
|
|
18
|
-
if (typeof envForRun.SUMMARIZE_MODEL ===
|
|
17
|
+
const defaultModelResolution = (() => {
|
|
18
|
+
if (typeof envForRun.SUMMARIZE_MODEL === "string" &&
|
|
19
19
|
envForRun.SUMMARIZE_MODEL.trim().length > 0) {
|
|
20
|
-
return envForRun.SUMMARIZE_MODEL.trim();
|
|
20
|
+
return { value: envForRun.SUMMARIZE_MODEL.trim(), source: "env" };
|
|
21
21
|
}
|
|
22
22
|
const modelFromConfig = config?.model;
|
|
23
23
|
if (modelFromConfig) {
|
|
24
|
-
if (
|
|
24
|
+
if ("id" in modelFromConfig && typeof modelFromConfig.id === "string") {
|
|
25
25
|
const id = modelFromConfig.id.trim();
|
|
26
26
|
if (id.length > 0)
|
|
27
|
-
return id;
|
|
27
|
+
return { value: id, source: "config" };
|
|
28
28
|
}
|
|
29
|
-
if (
|
|
29
|
+
if ("name" in modelFromConfig && typeof modelFromConfig.name === "string") {
|
|
30
30
|
const name = modelFromConfig.name.trim();
|
|
31
31
|
if (name.length > 0)
|
|
32
|
-
return name;
|
|
32
|
+
return { value: name, source: "config" };
|
|
33
|
+
}
|
|
34
|
+
if ("mode" in modelFromConfig && modelFromConfig.mode === "auto") {
|
|
35
|
+
return { value: "auto", source: "config" };
|
|
33
36
|
}
|
|
34
|
-
if ('mode' in modelFromConfig && modelFromConfig.mode === 'auto')
|
|
35
|
-
return 'auto';
|
|
36
37
|
}
|
|
37
|
-
return
|
|
38
|
+
return { value: "auto", source: "default" };
|
|
38
39
|
})();
|
|
39
|
-
const
|
|
40
|
+
const explicitModelInput = explicitModelArg?.trim() ?? "";
|
|
41
|
+
const requestedModelInput = (explicitModelInput || defaultModelResolution.value).trim();
|
|
42
|
+
const requestedModelSource = explicitModelInput.length > 0 ? "explicit" : defaultModelResolution.source;
|
|
40
43
|
const requestedModelInputLower = requestedModelInput.toLowerCase();
|
|
41
|
-
const wantsFreeNamedModel = requestedModelInputLower ===
|
|
42
|
-
const namedModelMatch = requestedModelInputLower !==
|
|
44
|
+
const wantsFreeNamedModel = requestedModelInputLower === "free";
|
|
45
|
+
const namedModelMatch = requestedModelInputLower !== "auto" ? (modelMap.get(requestedModelInputLower) ?? null) : null;
|
|
43
46
|
const namedModelConfig = namedModelMatch?.model ?? null;
|
|
44
47
|
const isNamedModelSelection = Boolean(namedModelMatch);
|
|
45
48
|
const configForModelSelection = isNamedModelSelection && namedModelConfig
|
|
@@ -47,28 +50,30 @@ export function resolveModelSelection({ config, configForCli, configPath, envFor
|
|
|
47
50
|
: configForCli;
|
|
48
51
|
const requestedModel = (() => {
|
|
49
52
|
if (isNamedModelSelection && namedModelConfig) {
|
|
50
|
-
if (
|
|
53
|
+
if ("id" in namedModelConfig)
|
|
51
54
|
return parseRequestedModelId(namedModelConfig.id);
|
|
52
|
-
if (
|
|
53
|
-
return { kind:
|
|
55
|
+
if ("mode" in namedModelConfig && namedModelConfig.mode === "auto")
|
|
56
|
+
return { kind: "auto" };
|
|
54
57
|
throw new Error(`Invalid model "${namedModelMatch?.name ?? requestedModelInput}": unsupported model config`);
|
|
55
58
|
}
|
|
56
|
-
if (requestedModelInputLower !==
|
|
57
|
-
throw new Error(`Unknown model "${requestedModelInput}". Define it in ${configPath ??
|
|
59
|
+
if (requestedModelInputLower !== "auto" && !requestedModelInput.includes("/")) {
|
|
60
|
+
throw new Error(`Unknown model "${requestedModelInput}". Define it in ${configPath ?? "~/.summarize/config.json"} under "models", or use a provider-prefixed id like openai/...`);
|
|
58
61
|
}
|
|
59
62
|
return parseRequestedModelId(requestedModelInput);
|
|
60
63
|
})();
|
|
61
64
|
const requestedModelLabel = isNamedModelSelection
|
|
62
65
|
? requestedModelInput
|
|
63
|
-
: requestedModel.kind ===
|
|
64
|
-
?
|
|
66
|
+
: requestedModel.kind === "auto"
|
|
67
|
+
? "auto"
|
|
65
68
|
: requestedModel.userModelId;
|
|
66
|
-
const isFallbackModel = requestedModel.kind ===
|
|
69
|
+
const isFallbackModel = requestedModel.kind === "auto";
|
|
70
|
+
const isImplicitAutoSelection = requestedModel.kind === "auto" && requestedModelSource === "default";
|
|
67
71
|
return {
|
|
68
72
|
requestedModel,
|
|
69
73
|
requestedModelInput,
|
|
70
74
|
requestedModelLabel,
|
|
71
75
|
isNamedModelSelection,
|
|
76
|
+
isImplicitAutoSelection,
|
|
72
77
|
wantsFreeNamedModel,
|
|
73
78
|
configForModelSelection,
|
|
74
79
|
isFallbackModel,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-models.js","sourceRoot":"","sources":["../../../src/run/run-models.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,
|
|
1
|
+
{"version":3,"file":"run-models.js","sourceRoot":"","sources":["../../../src/run/run-models.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { SUMMARY_LENGTH_MAX_CHARACTERS } from
|
|
2
|
-
import { resolveTargetCharacters } from
|
|
1
|
+
import { SUMMARY_LENGTH_MAX_CHARACTERS } from "../prompts/index.js";
|
|
2
|
+
import { resolveTargetCharacters } from "./format.js";
|
|
3
3
|
export function resolveDesiredOutputTokens({ lengthArg, maxOutputTokensArg, }) {
|
|
4
|
-
if (typeof maxOutputTokensArg ===
|
|
4
|
+
if (typeof maxOutputTokensArg === "number")
|
|
5
5
|
return maxOutputTokensArg;
|
|
6
6
|
const targetChars = resolveTargetCharacters(lengthArg, SUMMARY_LENGTH_MAX_CHARACTERS);
|
|
7
7
|
if (!Number.isFinite(targetChars) ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-output.js","sourceRoot":"","sources":["../../../src/run/run-output.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,
|
|
1
|
+
{"version":3,"file":"run-output.js","sourceRoot":"","sources":["../../../src/run/run-output.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEtD,MAAM,UAAU,0BAA0B,CAAC,EACzC,SAAS,EACT,kBAAkB,GAInB;IACC,IAAI,OAAO,kBAAkB,KAAK,QAAQ;QAAE,OAAO,kBAAkB,CAAC;IACtE,MAAM,WAAW,GAAG,uBAAuB,CAAC,SAAS,EAAE,6BAA6B,CAAC,CAAC;IACtF,IACE,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC;QAC7B,WAAW,IAAI,CAAC;QAChB,WAAW,KAAK,MAAM,CAAC,iBAAiB,EACxC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,+EAA+E;IAC/E,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC;AAClD,CAAC"}
|