@llm4ts/core 3.3.0 → 4.0.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/dist/ConnectorConfig.d.ts +3 -1
- package/dist/ConnectorConfig.d.ts.map +1 -1
- package/dist/ConnectorConfig.js +4 -17
- package/dist/ConnectorConfig.js.map +1 -1
- package/dist/Models.d.ts +177 -22
- package/dist/Models.d.ts.map +1 -1
- package/dist/Models.js +144 -99
- package/dist/Models.js.map +1 -1
- package/dist/UsageLimits.d.ts.map +1 -1
- package/dist/UsageLimits.js +1 -0
- package/dist/UsageLimits.js.map +1 -1
- package/dist/eval/Checks.d.ts +1 -1
- package/dist/eval/Checks.d.ts.map +1 -1
- package/dist/eval/Checks.js.map +1 -1
- package/dist/eval/Eval.d.ts +4 -1
- package/dist/eval/Eval.d.ts.map +1 -1
- package/dist/eval/Eval.js.map +1 -1
- package/dist/eval/EvalSuite.d.ts +1 -2
- package/dist/eval/EvalSuite.d.ts.map +1 -1
- package/dist/eval/EvalSuite.js.map +1 -1
- package/dist/eval/Evaluator.d.ts +1 -6
- package/dist/eval/Evaluator.d.ts.map +1 -1
- package/dist/eval/Evaluator.js.map +1 -1
- package/dist/eval/Judge.d.ts +1 -2
- package/dist/eval/Judge.d.ts.map +1 -1
- package/dist/eval/Judge.js.map +1 -1
- package/dist/providers/AntigravityConnector.d.ts.map +1 -1
- package/dist/providers/AntigravityConnector.js +5 -4
- package/dist/providers/AntigravityConnector.js.map +1 -1
- package/dist/providers/ClaudeCliConnector.d.ts.map +1 -1
- package/dist/providers/ClaudeCliConnector.js +7 -6
- package/dist/providers/ClaudeCliConnector.js.map +1 -1
- package/dist/providers/CodexConnector.d.ts.map +1 -1
- package/dist/providers/CodexConnector.js +8 -7
- package/dist/providers/CodexConnector.js.map +1 -1
- package/dist/providers/ConnectorFactories.d.ts.map +1 -1
- package/dist/providers/ConnectorFactories.js +26 -20
- package/dist/providers/ConnectorFactories.js.map +1 -1
- package/dist/providers/CopilotConnector.d.ts.map +1 -1
- package/dist/providers/CopilotConnector.js +5 -4
- package/dist/providers/CopilotConnector.js.map +1 -1
- package/dist/providers/CursorConnector.d.ts.map +1 -1
- package/dist/providers/CursorConnector.js +6 -5
- package/dist/providers/CursorConnector.js.map +1 -1
- package/dist/providers/GeminiAcpSession.d.ts.map +1 -1
- package/dist/providers/GeminiAcpSession.js +3 -1
- package/dist/providers/GeminiAcpSession.js.map +1 -1
- package/dist/providers/GeminiCliProvider.d.ts.map +1 -1
- package/dist/providers/GeminiCliProvider.js +4 -3
- package/dist/providers/GeminiCliProvider.js.map +1 -1
- package/dist/providers/GrokCliConnector.d.ts.map +1 -1
- package/dist/providers/GrokCliConnector.js +11 -5
- package/dist/providers/GrokCliConnector.js.map +1 -1
- package/dist/providers/OpenCodeCliConnector.d.ts.map +1 -1
- package/dist/providers/OpenCodeCliConnector.js +6 -5
- package/dist/providers/OpenCodeCliConnector.js.map +1 -1
- package/dist/providers/PiConnector.d.ts.map +1 -1
- package/dist/providers/PiConnector.js +8 -7
- package/dist/providers/PiConnector.js.map +1 -1
- package/package.json +17 -20
- package/src/ConnectorConfig.ts +18 -17
- package/src/Models.ts +238 -101
- package/src/UsageLimits.ts +1 -0
- package/src/eval/Checks.ts +2 -2
- package/src/eval/Eval.ts +4 -1
- package/src/eval/EvalSuite.ts +1 -2
- package/src/eval/Evaluator.ts +1 -6
- package/src/eval/Judge.ts +2 -2
- package/src/providers/AntigravityConnector.ts +12 -4
- package/src/providers/ClaudeCliConnector.ts +9 -6
- package/src/providers/CodexConnector.ts +10 -7
- package/src/providers/ConnectorFactories.ts +53 -51
- package/src/providers/CopilotConnector.ts +6 -4
- package/src/providers/CursorConnector.ts +7 -5
- package/src/providers/GeminiAcpSession.ts +4 -1
- package/src/providers/GeminiCliProvider.ts +6 -3
- package/src/providers/GrokCliConnector.ts +12 -5
- package/src/providers/OpenCodeCliConnector.ts +7 -5
- package/src/providers/PiConnector.ts +15 -7
- package/dist/AgentSession.d.ts +0 -66
- package/dist/AgentSession.d.ts.map +0 -1
- package/dist/AgentSession.js +0 -53
- package/dist/AgentSession.js.map +0 -1
- package/dist/providers/ClaudeAgentSession.d.ts +0 -11
- package/dist/providers/ClaudeAgentSession.d.ts.map +0 -1
- package/dist/providers/ClaudeAgentSession.js +0 -161
- package/dist/providers/ClaudeAgentSession.js.map +0 -1
- package/src/AgentSession.ts +0 -69
- package/src/providers/ClaudeAgentSession.ts +0 -230
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import * as Effect from "effect/Effect";
|
|
2
2
|
import * as Stream from "effect/Stream";
|
|
3
3
|
import { makeCliConnector } from "../Connector.js";
|
|
4
|
-
import { ConnectorIds, LlmChunk, TokenUsage } from "../Models.js";
|
|
4
|
+
import { ConnectorIds, LlmChunk, TokenUsage, cliExecutable } from "../Models.js";
|
|
5
5
|
import { failClassifiedCliError, jsonField, jsonIntField, jsonStringField, optionalModelArgs, parseJsonLine, sortedFlagArgs, cumulativeUsage, toolEventChunk, usageEventChunk } from "./CliSupport.js";
|
|
6
|
+
const executable = cliExecutable("OpenCode");
|
|
6
7
|
export const openCodeCliExtraArgs = (config) => [
|
|
7
8
|
...optionalModelArgs(config.model),
|
|
8
9
|
...(config.readOnly ? ["--agent", "plan"] : ["--auto"]),
|
|
@@ -71,7 +72,7 @@ export const makeOpenCodeCliConnector = (config, executor) => {
|
|
|
71
72
|
const cwd = config.workingDir ?? ".";
|
|
72
73
|
const extraArgs = openCodeCliExtraArgs(config);
|
|
73
74
|
const buildArgv = (prompt) => [
|
|
74
|
-
|
|
75
|
+
executable,
|
|
75
76
|
"run",
|
|
76
77
|
...extraArgs,
|
|
77
78
|
prompt
|
|
@@ -85,7 +86,7 @@ export const makeOpenCodeCliConnector = (config, executor) => {
|
|
|
85
86
|
return result.stdout.join("\n");
|
|
86
87
|
});
|
|
87
88
|
const completeStream = (prompt) => executor
|
|
88
|
-
.runStreaming([
|
|
89
|
+
.runStreaming([executable, "run", "--format", "json", ...extraArgs, prompt], cwd, config.envVars)
|
|
89
90
|
.pipe(Stream.flatMap((line) => Stream.fromIterable(parseOpenCodeCliStreamLine(line))),
|
|
90
91
|
// opencode reports usage per step; a turn is all of them.
|
|
91
92
|
cumulativeUsage, Stream.mapEffect((chunk) => {
|
|
@@ -98,12 +99,12 @@ export const makeOpenCodeCliConnector = (config, executor) => {
|
|
|
98
99
|
id: ConnectorIds.OpenCode,
|
|
99
100
|
interactionSupport: "ContinuationOnly",
|
|
100
101
|
buildArgv: (prompt, _context) => buildArgv(prompt),
|
|
101
|
-
buildInteractiveArgv: (_context) => [
|
|
102
|
+
buildInteractiveArgv: (_context) => [executable],
|
|
102
103
|
complete,
|
|
103
104
|
completeStream,
|
|
104
105
|
// No auth probe: `opencode auth list` lists stored credentials by
|
|
105
106
|
// provider, not whether the provider this seat runs has any; Unknown.
|
|
106
|
-
versionProbe: { executor, binary:
|
|
107
|
+
versionProbe: { executor, binary: executable, cwd }
|
|
107
108
|
});
|
|
108
109
|
};
|
|
109
110
|
//# sourceMappingURL=OpenCodeCliConnector.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenCodeCliConnector.js","sourceRoot":"","sources":["../../src/providers/OpenCodeCliConnector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,gBAAgB,EAA0B,MAAM,iBAAiB,CAAA;AAE1E,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"OpenCodeCliConnector.js","sourceRoot":"","sources":["../../src/providers/OpenCodeCliConnector.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PiConnector.d.ts","sourceRoot":"","sources":["../../src/providers/PiConnector.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,KAAK,YAAY,EAAE,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAC7F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAE/D,OAAO,
|
|
1
|
+
{"version":3,"file":"PiConnector.d.ts","sourceRoot":"","sources":["../../src/providers/PiConnector.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,KAAK,YAAY,EAAE,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAC7F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAE/D,OAAO,EAGL,QAAQ,EAGT,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAwBjE;;;;;;;GAOG;AACH,eAAO,MAAM,WAAW,GAAI,OAAO,MAAM,KAAG,YAe1C,CAAA;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,UAAU,CAAA;AAEtC,wEAAwE;AACxE,eAAO,MAAM,iBAAiB,GAAI,aAAa,MAAM,KAAG,MAAM,GAAG,SAchE,CAAA;AAMD,eAAO,MAAM,WAAW,GAAI,QAAQ,kBAAkB,KAAG,aAAa,CAAC,MAAM,CAwB5E,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,KAAG,aAAa,CAAC,QAAQ,CAgHtE,CAAA;AAED,eAAO,MAAM,eAAe,GAC1B,QAAQ,kBAAkB,EAC1B,UAAU,oBAAoB,KAC7B,iBA6FF,CAAA"}
|
|
@@ -2,8 +2,9 @@ import * as Effect from "effect/Effect";
|
|
|
2
2
|
import * as Stream from "effect/Stream";
|
|
3
3
|
import { makeCliConnector } from "../Connector.js";
|
|
4
4
|
import { InvalidRequestError, ProviderError } from "../Errors.js";
|
|
5
|
-
import { ConnectorCapabilities, ConnectorIds, LlmChunk, TokenUsage } from "../Models.js";
|
|
5
|
+
import { ConnectorCapabilities, ConnectorIds, LlmChunk, TokenUsage, cliExecutable } from "../Models.js";
|
|
6
6
|
import { atLeastVersion, effortWord, cumulativeUsage, failClassifiedCliError, jsonBooleanField, jsonField, jsonIntField, jsonStringField, optionalModelArgs, parseJsonLine, parseJsonOutput, sortedFlagArgs, toolEventChunk, toolResultChunk, toolResultText, usageEventChunk, versionTriple, statusChunk } from "./CliSupport.js";
|
|
7
|
+
const executable = cliExecutable("Pi");
|
|
7
8
|
/**
|
|
8
9
|
* `pi auth check --model <model> --no-refresh --json` says whether pi holds
|
|
9
10
|
* credentials for the provider that model resolves to:
|
|
@@ -189,7 +190,7 @@ export const makePiConnector = (config, executor) => {
|
|
|
189
190
|
let floorChecked = !config.readOnly;
|
|
190
191
|
const checkFloorOnce = Effect.suspend(() => floorChecked
|
|
191
192
|
? Effect.void
|
|
192
|
-
: Effect.flatMap(executor.run([
|
|
193
|
+
: Effect.flatMap(executor.run([executable, "--version"], cwd, config.envVars), (result) => {
|
|
193
194
|
const problem = piReadOnlyProblem([...result.stdout, ...result.stderr].join("\n"));
|
|
194
195
|
return problem === undefined
|
|
195
196
|
? Effect.sync(() => {
|
|
@@ -199,7 +200,7 @@ export const makePiConnector = (config, executor) => {
|
|
|
199
200
|
}));
|
|
200
201
|
const complete = Effect.fn("@llm4ts/core/providers/PiConnector.complete")(function* (prompt) {
|
|
201
202
|
yield* checkFloorOnce;
|
|
202
|
-
const result = yield* executor.runWithStdin([
|
|
203
|
+
const result = yield* executor.runWithStdin([executable, "-p", ...extraArgs], cwd, config.envVars, prompt);
|
|
203
204
|
if (result.exitCode !== 0) {
|
|
204
205
|
// pi explains a refusal on stderr (a usage error, a missing model, an
|
|
205
206
|
// auth failure); stdout is empty then, so both streams are reported.
|
|
@@ -212,7 +213,7 @@ export const makePiConnector = (config, executor) => {
|
|
|
212
213
|
}
|
|
213
214
|
return result.stdout.join("\n");
|
|
214
215
|
});
|
|
215
|
-
const completeStream = (prompt) => Stream.fromEffect(checkFloorOnce).pipe(Stream.drain, Stream.concat(executor.runStreamingWithStdin([
|
|
216
|
+
const completeStream = (prompt) => Stream.fromEffect(checkFloorOnce).pipe(Stream.drain, Stream.concat(executor.runStreamingWithStdin([executable, "-p", "--mode", "json", ...extraArgs], cwd, config.envVars, prompt)), Stream.flatMap((line) => Stream.fromIterable(parsePiStreamLine(line))),
|
|
216
217
|
// pi reports usage per assistant message; a turn is all of them.
|
|
217
218
|
cumulativeUsage, Stream.mapEffect((chunk) => {
|
|
218
219
|
const message = chunk.metadata.piError;
|
|
@@ -236,13 +237,13 @@ export const makePiConnector = (config, executor) => {
|
|
|
236
237
|
}),
|
|
237
238
|
// `--` ends the options (pi >= 0.84.3): a prompt starting with a dash
|
|
238
239
|
// is a prompt, not a flag. Stdin paths need no separator.
|
|
239
|
-
buildArgv: (prompt, _context) => [
|
|
240
|
-
buildInteractiveArgv: (_context) => [
|
|
240
|
+
buildArgv: (prompt, _context) => [executable, "-p", ...extraArgs, "--", prompt],
|
|
241
|
+
buildInteractiveArgv: (_context) => [executable, ...extraArgs],
|
|
241
242
|
complete,
|
|
242
243
|
completeStream,
|
|
243
244
|
versionProbe: {
|
|
244
245
|
executor,
|
|
245
|
-
binary:
|
|
246
|
+
binary: executable,
|
|
246
247
|
cwd,
|
|
247
248
|
...(config.model === undefined ? {} : { authProbe: piAuthProbe(config.model) })
|
|
248
249
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PiConnector.js","sourceRoot":"","sources":["../../src/providers/PiConnector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,gBAAgB,EAA6C,MAAM,iBAAiB,CAAA;AAE7F,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAiB,MAAM,cAAc,CAAA;AAChF,OAAO,
|
|
1
|
+
{"version":3,"file":"PiConnector.js","sourceRoot":"","sources":["../../src/providers/PiConnector.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@llm4ts/core",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "4.0.0",
|
|
4
4
|
"description": "Effect-native LLM contracts, providers, evaluation, and observability",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -13,37 +13,38 @@
|
|
|
13
13
|
"src"
|
|
14
14
|
],
|
|
15
15
|
"exports": {
|
|
16
|
-
"./AgentSession": "./dist/AgentSession.js",
|
|
17
|
-
"./blackboard/Fact": "./dist/blackboard/Fact.js",
|
|
18
|
-
"./blackboard/Rule": "./dist/blackboard/Rule.js",
|
|
19
|
-
"./blackboard/Ruleset": "./dist/blackboard/Ruleset.js",
|
|
20
|
-
"./blackboard/Run": "./dist/blackboard/Run.js",
|
|
21
16
|
"./Capability": "./dist/Capability.js",
|
|
22
17
|
"./Connector": "./dist/Connector.js",
|
|
23
18
|
"./ConnectorConfig": "./dist/ConnectorConfig.js",
|
|
24
19
|
"./ConnectorRegistry": "./dist/ConnectorRegistry.js",
|
|
25
20
|
"./Errors": "./dist/Errors.js",
|
|
21
|
+
"./HttpClient": "./dist/HttpClient.js",
|
|
22
|
+
"./LabelScoring": "./dist/LabelScoring.js",
|
|
23
|
+
"./LlmService": "./dist/LlmService.js",
|
|
24
|
+
"./Models": "./dist/Models.js",
|
|
25
|
+
"./ProcessExecutor": "./dist/ProcessExecutor.js",
|
|
26
|
+
"./Streaming": "./dist/Streaming.js",
|
|
27
|
+
"./StructuredOutput": "./dist/StructuredOutput.js",
|
|
28
|
+
"./TemporaryFiles": "./dist/TemporaryFiles.js",
|
|
29
|
+
"./blackboard/Fact": "./dist/blackboard/Fact.js",
|
|
30
|
+
"./blackboard/Rule": "./dist/blackboard/Rule.js",
|
|
31
|
+
"./blackboard/Ruleset": "./dist/blackboard/Ruleset.js",
|
|
32
|
+
"./blackboard/Run": "./dist/blackboard/Run.js",
|
|
26
33
|
"./eval/Checks": "./dist/eval/Checks.js",
|
|
27
34
|
"./eval/Eval": "./dist/eval/Eval.js",
|
|
28
|
-
"./eval/Evaluator": "./dist/eval/Evaluator.js",
|
|
29
35
|
"./eval/EvalSuite": "./dist/eval/EvalSuite.js",
|
|
36
|
+
"./eval/Evaluator": "./dist/eval/Evaluator.js",
|
|
30
37
|
"./eval/Judge": "./dist/eval/Judge.js",
|
|
31
|
-
"./HttpClient": "./dist/HttpClient.js",
|
|
32
38
|
"./judgment/FakeJudgment": "./dist/judgment/FakeJudgment.js",
|
|
33
39
|
"./judgment/Judgment": "./dist/judgment/Judgment.js",
|
|
34
40
|
"./judgment/LlmJudgment": "./dist/judgment/LlmJudgment.js",
|
|
35
41
|
"./judgment/Schemas": "./dist/judgment/Schemas.js",
|
|
36
42
|
"./judgment/TypeSafeJudgment": "./dist/judgment/TypeSafeJudgment.js",
|
|
37
|
-
"./LabelScoring": "./dist/LabelScoring.js",
|
|
38
|
-
"./LlmService": "./dist/LlmService.js",
|
|
39
|
-
"./Models": "./dist/Models.js",
|
|
40
43
|
"./observability/Redaction": "./dist/observability/Redaction.js",
|
|
41
44
|
"./observability/StreamRecorder": "./dist/observability/StreamRecorder.js",
|
|
42
|
-
"./ProcessExecutor": "./dist/ProcessExecutor.js",
|
|
43
45
|
"./providers/AnthropicModels": "./dist/providers/AnthropicModels.js",
|
|
44
46
|
"./providers/AnthropicProvider": "./dist/providers/AnthropicProvider.js",
|
|
45
47
|
"./providers/AntigravityConnector": "./dist/providers/AntigravityConnector.js",
|
|
46
|
-
"./providers/ClaudeAgentSession": "./dist/providers/ClaudeAgentSession.js",
|
|
47
48
|
"./providers/ClaudeCliConnector": "./dist/providers/ClaudeCliConnector.js",
|
|
48
49
|
"./providers/CliSupport": "./dist/providers/CliSupport.js",
|
|
49
50
|
"./providers/CodexConnector": "./dist/providers/CodexConnector.js",
|
|
@@ -55,21 +56,17 @@
|
|
|
55
56
|
"./providers/GeminiCliProvider": "./dist/providers/GeminiCliProvider.js",
|
|
56
57
|
"./providers/GeminiModelBridge": "./dist/providers/GeminiModelBridge.js",
|
|
57
58
|
"./providers/GeminiModels": "./dist/providers/GeminiModels.js",
|
|
59
|
+
"./providers/GrokCliConnector": "./dist/providers/GrokCliConnector.js",
|
|
58
60
|
"./providers/LmStudioModels": "./dist/providers/LmStudioModels.js",
|
|
59
61
|
"./providers/LmStudioProvider": "./dist/providers/LmStudioProvider.js",
|
|
60
62
|
"./providers/MlxLmProvider": "./dist/providers/MlxLmProvider.js",
|
|
61
63
|
"./providers/MockProvider": "./dist/providers/MockProvider.js",
|
|
62
|
-
"./providers/
|
|
64
|
+
"./providers/OllamaModels": "./dist/providers/OllamaModels.js",
|
|
65
|
+
"./providers/OllamaProvider": "./dist/providers/OllamaProvider.js",
|
|
63
66
|
"./providers/OpenAIModels": "./dist/providers/OpenAIModels.js",
|
|
64
67
|
"./providers/OpenAIProvider": "./dist/providers/OpenAIProvider.js",
|
|
65
68
|
"./providers/OpenCodeCliConnector": "./dist/providers/OpenCodeCliConnector.js",
|
|
66
|
-
"./providers/OllamaModels": "./dist/providers/OllamaModels.js",
|
|
67
|
-
"./providers/OllamaProvider": "./dist/providers/OllamaProvider.js",
|
|
68
69
|
"./providers/PiConnector": "./dist/providers/PiConnector.js",
|
|
69
|
-
"./Streaming": "./dist/Streaming.js",
|
|
70
|
-
"./StructuredOutput": "./dist/StructuredOutput.js",
|
|
71
|
-
"./TemporaryFiles": "./dist/TemporaryFiles.js",
|
|
72
|
-
"./UsageLimits": "./dist/UsageLimits.js",
|
|
73
70
|
"./package.json": "./package.json"
|
|
74
71
|
},
|
|
75
72
|
"publishConfig": {
|
package/src/ConnectorConfig.ts
CHANGED
|
@@ -1,7 +1,16 @@
|
|
|
1
1
|
import * as Duration from "effect/Duration"
|
|
2
2
|
import * as Effect from "effect/Effect"
|
|
3
3
|
import * as Schema from "effect/Schema"
|
|
4
|
-
import {
|
|
4
|
+
import {
|
|
5
|
+
ConnectorId,
|
|
6
|
+
ConnectorIds,
|
|
7
|
+
Effort,
|
|
8
|
+
LlmConfig,
|
|
9
|
+
connectorRow,
|
|
10
|
+
type CliConnectorName,
|
|
11
|
+
type ConnectorName,
|
|
12
|
+
type LlmProvider
|
|
13
|
+
} from "./Models.ts"
|
|
5
14
|
|
|
6
15
|
export class DockerSandbox extends Schema.TaggedClass<DockerSandbox>()("Docker", {
|
|
7
16
|
image: Schema.String,
|
|
@@ -107,23 +116,15 @@ export class CliConnectorConfig extends Schema.TaggedClass<CliConnectorConfig>()
|
|
|
107
116
|
export const ConnectorConfig = Schema.Union([ApiConnectorConfig, CliConnectorConfig])
|
|
108
117
|
export type ConnectorConfig = typeof ConnectorConfig.Type
|
|
109
118
|
|
|
119
|
+
/** The config class the connector named `K` takes, by its kind in `connectorTable`. */
|
|
120
|
+
export type ConnectorConfigOf<K extends ConnectorName> = K extends CliConnectorName
|
|
121
|
+
? CliConnectorConfig
|
|
122
|
+
: ApiConnectorConfig
|
|
123
|
+
|
|
124
|
+
// An id that names no API connector reads as OpenAI, the wire most servers speak.
|
|
110
125
|
const providerForConnector = (connectorId: ConnectorId): LlmProvider => {
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
return "Anthropic"
|
|
114
|
-
case "gemini-api":
|
|
115
|
-
return "GeminiApi"
|
|
116
|
-
case "lm-studio":
|
|
117
|
-
return "LmStudio"
|
|
118
|
-
case "ollama":
|
|
119
|
-
return "Ollama"
|
|
120
|
-
case "mlx-lm":
|
|
121
|
-
return "MlxLm"
|
|
122
|
-
case "mock":
|
|
123
|
-
return "Mock"
|
|
124
|
-
default:
|
|
125
|
-
return "OpenAI"
|
|
126
|
-
}
|
|
126
|
+
const row = connectorRow(connectorId)
|
|
127
|
+
return row?.kind === "Api" ? (row.provider ?? "OpenAI") : "OpenAI"
|
|
127
128
|
}
|
|
128
129
|
|
|
129
130
|
export const toLlmConfig = (config: ApiConnectorConfig): LlmConfig =>
|