@caretakerai/agent 0.0.6 → 0.0.8
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/action.js +17 -11
- package/dist/action.js.map +1 -1
- package/dist/activity.js +5 -3
- package/dist/activity.js.map +1 -1
- package/dist/agent.d.ts +2 -5
- package/dist/agent.js +50 -33
- package/dist/agent.js.map +1 -1
- package/package.json +1 -1
package/dist/action.js
CHANGED
|
@@ -17,15 +17,14 @@ const ajv = (0, ajv_errors_1.default)(new ajv_1.default({
|
|
|
17
17
|
}));
|
|
18
18
|
const ACTION_TEMPLATE = (`
|
|
19
19
|
\`\`\`ts
|
|
20
|
-
{params}
|
|
21
|
-
{result}
|
|
22
20
|
/**
|
|
23
|
-
{description}
|
|
24
21
|
* @kind {kind}
|
|
25
|
-
|
|
26
|
-
* @returns {{resultType}} {kind} action result
|
|
22
|
+
{description}
|
|
27
23
|
* /
|
|
28
|
-
|
|
24
|
+
|
|
25
|
+
{params}
|
|
26
|
+
|
|
27
|
+
{result}
|
|
29
28
|
{examples}\`\`\`
|
|
30
29
|
`).trim();
|
|
31
30
|
class Action {
|
|
@@ -48,11 +47,15 @@ class Action {
|
|
|
48
47
|
const paramsType = `${this.kind}Params`;
|
|
49
48
|
const resultType = `${this.kind}Result`;
|
|
50
49
|
const partial = await prompts_1.PromptTemplate.fromTemplate(template).partial({
|
|
51
|
-
params: () =>
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
50
|
+
params: async () => {
|
|
51
|
+
const ts = await (0, json_schema_to_typescript_1.compile)(this.params, paramsType, { bannerComment: '', additionalProperties: false });
|
|
52
|
+
return ts.replace(/^(export\s*)/gm, '').trim();
|
|
53
|
+
},
|
|
54
|
+
result: async () => {
|
|
55
|
+
const ts = await (0, json_schema_to_typescript_1.compile)(this.result, resultType, { bannerComment: '', additionalProperties: false });
|
|
56
|
+
return ts.replace(/^(export\s*)/gm, '').trim();
|
|
57
|
+
},
|
|
58
|
+
examples: () => this._examplesPrompt(),
|
|
56
59
|
kind: this.kind,
|
|
57
60
|
description: this.description
|
|
58
61
|
.split('\n')
|
|
@@ -61,6 +64,9 @@ class Action {
|
|
|
61
64
|
paramsType,
|
|
62
65
|
resultType,
|
|
63
66
|
});
|
|
67
|
+
return partial
|
|
68
|
+
.pipe(prompt => prompt.toString().trim())
|
|
69
|
+
.invoke({});
|
|
64
70
|
}
|
|
65
71
|
async _call(input, agent) {
|
|
66
72
|
const params = JSON.parse(input);
|
package/dist/action.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.js","sourceRoot":"","sources":["../src/action.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,8CAAsB;AACtB,4DAAyC;AACzC,+CAAmD;AAEnD,yEAAqE;AAErE,2CAA2C;AAE3C,MAAM,GAAG,GAAG,IAAA,oBAAe,EACzB,IAAI,aAAG,CAAC;IACN,WAAW,EAAE,IAAI;IACjB,gBAAgB,EAAE,IAAI;IACtB,SAAS,EAAE,IAAI;CAChB,CAAC,CACH,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC
|
|
1
|
+
{"version":3,"file":"action.js","sourceRoot":"","sources":["../src/action.ts"],"names":[],"mappings":"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"}
|
package/dist/activity.js
CHANGED
|
@@ -28,8 +28,9 @@ class Activity {
|
|
|
28
28
|
}
|
|
29
29
|
static parse(text) {
|
|
30
30
|
const { elements: [root] } = (0, xml_js_1.xml2js)(`<root>${text}</root>`, { trim: true });
|
|
31
|
-
return root.elements
|
|
32
|
-
|
|
31
|
+
return root.elements
|
|
32
|
+
.map(({ name, attributes, elements }) => {
|
|
33
|
+
const input = (0, xml_js_1.js2xml)({ elements: elements.filter(({ type }) => type === 'text') })
|
|
33
34
|
.replaceAll('<', '<')
|
|
34
35
|
.replaceAll('>', '>');
|
|
35
36
|
return Activity.fromObject({
|
|
@@ -37,7 +38,8 @@ class Activity {
|
|
|
37
38
|
input: input,
|
|
38
39
|
attributes: attributes,
|
|
39
40
|
});
|
|
40
|
-
})
|
|
41
|
+
})
|
|
42
|
+
.filter(a => [ActivityKind.Action, ActivityKind.Observation, ActivityKind.Thought].includes(a?.kind));
|
|
41
43
|
}
|
|
42
44
|
}
|
|
43
45
|
exports.Activity = Activity;
|
package/dist/activity.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity.js","sourceRoot":"","sources":["../src/activity.ts"],"names":[],"mappings":";;;AAAA,mCAAiD;AAKjD,IAAY,YAOX;AAPD,WAAY,YAAY;IAEtB,2CAA2B,CAAA;IAE3B,mCAAmB,CAAA;IAEnB,iCAAiB,CAAA;AACnB,CAAC,EAPW,YAAY,4BAAZ,YAAY,QAOvB;AAcD,MAAa,QAAQ;IACnB,IAAI,CAAgB;IACpB,UAAU,CAA0B;IACpC,KAAK,CAAU;IAEf,YAAY,MAAsB;QAChC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM;QACJ,OAAO,IAAA,eAAM,EACX,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,UAAU,IAAI,EAAE,EAAE,KAAK,EAAE,KAAK,IAAI,CAAC,KAAK,IAAI,GAAG,EAAE,EACpF,EAAE,OAAO,EAAE,IAAI,EAAE,CAClB;aACE,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC;aACvB,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,QAAQ;QACN,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAuB;QAChE,OAAO,IAAI,QAAQ,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAY;QACvB,MAAM,EAAE,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,IAAA,eAAM,EAAC,SAAS,IAAI,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"activity.js","sourceRoot":"","sources":["../src/activity.ts"],"names":[],"mappings":";;;AAAA,mCAAiD;AAKjD,IAAY,YAOX;AAPD,WAAY,YAAY;IAEtB,2CAA2B,CAAA;IAE3B,mCAAmB,CAAA;IAEnB,iCAAiB,CAAA;AACnB,CAAC,EAPW,YAAY,4BAAZ,YAAY,QAOvB;AAcD,MAAa,QAAQ;IACnB,IAAI,CAAgB;IACpB,UAAU,CAA0B;IACpC,KAAK,CAAU;IAEf,YAAY,MAAsB;QAChC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM;QACJ,OAAO,IAAA,eAAM,EACX,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,UAAU,IAAI,EAAE,EAAE,KAAK,EAAE,KAAK,IAAI,CAAC,KAAK,IAAI,GAAG,EAAE,EACpF,EAAE,OAAO,EAAE,IAAI,EAAE,CAClB;aACE,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC;aACvB,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,QAAQ;QACN,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAuB;QAChE,OAAO,IAAI,QAAQ,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAY;QACvB,MAAM,EAAE,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,IAAA,eAAM,EAAC,SAAS,IAAI,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAE5E,OAAQ,IAAI,CAAC,QAAsB;aAChC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAW,EAAE,EAAE;YAC/C,MAAM,KAAK,GAAG,IAAA,eAAM,EAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,MAAM,CAAE,EAAE,CAAC;iBAChF,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC;iBACvB,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAE3B,OAAO,QAAQ,CAAC,UAAU,CAAC;gBACzB,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,KAAK;gBACZ,UAAU,EAAE,UAAU;aACvB,CAAC,CAAC;QACL,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,WAAW,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;IAC1G,CAAC;CACF;AA3CD,4BA2CC"}
|
package/dist/agent.d.ts
CHANGED
|
@@ -11,10 +11,8 @@ interface AgentPrams {
|
|
|
11
11
|
actions: Action[];
|
|
12
12
|
history?: Activity[];
|
|
13
13
|
examples?: Activity[];
|
|
14
|
-
constrains?: string[];
|
|
15
14
|
objective?: string;
|
|
16
|
-
|
|
17
|
-
actionSuffix?: string;
|
|
15
|
+
instruction?: string;
|
|
18
16
|
maxIterations?: number;
|
|
19
17
|
maxRetries?: number;
|
|
20
18
|
optimizer: Optimizer;
|
|
@@ -29,9 +27,8 @@ export declare class Agent implements AgentPrams {
|
|
|
29
27
|
actions: Action[];
|
|
30
28
|
history: Activity[];
|
|
31
29
|
examples: Activity[];
|
|
32
|
-
constrains: string[];
|
|
33
30
|
objective: string;
|
|
34
|
-
|
|
31
|
+
instruction: string;
|
|
35
32
|
actionSuffix: string;
|
|
36
33
|
maxIterations: number;
|
|
37
34
|
maxRetries: number;
|
package/dist/agent.js
CHANGED
|
@@ -7,7 +7,6 @@ exports.Agent = void 0;
|
|
|
7
7
|
const dedent_1 = __importDefault(require("dedent"));
|
|
8
8
|
const winston_1 = require("winston");
|
|
9
9
|
const prompts_1 = require("langchain/prompts");
|
|
10
|
-
const runnable_1 = require("langchain/schema/runnable");
|
|
11
10
|
const output_parser_1 = require("langchain/schema/output_parser");
|
|
12
11
|
const constants_1 = require("./constants");
|
|
13
12
|
const activity_1 = require("./activity");
|
|
@@ -18,9 +17,8 @@ class Agent {
|
|
|
18
17
|
actions;
|
|
19
18
|
history;
|
|
20
19
|
examples;
|
|
21
|
-
constrains;
|
|
22
20
|
objective;
|
|
23
|
-
|
|
21
|
+
instruction;
|
|
24
22
|
actionSuffix;
|
|
25
23
|
maxIterations;
|
|
26
24
|
maxRetries;
|
|
@@ -32,9 +30,6 @@ class Agent {
|
|
|
32
30
|
# Objective
|
|
33
31
|
{objective}
|
|
34
32
|
|
|
35
|
-
# Constraints
|
|
36
|
-
{constraints}
|
|
37
|
-
|
|
38
33
|
# Actions
|
|
39
34
|
The only permissible actions you may take are listed below:
|
|
40
35
|
{actions}
|
|
@@ -43,12 +38,18 @@ class Agent {
|
|
|
43
38
|
{examples}
|
|
44
39
|
|
|
45
40
|
# History:
|
|
41
|
+
{instruction}
|
|
46
42
|
{history}
|
|
47
|
-
{
|
|
48
|
-
|
|
43
|
+
{completions}
|
|
44
|
+
`),
|
|
49
45
|
objective: 'You are helpful assistant.',
|
|
50
|
-
|
|
51
|
-
|
|
46
|
+
instruction: (0, dedent_1.default) `
|
|
47
|
+
Think your further actions step by step before taking any.
|
|
48
|
+
Your must always explain your choice in your thoughts.
|
|
49
|
+
Use only actions listed in Actions section.
|
|
50
|
+
Reject any request that are not related to your objective and cannot be fulfilled within the given list of actions.
|
|
51
|
+
Provide your thought and action here.
|
|
52
|
+
`,
|
|
52
53
|
maxRetries: 7,
|
|
53
54
|
maxIterations: Number.MAX_SAFE_INTEGER,
|
|
54
55
|
logger: (0, winston_1.createLogger)({ transports: [new winston_1.transports.Console()] }),
|
|
@@ -72,10 +73,6 @@ class Agent {
|
|
|
72
73
|
`.trim(),
|
|
73
74
|
}),
|
|
74
75
|
],
|
|
75
|
-
constrains: [
|
|
76
|
-
'Use only actions listed in Actions section.',
|
|
77
|
-
'Reject any request that are not related to your objective and cannot be fulfilled within the given list of actions.',
|
|
78
|
-
]
|
|
79
76
|
};
|
|
80
77
|
constructor(params) {
|
|
81
78
|
const { actions } = params;
|
|
@@ -91,43 +88,52 @@ class Agent {
|
|
|
91
88
|
async prompt(params) {
|
|
92
89
|
let activities = [];
|
|
93
90
|
const history = async () => {
|
|
94
|
-
const history =
|
|
91
|
+
const history = await this.optimizer.optimize(this.history);
|
|
95
92
|
const historyStrings = history.map(h => h.prompt()).join(constants_1.ACTIVITY_SEP);
|
|
96
93
|
return historyStrings;
|
|
97
94
|
};
|
|
95
|
+
const completions = async () => {
|
|
96
|
+
const activitiesStrings = activities.map(a => a.prompt()).join(constants_1.ACTIVITY_SEP);
|
|
97
|
+
return activitiesStrings;
|
|
98
|
+
};
|
|
98
99
|
const actions = async () => {
|
|
99
100
|
const actionsStrings = await Promise.all(this.actions.map(a => a._prompt()));
|
|
100
101
|
return actionsStrings.join(constants_1.ACTION_SEP);
|
|
101
102
|
};
|
|
102
|
-
const
|
|
103
|
+
const instruction = () => this.instruction
|
|
104
|
+
.split('\n')
|
|
105
|
+
.filter(i => i)
|
|
106
|
+
.map(i => `<!-- ${i} -->`)
|
|
107
|
+
.join('\n');
|
|
103
108
|
const examples = async () => {
|
|
104
109
|
const examplesStrings = this.examples.map(h => h.prompt()).join(constants_1.ACTIVITY_SEP);
|
|
105
110
|
return examplesStrings;
|
|
106
111
|
};
|
|
107
|
-
const suffix = () => ([...this.history, ...activities].at(-1).kind === activity_1.ActivityKind.Observation
|
|
108
|
-
? this.thoughtSuffix
|
|
109
|
-
: this.actionSuffix);
|
|
110
112
|
const template = await this.template.partial({
|
|
111
113
|
objective: this.objective,
|
|
112
114
|
history,
|
|
113
115
|
actions,
|
|
114
|
-
constraints,
|
|
115
116
|
examples,
|
|
116
|
-
|
|
117
|
+
instruction,
|
|
118
|
+
completions,
|
|
117
119
|
});
|
|
118
|
-
const
|
|
119
|
-
|
|
120
|
-
this.llm.bind({ stop: [`<${activity_1.ActivityKind.Observation}
|
|
121
|
-
new output_parser_1.StringOutputParser()
|
|
122
|
-
]);
|
|
120
|
+
const chain = template
|
|
121
|
+
.pipe((prompt) => prompt.toString().trim())
|
|
122
|
+
.pipe(this.llm.bind({ stop: [`<${activity_1.ActivityKind.Observation}`] }))
|
|
123
|
+
.pipe(new output_parser_1.StringOutputParser());
|
|
123
124
|
for (let i = 0; i < this.maxRetries; ++i) {
|
|
124
|
-
let completion = await
|
|
125
|
+
let completion = await chain.invoke(params ?? {});
|
|
125
126
|
try {
|
|
126
|
-
|
|
127
|
+
const newActivities = activity_1.Activity.parse(completion);
|
|
128
|
+
if (!newActivities.length) {
|
|
129
|
+
throw new Error('No activities generated!');
|
|
130
|
+
}
|
|
131
|
+
activities.push(...newActivities);
|
|
127
132
|
}
|
|
128
133
|
catch (e) {
|
|
129
|
-
|
|
130
|
-
this.logger.
|
|
134
|
+
const err = e;
|
|
135
|
+
this.logger.warn(err.message);
|
|
136
|
+
this.logger.debug(`Retry ${i + 1} due to malformed output: ${err.message}`);
|
|
131
137
|
continue;
|
|
132
138
|
}
|
|
133
139
|
const activity = activities.at(-1);
|
|
@@ -138,12 +144,23 @@ class Agent {
|
|
|
138
144
|
if (activity.kind === activity_1.ActivityKind.Action) {
|
|
139
145
|
try {
|
|
140
146
|
const observation = await this.execute(activity);
|
|
141
|
-
return [
|
|
147
|
+
return [
|
|
148
|
+
...activities,
|
|
149
|
+
new activity_1.Activity({
|
|
150
|
+
kind: activity_1.ActivityKind.Observation,
|
|
151
|
+
input: observation,
|
|
152
|
+
attributes: { of: activity.attributes.kind }
|
|
153
|
+
}),
|
|
154
|
+
];
|
|
142
155
|
}
|
|
143
156
|
catch (e) {
|
|
144
157
|
const err = e;
|
|
145
|
-
activities.push(new activity_1.Activity({
|
|
146
|
-
|
|
158
|
+
activities.push(new activity_1.Activity({
|
|
159
|
+
kind: activity_1.ActivityKind.Observation,
|
|
160
|
+
input: err.toString(),
|
|
161
|
+
attributes: { of: activity.attributes.kind }
|
|
162
|
+
}));
|
|
163
|
+
this.logger.debug(`Retry ${i + 1} due to action error: ${err}`);
|
|
147
164
|
continue;
|
|
148
165
|
}
|
|
149
166
|
}
|
package/dist/agent.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.js","sourceRoot":"","sources":["../src/agent.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,qCAA2D;AAC3D,+CAAuE;
|
|
1
|
+
{"version":3,"file":"agent.js","sourceRoot":"","sources":["../src/agent.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,qCAA2D;AAC3D,+CAAuE;AAEvE,kEAAoE;AAEpE,2CAAuD;AACvD,yCAAoD;AAsCpD,MAAa,KAAK;IAChB,IAAI,CAAU;IACd,WAAW,CAAU;IACrB,GAAG,CAAW;IACd,OAAO,CAAY;IACnB,OAAO,CAAc;IACrB,QAAQ,CAAc;IACtB,SAAS,CAAU;IACnB,WAAW,CAAU;IACrB,YAAY,CAAU;IACtB,aAAa,CAAU;IACvB,UAAU,CAAU;IACpB,SAAS,CAAa;IACtB,MAAM,CAAU;IAChB,QAAQ,CAAsB;IAE9B,MAAM,CAAC,QAAQ,GAAwB;QACrC,QAAQ,EAAE,wBAAc,CAAC,YAAY,CAAC,IAAA,gBAAM,EAAA;;;;;;;;;;;;;;;KAe3C,CAAC;QACF,SAAS,EAAE,4BAA4B;QACvC,WAAW,EAAE,IAAA,gBAAM,EAAA;;;;;;KAMlB;QACD,UAAU,EAAE,CAAC;QACb,aAAa,EAAE,MAAM,CAAC,gBAAgB;QACtC,MAAM,EAAE,IAAA,sBAAY,EAAC,EAAE,UAAU,EAAE,CAAC,IAAI,oBAAU,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;QAChE,QAAQ,EAAE;YACR,IAAI,mBAAQ,CAAC;gBACX,IAAI,EAAE,uBAAY,CAAC,WAAW;gBAC9B,KAAK,EAAE,uCAAuC;aAC/C,CAAC;YACF,IAAI,mBAAQ,CAAC;gBACX,IAAI,EAAE,uBAAY,CAAC,OAAO;gBAC1B,KAAK,EAAE,gDAAgD;aACxD,CAAC;YACF,IAAI,mBAAQ,CAAC;gBACX,IAAI,EAAE,uBAAY,CAAC,MAAM;gBACzB,UAAU,EAAE,EAAE,IAAI,EAAE,qEAAqE,EAAE;gBAC3F,KAAK,EAAE,IAAA,gBAAM,EAAA;;;;;SAKZ,CAAC,IAAI,EAAE;aACT,CAAC;SACH;KACF,CAAA;IAED,YAAY,MAAkB;QAC5B,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;QAE3B,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;SACnD;QAED,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED,aAAa,CAAC,GAAG,UAAsB;QACrC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAA;IAClC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,MAA+B;QAC1C,IAAI,UAAU,GAAe,EAAE,CAAC;QAEhC,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;YACzB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC5D,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,wBAAY,CAAC,CAAC;YACvE,OAAO,cAAc,CAAC;QACxB,CAAC,CAAC;QACF,MAAM,WAAW,GAAG,KAAK,IAAI,EAAE;YAC7B,MAAM,iBAAiB,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,wBAAY,CAAC,CAAC;YAC7E,OAAO,iBAAiB,CAAC;QAC3B,CAAC,CAAC;QAEF,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;YACzB,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YAC7E,OAAO,cAAc,CAAC,IAAI,CAAC,sBAAU,CAAC,CAAC;QACzC,CAAC,CAAC;QAEF,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW;aACvC,KAAK,CAAC,IAAI,CAAC;aACX,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACd,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC;aACzB,IAAI,CAAC,IAAI,CAAC,CAAC;QAEd,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;YAC1B,MAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,wBAAY,CAAC,CAAC;YAC9E,OAAO,eAAe,CAAC;QACzB,CAAC,CAAC;QAEF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC3C,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,OAAO;YACP,OAAO;YACP,QAAQ;YACR,WAAW;YACX,WAAW;SACZ,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,QAAQ;aACnB,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;aAC1C,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,IAAI,uBAAY,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC;aAC/D,IAAI,CAAC,IAAI,kCAAkB,EAAE,CAAC,CAAC;QAElC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC,EAAE;YACxC,IAAI,UAAU,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;YAElD,IAAI;gBACF,MAAM,aAAa,GAAG,mBAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBAEjD,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE;oBACzB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;iBAC7C;gBAED,UAAU,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;aACnC;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,GAAG,GAAG,CAAU,CAAC;gBACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAC9B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,6BAA6B,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC5E,SAAS;aACV;YAED,MAAM,QAAQ,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAEnC,IAAI,QAAQ,CAAC,IAAI,KAAK,uBAAY,CAAC,OAAO,EAAE;gBAC1C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;gBAC1D,SAAS;aACV;YAED,IAAI,QAAQ,CAAC,IAAI,KAAK,uBAAY,CAAC,MAAM,EAAE;gBACzC,IAAI;oBACF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;oBACjD,OAAO;wBACL,GAAG,UAAU;wBACb,IAAI,mBAAQ,CAAC;4BACX,IAAI,EAAE,uBAAY,CAAC,WAAW;4BAC9B,KAAK,EAAE,WAAW;4BAClB,UAAU,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE;yBAC7C,CAAC;qBACH,CAAC;iBACH;gBAAC,OAAM,CAAC,EAAE;oBACT,MAAM,GAAG,GAAG,CAAU,CAAC;oBACvB,UAAU,CAAC,IAAI,CAAC,IAAI,mBAAQ,CAAC;wBAC3B,IAAI,EAAE,uBAAY,CAAC,WAAW;wBAC9B,KAAK,EAAE,GAAG,CAAC,QAAQ,EAAE;wBACrB,UAAU,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE;qBAC7C,CAAC,CAAC,CAAA;oBACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,yBAAyB,GAAG,EAAE,CAAC,CAAC;oBAChE,SAAS;iBACV;aACF;SACF;QAED,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,KAAK,EAAY;QAC3C,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;QAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAEvD,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,WAAW,IAAI,mBAAmB,CAAC,CAAC;SACrD;QAED,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACpD,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,MAA4B;QACvC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;SACrD;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,uBAAY,CAAC,WAAW,EAAE;YAC1D,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;SAClE;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC,EAAE;YAC3C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC7C,IAAI,CAAC,aAAa,CAAC,GAAG,UAAU,CAAC,CAAC;YAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC;YACtC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAE3E,IAAI,MAAM,CAAC,IAAI,EAAE;gBACf,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;aAClC;SACF;QAED,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACvD,CAAC;;AAjNH,sBAkNC"}
|