@agentica/core 0.16.4 → 0.16.7
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/lib/index.d.ts +2 -0
- package/lib/index.js +2 -0
- package/lib/index.js.map +1 -1
- package/lib/index.mjs +128 -193
- package/lib/index.mjs.map +1 -1
- package/lib/orchestrate/call.js +13 -18
- package/lib/orchestrate/call.js.map +1 -1
- package/lib/orchestrate/cancel.js +3 -2
- package/lib/orchestrate/cancel.js.map +1 -1
- package/lib/orchestrate/execute.js +0 -7
- package/lib/orchestrate/execute.js.map +1 -1
- package/lib/orchestrate/internal/cancelFunction.js +13 -24
- package/lib/orchestrate/internal/cancelFunction.js.map +1 -1
- package/lib/utils/ChatGptCompletionMessageUtil.js +316 -368
- package/lib/utils/ChatGptCompletionMessageUtil.js.map +1 -1
- package/package.json +1 -1
- package/src/index.ts +2 -0
- package/src/orchestrate/call.ts +15 -22
- package/src/orchestrate/cancel.ts +3 -2
- package/src/orchestrate/execute.ts +0 -7
- package/src/orchestrate/internal/cancelFunction.ts +4 -4
- package/src/utils/ChatGptCompletionMessageUtil.ts +7 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChatGptCompletionMessageUtil.js","sourceRoot":"","sources":["../../src/utils/ChatGptCompletionMessageUtil.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ChatGptCompletionMessageUtil.js","sourceRoot":"","sources":["../../src/utils/ChatGptCompletionMessageUtil.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/index.ts
CHANGED
|
@@ -37,6 +37,8 @@ export * from "./json/IAgenticaHistoryJson";
|
|
|
37
37
|
export * from "./json/IAgenticaOperationJson";
|
|
38
38
|
export * from "./json/IAgenticaOperationSelectionJson";
|
|
39
39
|
export * from "./json/IAgenticaTokenUsageJson";
|
|
40
|
+
export * from "./json/IMicroAgenticaEventJson";
|
|
41
|
+
export * from "./json/IMicroAgenticaHistoryJson";
|
|
40
42
|
export * from "./MicroAgentica";
|
|
41
43
|
export * as orchestrate from "./orchestrate";
|
|
42
44
|
|
package/src/orchestrate/call.ts
CHANGED
|
@@ -27,7 +27,7 @@ import { AgenticaConstant } from "../constants/AgenticaConstant";
|
|
|
27
27
|
import { AgenticaDefaultPrompt } from "../constants/AgenticaDefaultPrompt";
|
|
28
28
|
import { AgenticaSystemPrompt } from "../constants/AgenticaSystemPrompt";
|
|
29
29
|
import { isAgenticaContext } from "../context/internal/isAgenticaContext";
|
|
30
|
-
import { createCallEvent,
|
|
30
|
+
import { createCallEvent, createExecuteEvent, createTextEvent, createValidateEvent } from "../factory/events";
|
|
31
31
|
import { createCancelHistory, createExecuteHistory, createTextHistory, decodeHistory } from "../factory/histories";
|
|
32
32
|
import { createOperationSelection } from "../factory/operations";
|
|
33
33
|
import { ChatGptCompletionMessageUtil } from "../utils/ChatGptCompletionMessageUtil";
|
|
@@ -116,7 +116,7 @@ export async function call<Model extends ILlmSchema.Model>(
|
|
|
116
116
|
}
|
|
117
117
|
closures.push(
|
|
118
118
|
async (): Promise<
|
|
119
|
-
|
|
119
|
+
Array<AgenticaExecuteHistory<Model> | AgenticaCancelHistory<Model>>
|
|
120
120
|
> => {
|
|
121
121
|
const call: AgenticaCallEvent<Model> = createCallEvent({
|
|
122
122
|
id: tc.id,
|
|
@@ -147,31 +147,24 @@ export async function call<Model extends ILlmSchema.Model>(
|
|
|
147
147
|
).catch(() => {});
|
|
148
148
|
|
|
149
149
|
if (isAgenticaContext(ctx)) {
|
|
150
|
-
|
|
150
|
+
cancelFunction(ctx, {
|
|
151
151
|
name: call.operation.name,
|
|
152
152
|
reason: "completed",
|
|
153
153
|
});
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
154
|
+
return [
|
|
155
|
+
execute,
|
|
156
|
+
createCancelHistory({
|
|
157
|
+
id: call.id,
|
|
158
|
+
selections: [
|
|
159
|
+
createOperationSelection({
|
|
160
|
+
operation: call.operation,
|
|
161
|
+
reason: "complete",
|
|
162
|
+
}),
|
|
163
|
+
],
|
|
160
164
|
}),
|
|
161
|
-
|
|
165
|
+
];
|
|
162
166
|
}
|
|
163
|
-
return [
|
|
164
|
-
execute,
|
|
165
|
-
createCancelHistory({
|
|
166
|
-
id: call.id,
|
|
167
|
-
selections: [
|
|
168
|
-
createOperationSelection({
|
|
169
|
-
operation: call.operation,
|
|
170
|
-
reason: "complete",
|
|
171
|
-
}),
|
|
172
|
-
],
|
|
173
|
-
}),
|
|
174
|
-
] as const;
|
|
167
|
+
return [execute];
|
|
175
168
|
},
|
|
176
169
|
);
|
|
177
170
|
}
|
|
@@ -34,6 +34,7 @@ interface IFailure {
|
|
|
34
34
|
}
|
|
35
35
|
|
|
36
36
|
export async function cancel<Model extends ILlmSchema.Model>(ctx: AgenticaContext<Model>): Promise<AgenticaCancelHistory<Model>[]> {
|
|
37
|
+
console.error("orchestrate.cancel");
|
|
37
38
|
if (ctx.operations.divided === undefined) {
|
|
38
39
|
return step(ctx, ctx.operations.array, 0);
|
|
39
40
|
}
|
|
@@ -85,7 +86,7 @@ export async function cancel<Model extends ILlmSchema.Model>(ctx: AgenticaContex
|
|
|
85
86
|
for (const e of events) {
|
|
86
87
|
if (e.type === "select") {
|
|
87
88
|
collection.selections.push(e.selection);
|
|
88
|
-
|
|
89
|
+
cancelFunction(ctx, {
|
|
89
90
|
name: e.selection.operation.name,
|
|
90
91
|
reason: e.selection.reason,
|
|
91
92
|
});
|
|
@@ -231,7 +232,7 @@ async function step<Model extends ILlmSchema.Model>(ctx: AgenticaContext<Model>,
|
|
|
231
232
|
});
|
|
232
233
|
|
|
233
234
|
for (const reference of input.functions) {
|
|
234
|
-
const operation =
|
|
235
|
+
const operation = cancelFunction(ctx, reference);
|
|
235
236
|
if (operation !== null) {
|
|
236
237
|
collection.selections.push(operation);
|
|
237
238
|
}
|
|
@@ -9,7 +9,6 @@ import { call } from "./call";
|
|
|
9
9
|
import { cancel } from "./cancel";
|
|
10
10
|
import { describe } from "./describe";
|
|
11
11
|
import { initialize } from "./initialize";
|
|
12
|
-
import { cancelFunction } from "./internal/cancelFunction";
|
|
13
12
|
import { select } from "./select";
|
|
14
13
|
|
|
15
14
|
export function execute<Model extends ILlmSchema.Model>(executor: Partial<IAgenticaExecutor<Model>> | null) {
|
|
@@ -64,12 +63,6 @@ export function execute<Model extends ILlmSchema.Model>(executor: Partial<IAgent
|
|
|
64
63
|
const executes: AgenticaExecuteHistory<Model>[] = prompts.filter(
|
|
65
64
|
prompt => prompt.type === "execute",
|
|
66
65
|
);
|
|
67
|
-
for (const e of executes) {
|
|
68
|
-
await cancelFunction(ctx, {
|
|
69
|
-
reason: "completed",
|
|
70
|
-
name: e.operation.name,
|
|
71
|
-
});
|
|
72
|
-
}
|
|
73
66
|
histories.push(
|
|
74
67
|
...(await (
|
|
75
68
|
executor?.describe ?? describe
|
|
@@ -10,10 +10,10 @@ import { createOperationSelection } from "../../factory/operations";
|
|
|
10
10
|
/**
|
|
11
11
|
* @internal
|
|
12
12
|
*/
|
|
13
|
-
export
|
|
13
|
+
export function cancelFunction<Model extends ILlmSchema.Model>(
|
|
14
14
|
ctx: AgenticaContext<Model>,
|
|
15
15
|
reference: __IChatFunctionReference,
|
|
16
|
-
):
|
|
16
|
+
): AgenticaOperationSelection<Model> | null {
|
|
17
17
|
const index: number = ctx.stack.findIndex(
|
|
18
18
|
item => item.operation.name === reference.name,
|
|
19
19
|
);
|
|
@@ -23,13 +23,13 @@ export async function cancelFunction<Model extends ILlmSchema.Model>(
|
|
|
23
23
|
|
|
24
24
|
const item: AgenticaOperationSelection<Model> = ctx.stack[index]!;
|
|
25
25
|
ctx.stack.splice(index, 1);
|
|
26
|
-
|
|
26
|
+
ctx.dispatch(
|
|
27
27
|
createCancelEvent({
|
|
28
28
|
selection: createOperationSelection({
|
|
29
29
|
operation: item.operation,
|
|
30
30
|
reason: reference.reason,
|
|
31
31
|
}),
|
|
32
32
|
}),
|
|
33
|
-
);
|
|
33
|
+
).catch(() => {});
|
|
34
34
|
return item;
|
|
35
35
|
}
|
|
@@ -3,10 +3,9 @@ import type {
|
|
|
3
3
|
ChatCompletionChunk,
|
|
4
4
|
ChatCompletionMessage,
|
|
5
5
|
ChatCompletionMessageToolCall,
|
|
6
|
-
CompletionUsage,
|
|
7
6
|
} from "openai/resources";
|
|
8
7
|
|
|
9
|
-
import
|
|
8
|
+
import typia from "typia";
|
|
10
9
|
|
|
11
10
|
import { ByteArrayUtil } from "./ByteArrayUtil";
|
|
12
11
|
import { ChatGptTokenUsageAggregator } from "./ChatGptTokenUsageAggregator";
|
|
@@ -14,9 +13,12 @@ import { ChatGptTokenUsageAggregator } from "./ChatGptTokenUsageAggregator";
|
|
|
14
13
|
function transformCompletionChunk(source: string | Uint8Array): ChatCompletionChunk {
|
|
15
14
|
const str
|
|
16
15
|
= source instanceof Uint8Array ? ByteArrayUtil.toUtf8(source) : source;
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
16
|
+
const result: ChatCompletionChunk = JSON.parse(str) as ChatCompletionChunk;
|
|
17
|
+
const valid = typia.validate<ChatCompletionChunk>(result);
|
|
18
|
+
if (valid.success === false) {
|
|
19
|
+
console.error("Invalid ChatCompletionChunk", valid.errors);
|
|
20
|
+
}
|
|
21
|
+
return result;
|
|
20
22
|
}
|
|
21
23
|
|
|
22
24
|
function accumulate(origin: ChatCompletion, chunk: ChatCompletionChunk): ChatCompletion {
|