@arizeai/openinference-instrumentation-beeai 1.1.2 → 1.2.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/esm/helpers/getSerializedObjectSafe.js +2 -2
- package/dist/esm/helpers/getSerializedObjectSafe.js.map +1 -1
- package/dist/esm/middleware.d.ts.map +1 -1
- package/dist/esm/middleware.js +25 -3
- package/dist/esm/middleware.js.map +1 -1
- package/dist/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/dist/esnext/helpers/getSerializedObjectSafe.js +9 -9
- package/dist/esnext/helpers/getSerializedObjectSafe.js.map +1 -1
- package/dist/esnext/middleware.d.ts.map +1 -1
- package/dist/esnext/middleware.js +25 -3
- package/dist/esnext/middleware.js.map +1 -1
- package/dist/esnext/tsconfig.esnext.tsbuildinfo +1 -1
- package/dist/examples/run-react-agent.d.ts +2 -0
- package/dist/examples/run-react-agent.d.ts.map +1 -0
- package/dist/examples/{run-agent.js → run-react-agent.js} +1 -1
- package/dist/examples/run-react-agent.js.map +1 -0
- package/dist/examples/run-toolcalling-agent.d.ts +2 -0
- package/dist/examples/run-toolcalling-agent.d.ts.map +1 -0
- package/dist/examples/run-toolcalling-agent.js +36 -0
- package/dist/examples/run-toolcalling-agent.js.map +1 -0
- package/dist/src/helpers/getSerializedObjectSafe.js +9 -9
- package/dist/src/helpers/getSerializedObjectSafe.js.map +1 -1
- package/dist/src/middleware.d.ts.map +1 -1
- package/dist/src/middleware.js +25 -3
- package/dist/src/middleware.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/src/helpers/getSerializedObjectSafe.ts +2 -2
- package/src/middleware.ts +35 -4
- package/dist/examples/run-agent.d.ts +0 -2
- package/dist/examples/run-agent.d.ts.map +0 -1
- package/dist/examples/run-agent.js.map +0 -1
|
@@ -54,7 +54,7 @@ export function getSerializedObjectSafe(dataObject, meta) {
|
|
|
54
54
|
const { meta, tools, memory, error, data } = dataObject;
|
|
55
55
|
return {
|
|
56
56
|
[SemanticConventions.OPENINFERENCE_SPAN_KIND]: OpenInferenceSpanKind.AGENT,
|
|
57
|
-
iteration: meta
|
|
57
|
+
iteration: meta?.iteration,
|
|
58
58
|
...(tools?.length > 0 && {
|
|
59
59
|
[SemanticConventions.LLM_TOOLS]: tools.map((tool) => ({
|
|
60
60
|
[SemanticConventions.TOOL_NAME]: tool.name,
|
|
@@ -103,7 +103,7 @@ export function getSerializedObjectSafe(dataObject, meta) {
|
|
|
103
103
|
const output = data?.result && data.result.createSnapshot();
|
|
104
104
|
return {
|
|
105
105
|
[SemanticConventions.OPENINFERENCE_SPAN_KIND]: OpenInferenceSpanKind.TOOL,
|
|
106
|
-
thought: data
|
|
106
|
+
thought: data?.iteration?.thought,
|
|
107
107
|
...(data?.input
|
|
108
108
|
? {
|
|
109
109
|
[SemanticConventions.TOOL_PARAMETERS]: JSON.stringify(data.input),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSerializedObjectSafe.js","sourceRoot":"","sources":["../../../src/helpers/getSerializedObjectSafe.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"getSerializedObjectSafe.js","sourceRoot":"","sources":["../../../src/helpers/getSerializedObjectSafe.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../src/middleware.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAWvD,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAgB1E,OAAO,EACL,qBAAqB,EAEtB,MAAM,6CAA6C,CAAC;
|
|
1
|
+
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../src/middleware.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAWvD,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAgB1E,OAAO,EACL,qBAAqB,EAEtB,MAAM,6CAA6C,CAAC;AAIrD,eAAO,MAAM,eAAe,qBAA4B,CAAC;AAEzD;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,QAAQ,EAChB,YAAY,EAAE,qBAAqB,aAElB,aAAa,CAAC,WAAW,EAAE,OAAO,CAAC,UA+SrD"}
|
package/dist/esm/middleware.js
CHANGED
|
@@ -24,10 +24,12 @@ import { Role } from "beeai-framework/backend/message";
|
|
|
24
24
|
import { traceSerializer } from "./helpers/traceSerializer.js";
|
|
25
25
|
import { errorLLMEventName, finishLLMEventName, INSTRUMENTATION_IGNORED_KEYS, newTokenLLMEventName, partialUpdateEventName, successLLMEventName, } from "./config.js";
|
|
26
26
|
import { createFullPath } from "beeai-framework/emitter/utils";
|
|
27
|
+
import { ReActAgent } from "beeai-framework/agents/react/agent";
|
|
27
28
|
import { BaseAgent } from "beeai-framework/agents/base";
|
|
28
29
|
import { diag } from "@opentelemetry/api";
|
|
29
30
|
import { buildTraceTree } from "./helpers/buildTraceTree.js";
|
|
30
31
|
import { SemanticConventions, } from "@arizeai/openinference-semantic-conventions";
|
|
32
|
+
import { ToolCallingAgent } from "beeai-framework/agents/toolCalling/agent";
|
|
31
33
|
export const activeTracesMap = new Map();
|
|
32
34
|
/**
|
|
33
35
|
* First we collect, filter and transform events from the beeai emitter to our internal framework spans in the `emitter.match("*.*"` block
|
|
@@ -235,9 +237,9 @@ export function createTelemetryMiddleware(tracer, mainSpanKind) {
|
|
|
235
237
|
diag.warn("Instrumentation error", e);
|
|
236
238
|
}
|
|
237
239
|
});
|
|
238
|
-
// The generated response and message history are collected from the `success`
|
|
240
|
+
// The generated response and message history are collected from the `success` event generated by ReActAgent
|
|
239
241
|
emitter.match((event) => event.name === successLLMEventName &&
|
|
240
|
-
event.creator instanceof
|
|
242
|
+
event.creator instanceof ReActAgent, (data) => {
|
|
241
243
|
try {
|
|
242
244
|
const { data: dataObject, memory } = data;
|
|
243
245
|
generatedMessage = {
|
|
@@ -250,7 +252,27 @@ export function createTelemetryMiddleware(tracer, mainSpanKind) {
|
|
|
250
252
|
}));
|
|
251
253
|
}
|
|
252
254
|
catch (e) {
|
|
253
|
-
diag.warn("Instrumentation error. Unable to map messages to history", e);
|
|
255
|
+
diag.warn("Instrumentation error. Unable to map messages to history for ReActAgent", e);
|
|
256
|
+
}
|
|
257
|
+
});
|
|
258
|
+
// The generated response and message history are collected from the `success` event generated by ToolCallingAgentCallbacks
|
|
259
|
+
emitter.match((event) => event.name === successLLMEventName &&
|
|
260
|
+
event.creator instanceof ToolCallingAgent, (data) => {
|
|
261
|
+
try {
|
|
262
|
+
const { state } = data;
|
|
263
|
+
if (state.result) {
|
|
264
|
+
generatedMessage = {
|
|
265
|
+
role: state.result.role,
|
|
266
|
+
text: state.result.text,
|
|
267
|
+
};
|
|
268
|
+
}
|
|
269
|
+
history = state.memory.messages.map((msg) => ({
|
|
270
|
+
text: msg.text,
|
|
271
|
+
role: msg.role,
|
|
272
|
+
}));
|
|
273
|
+
}
|
|
274
|
+
catch (e) {
|
|
275
|
+
diag.warn("Instrumentation error. Unable to map messages to history for ToolCallingAgent", e);
|
|
254
276
|
}
|
|
255
277
|
});
|
|
256
278
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../src/middleware.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAG3C,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,4BAA4B,EAC5B,oBAAoB,EACpB,sBAAsB,EACtB,mBAAmB,GACpB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../src/middleware.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAG3C,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,4BAA4B,EAC5B,oBAAoB,EACpB,sBAAsB,EACtB,mBAAmB,GACpB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE1C,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAEL,mBAAmB,GACpB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAG5E,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,GAAG,EAAkB,CAAC;AAEzD;;;;;;GAMG;AACH,MAAM,UAAU,yBAAyB,CACvC,MAAgB,EAChB,YAAmC;IAEnC,OAAO,CAAC,OAA4C,EAAE,EAAE;QACtD,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;YAChC,MAAM,IAAI,cAAc,CAAC,8BAA8B,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QAC5E,CAAC;QAED,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC;QAC3C,IAAI,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YACjC,OAAO;QACT,CAAC;QACD,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAEhE,IAAI,CAAC,KAAK,CAAC,2BAA2B,EAAE;YACtC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI;YACzC,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;QACH,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QACjD,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAEvD,IAAI,MAAM,GAA8B,IAAI,CAAC;QAC7C,IAAI,QAAQ,YAAY,SAAS,EAAE,CAAC;YAClC,MAAM,GAAI,SAA2C,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QAClE,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAyB,CAAC;QAClD,MAAM,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC/C,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAqB,CAAC;QAEtD,IAAI,gBAAgB,GAAkC,SAAS,CAAC;QAChE,IAAI,OAAO,GAAoC,SAAS,CAAC;QACzD,MAAM,eAAe,GAAa,EAAE,CAAC;QAErC,MAAM,aAAa,GAAG,IAAI,aAAa,EAAE,CAAC;QAE1C,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAA+B,CAAC;QAEnE,MAAM,aAAa,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAC3C,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;QACxC,SAAS,wBAAwB,CAAC,IAAU;YAC1C,OAAO,IAAI,CAAC,OAAO,EAAE,GAAG,aAAa,GAAG,aAAa,CAAC;QACxD,CAAC;QAED,MAAM,UAAU,GAAG,eAAe,CAAC;YACjC,YAAY,EAAE,4BAA4B;SAC3C,CAAC,CAAC;QAEH,SAAS,gBAAgB,CAAC,EAAE,MAAM,EAAsB;YACtD,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC;YACjD,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,OAAO;YACT,CAAC;YAED,MAAM,SAAS,GAAG,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC7C,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,OAAO;YACT,CAAC;YAED,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;gBAClB,2CAA2C;gBAC3C,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC;YAC5C,CAAC;iBAAM,IAAI,SAAS,KAAK,CAAC,EAAE,CAAC;gBAC3B,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC9B,oFAAoF;gBACpF,IAAI,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACnC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;oBAC1B,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACpC,CAAC;YACH,CAAC;QACH,CAAC;QAED;;WAEG;QACH,OAAO,CAAC,KAAK,CACX,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,QAAQ,QAAQ,kBAAkB,EAAE,EACjE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;YAChB,IAAI,CAAC;gBACH,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;gBAEtE,IAAI,CAAC,MAAM,IAAI,QAAQ,YAAY,SAAS,EAAE,CAAC;oBAC7C,MAAM,GAAG,QAAQ,CACf,QAAQ,CAAC,MAAM,CAAC,QAAQ,EACxB,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CACxC,EAAE,IAAI,CAAC;oBAER,IAAI,CAAC,MAAM,EAAE,CAAC;wBACZ,MAAM,IAAI,cAAc,CACtB,gDAAgD,EAChD,EAAE,EACF;4BACE,OAAO;yBACR,CACF,CAAC;oBACJ,CAAC;gBACH,CAAC;gBAED,0CAA0C;gBAC1C,cAAc,CAAC;oBACb,MAAM;oBACN,YAAY;oBACZ,IAAI,EAAE;wBACJ,MAAM,EAAE,MAAM;wBACd,OAAO;wBACP,gBAAgB;wBAChB,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;wBAC5D,OAAO;wBACP,OAAO,EAAE,OAAO;wBAChB,eAAe,EAAE,GAAG,QAAQ,QAAQ,iBAAiB,EAAE;wBACvD,SAAS,EAAE,aAAa;wBACxB,OAAO,EAAE,WAAW,CAAC,GAAG,EAAE;wBAC1B,MAAM,EAAE,eAAe,CAAC,GAAG,CAAC,OAAO,CAAE;qBACtC;iBACF,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC,CAAC;YACxC,CAAC;oBAAS,CAAC;gBACT,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAClC,CAAC;QACH,CAAC,CACF,CAAC;QAEF;;;;;WAKG;QACH,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YAClC,+DAA+D;YAC/D,IACE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAC3B,IAAI,CAAC,IAAI,KAAK,GAAG,QAAQ,QAAQ,iBAAiB,EAAE,EACpD,CAAC;gBACD,OAAO;YACT,CAAC;YACD,4BAA4B;YAC5B,IAAI,IAAI,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC;gBACvC,OAAO;YACT,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC;gBACvB,MAAM,IAAI,cAAc,CACtB,yCAAyC,IAAI,CAAC,IAAI,EAAE,EACpD,EAAE,EACF;oBACE,OAAO;iBACR,CACF,CAAC;YACJ,CAAC;YAED,IAAI,CAAC;gBACH;;;mBAGG;gBACH,IACE,IAAI,CAAC,OAAO;oBACZ,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW;oBACvB,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EACvC,CAAC;oBACD,QAAQ,CAAC,GAAG,CACV,IAAI,CAAC,OAAO,EACZ,UAAU,CAAC;wBACT,EAAE,EAAE,IAAI,CAAC,OAAO;wBAChB,IAAI,EAAE,IAAI,CAAC,OAAO;wBAClB,MAAM,EAAE,SAAS;wBACjB,IAAI,EAAE;4BACJ,CAAC,mBAAmB,CAAC,uBAAuB,CAAC,EAAE,OAAO;yBACvD;wBACD,SAAS,EAAE,wBAAwB,CAAC,IAAI,CAAC,SAAS,CAAC;qBACpD,CAAC,CACH,CAAC;oBACF,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACrC,CAAC;gBAED,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,aAAa,CAAC,MAAM,CAAC;oBACpD,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,EAAE,EAAE,IAAI,CAAC,EAAE;oBACX,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK;oBACvB,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW;oBACnC,OAAO,EAAE,IAAI,CAAC,OAAO;iBACtB,CAAC,CAAC;gBAEH,MAAM,cAAc,GAAG,uBAAuB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAE3D,yCAAyC;gBACzC,IAAI,IAAI,CAAC,IAAI,KAAK,sBAAsB,IAAI,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;oBACpE,OAAO;gBACT,CAAC;gBAED,MAAM,IAAI,GAAG,UAAU,CAAC;oBACtB,EAAE,EAAE,MAAM;oBACV,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,MAAM,EAAE,IAAI,CAAC,IAAI;oBACjB,GAAG,CAAC,YAAY,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,CAAC;oBACrD,GAAG,EAAE,IAAI,CAAC,OAAO;oBACjB,IAAI,EAAE,cAAc;oBACpB,KAAK,EAAE,YAAY,CAAC,IAAI,CAAC;oBACzB,SAAS,EAAE,wBAAwB,CAAC,IAAI,CAAC,SAAS,CAAC;iBACpD,CAAC,CAAC;gBAEH,MAAM,aAAa,GAAG,eAAe,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBAElE,iEAAiE;gBACjE,MAAM,wBAAwB,GAAG,mBAAmB;qBACjD,GAAG,CAAC,aAAa,CAAC;oBACnB,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACnB,IACE,wBAAwB;oBACxB,sBAAsB,KAAK,IAAI,CAAC,IAAI;oBACpC,QAAQ,CAAC,GAAG,CAAC,wBAAwB,CAAC,EACtC,CAAC;oBACD,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,wBAAwB,CAAE,CAAC;oBAC5D,IAAI,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;wBACtC,gBAAgB,CAAC,GAAG,CAAC,wBAAwB,EAAE,SAAS,CAAC,CAAC;oBAC5D,CAAC;yBAAM,CAAC;wBACN,cAAc;wBACd,gBAAgB,CAAC,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAC,CAAC;wBACvD,QAAQ,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;oBAC5C,CAAC;gBACH,CAAC;gBAED,kBAAkB;gBAClB,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;gBACzC,wDAAwD;gBACxD,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;oBACnB,YAAY,CAAC,GAAG,CACd,IAAI,CAAC,SAAS,EACd,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAC5C,CAAC;gBACJ,CAAC;gBAED,yCAAyC;gBACzC,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC/B,IAAI,mBAAmB,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;wBAC3C,mBAAmB;6BAChB,GAAG,CAAC,aAAa,CAAE;6BACnB,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBAC1C,CAAC;yBAAM,CAAC;wBACN,mBAAmB,CAAC,GAAG,CACrB,aAAa,EACb,IAAI,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAC/C,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC,CAAC;YACxC,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,4GAA4G;QAC5G,OAAO,CAAC,KAAK,CACX,CAAC,KAAK,EAAE,EAAE,CACR,KAAK,CAAC,IAAI,KAAK,mBAAmB;YAClC,KAAK,CAAC,OAAO,YAAY,UAAU,EACrC,CAAC,IAAwD,EAAE,EAAE;YAC3D,IAAI,CAAC;gBACH,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;gBAE1C,gBAAgB,GAAG;oBACjB,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,IAAI,EAAE,UAAU,CAAC,IAAI;iBACtB,CAAC;gBACF,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;oBACtC,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,IAAI,EAAE,GAAG,CAAC,IAAI;iBACf,CAAC,CAAC,CAAC;YACN,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,IAAI,CACP,yEAAyE,EACzE,CAAC,CACF,CAAC;YACJ,CAAC;QACH,CAAC,CACF,CAAC;QAEF,2HAA2H;QAC3H,OAAO,CAAC,KAAK,CACX,CAAC,KAAK,EAAE,EAAE,CACR,KAAK,CAAC,IAAI,KAAK,mBAAmB;YAClC,KAAK,CAAC,OAAO,YAAY,gBAAgB,EAC3C,CAAC,IAA8D,EAAE,EAAE;YACjE,IAAI,CAAC;gBACH,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;gBAEvB,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;oBACjB,gBAAgB,GAAG;wBACjB,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI;wBACvB,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI;qBACxB,CAAC;gBACJ,CAAC;gBAED,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;oBAC5C,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,IAAI,EAAE,GAAG,CAAC,IAAI;iBACf,CAAC,CAAC,CAAC;YACN,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,IAAI,CACP,+EAA+E,EAC/E,CAAC,CACF,CAAC;YACJ,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC"}
|