@tyvm/knowhow 0.0.38 → 0.0.40
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/package.json +1 -1
- package/src/cli.ts +7 -2
- package/src/clients/openai.ts +36 -1
- package/src/clients/types.ts +4 -4
- package/tests/manual/cli/no-env.sh +7 -0
- package/ts_build/src/cli.js +6 -2
- package/ts_build/src/cli.js.map +1 -1
- package/ts_build/src/clients/openai.d.ts +1 -0
- package/ts_build/src/clients/openai.js +24 -0
- package/ts_build/src/clients/openai.js.map +1 -1
- package/ts_build/src/clients/types.d.ts +4 -4
package/package.json
CHANGED
package/src/cli.ts
CHANGED
|
@@ -172,7 +172,10 @@ async function main() {
|
|
|
172
172
|
}
|
|
173
173
|
|
|
174
174
|
input = readPromptFile(options.promptFile, input);
|
|
175
|
-
|
|
175
|
+
|
|
176
|
+
const agentModule = new AgentModule();
|
|
177
|
+
await agentModule.initialize(chatService);
|
|
178
|
+
const { taskCompleted } = await agentModule.setupAgent({
|
|
176
179
|
...options,
|
|
177
180
|
input,
|
|
178
181
|
maxTimeLimit: parseInt(options.maxTimeLimit, 10),
|
|
@@ -272,7 +275,9 @@ async function main() {
|
|
|
272
275
|
.description("Manage agent sessions from CLI")
|
|
273
276
|
.action(async () => {
|
|
274
277
|
try {
|
|
275
|
-
|
|
278
|
+
const agentModule = new AgentModule();
|
|
279
|
+
await agentModule.initialize(chatService);
|
|
280
|
+
await agentModule.logSessionTable();
|
|
276
281
|
} catch (error) {
|
|
277
282
|
console.error("Error listing sessions:", error);
|
|
278
283
|
process.exit(1);
|
package/src/clients/openai.ts
CHANGED
|
@@ -33,6 +33,41 @@ export class GenericOpenAiClient implements GenericClient {
|
|
|
33
33
|
});
|
|
34
34
|
}
|
|
35
35
|
|
|
36
|
+
reasoningEffort(
|
|
37
|
+
messages: CompletionOptions["messages"]
|
|
38
|
+
): "low" | "medium" | "high" {
|
|
39
|
+
const effortMap = {
|
|
40
|
+
ultrathink: "high",
|
|
41
|
+
"think hard": "high",
|
|
42
|
+
"reason hard": "high",
|
|
43
|
+
|
|
44
|
+
"think carefully": "medium",
|
|
45
|
+
"reason carefully": "medium",
|
|
46
|
+
"think medium": "medium",
|
|
47
|
+
"reason medium": "medium",
|
|
48
|
+
|
|
49
|
+
"think low": "low",
|
|
50
|
+
"reason low": "low",
|
|
51
|
+
"think simple": "low",
|
|
52
|
+
"reason simple": "low",
|
|
53
|
+
};
|
|
54
|
+
|
|
55
|
+
for (const key in effortMap) {
|
|
56
|
+
if (
|
|
57
|
+
messages.some(
|
|
58
|
+
(msg) =>
|
|
59
|
+
typeof msg.content === "string" &&
|
|
60
|
+
msg.role === "user" &&
|
|
61
|
+
msg.content?.includes(key)
|
|
62
|
+
)
|
|
63
|
+
) {
|
|
64
|
+
return effortMap[key];
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
return "medium"; // Default to medium if no specific effort is mentioned
|
|
69
|
+
}
|
|
70
|
+
|
|
36
71
|
async createChatCompletion(
|
|
37
72
|
options: CompletionOptions
|
|
38
73
|
): Promise<CompletionResponse> {
|
|
@@ -55,7 +90,7 @@ export class GenericOpenAiClient implements GenericClient {
|
|
|
55
90
|
...(OpenAiReasoningModels.includes(options.model) && {
|
|
56
91
|
max_tokens: undefined,
|
|
57
92
|
max_completion_tokens: Math.max(options.max_tokens, 100),
|
|
58
|
-
|
|
93
|
+
reasoning_effort: this.reasoningEffort(options.messages),
|
|
59
94
|
}),
|
|
60
95
|
|
|
61
96
|
...(options.tools && {
|
package/src/clients/types.ts
CHANGED
|
@@ -16,8 +16,8 @@ export interface OutputMessage extends Message {
|
|
|
16
16
|
}
|
|
17
17
|
|
|
18
18
|
export interface ToolProp {
|
|
19
|
-
type
|
|
20
|
-
description
|
|
19
|
+
type?: string;
|
|
20
|
+
description?: string;
|
|
21
21
|
properties?: { [key: string]: ToolProp };
|
|
22
22
|
items?: ToolProp;
|
|
23
23
|
}
|
|
@@ -26,14 +26,14 @@ export interface Tool {
|
|
|
26
26
|
type: "function";
|
|
27
27
|
function: {
|
|
28
28
|
name: string;
|
|
29
|
-
description
|
|
29
|
+
description?: string;
|
|
30
30
|
parameters: {
|
|
31
31
|
type: string;
|
|
32
32
|
positional?: boolean;
|
|
33
33
|
properties: {
|
|
34
34
|
[key: string]: ToolProp;
|
|
35
35
|
};
|
|
36
|
-
required
|
|
36
|
+
required?: string[];
|
|
37
37
|
};
|
|
38
38
|
};
|
|
39
39
|
}
|
|
@@ -204,6 +204,13 @@ echo "Testing knowhow ask command with specific model - should work without env
|
|
|
204
204
|
echo
|
|
205
205
|
run_test "knowhow ask --input 'hello' --model claude-sonnet-4" "knowhow ask --input 'hello' --model claude-sonnet-4" 0
|
|
206
206
|
|
|
207
|
+
|
|
208
|
+
# Test 8.1: Agent command with specific model (should work gracefully)
|
|
209
|
+
echo -e "${BLUE}=== Testing Ask Command with Model ===${NC}"
|
|
210
|
+
echo "Testing knowhow ask command with specific model - should work without env variables"
|
|
211
|
+
echo
|
|
212
|
+
run_test "knowhow agent --input 'hello' --model claude-sonnet-4" "knowhow agent --input 'hello' --model claude-sonnet-4" 0
|
|
213
|
+
|
|
207
214
|
# Test 9: Check if there are any other subcommands
|
|
208
215
|
echo -e "${YELLOW}Testing additional subcommands...${NC}"
|
|
209
216
|
subcommands=("agents" "tasks" "models" "providers")
|
package/ts_build/src/cli.js
CHANGED
|
@@ -154,7 +154,9 @@ async function main() {
|
|
|
154
154
|
}
|
|
155
155
|
}
|
|
156
156
|
input = (0, ai_1.readPromptFile)(options.promptFile, input);
|
|
157
|
-
const
|
|
157
|
+
const agentModule = new AgentModule_1.AgentModule();
|
|
158
|
+
await agentModule.initialize(chatService);
|
|
159
|
+
const { taskCompleted } = await agentModule.setupAgent({
|
|
158
160
|
...options,
|
|
159
161
|
input,
|
|
160
162
|
maxTimeLimit: parseInt(options.maxTimeLimit, 10),
|
|
@@ -240,7 +242,9 @@ async function main() {
|
|
|
240
242
|
.description("Manage agent sessions from CLI")
|
|
241
243
|
.action(async () => {
|
|
242
244
|
try {
|
|
243
|
-
|
|
245
|
+
const agentModule = new AgentModule_1.AgentModule();
|
|
246
|
+
await agentModule.initialize(chatService);
|
|
247
|
+
await agentModule.logSessionTable();
|
|
244
248
|
}
|
|
245
249
|
catch (error) {
|
|
246
250
|
console.error("Error listing sessions:", error);
|
package/ts_build/src/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uCAAqC;AAIrC,yCAAoC;AACpC,mCAAkD;AAClD,qCAAgC;AAEhC,wBAAoC;AACpC,8CAAoD;AACpD,yDAA2C;AAC3C,yCAAsC;AACtC,mCAAgC;AAChC,qCAAkC;AAClC,qCAAkC;AAClC,iCAAmC;AAGnC,qCAAqC;AAGrC,wDAAqD;AACrD,8DAA2D;AAC3D,4DAAyD;AACzD,6BAAsC;AACtC,4DAAyD;AACzD,0DAAuD;AAEvD,KAAK,UAAU,aAAa;IAC1B,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,IAAA,mBAAQ,GAAE,CAAC;IACnD,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,IAAA,eAAM,GAAE,CAAC;IAC3D,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IACjC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAC9B,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAChC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAC5B,MAAM,CAAC,oBAAoB,CAAC,IAAA,mBAAQ,GAAE,CAAC,CAAC;IAExC,KAAK,CAAC,WAAW,CAAC,oBAAa,EAAE,QAAQ,CAAC,CAAC;IAE3C,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,GAAG,CAAC,mBAAmB,CAAC,KAAK,CAAC;QAC9B,OAAO,CAAC,wBAAwB,EAAE;KACnC,CAAC,CAAC;AACL,CAAC;AAGD,KAAK,UAAU,SAAS;IACtB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAElC,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE;YACvB,OAAO,CAAC,EAAE,CAAC,CAAC;YACZ,OAAO;SACR;QAED,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE;YAChC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YACnC,IAAI,KAAK,KAAK,IAAI;gBAAE,IAAI,IAAI,KAAK,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,IAAI;IACjB,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;IAC9B,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAS,GAAE,CAAC;IACjC,MAAM,WAAW,GAAG,IAAI,+BAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEvD,OAAO;SACJ,IAAI,CAAC,SAAS,CAAC;SACf,WAAW,CAAC,gCAAgC,CAAC;SAC7C,OAAO,CAAC,QAAQ,CAAC,CAAC;IAGrB,MAAM,aAAa,EAAE,CAAC;IAEtB,OAAO;SACJ,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,kCAAkC,CAAC;SAC/C,MAAM,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,IAAA,aAAI,GAAE,CAAC;IACf,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,kBAAkB,CAAC;SAC/B,MAAM,CAAC,OAAO,EAAE,+CAA+C,CAAC;SAChE,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACrB,MAAM,IAAA,aAAK,EAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,UAAU,CAAC;SACnB,WAAW,CAAC,wBAAwB,CAAC;SACrC,MAAM,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,IAAA,gBAAQ,GAAE,CAAC;IACnB,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,mBAAmB,CAAC;SAChC,MAAM,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,IAAA,aAAK,GAAE,CAAC;IAChB,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,aAAa,CAAC;SACtB,WAAW,CAAC,0CAA0C,CAAC;SACvD,QAAQ,CAAC,WAAW,EAAE,yCAAyC,CAAC;SAChE,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACxB,MAAM,IAAA,QAAK,EAAC,OAAO,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,aAAa,CAAC;SAC1B,MAAM,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,IAAA,cAAM,GAAE,CAAC;IACjB,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,UAAU,CAAC;SACnB,WAAW,CAAC,eAAe,CAAC;SAC5B,MAAM,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,IAAA,WAAQ,GAAE,CAAC;IACnB,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,0BAA0B,CAAC;SACvC,MAAM,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,IAAA,gBAAS,GAAE,CAAC;IACpB,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,kCAAkC,CAAC;SAC/C,MAAM,CACL,uBAAuB,EACvB,8CAA8C,EAC9C,QAAQ,CACT;SACA,MAAM,CAAC,iBAAiB,EAAE,iCAAiC,CAAC;SAC5D,MAAM,CAAC,qBAAqB,EAAE,oBAAoB,EAAE,SAAS,CAAC;SAC9D,MAAM,CACL,4BAA4B,EAC5B,0CAA0C,EAC1C,IAAI,CACL;SACA,MAAM,CACL,6BAA6B,EAC7B,0CAA0C,EAC1C,IAAI,CACL;SACA,MAAM,CAAC,0BAA0B,EAAE,sCAAsC,CAAC;SAC1E,MAAM,CAAC,sBAAsB,EAAE,yCAAyC,CAAC;SACzE,MAAM,CAAC,gBAAgB,EAAE,gDAAgD,CAAC;SAC1E,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACxB,IAAI;YACF,IAAI,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;YAC1B,IAAI,CAAC,KAAK,EAAE;gBACV,KAAK,GAAG,MAAM,SAAS,EAAE,CAAC;gBAC1B,IAAI,CAAC,KAAK,EAAE;oBACV,OAAO,CAAC,KAAK,CACX,qEAAqE,CACtE,CAAC;oBACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;iBACjB;aACF;YAED,KAAK,GAAG,IAAA,mBAAc,EAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;YAElD,MAAM,WAAW,GAAG,IAAI,yBAAW,EAAE,CAAC;YACtC,MAAM,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YAC1C,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC;gBACrD,GAAG,OAAO;gBACV,KAAK;gBACL,YAAY,EAAE,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC;gBAChD,aAAa,EAAE,UAAU,CAAC,OAAO,CAAC,aAAa,CAAC;gBAChD,GAAG,EAAE,IAAI;aACV,CAAC,CAAC;YACH,MAAM,aAAa,CAAC;SACrB;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;YAC7C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,KAAK,CAAC;SACd,WAAW,CAAC,8CAA8C,CAAC;SAC3D,MAAM,CAAC,uBAAuB,EAAE,oBAAoB,EAAE,QAAQ,CAAC;SAC/D,MAAM,CAAC,iBAAiB,EAAE,gBAAgB,CAAC;SAC3C,MAAM,CAAC,gBAAgB,EAAE,8CAA8C,CAAC;SACxE,MAAM,CAAC,sBAAsB,EAAE,6BAA6B,CAAC;SAC7D,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACxB,IAAI;YACF,IAAI,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;YAC1B,IAAI,CAAC,KAAK,EAAE;gBACV,KAAK,GAAG,MAAM,SAAS,EAAE,CAAC;gBAC1B,IAAI,CAAC,KAAK,EAAE;oBACV,OAAO,CAAC,KAAK,CACX,wEAAwE,CACzE,CAAC;oBACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;iBACjB;aACF;YAED,KAAK,GAAG,IAAA,mBAAc,EAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;YAElD,MAAM,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;YAClC,MAAM,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YACxC,MAAM,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE;gBACpC,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,YAAY,EAAE,OAAO,CAAC,KAAK;gBAC3B,eAAe,EAAE,OAAO,CAAC,QAAQ;aAClC,CAAC,CAAC;SACJ;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;YACzC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,oCAAoC,CAAC;SACjD,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACxB,IAAI;YACF,MAAM,WAAW,GAAG,IAAI,yBAAW,EAAE,CAAC;YACtC,MAAM,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YAC1C,MAAM,WAAW,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;SAC1C;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;YAC7C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,qCAAqC,CAAC;SAClD,MAAM,CACL,gBAAgB,EAChB,kDAAkD,CACnD;SACA,MAAM,CACL,wBAAwB,EACxB,wCAAwC,EACxC,KAAK,CACN;SACA,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACxB,IAAI;YACF,IAAI,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;YAC1B,IAAI,CAAC,KAAK,EAAE;gBACV,KAAK,GAAG,MAAM,SAAS,EAAE,CAAC;gBAC1B,IAAI,CAAC,KAAK,EAAE;oBACV,OAAO,CAAC,KAAK,CACX,4EAA4E,CAC7E,CAAC;oBACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;iBACjB;aACF;YAED,MAAM,IAAI,2BAAY,EAAE,CAAC,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;SACxE;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC;YACpD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,UAAU,CAAC;SACnB,WAAW,CAAC,gCAAgC,CAAC;SAC7C,MAAM,CAAC,KAAK,IAAI,EAAE;QACjB,IAAI;YACF,MAAM,WAAW,GAAG,IAAI,yBAAW,EAAE,CAAC;YACtC,MAAM,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YAC1C,MAAM,WAAW,CAAC,eAAe,EAAE,CAAC;SACrC;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC;YAChD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,sBAAsB,CAAC;SACnC,MAAM,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,IAAA,eAAM,GAAE,CAAC;IACjB,CAAC,CAAC,CAAC;IAEL,MAAM,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACzC,CAAC;AAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE;IAC3B,IAAI,EAAE;SACH,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;QACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,EAAE;QACT,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;CACN"}
|
|
@@ -5,6 +5,7 @@ export declare class GenericOpenAiClient implements GenericClient {
|
|
|
5
5
|
apiKey?: string;
|
|
6
6
|
constructor(apiKey?: string);
|
|
7
7
|
setKey(apiKey: string): void;
|
|
8
|
+
reasoningEffort(messages: CompletionOptions["messages"]): "low" | "medium" | "high";
|
|
8
9
|
createChatCompletion(options: CompletionOptions): Promise<CompletionResponse>;
|
|
9
10
|
pricesPerMillion(): {
|
|
10
11
|
[x: string]: {
|
|
@@ -21,6 +21,29 @@ class GenericOpenAiClient {
|
|
|
21
21
|
...(config.openaiBaseUrl && { baseURL: config.openaiBaseUrl }),
|
|
22
22
|
});
|
|
23
23
|
}
|
|
24
|
+
reasoningEffort(messages) {
|
|
25
|
+
const effortMap = {
|
|
26
|
+
ultrathink: "high",
|
|
27
|
+
"think hard": "high",
|
|
28
|
+
"reason hard": "high",
|
|
29
|
+
"think carefully": "medium",
|
|
30
|
+
"reason carefully": "medium",
|
|
31
|
+
"think medium": "medium",
|
|
32
|
+
"reason medium": "medium",
|
|
33
|
+
"think low": "low",
|
|
34
|
+
"reason low": "low",
|
|
35
|
+
"think simple": "low",
|
|
36
|
+
"reason simple": "low",
|
|
37
|
+
};
|
|
38
|
+
for (const key in effortMap) {
|
|
39
|
+
if (messages.some((msg) => typeof msg.content === "string" &&
|
|
40
|
+
msg.role === "user" &&
|
|
41
|
+
msg.content?.includes(key))) {
|
|
42
|
+
return effortMap[key];
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
return "medium";
|
|
46
|
+
}
|
|
24
47
|
async createChatCompletion(options) {
|
|
25
48
|
const openaiMessages = options.messages.map((msg) => {
|
|
26
49
|
if (msg.role === "tool") {
|
|
@@ -40,6 +63,7 @@ class GenericOpenAiClient {
|
|
|
40
63
|
...(types_1.OpenAiReasoningModels.includes(options.model) && {
|
|
41
64
|
max_tokens: undefined,
|
|
42
65
|
max_completion_tokens: Math.max(options.max_tokens, 100),
|
|
66
|
+
reasoning_effort: this.reasoningEffort(options.messages),
|
|
43
67
|
}),
|
|
44
68
|
...(options.tools && {
|
|
45
69
|
tools: options.tools,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../../src/clients/openai.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,sCAA0C;AAc1C,oCAA0E;AAE1E,MAAM,MAAM,GAAG,IAAA,sBAAa,GAAE,CAAC;AAE/B,MAAa,mBAAmB;IAC9B,MAAM,CAAS;IACf,MAAM,CAAU;IAEhB,YAAY,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU;QACzC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC;IAED,MAAM,CAAC,MAAc;QACnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,IAAI,gBAAM,CAAC;YACvB,MAAM;YACN,GAAG,CAAC,MAAM,CAAC,aAAa,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,aAAa,EAAE,CAAC;SAC/D,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,OAA0B;QAE1B,MAAM,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAClD,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,EAAE;gBACvB,OAAO;oBACL,GAAG,GAAG;oBACN,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,EAAE;oBAC1B,IAAI,EAAE,MAAM;oBACZ,YAAY,EAAE,GAAG,CAAC,YAAY;iBACG,CAAC;aACrC;YACD,OAAO,GAAiC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;YACzD,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,QAAQ,EAAE,cAAc;YACxB,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,GAAG,CAAC,6BAAqB,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI;gBACnD,UAAU,EAAE,SAAS;gBACrB,qBAAqB,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../../src/clients/openai.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,8 +18,8 @@ export interface OutputMessage extends Message {
|
|
|
18
18
|
content: string;
|
|
19
19
|
}
|
|
20
20
|
export interface ToolProp {
|
|
21
|
-
type
|
|
22
|
-
description
|
|
21
|
+
type?: string;
|
|
22
|
+
description?: string;
|
|
23
23
|
properties?: {
|
|
24
24
|
[key: string]: ToolProp;
|
|
25
25
|
};
|
|
@@ -29,14 +29,14 @@ export interface Tool {
|
|
|
29
29
|
type: "function";
|
|
30
30
|
function: {
|
|
31
31
|
name: string;
|
|
32
|
-
description
|
|
32
|
+
description?: string;
|
|
33
33
|
parameters: {
|
|
34
34
|
type: string;
|
|
35
35
|
positional?: boolean;
|
|
36
36
|
properties: {
|
|
37
37
|
[key: string]: ToolProp;
|
|
38
38
|
};
|
|
39
|
-
required
|
|
39
|
+
required?: string[];
|
|
40
40
|
};
|
|
41
41
|
};
|
|
42
42
|
}
|