@zimtsui/typechat 0.0.106 → 0.0.108
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/README.md +0 -5
- package/assets/xml/instruction.md +19 -0
- package/assets/xml/quotation.handlebars +1 -0
- package/assets/xml/system.handlebars +1 -0
- package/build/adaptor.d.ts +6 -7
- package/build/adaptor.js.map +1 -1
- package/build/assets.d.ts +1 -3
- package/build/assets.js +4 -6
- package/build/assets.js.map +1 -1
- package/build/engine/message.d.ts +7 -15
- package/build/engine/message.js +4 -19
- package/build/engine/message.js.map +1 -1
- package/build/engine/middleware.d.ts +3 -4
- package/build/engine/parts-validator.d.ts +3 -4
- package/build/engine/parts-validator.js.map +1 -1
- package/build/engine/recoverable.d.ts +7 -8
- package/build/engine/recoverable.js.map +1 -1
- package/build/engine/session.d.ts +5 -6
- package/build/engine/tool-choice-validator.d.ts +14 -0
- package/build/engine/tool-choice-validator.js +44 -0
- package/build/engine/tool-choice-validator.js.map +1 -0
- package/build/engine/transport.d.ts +2 -3
- package/build/engine.d.ts +23 -26
- package/build/engine.js +12 -18
- package/build/engine.js.map +1 -1
- package/build/engines/anthropic/message-codec.d.ts +6 -9
- package/build/engines/anthropic/message-codec.js +2 -7
- package/build/engines/anthropic/message-codec.js.map +1 -1
- package/build/engines/anthropic/message.d.ts +2 -3
- package/build/engines/anthropic/message.js.map +1 -1
- package/build/engines/anthropic/tool-choice-codec.d.ts +3 -0
- package/build/engines/anthropic/tool-choice-codec.js +15 -0
- package/build/engines/anthropic/tool-choice-codec.js.map +1 -0
- package/build/engines/anthropic/transport.d.ts +10 -11
- package/build/engines/anthropic/transport.js +4 -4
- package/build/engines/anthropic/transport.js.map +1 -1
- package/build/engines/anthropic.d.ts +8 -9
- package/build/engines/anthropic.js +1 -2
- package/build/engines/anthropic.js.map +1 -1
- package/build/engines/google/message-codec.d.ts +6 -9
- package/build/engines/google/message-codec.js +3 -9
- package/build/engines/google/message-codec.js.map +1 -1
- package/build/engines/google/message.d.ts +3 -4
- package/build/engines/google/message.js +2 -2
- package/build/engines/google/message.js.map +1 -1
- package/build/engines/google/tool-choice-codec.d.ts +3 -0
- package/build/engines/google/tool-choice-codec.js +15 -0
- package/build/engines/google/tool-choice-codec.js.map +1 -0
- package/build/engines/google/transport.d.ts +9 -10
- package/build/engines/google/transport.js +4 -4
- package/build/engines/google/transport.js.map +1 -1
- package/build/engines/google.d.ts +15 -16
- package/build/engines/google.js +10 -18
- package/build/engines/google.js.map +1 -1
- package/build/engines/openai-chatcompletions/message-codec.d.ts +7 -10
- package/build/engines/openai-chatcompletions/message-codec.js +2 -7
- package/build/engines/openai-chatcompletions/message-codec.js.map +1 -1
- package/build/engines/openai-chatcompletions/tool-choice-codec.d.ts +3 -0
- package/build/engines/openai-chatcompletions/tool-choice-codec.js +14 -0
- package/build/engines/openai-chatcompletions/tool-choice-codec.js.map +1 -0
- package/build/engines/openai-chatcompletions/transport.d.ts +10 -11
- package/build/engines/openai-chatcompletions/transport.js +4 -4
- package/build/engines/openai-chatcompletions/transport.js.map +1 -1
- package/build/engines/openai-chatcompletions.d.ts +8 -9
- package/build/engines/openai-chatcompletions.js +1 -4
- package/build/engines/openai-chatcompletions.js.map +1 -1
- package/build/engines/openai-responses/message-codec.d.ts +6 -9
- package/build/engines/openai-responses/message-codec.js +2 -7
- package/build/engines/openai-responses/message-codec.js.map +1 -1
- package/build/engines/openai-responses/message.d.ts +2 -3
- package/build/engines/openai-responses/message.js.map +1 -1
- package/build/engines/openai-responses/tool-choice-codec.d.ts +3 -0
- package/build/engines/openai-responses/tool-choice-codec.js +14 -0
- package/build/engines/openai-responses/tool-choice-codec.js.map +1 -0
- package/build/engines/openai-responses/tool-choice-validator.d.ts +11 -0
- package/build/engines/openai-responses/tool-choice-validator.js +50 -0
- package/build/engines/openai-responses/tool-choice-validator.js.map +1 -0
- package/build/engines/openai-responses/transport.d.ts +10 -11
- package/build/engines/openai-responses/transport.js +4 -4
- package/build/engines/openai-responses/transport.js.map +1 -1
- package/build/engines/openai-responses.d.ts +16 -17
- package/build/engines/openai-responses.js +10 -18
- package/build/engines/openai-responses.js.map +1 -1
- package/build/exports.d.ts +2 -2
- package/build/exports.js +2 -2
- package/build/exports.js.map +1 -1
- package/build/function.d.ts +3 -2
- package/build/function.js.map +1 -1
- package/build/media.js +2 -2
- package/build/media.js.map +1 -1
- package/build/tool-choice.d.ts +7 -0
- package/build/tool-choice.js +8 -0
- package/build/tool-choice.js.map +1 -0
- package/build/tsconfig.tsbuildinfo +1 -1
- package/build/xml/helpers.js.map +1 -0
- package/build/{verbatim/codec → xml}/quotation.js +2 -2
- package/build/xml/quotation.js.map +1 -0
- package/build/xml/system.js +7 -0
- package/build/xml/system.js.map +1 -0
- package/build/xml.d.ts +2 -0
- package/build/xml.js +3 -0
- package/build/xml.js.map +1 -0
- package/package.json +2 -2
- package/assets/verbatim/declarations.handlebars +0 -12
- package/assets/verbatim/instruction.md +0 -55
- package/assets/verbatim/quotation.handlebars +0 -1
- package/assets/verbatim/response.handlebars +0 -1
- package/assets/verbatim/system.handlebars +0 -1
- package/build/engine/structuring-validator.d.ts +0 -15
- package/build/engine/structuring-validator.js +0 -77
- package/build/engine/structuring-validator.js.map +0 -1
- package/build/engines/anthropic/structuring-choice-codec.d.ts +0 -5
- package/build/engines/anthropic/structuring-choice-codec.js +0 -23
- package/build/engines/anthropic/structuring-choice-codec.js.map +0 -1
- package/build/engines/google/structuring-choice-codec.d.ts +0 -5
- package/build/engines/google/structuring-choice-codec.js +0 -23
- package/build/engines/google/structuring-choice-codec.js.map +0 -1
- package/build/engines/openai-chatcompletions/structuring-choice-codec.d.ts +0 -5
- package/build/engines/openai-chatcompletions/structuring-choice-codec.js +0 -22
- package/build/engines/openai-chatcompletions/structuring-choice-codec.js.map +0 -1
- package/build/engines/openai-responses/structuring-choice-codec.d.ts +0 -3
- package/build/engines/openai-responses/structuring-choice-codec.js +0 -22
- package/build/engines/openai-responses/structuring-choice-codec.js.map +0 -1
- package/build/engines/openai-responses/structuring-validator.d.ts +0 -12
- package/build/engines/openai-responses/structuring-validator.js +0 -83
- package/build/engines/openai-responses/structuring-validator.js.map +0 -1
- package/build/structuring-choice.d.ts +0 -15
- package/build/structuring-choice.js +0 -18
- package/build/structuring-choice.js.map +0 -1
- package/build/verbatim/codec/declarations.d.ts +0 -2
- package/build/verbatim/codec/declarations.js +0 -25
- package/build/verbatim/codec/declarations.js.map +0 -1
- package/build/verbatim/codec/helpers.js.map +0 -1
- package/build/verbatim/codec/quotation.js.map +0 -1
- package/build/verbatim/codec/request.d.ts +0 -11
- package/build/verbatim/codec/request.js +0 -81
- package/build/verbatim/codec/request.js.map +0 -1
- package/build/verbatim/codec/response.d.ts +0 -2
- package/build/verbatim/codec/response.js +0 -7
- package/build/verbatim/codec/response.js.map +0 -1
- package/build/verbatim/codec/system.js +0 -7
- package/build/verbatim/codec/system.js.map +0 -1
- package/build/verbatim/codec.d.ts +0 -5
- package/build/verbatim/codec.js +0 -6
- package/build/verbatim/codec.js.map +0 -1
- package/build/verbatim.d.ts +0 -76
- package/build/verbatim.js +0 -17
- package/build/verbatim.js.map +0 -1
- /package/build/{verbatim/codec → xml}/helpers.d.ts +0 -0
- /package/build/{verbatim/codec → xml}/helpers.js +0 -0
- /package/build/{verbatim/codec → xml}/quotation.d.ts +0 -0
- /package/build/{verbatim/codec → xml}/system.d.ts +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/engines/google/transport.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAIjC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/engines/google/transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,37 +1,36 @@
|
|
|
1
1
|
import { Engine, Middleware } from '../engine.ts';
|
|
2
2
|
import { Function } from '../function.ts';
|
|
3
|
-
import { Verbatim } from '../verbatim.ts';
|
|
4
3
|
import { MessageCodec } from './google/message-codec.ts';
|
|
5
4
|
import { ToolCodec } from './google/tool-codec.ts';
|
|
6
5
|
import { Billing } from './google/billing.ts';
|
|
7
6
|
import { Transport } from './google/transport.ts';
|
|
8
7
|
import { InferenceContext } from '../inference-context.ts';
|
|
9
8
|
import * as MessageModule from './google/message.ts';
|
|
10
|
-
export type GoogleEngine<fdm extends Function.Decl.Map.Proto
|
|
9
|
+
export type GoogleEngine<fdm extends Function.Decl.Map.Proto> = GoogleEngine.Instance<fdm>;
|
|
11
10
|
export declare namespace GoogleEngine {
|
|
12
|
-
class Instance<in out fdm extends Function.Decl.Map.Proto
|
|
13
|
-
protected options: GoogleEngine.Options<fdm
|
|
11
|
+
class Instance<in out fdm extends Function.Decl.Map.Proto> extends Engine.Instance<fdm> {
|
|
12
|
+
protected options: GoogleEngine.Options<fdm>;
|
|
14
13
|
protected toolCodec: ToolCodec<fdm>;
|
|
15
|
-
protected messageCodec: MessageCodec<fdm
|
|
14
|
+
protected messageCodec: MessageCodec<fdm>;
|
|
16
15
|
protected billing: Billing;
|
|
17
|
-
protected transport: Transport<fdm
|
|
18
|
-
protected
|
|
16
|
+
protected transport: Transport<fdm>;
|
|
17
|
+
protected toolChoiceValidator: Engine.ToolChoiceValidator.From<fdm>;
|
|
19
18
|
protected codeExecution: boolean;
|
|
20
19
|
protected urlContext: boolean;
|
|
21
20
|
protected googleSearch: boolean;
|
|
22
|
-
constructor(options: GoogleEngine.Options<fdm
|
|
23
|
-
clone(): GoogleEngine<fdm
|
|
24
|
-
protected infer(wfctx: InferenceContext, session: Engine.Session.From<fdm
|
|
25
|
-
stateless(wfctx: InferenceContext, session: Engine.Session.From<fdm
|
|
26
|
-
stateful(wfctx: InferenceContext, session: Engine.Session.From<fdm
|
|
27
|
-
useStateless(middleware: Middleware.From<fdm
|
|
28
|
-
useStateful(middleware: Middleware.From<fdm
|
|
21
|
+
constructor(options: GoogleEngine.Options<fdm>);
|
|
22
|
+
clone(): GoogleEngine<fdm>;
|
|
23
|
+
protected infer(wfctx: InferenceContext, session: Engine.Session.From<fdm>): Promise<RoleMessage.Ai.From<fdm>>;
|
|
24
|
+
stateless(wfctx: InferenceContext, session: Engine.Session.From<fdm>): Promise<RoleMessage.Ai.From<fdm>>;
|
|
25
|
+
stateful(wfctx: InferenceContext, session: Engine.Session.From<fdm>): Promise<RoleMessage.Ai.From<fdm>>;
|
|
26
|
+
useStateless(middleware: Middleware.From<fdm>): GoogleEngine<fdm>;
|
|
27
|
+
useStateful(middleware: Middleware.From<fdm>): GoogleEngine<fdm>;
|
|
29
28
|
/**
|
|
30
29
|
* @param session mutable
|
|
31
30
|
*/
|
|
32
|
-
agentloop(wfctx: InferenceContext, session: Engine.Session.From<fdm
|
|
31
|
+
agentloop(wfctx: InferenceContext, session: Engine.Session.From<fdm>, fnm: Function.Map<fdm>, limit?: number): AsyncGenerator<string, string, void>;
|
|
33
32
|
}
|
|
34
|
-
interface Options<in out fdm extends Function.Decl.Map.Proto
|
|
33
|
+
interface Options<in out fdm extends Function.Decl.Map.Proto> extends Engine.Options<fdm> {
|
|
35
34
|
codeExecution?: boolean;
|
|
36
35
|
urlContext?: boolean;
|
|
37
36
|
googleSearch?: boolean;
|
package/build/engines/google.js
CHANGED
|
@@ -5,7 +5,7 @@ import { ToolCodec } from "./google/tool-codec.js";
|
|
|
5
5
|
import { Billing } from "./google/billing.js";
|
|
6
6
|
import { env } from 'node:process';
|
|
7
7
|
import { Agent, ProxyAgent } from 'undici';
|
|
8
|
-
import {
|
|
8
|
+
import { ToolChoiceValidator } from "../engine/tool-choice-validator.js";
|
|
9
9
|
import { Transport } from "./google/transport.js";
|
|
10
10
|
import * as MessageModule from "./google/message.js";
|
|
11
11
|
export var GoogleEngine;
|
|
@@ -16,7 +16,7 @@ export var GoogleEngine;
|
|
|
16
16
|
messageCodec;
|
|
17
17
|
billing;
|
|
18
18
|
transport;
|
|
19
|
-
|
|
19
|
+
toolChoiceValidator;
|
|
20
20
|
codeExecution;
|
|
21
21
|
urlContext;
|
|
22
22
|
googleSearch;
|
|
@@ -44,7 +44,6 @@ export var GoogleEngine;
|
|
|
44
44
|
});
|
|
45
45
|
this.messageCodec = new MessageCodec({
|
|
46
46
|
toolCodec: this.toolCodec,
|
|
47
|
-
vdm: this.vdm,
|
|
48
47
|
codeExecution: this.codeExecution,
|
|
49
48
|
});
|
|
50
49
|
this.billing = new Billing({ pricing: this.pricing });
|
|
@@ -53,7 +52,7 @@ export var GoogleEngine;
|
|
|
53
52
|
providerSpec: this.providerSpecs,
|
|
54
53
|
fdm: this.fdm,
|
|
55
54
|
throttle: this.throttle,
|
|
56
|
-
|
|
55
|
+
toolChoice: this.toolChoice,
|
|
57
56
|
codeExecution: this.codeExecution,
|
|
58
57
|
urlContext: this.urlContext,
|
|
59
58
|
googleSearch: this.googleSearch,
|
|
@@ -61,7 +60,7 @@ export var GoogleEngine;
|
|
|
61
60
|
toolCodec: this.toolCodec,
|
|
62
61
|
billing: this.billing,
|
|
63
62
|
});
|
|
64
|
-
this.
|
|
63
|
+
this.toolChoiceValidator = new ToolChoiceValidator({ toolChoice: this.toolChoice });
|
|
65
64
|
}
|
|
66
65
|
clone() {
|
|
67
66
|
const engine = new GoogleEngine.Instance(this.options);
|
|
@@ -87,21 +86,15 @@ export var GoogleEngine;
|
|
|
87
86
|
/**
|
|
88
87
|
* @param session mutable
|
|
89
88
|
*/
|
|
90
|
-
async *agentloop(wfctx, session, fnm,
|
|
89
|
+
async *agentloop(wfctx, session, fnm, limit = Number.POSITIVE_INFINITY) {
|
|
91
90
|
for (let i = 0; i < limit; i++) {
|
|
92
91
|
const response = await this.stateful(wfctx, session);
|
|
93
|
-
if (response.
|
|
94
|
-
return response.
|
|
92
|
+
if (response.allText())
|
|
93
|
+
return response.getText();
|
|
95
94
|
const pfress = [];
|
|
96
|
-
const pvress = [];
|
|
97
95
|
for (const part of response.getParts()) {
|
|
98
96
|
if (part instanceof Engine.RoleMessage.Ai.Part.Text) {
|
|
99
|
-
|
|
100
|
-
yield textPart.text;
|
|
101
|
-
for (const vreq of textPart.vreqs) {
|
|
102
|
-
const vh = vhm[vreq.name];
|
|
103
|
-
pvress.push((async () => new GoogleEngine.RoleMessage.User.Part.Text(await vh.call(vhm, vreq.args)))());
|
|
104
|
-
}
|
|
97
|
+
yield part.text;
|
|
105
98
|
}
|
|
106
99
|
else if (part instanceof Function.Call) {
|
|
107
100
|
const fcall = part;
|
|
@@ -111,7 +104,7 @@ export var GoogleEngine;
|
|
|
111
104
|
return Function.Response.Successful.of({
|
|
112
105
|
id: fcall.id,
|
|
113
106
|
name: fcall.name,
|
|
114
|
-
text: await f.call(fnm, fcall.args),
|
|
107
|
+
text: await f.call(fnm, fcall.args, fcall),
|
|
115
108
|
});
|
|
116
109
|
}
|
|
117
110
|
catch (e) {
|
|
@@ -136,8 +129,7 @@ export var GoogleEngine;
|
|
|
136
129
|
throw new Error();
|
|
137
130
|
}
|
|
138
131
|
const fress = await Promise.all(pfress);
|
|
139
|
-
|
|
140
|
-
session.chatMessages.push(new GoogleEngine.RoleMessage.User([...fress, ...vress]));
|
|
132
|
+
session.chatMessages.push(new GoogleEngine.RoleMessage.User(fress));
|
|
141
133
|
}
|
|
142
134
|
throw new Engine.FunctionCallLimitExceeded('Function call limit exceeded.');
|
|
143
135
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google.js","sourceRoot":"","sources":["../../src/engines/google.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAc,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"google.js","sourceRoot":"","sources":["../../src/engines/google.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,21 +2,18 @@ import { Engine } from '../../engine.ts';
|
|
|
2
2
|
import { Function } from '../../function.ts';
|
|
3
3
|
import OpenAI from 'openai';
|
|
4
4
|
import type { ToolCodec } from './tool-codec.ts';
|
|
5
|
-
|
|
6
|
-
export declare class MessageCodec<in out fdm extends Function.Decl.Map.Proto, in out vdm extends Verbatim.Decl.Map.Proto> {
|
|
5
|
+
export declare class MessageCodec<in out fdm extends Function.Decl.Map.Proto> {
|
|
7
6
|
protected toolCodec: ToolCodec<fdm>;
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
decodeAiMessage(message: OpenAI.ChatCompletionMessage): Engine.RoleMessage.Ai.From<fdm, vdm>;
|
|
7
|
+
constructor(options: MessageCodec.Options<fdm>);
|
|
8
|
+
decodeAiMessage(message: OpenAI.ChatCompletionMessage): Engine.RoleMessage.Ai.From<fdm>;
|
|
11
9
|
encodeDeveloperMessage(developerMessage: Engine.RoleMessage.Developer): OpenAI.ChatCompletionSystemMessageParam;
|
|
12
10
|
encodeUserMessage(userMessage: Engine.RoleMessage.User.From<fdm>): (OpenAI.ChatCompletionUserMessageParam | OpenAI.ChatCompletionToolMessageParam)[];
|
|
13
|
-
encodeAiMessage(aiMessage: Engine.RoleMessage.Ai.From<fdm
|
|
14
|
-
encodeRoleMessage(roleMessage: Engine.Session.ChatMessage.From<fdm
|
|
15
|
-
encodeRoleMessages(chatMessages: (Engine.Session.ChatMessage.From<fdm
|
|
11
|
+
encodeAiMessage(aiMessage: Engine.RoleMessage.Ai.From<fdm>): OpenAI.ChatCompletionAssistantMessageParam;
|
|
12
|
+
encodeRoleMessage(roleMessage: Engine.Session.ChatMessage.From<fdm> | Engine.RoleMessage.Developer): OpenAI.ChatCompletionMessageParam[];
|
|
13
|
+
encodeRoleMessages(chatMessages: (Engine.Session.ChatMessage.From<fdm> | Engine.RoleMessage.Developer)[]): OpenAI.ChatCompletionMessageParam[];
|
|
16
14
|
}
|
|
17
15
|
export declare namespace MessageCodec {
|
|
18
|
-
interface Options<in out fdm extends Function.Decl.Map.Proto
|
|
16
|
+
interface Options<in out fdm extends Function.Decl.Map.Proto> {
|
|
19
17
|
toolCodec: ToolCodec<fdm>;
|
|
20
|
-
vdm: vdm;
|
|
21
18
|
}
|
|
22
19
|
}
|
|
@@ -1,19 +1,14 @@
|
|
|
1
1
|
import { Engine } from "../../engine.js";
|
|
2
2
|
import { Function } from "../../function.js";
|
|
3
|
-
import * as VerbatimCodec from "../../verbatim/codec.js";
|
|
4
3
|
export class MessageCodec {
|
|
5
4
|
toolCodec;
|
|
6
|
-
vdm;
|
|
7
5
|
constructor(options) {
|
|
8
6
|
this.toolCodec = options.toolCodec;
|
|
9
|
-
this.vdm = options.vdm;
|
|
10
7
|
}
|
|
11
8
|
decodeAiMessage(message) {
|
|
12
9
|
const parts = [];
|
|
13
|
-
if (message.content)
|
|
14
|
-
|
|
15
|
-
parts.push(new Engine.RoleMessage.Ai.Part.Text(message.content, vreqs));
|
|
16
|
-
}
|
|
10
|
+
if (message.content)
|
|
11
|
+
parts.push(new Engine.RoleMessage.Ai.Part.Text(message.content));
|
|
17
12
|
if (message.tool_calls)
|
|
18
13
|
for (const apifc of message.tool_calls)
|
|
19
14
|
if (apifc.type === 'function')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-codec.js","sourceRoot":"","sources":["../../../src/engines/openai-chatcompletions/message-codec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"message-codec.js","sourceRoot":"","sources":["../../../src/engines/openai-chatcompletions/message-codec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { ToolChoice } from "../../tool-choice.js";
|
|
2
|
+
export function encode(toolChoice) {
|
|
3
|
+
if (toolChoice === ToolChoice.NONE)
|
|
4
|
+
return 'none';
|
|
5
|
+
else if (toolChoice === ToolChoice.REQUIRED)
|
|
6
|
+
return 'required';
|
|
7
|
+
else if (toolChoice === ToolChoice.ANYONE)
|
|
8
|
+
return 'required';
|
|
9
|
+
else if (toolChoice === ToolChoice.AUTO)
|
|
10
|
+
return 'auto';
|
|
11
|
+
else
|
|
12
|
+
throw new Error();
|
|
13
|
+
}
|
|
14
|
+
//# sourceMappingURL=tool-choice-codec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-choice-codec.js","sourceRoot":"","sources":["../../../src/engines/openai-chatcompletions/tool-choice-codec.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGlD,MAAM,UAAU,MAAM,CAClB,UAAsB;IAEtB,IAAI,UAAU,KAAK,UAAU,CAAC,IAAI;QAAE,OAAO,MAAM,CAAC;SAC7C,IAAI,UAAU,KAAK,UAAU,CAAC,QAAQ;QAAE,OAAO,UAAU,CAAC;SAC1D,IAAI,UAAU,KAAK,UAAU,CAAC,MAAM;QAAE,OAAO,UAAU,CAAC;SACxD,IAAI,UAAU,KAAK,UAAU,CAAC,IAAI;QAAE,OAAO,MAAM,CAAC;;QAClD,MAAM,IAAI,KAAK,EAAE,CAAC;AAC3B,CAAC"}
|
|
@@ -1,37 +1,36 @@
|
|
|
1
1
|
import { Function } from '../../function.ts';
|
|
2
2
|
import OpenAI from 'openai';
|
|
3
3
|
import type { InferenceContext } from '../../inference-context.ts';
|
|
4
|
-
import type { Verbatim } from '../../verbatim.ts';
|
|
5
4
|
import { type InferenceOptions, type ProviderSpecs, Engine } from '../../engine.ts';
|
|
6
5
|
import type { Billing } from './billing.ts';
|
|
7
6
|
import type { ToolCodec } from './tool-codec.ts';
|
|
8
7
|
import { Throttle } from '../../throttle.ts';
|
|
9
8
|
import { type MessageCodec } from './message-codec.ts';
|
|
10
|
-
import type {
|
|
11
|
-
export declare class Transport<in out fdm extends Function.Decl.Map.Proto
|
|
9
|
+
import type { ToolChoice } from '../../tool-choice.ts';
|
|
10
|
+
export declare class Transport<in out fdm extends Function.Decl.Map.Proto> implements Engine.Transport<fdm> {
|
|
12
11
|
protected client: OpenAI;
|
|
13
12
|
protected inferenceParams: InferenceOptions;
|
|
14
13
|
protected providerSpec: ProviderSpecs;
|
|
15
14
|
protected fdm: fdm;
|
|
16
15
|
protected throttle: Throttle;
|
|
17
|
-
protected
|
|
18
|
-
protected messageCodec: MessageCodec<fdm
|
|
16
|
+
protected toolChoice: ToolChoice;
|
|
17
|
+
protected messageCodec: MessageCodec<fdm>;
|
|
19
18
|
protected toolCodec: ToolCodec<fdm>;
|
|
20
19
|
protected billing: Billing;
|
|
21
|
-
constructor(options: Transport.Options<fdm
|
|
22
|
-
protected makeParams(session: Engine.Session.From<fdm
|
|
20
|
+
constructor(options: Transport.Options<fdm>);
|
|
21
|
+
protected makeParams(session: Engine.Session.From<fdm>): OpenAI.ChatCompletionCreateParamsStreaming;
|
|
23
22
|
mergeToolCall(apifc: OpenAI.ChatCompletionChunk.Choice.Delta.ToolCall): OpenAI.ChatCompletionMessageToolCall;
|
|
24
23
|
mergeCompletion(stock: OpenAI.ChatCompletionChunk): OpenAI.ChatCompletion;
|
|
25
|
-
fetch(wfctx: InferenceContext, session: Engine.Session.From<fdm
|
|
24
|
+
fetch(wfctx: InferenceContext, session: Engine.Session.From<fdm>, signal?: AbortSignal): Promise<Engine.RoleMessage.Ai.From<fdm>>;
|
|
26
25
|
}
|
|
27
26
|
export declare namespace Transport {
|
|
28
|
-
interface Options<in out fdm extends Function.Decl.Map.Proto
|
|
27
|
+
interface Options<in out fdm extends Function.Decl.Map.Proto> {
|
|
29
28
|
inferenceParams: InferenceOptions;
|
|
30
29
|
providerSpec: ProviderSpecs;
|
|
31
30
|
fdm: fdm;
|
|
32
31
|
throttle: Throttle;
|
|
33
|
-
|
|
34
|
-
messageCodec: MessageCodec<fdm
|
|
32
|
+
toolChoice: ToolChoice;
|
|
33
|
+
messageCodec: MessageCodec<fdm>;
|
|
35
34
|
toolCodec: ToolCodec<fdm>;
|
|
36
35
|
billing: Billing;
|
|
37
36
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import OpenAI from 'openai';
|
|
2
2
|
import { loggers } from "../../telemetry.js";
|
|
3
|
-
import * as
|
|
3
|
+
import * as ToolChoiceCodec from "./tool-choice-codec.js";
|
|
4
4
|
import * as Undici from 'undici';
|
|
5
5
|
export class Transport {
|
|
6
6
|
client;
|
|
@@ -8,7 +8,7 @@ export class Transport {
|
|
|
8
8
|
providerSpec;
|
|
9
9
|
fdm;
|
|
10
10
|
throttle;
|
|
11
|
-
|
|
11
|
+
toolChoice;
|
|
12
12
|
messageCodec;
|
|
13
13
|
toolCodec;
|
|
14
14
|
billing;
|
|
@@ -23,7 +23,7 @@ export class Transport {
|
|
|
23
23
|
this.providerSpec = options.providerSpec;
|
|
24
24
|
this.fdm = options.fdm;
|
|
25
25
|
this.throttle = options.throttle;
|
|
26
|
-
this.
|
|
26
|
+
this.toolChoice = options.toolChoice;
|
|
27
27
|
this.messageCodec = options.messageCodec;
|
|
28
28
|
this.toolCodec = options.toolCodec;
|
|
29
29
|
this.billing = options.billing;
|
|
@@ -38,7 +38,7 @@ export class Transport {
|
|
|
38
38
|
model: this.inferenceParams.model,
|
|
39
39
|
messages,
|
|
40
40
|
tools: tools.length ? tools : undefined,
|
|
41
|
-
tool_choice: tools.length ?
|
|
41
|
+
tool_choice: tools.length ? ToolChoiceCodec.encode(this.toolChoice) : undefined,
|
|
42
42
|
parallel_tool_calls: tools.length ? this.inferenceParams.parallelToolCall : undefined,
|
|
43
43
|
stream: true,
|
|
44
44
|
stream_options: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/engines/openai-chatcompletions/transport.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/engines/openai-chatcompletions/transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,21 +2,20 @@ import { Function } from '../function.ts';
|
|
|
2
2
|
import { Engine } from '../engine.ts';
|
|
3
3
|
import { MessageCodec } from './openai-chatcompletions/message-codec.ts';
|
|
4
4
|
import { Transport } from './openai-chatcompletions/transport.ts';
|
|
5
|
-
import type { Verbatim } from '../verbatim.ts';
|
|
6
5
|
import { ToolCodec } from './openai-chatcompletions/tool-codec.ts';
|
|
7
6
|
import { Billing } from './openai-chatcompletions/billing.ts';
|
|
8
|
-
export type OpenAIChatCompletionsEngine<fdm extends Function.Decl.Map.Proto
|
|
7
|
+
export type OpenAIChatCompletionsEngine<fdm extends Function.Decl.Map.Proto> = OpenAIChatCompletionsEngine.Instance<fdm>;
|
|
9
8
|
export declare namespace OpenAIChatCompletionsEngine {
|
|
10
|
-
class Instance<in out fdm extends Function.Decl.Map.Proto
|
|
11
|
-
protected options: OpenAIChatCompletionsEngine.Options<fdm
|
|
9
|
+
class Instance<in out fdm extends Function.Decl.Map.Proto> extends Engine.Instance<fdm> {
|
|
10
|
+
protected options: OpenAIChatCompletionsEngine.Options<fdm>;
|
|
12
11
|
protected toolCodec: ToolCodec<fdm>;
|
|
13
|
-
protected messageCodec: MessageCodec<fdm
|
|
12
|
+
protected messageCodec: MessageCodec<fdm>;
|
|
14
13
|
protected billing: Billing;
|
|
15
|
-
protected transport: Transport<fdm
|
|
16
|
-
constructor(options: OpenAIChatCompletionsEngine.Options<fdm
|
|
17
|
-
clone(): Engine<fdm
|
|
14
|
+
protected transport: Transport<fdm>;
|
|
15
|
+
constructor(options: OpenAIChatCompletionsEngine.Options<fdm>);
|
|
16
|
+
clone(): Engine<fdm>;
|
|
18
17
|
}
|
|
19
|
-
interface Options<in out fdm extends Function.Decl.Map.Proto
|
|
18
|
+
interface Options<in out fdm extends Function.Decl.Map.Proto> extends Engine.Options<fdm> {
|
|
20
19
|
}
|
|
21
20
|
const create: Engine.Create;
|
|
22
21
|
}
|
|
@@ -17,7 +17,6 @@ export var OpenAIChatCompletionsEngine;
|
|
|
17
17
|
this.toolCodec = new ToolCodec({ fdm: this.fdm });
|
|
18
18
|
this.messageCodec = new MessageCodec({
|
|
19
19
|
toolCodec: this.toolCodec,
|
|
20
|
-
vdm: this.vdm,
|
|
21
20
|
});
|
|
22
21
|
this.billing = new Billing({ pricing: this.pricing });
|
|
23
22
|
this.transport = new Transport({
|
|
@@ -25,13 +24,11 @@ export var OpenAIChatCompletionsEngine;
|
|
|
25
24
|
providerSpec: this.providerSpecs,
|
|
26
25
|
fdm: this.fdm,
|
|
27
26
|
throttle: this.throttle,
|
|
28
|
-
|
|
27
|
+
toolChoice: this.toolChoice,
|
|
29
28
|
messageCodec: this.messageCodec,
|
|
30
29
|
toolCodec: this.toolCodec,
|
|
31
30
|
billing: this.billing,
|
|
32
31
|
});
|
|
33
|
-
if (Object.keys(this.fdm).length && Object.keys(this.vdm).length)
|
|
34
|
-
throw new Error('Functions cannot be declared together with Verbatim Channels in OpenAI ChatCompletions Engine.');
|
|
35
32
|
}
|
|
36
33
|
clone() {
|
|
37
34
|
const engine = new OpenAIChatCompletionsEngine.Instance(this.options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-chatcompletions.js","sourceRoot":"","sources":["../../src/engines/openai-chatcompletions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"openai-chatcompletions.js","sourceRoot":"","sources":["../../src/engines/openai-chatcompletions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AACzE,OAAO,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAM9D,MAAM,KAAW,2BAA2B,CA6C3C;AA7CD,WAAiB,2BAA2B;IACxC,MAAa,QAEX,SAAQ,MAAM,CAAC,QAAa;QAMG;QALnB,SAAS,CAAiB;QAC1B,YAAY,CAAoB;QAChC,OAAO,CAAU;QACR,SAAS,CAAiB;QAE7C,YAA6B,OAAiD;YAC1E,KAAK,CAAC,OAAO,CAAC,CAAC;YADU,YAAO,GAAP,OAAO,CAA0C;YAE1E,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YAClD,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,CAAC;gBACjC,SAAS,EAAE,IAAI,CAAC,SAAS;aAC5B,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,GAAG,IAAI,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACtD,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC;gBAC3B,eAAe,EAAE,IAAI,CAAC,gBAAgB;gBACtC,YAAY,EAAE,IAAI,CAAC,aAAa;gBAChC,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,OAAO,EAAE,IAAI,CAAC,OAAO;aACxB,CAAC,CAAC;QACP,CAAC;QAEe,KAAK;YACjB,MAAM,MAAM,GAAG,IAAI,2BAA2B,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACtE,MAAM,CAAC,oBAAoB,GAAG,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;YAC7D,MAAM,CAAC,mBAAmB,GAAG,CAAC,GAAG,IAAI,CAAC,mBAAmB,CAAC,CAAC;YAC3D,OAAO,MAAM,CAAC;QAClB,CAAC;KACJ;IAjCY,oCAAQ,WAiCpB,CAAA;IAMY,kCAAM,GAAkB,UAEnC,OAA4B;QAC1B,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC,CAAA;AACL,CAAC,EA7CgB,2BAA2B,KAA3B,2BAA2B,QA6C3C"}
|
|
@@ -3,22 +3,19 @@ import { RoleMessage } from './message.ts';
|
|
|
3
3
|
import { Function } from '../../function.ts';
|
|
4
4
|
import OpenAI from 'openai';
|
|
5
5
|
import type { ToolCodec } from './tool-codec.ts';
|
|
6
|
-
import type { Verbatim } from '../../verbatim.ts';
|
|
7
6
|
import { Media } from '../../media.ts';
|
|
8
|
-
export declare class MessageCodec<in out fdm extends Function.Decl.Map.Proto
|
|
7
|
+
export declare class MessageCodec<in out fdm extends Function.Decl.Map.Proto> {
|
|
9
8
|
protected toolCodec: ToolCodec<fdm>;
|
|
10
|
-
|
|
11
|
-
constructor(options: MessageCodec.Options<fdm, vdm>);
|
|
9
|
+
constructor(options: MessageCodec.Options<fdm>);
|
|
12
10
|
protected encodeImageResolution(resolution: Media.Image.Resolution): OpenAI.Responses.ResponseInputImage['detail'];
|
|
13
|
-
decodeAiMessage(output: OpenAI.Responses.ResponseOutputItem[]): RoleMessage.Ai.From<fdm
|
|
11
|
+
decodeAiMessage(output: OpenAI.Responses.ResponseOutputItem[]): RoleMessage.Ai.From<fdm>;
|
|
14
12
|
encodeUserMessage(userMessage: Engine.RoleMessage.User.From<fdm>): OpenAI.Responses.ResponseInput;
|
|
15
|
-
encodeAiMessage(aiMessage: Engine.RoleMessage.Ai.From<fdm
|
|
13
|
+
encodeAiMessage(aiMessage: Engine.RoleMessage.Ai.From<fdm>): OpenAI.Responses.ResponseInput;
|
|
16
14
|
encodeDeveloperMessage(developerMessage: Engine.RoleMessage.Developer): string;
|
|
17
|
-
encodeChatMessage(chatMessage: Engine.Session.ChatMessage.From<fdm
|
|
15
|
+
encodeChatMessage(chatMessage: Engine.Session.ChatMessage.From<fdm>): OpenAI.Responses.ResponseInput;
|
|
18
16
|
}
|
|
19
17
|
export declare namespace MessageCodec {
|
|
20
|
-
interface Options<in out fdm extends Function.Decl.Map.Proto
|
|
18
|
+
interface Options<in out fdm extends Function.Decl.Map.Proto> {
|
|
21
19
|
toolCodec: ToolCodec<fdm>;
|
|
22
|
-
vdm: vdm;
|
|
23
20
|
}
|
|
24
21
|
}
|
|
@@ -2,14 +2,11 @@ import { Engine } from "../../engine.js";
|
|
|
2
2
|
import { RoleMessage } from "./message.js";
|
|
3
3
|
import { Function } from "../../function.js";
|
|
4
4
|
import { Tool } from "./tool.js";
|
|
5
|
-
import * as VerbatimCodec from "../../verbatim/codec.js";
|
|
6
5
|
import { Media } from "../../media.js";
|
|
7
6
|
export class MessageCodec {
|
|
8
7
|
toolCodec;
|
|
9
|
-
vdm;
|
|
10
8
|
constructor(options) {
|
|
11
9
|
this.toolCodec = options.toolCodec;
|
|
12
|
-
this.vdm = options.vdm;
|
|
13
10
|
}
|
|
14
11
|
encodeImageResolution(resolution) {
|
|
15
12
|
if (resolution === 1 /* Media.Image.Resolution.LOW */)
|
|
@@ -28,10 +25,8 @@ export class MessageCodec {
|
|
|
28
25
|
for (const item of output) {
|
|
29
26
|
if (item.type === 'message')
|
|
30
27
|
for (const part of item.content)
|
|
31
|
-
if (part.type === 'output_text')
|
|
32
|
-
|
|
33
|
-
parts.push(new RoleMessage.Ai.Part.Text(part.text, vreqs));
|
|
34
|
-
}
|
|
28
|
+
if (part.type === 'output_text')
|
|
29
|
+
parts.push(new RoleMessage.Ai.Part.Text(part.text));
|
|
35
30
|
else if (part.type === 'refusal')
|
|
36
31
|
throw new SyntaxError('Refusal', { cause: output });
|
|
37
32
|
else
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-codec.js","sourceRoot":"","sources":["../../../src/engines/openai-responses/message-codec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"message-codec.js","sourceRoot":"","sources":["../../../src/engines/openai-responses/message-codec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import { Engine } from '../../engine.ts';
|
|
2
2
|
import { Function } from '../../function.ts';
|
|
3
3
|
import { Tool } from './tool.ts';
|
|
4
|
-
import type { Verbatim } from '../../verbatim.ts';
|
|
5
4
|
import OpenAI from 'openai';
|
|
6
5
|
declare const NOMINAL: unique symbol;
|
|
7
6
|
export declare namespace RoleMessage {
|
|
8
|
-
class Ai<in out fdu extends Function.Decl.Proto
|
|
7
|
+
class Ai<in out fdu extends Function.Decl.Proto> extends Engine.RoleMessage.Ai<fdu> {
|
|
9
8
|
protected raw: OpenAI.Responses.ResponseOutputItem[];
|
|
10
9
|
protected [NOMINAL]: never;
|
|
11
10
|
constructor(parts: unknown[], raw: OpenAI.Responses.ResponseOutputItem[]);
|
|
@@ -14,7 +13,7 @@ export declare namespace RoleMessage {
|
|
|
14
13
|
getOnlyToolCall(): Tool.Call.Of<fdu>;
|
|
15
14
|
}
|
|
16
15
|
namespace Ai {
|
|
17
|
-
type From<fdm extends Function.Decl.Map.Proto
|
|
16
|
+
type From<fdm extends Function.Decl.Map.Proto> = Ai<Function.Decl.From<fdm>>;
|
|
18
17
|
namespace Part {
|
|
19
18
|
export import Text = Engine.RoleMessage.Ai.Part.Text;
|
|
20
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../src/engines/openai-responses/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../src/engines/openai-responses/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC;AAGzB,MAAM,KAAW,WAAW,CA2C3B;AA3CD,WAAiB,WAAW;IACxB,MAAa,EAEX,SAAQ,MAAM,CAAC,WAAW,CAAC,EAAO;QAIlB;QAFd,YACI,KAAgB,EACN,GAA0C;YAEpD,KAAK,CAAC,KAAK,CAAC,CAAC;YAFH,QAAG,GAAH,GAAG,CAAuC;QAGxD,CAAC;QAEM,MAAM;YACT,OAAO,IAAI,CAAC,GAAG,CAAC;QACpB,CAAC;QACM,YAAY;YACf,MAAM,GAAG,GAAwB,EAAE,CAAC;YACpC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK;gBACzB,IAAI,IAAI,YAAY,QAAQ,CAAC,IAAI,IAAI,IAAI,YAAY,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;oBACxE,MAAM,EAAE,GAAG,IAAyB,CAAC;oBACrC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACjB,CAAC;YACL,OAAO,GAAG,CAAC;QACf,CAAC;QACM,eAAe;YAClB,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YAChC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC,CAAA,CAAC;;gBAAM,MAAM,IAAI,KAAK,EAAE,CAAC;YAChD,OAAO,GAAG,CAAC,CAAC,CAAE,CAAC;QACnB,CAAC;KACJ;IA5BY,cAAE,KA4Bd,CAAA;IAED,WAAiB,EAAE;QAKf,IAAiB,IAAI,CAEpB;QAFD,WAAiB,IAAI;YACH,SAAI,GAAG,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;QACzD,CAAC,EAFgB,IAAI,GAAJ,OAAI,KAAJ,OAAI,QAEpB;IACL,CAAC,EARgB,EAAE,GAAF,cAAE,KAAF,cAAE,QAQlB;IAEa,gBAAI,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC;IAC/B,qBAAS,GAAG,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC;AAC3D,CAAC,EA3CgB,WAAW,KAAX,WAAW,QA2C3B"}
|