donobu 1.0.0

package/dist/clients/GoogleGptClient.js

@@ -0,0 +1,380 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GoogleGptClient = void 0;
+const GptModelNotFoundException_1 = require("../exceptions/GptModelNotFoundException");
+const GptClient_1 = require("./GptClient");
+const JsonUtils_1 = require("../utils/JsonUtils");
+const MiscUtils_1 = require("../utils/MiscUtils");
+const Logger_1 = require("../utils/Logger");
+const GptPlatformAuthenticationFailedException_1 = require("../exceptions/GptPlatformAuthenticationFailedException");
+const GptPlatformInternalErrorException_1 = require("../exceptions/GptPlatformInternalErrorException");
+const GptPlatformNotReachableException_1 = require("../exceptions/GptPlatformNotReachableException");
+/**
+ * Implementation using the Google API
+ * @see https://ai.google.dev/api/all-methods#service:-generativelanguage.googleapis.com
+ */
+class GoogleGptClient extends GptClient_1.GptClient {
+    googleGeminiConfig;
+    static API_URL = 'https://generativelanguage.googleapis.com';
+    static REQUEST_TIMEOUT_MILLISECONDS = 60000;
+    static API_KEY_HEADER_NAME = 'x-goog-api-key';
+    static CONTENT_TYPE = 'application/json';
+    headers;
+    /**
+     * Create a new instance.
+     * @param apiKey The Google API key to use for all requests with this client.
+     * @param modelName See https://ai.google.dev/gemini-api/docs/models/gemini for the list of models.
+     * @param apiUrl The URL of the API to use for all requests with this client.
+     */
+    constructor(googleGeminiConfig) {
+        super(googleGeminiConfig);
+        this.googleGeminiConfig = googleGeminiConfig;
+        this.headers = new Headers({
+            [GoogleGptClient.API_KEY_HEADER_NAME]: googleGeminiConfig.apiKey,
+            'Content-Type': GoogleGptClient.CONTENT_TYPE,
+        });
+    }
+    async ping() {
+        const resp = await this.makeRequest(`/v1beta/models/${this.googleGeminiConfig.modelName}`);
+        if (resp.status === 404) {
+            throw new GptModelNotFoundException_1.GptModelNotFoundException(this.config.type, this.googleGeminiConfig.modelName);
+        }
+        else if (resp.status !== 200) {
+            throw await this.mapErrorResponseToDonobuException(resp);
+        }
+    }
+    async getMessage(messages) {
+        // Set system prompt if it exists (Google only supports one)
+        const systemMessageRaw = messages.find((msg) => msg.type === 'system');
+        const mappedMessages = messages
+            .filter((msg) => msg.type !== 'system')
+            .map(GoogleGptClient.chatRequestMessageFromGptMessage);
+        GoogleGptClient.shenanigansUserMessageMerge(mappedMessages);
+        const body = {
+            generationConfig: {
+                temperature: 0.0,
+                maxOutputTokens: 8192,
+            },
+            contents: mappedMessages,
+            systemInstruction: systemMessageRaw
+                ? {
+                    role: 'user',
+                    parts: [
+                        {
+                            text: systemMessageRaw.text,
+                        },
+                    ],
+                }
+                : undefined,
+        };
+        const resp = await this.makeRequest(`/v1beta/models/${this.googleGeminiConfig.modelName}:generateContent`, 'POST', body);
+        if (resp.status !== 200) {
+            throw await this.mapErrorResponseToDonobuException(resp);
+        }
+        const data = await resp.json();
+        const text = data.candidates[0].content.parts[0].text;
+        const promptTokensUsed = data.usageMetadata.promptTokenCount;
+        const completionTokensUsed = data.usageMetadata.candidatesTokenCount;
+        return {
+            type: 'assistant',
+            text: text,
+            promptTokensUsed: promptTokensUsed,
+            completionTokensUsed: completionTokensUsed,
+        };
+    }
+    async getStructuredOutputWithSchema(messages, jsonSchema) {
+        // Set system prompt if it exists (Google only supports one)
+        const systemMessageRaw = messages.find((msg) => msg.type === 'system');
+        const mappedMessages = messages
+            .filter((msg) => msg.type !== 'system')
+            .map(GoogleGptClient.chatRequestMessageFromGptMessage);
+        GoogleGptClient.shenanigansUserMessageMerge(mappedMessages);
+        const body = {
+            generationConfig: {
+                temperature: 0.0,
+                maxOutputTokens: 8192,
+                responseMimeType: GoogleGptClient.CONTENT_TYPE,
+                responseSchema: GoogleGptClient.createGoogleCompatibleJsonSchema(jsonSchema),
+            },
+            contents: mappedMessages,
+            systemInstruction: systemMessageRaw
+                ? {
+                    role: 'user',
+                    parts: [
+                        {
+                            text: systemMessageRaw.text,
+                        },
+                    ],
+                }
+                : undefined,
+        };
+        const resp = await this.makeRequest(`/v1beta/models/${this.googleGeminiConfig.modelName}:generateContent`, 'POST', body);
+        if (resp.status !== 200) {
+            throw await this.mapErrorResponseToDonobuException(resp);
+        }
+        const data = await resp.json();
+        const text = data.candidates[0].content.parts[0].text.trim();
+        const respObj = JsonUtils_1.JsonUtils.jsonStringToJsonObject(text);
+        if (!respObj) {
+            throw new Error('Failed to parse response as JSON object');
+        }
+        const promptTokensUsed = data.usageMetadata.promptTokenCount;
+        const completionTokensUsed = data.usageMetadata.candidatesTokenCount;
+        return {
+            type: 'structured_output',
+            output: respObj,
+            promptTokensUsed: promptTokensUsed,
+            completionTokensUsed: completionTokensUsed,
+        };
+    }
+    async getToolCalls(messages, tools) {
+        // Set system prompt if it exists (Google only supports one)
+        const systemMessageRaw = messages.find((msg) => msg.type === 'system');
+        const mappedMessages = messages
+            .filter((msg) => msg.type !== 'system')
+            .map(GoogleGptClient.chatRequestMessageFromGptMessage);
+        GoogleGptClient.shenanigansUserMessageMerge(mappedMessages);
+        const body = {
+            generationConfig: {
+                temperature: 0.0,
+                maxOutputTokens: 8192,
+            },
+            toolConfig: {
+                functionCallingConfig: {
+                    mode: 'ANY',
+                },
+            },
+            contents: mappedMessages,
+            tools: tools.length
+                ? [
+                    {
+                        functionDeclarations: tools.map(GoogleGptClient.toolChoiceFromTool),
+                    },
+                ]
+                : undefined,
+            systemInstruction: systemMessageRaw
+                ? {
+                    role: 'user',
+                    parts: [
+                        {
+                            text: systemMessageRaw.text,
+                        },
+                    ],
+                }
+                : undefined,
+        };
+        const resp = await this.makeRequest(`/v1beta/models/${this.googleGeminiConfig.modelName}:generateContent`, 'POST', body);
+        if (resp.status !== 200) {
+            throw await this.mapErrorResponseToDonobuException(resp);
+        }
+        const data = await resp.json();
+        const toolCallsArray = data.candidates[0].content.parts;
+        if (!toolCallsArray?.length) {
+            throw new Error('Unable to extract tool calls from Google response');
+        }
+        const toolCalls = toolCallsArray.map((tc) => {
+            const functionName = tc.functionCall.name;
+            const parameters = tc.functionCall.args;
+            const tool = tools.find((t) => t.name === functionName);
+            if (!tool) {
+                throw new Error(`Tool not found: ${functionName}`);
+            }
+            return {
+                name: functionName,
+                parameters: parameters,
+                toolCallId: MiscUtils_1.MiscUtils.createAdHocToolCallId(),
+            };
+        });
+        const promptTokensUsed = data.usageMetadata.promptTokenCount;
+        const completionTokensUsed = data.usageMetadata.candidatesTokenCount;
+        return {
+            type: 'proposed_tool_calls',
+            proposedToolCalls: toolCalls,
+            promptTokensUsed: promptTokensUsed,
+            completionTokensUsed: completionTokensUsed,
+        };
+    }
+    async mapErrorResponseToDonobuException(error) {
+        try {
+            const errorData = await error.json();
+            Logger_1.Logger.appLogger.error(`Google error response: ${JSON.stringify(JsonUtils_1.JsonUtils.objectToJson(errorData))}`);
+            if (errorData.error?.details?.[0]?.reason === 'API_KEY_INVALID') {
+                return new GptPlatformAuthenticationFailedException_1.GptPlatformAuthenticationFailedException(this.config.type);
+            }
+            return new GptPlatformInternalErrorException_1.GptPlatformInternalErrorException(errorData.error?.message || `HTTP ${error.status}: ${error.statusText}`);
+        }
+        catch (_) {
+            Logger_1.Logger.appLogger.error(`Failed to parse Google error response: HTTP ${error.status}: ${error.statusText}`);
+            return new GptPlatformInternalErrorException_1.GptPlatformInternalErrorException(`HTTP ${error.status}: ${error.statusText}`);
+        }
+    }
+    async makeRequest(endpoint, method = 'GET', body) {
+        try {
+            return await fetch(`${GoogleGptClient.API_URL}${endpoint}`, {
+                method,
+                headers: this.headers,
+                body: body ? JSON.stringify(body) : undefined,
+                signal: AbortSignal.timeout(GoogleGptClient.REQUEST_TIMEOUT_MILLISECONDS),
+            });
+        }
+        catch (error) {
+            if (error instanceof TypeError) {
+                throw new GptPlatformNotReachableException_1.GptPlatformNotReachableException(this.config.type);
+            }
+            else {
+                throw error;
+            }
+        }
+    }
+    static chatRequestMessageFromGptMessage(gptMessage) {
+        if (gptMessage.type === 'assistant') {
+            return {
+                role: 'model',
+                parts: [
+                    {
+                        text: gptMessage.text,
+                    },
+                ],
+            };
+        }
+        if (gptMessage.type === 'structured_output') {
+            return {
+                role: 'model',
+                parts: [
+                    {
+                        text: JSON.stringify(gptMessage.output, null, 2),
+                    },
+                ],
+            };
+        }
+        if (gptMessage.type === 'proposed_tool_calls') {
+            return {
+                role: 'model',
+                parts: gptMessage.proposedToolCalls.map((tc) => ({
+                    functionCall: {
+                        name: tc.name,
+                        args: JsonUtils_1.JsonUtils.objectToJson(tc.parameters),
+                    },
+                })),
+            };
+        }
+        if (gptMessage.type === 'system') {
+            throw new Error('Inline system messages must be filtered out for Google calls!');
+        }
+        if (gptMessage.type === 'user') {
+            return {
+                role: 'user',
+                parts: gptMessage.items.map((item) => {
+                    if ('bytes' in item) {
+                        // PNG
+                        return {
+                            inlineData: {
+                                mimeType: 'image/png',
+                                data: Buffer.from(item.bytes).toString('base64'),
+                            },
+                        };
+                    }
+                    return { text: item.text }; // Text
+                }),
+            };
+        }
+        if (gptMessage.type === 'tool_call_result') {
+            return {
+                role: 'user',
+                parts: [
+                    {
+                        functionResponse: {
+                            name: gptMessage.toolName,
+                            response: {
+                                value: gptMessage.data,
+                            },
+                        },
+                    },
+                ],
+            };
+        }
+        throw new Error(`Unsupported message type: ${JsonUtils_1.JsonUtils.objectToJson(gptMessage)}`);
+    }
+    static toolChoiceFromTool(tool) {
+        const result = {
+            name: tool.name,
+            description: tool.description,
+        };
+        // Only set parameters if there are properties
+        if (tool.jsonSchema.properties &&
+            Object.keys(tool.jsonSchema.properties).length > 0) {
+            result.parameters = GoogleGptClient.createGoogleCompatibleJsonSchema(tool.jsonSchema);
+        }
+        return result;
+    }
+    /**
+     * Creates a new JSON schema compatible with Google's API.
+     */
+    static createGoogleCompatibleJsonSchema(schema) {
+        // Deep clone the schema to avoid modifying the original.
+        const clonedSchema = JSON.parse(JSON.stringify(schema));
+        GoogleGptClient.removeAdditionalProperties(clonedSchema);
+        GoogleGptClient.normalizeTypeFields(clonedSchema);
+        return clonedSchema;
+    }
+    /**
+     * Recursively removes all "additionalProperties" fields from the JSON
+     * schema since Google does not support that keyword.
+     **/
+    static removeAdditionalProperties(node) {
+        if (!node || typeof node !== 'object') {
+            return;
+        }
+        if (Array.isArray(node)) {
+            node.forEach((item) => GoogleGptClient.removeAdditionalProperties(item));
+            return;
+        }
+        delete node['additionalProperties'];
+        Object.values(node).forEach((value) => {
+            if (value && typeof value === 'object') {
+                GoogleGptClient.removeAdditionalProperties(value);
+            }
+        });
+    }
+    /**
+     * Merges adjacent user messages because Google will otherwise reject the request.
+     */
+    static shenanigansUserMessageMerge(messages) {
+        for (let i = messages.length - 1; i > 0; i--) {
+            const message = messages[i];
+            const adjacentMessage = messages[i - 1];
+            if (message.role === 'user' && adjacentMessage.role === 'user') {
+                adjacentMessage.parts.push(...message.parts);
+                messages.splice(i, 1);
+            }
+        }
+    }
+    /**
+     * Recursively replaces "type" fields that are arrays containing "null" with
+     * a single non-null type since Google will otherwise throw an error.
+     **/
+    static normalizeTypeFields(node) {
+        if (!node || typeof node !== 'object') {
+            return;
+        }
+        if (Array.isArray(node)) {
+            node.forEach((item) => GoogleGptClient.normalizeTypeFields(item));
+            return;
+        }
+        const obj = node;
+        if (Array.isArray(obj.type)) {
+            // Find first non-null type
+            const nonNullType = obj.type.find((type) => type !== 'null');
+            if (nonNullType) {
+                obj.type = nonNullType;
+            }
+        }
+        Object.values(obj).forEach((value) => {
+            if (value && typeof value === 'object') {
+                GoogleGptClient.normalizeTypeFields(value);
+            }
+        });
+    }
+}
+exports.GoogleGptClient = GoogleGptClient;
+//# sourceMappingURL=GoogleGptClient.js.map

package/dist/clients/GoogleGptClient.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GoogleGptClient.js","sourceRoot":"","sources":["../../src/clients/GoogleGptClient.ts"],"names":[],"mappings":"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"}

package/dist/clients/GoogleGptClient2.d.ts

@@ -0,0 +1,18 @@
+import { GptClient } from './GptClient';
+import { GptMessage, AssistantMessage, ProposedToolCallsMessage, StructuredOutputMessage } from '../models/GptMessage';
+import { Tool } from '../tools/Tool';
+import { JSONSchema7 as JSONSchema } from 'json-schema';
+export declare class GoogleGptClient extends GptClient {
+    private readonly client;
+    private readonly model;
+    constructor(apiKey: string, modelName: string);
+    ping(): Promise<void>;
+    getMessage(message: string): Promise<AssistantMessage>;
+    getStructuredOutputWithSchema(messages: GptMessage[], jsonSchema: JSONSchema): Promise<StructuredOutputMessage>;
+    getToolCalls(messages: GptMessage[], tools: ReadonlyArray<Tool<any>>): Promise<ProposedToolCallsMessage>;
+    private convertMessagesToGoogleFormat;
+    private convertToolToGoogleFormat;
+    private normalizeJsonSchema;
+    private removeAdditionalProperties;
+    private normalizeTypeFields;
+}

package/dist/clients/GoogleGptClient2.js

@@ -0,0 +1,237 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GoogleGptClient = void 0;
+const generative_ai_1 = require("@google/generative-ai");
+const Logger_1 = require("../utils/Logger");
+const JsonUtils_1 = require("../utils/JsonUtils");
+const GptClient_1 = require("./GptClient");
+const GptModelNotFoundException_1 = require("../exceptions/GptModelNotFoundException");
+const GptPlatformAuthenticationFailedException_1 = require("../exceptions/GptPlatformAuthenticationFailedException");
+const GptPlatformInternalErrorException_1 = require("../exceptions/GptPlatformInternalErrorException");
+const GptPlatformNotReachableException_1 = require("../exceptions/GptPlatformNotReachableException");
+const FlowMetadata_1 = require("../models/FlowMetadata");
+const DonobuFlow_1 = require("../managers/DonobuFlow");
+const server_1 = require("@google/generative-ai/server");
+class GoogleGptClient extends GptClient_1.GptClient {
+    client;
+    model;
+    constructor(apiKey, modelName) {
+        super(FlowMetadata_1.Platform.GOOGLE, modelName);
+        this.client = new generative_ai_1.GoogleGenerativeAI(apiKey);
+        this.model = this.client.getGenerativeModel({ model: modelName });
+    }
+    async ping() {
+        try {
+            // Simple test call to verify credentials and model
+            await this.model.countTokens('test');
+        }
+        catch (error) {
+            if (error.message?.includes('NOT_FOUND')) {
+                throw new GptModelNotFoundException_1.GptModelNotFoundException(FlowMetadata_1.Platform.GOOGLE, this.modelName);
+            }
+            if (error.message?.includes('INVALID_ARGUMENT') &&
+                error.message?.includes('API key')) {
+                throw new GptPlatformAuthenticationFailedException_1.GptPlatformAuthenticationFailedException(FlowMetadata_1.Platform.GOOGLE);
+            }
+            if (error.message?.includes('UNAVAILABLE')) {
+                throw new GptPlatformNotReachableException_1.GptPlatformNotReachableException(FlowMetadata_1.Platform.GOOGLE);
+            }
+            Logger_1.Logger.appLogger.error('Unexpected Google error:', error);
+            throw new GptPlatformInternalErrorException_1.GptPlatformInternalErrorException(`Unexpected Google error: ${error.message}`);
+        }
+    }
+    async getMessage(message) {
+        try {
+            const result = await this.model.generateContent(message);
+            const response = result.response;
+            return {
+                type: 'assistant',
+                text: response.text(),
+                promptTokensUsed: response.usageMetadata?.promptTokenCount ?? 0,
+                completionTokensUsed: response.usageMetadata?.candidatesTokenCount ?? 0,
+            };
+        }
+        catch (error) {
+            Logger_1.Logger.appLogger.error('Failed to get message from Google:', error);
+            throw error;
+        }
+    }
+    async getStructuredOutputWithSchema(messages, jsonSchema) {
+        try {
+            const contents = this.convertMessagesToGoogleFormat(messages);
+            const result = await this.model.generateContent({
+                contents,
+                generationConfig: {
+                    temperature: 0.0,
+                    maxOutputTokens: 8192,
+                    responseMimeType: 'application/json',
+                    responseSchema: jsonSchema,
+                },
+            });
+            const response = result.response;
+            const text = response.text().trim();
+            const output = JsonUtils_1.JsonUtils.jsonStringToJsonObject(text);
+            if (!output) {
+                throw new Error('Failed to parse response as JSON object');
+            }
+            return {
+                type: 'structured_output',
+                output,
+                promptTokensUsed: response.usageMetadata?.promptTokenCount ?? 0,
+                completionTokensUsed: response.usageMetadata?.candidatesTokenCount ?? 0,
+            };
+        }
+        catch (error) {
+            Logger_1.Logger.appLogger.error('Failed to get structured output from Google:', error);
+            throw error;
+        }
+    }
+    async getToolCalls(messages, tools) {
+        try {
+            const contents = this.convertMessagesToGoogleFormat(messages);
+            const result = await this.model.generateContent({
+                contents,
+                tools: [
+                    {
+                        functionDeclarations: tools.map((tool) => this.convertToolToGoogleFormat(tool)),
+                    },
+                ],
+                generationConfig: {
+                    temperature: 0.0,
+                    maxOutputTokens: 8192,
+                },
+                toolConfig: {
+                    functionCallingConfig: {
+                        mode: server_1.FunctionCallingMode.ANY,
+                    },
+                },
+            });
+            const response = result.response;
+            const functionCalls = response.functionCalls() || [];
+            const proposedCalls = await Promise.all(functionCalls.map(async (fc) => {
+                const tool = tools.find((t) => t.name === fc.name);
+                if (!tool) {
+                    throw new Error(`Tool not found: ${fc.name}`);
+                }
+                return tool.proposeCall(fc.args, (0, DonobuFlow_1.createAdHocToolCallId)());
+            }));
+            return {
+                type: 'proposed_tool_calls',
+                proposedToolCalls: proposedCalls,
+                promptTokensUsed: response.usageMetadata?.promptTokenCount ?? 0,
+                completionTokensUsed: response.usageMetadata?.candidatesTokenCount ?? 0,
+            };
+        }
+        catch (error) {
+            Logger_1.Logger.appLogger.error('Failed to get tool calls from Google:', error);
+            throw error;
+        }
+    }
+    convertMessagesToGoogleFormat(messages) {
+        // Find any system message to use as systemInstruction
+        const systemMessage = messages.find((msg) => msg.type === 'system');
+        // Filter out system message since it will be handled separately
+        const nonSystemMessages = messages.filter((msg) => msg.type !== 'system');
+        const contents = nonSystemMessages.map((msg) => {
+            switch (msg.type) {
+                case 'assistant':
+                    return {
+                        role: 'model',
+                        parts: [{ text: msg.text }],
+                    };
+                case 'user':
+                    return {
+                        role: 'user',
+                        parts: msg.items.map((item) => {
+                            if (item.type === 'text') {
+                                return { text: item.text };
+                            }
+                            return {
+                                inlineData: {
+                                    mimeType: 'image/png',
+                                    data: Buffer.from(item.bytes).toString('base64'),
+                                },
+                            };
+                        }),
+                    };
+                case 'structured_output':
+                    return {
+                        role: 'model',
+                        parts: [{ text: JSON.stringify(msg.output, null, 2) }],
+                    };
+                case 'proposed_tool_calls':
+                    return {
+                        role: 'model',
+                        parts: msg.proposedToolCalls.map((tc) => ({
+                            functionCall: {
+                                name: tc.name,
+                                args: tc.parameters,
+                            },
+                        })),
+                    };
+                case 'tool_call_result':
+                    return {
+                        role: 'function',
+                        parts: [
+                            {
+                                functionResponse: {
+                                    name: msg.toolName,
+                                    response: { value: msg.data },
+                                },
+                            },
+                        ],
+                    };
+                default:
+                    throw new Error(`Unsupported message type: ${JsonUtils_1.JsonUtils.objectToJson(msg)}`);
+            }
+        });
+        // If there's a system message, add it at the beginning
+        if (systemMessage) {
+            contents.unshift({
+                role: 'system',
+                parts: [{ text: systemMessage.text }],
+            });
+        }
+        return contents;
+    }
+    convertToolToGoogleFormat(tool) {
+        return {
+            name: tool.name,
+            description: tool.description,
+            parameters: this.normalizeJsonSchema(tool.jsonSchema),
+        };
+    }
+    normalizeJsonSchema(schema) {
+        // Remove additionalProperties and normalize type fields for Google
+        const normalized = JSON.parse(JSON.stringify(schema));
+        this.removeAdditionalProperties(normalized);
+        this.normalizeTypeFields(normalized);
+        return normalized;
+    }
+    removeAdditionalProperties(obj) {
+        if (!obj || typeof obj !== 'object')
+            return;
+        delete obj.additionalProperties;
+        Object.values(obj).forEach((value) => {
+            if (value && typeof value === 'object') {
+                this.removeAdditionalProperties(value);
+            }
+        });
+    }
+    normalizeTypeFields(obj) {
+        if (!obj || typeof obj !== 'object')
+            return;
+        if (Array.isArray(obj.type)) {
+            const nonNullType = obj.type.find((t) => t !== 'null');
+            if (nonNullType)
+                obj.type = nonNullType;
+        }
+        Object.values(obj).forEach((value) => {
+            if (value && typeof value === 'object') {
+                this.normalizeTypeFields(value);
+            }
+        });
+    }
+}
+exports.GoogleGptClient = GoogleGptClient;
+//# sourceMappingURL=GoogleGptClient2.js.map

package/dist/clients/GoogleGptClient2.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GoogleGptClient2.js","sourceRoot":"","sources":["../../src/clients/GoogleGptClient2.ts"],"names":[],"mappings":";;;AAAA,yDAM+B;AAC/B,4CAAyC;AACzC,kDAA+C;AAC/C,2CAAwC;AACxC,uFAAoF;AACpF,qHAAkH;AAClH,uGAAoG;AACpG,qGAAkG;AASlG,yDAAkD;AAElD,uDAA+D;AAC/D,yDAAmE;AAEnE,MAAa,eAAgB,SAAQ,qBAAS;IAC3B,MAAM,CAAqB;IAC3B,KAAK,CAAkB;IAExC,YAAY,MAAc,EAAE,SAAiB;QAC3C,KAAK,CAAC,uBAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAClC,IAAI,CAAC,MAAM,GAAG,IAAI,kCAAkB,CAAC,MAAM,CAAC,CAAC;QAC7C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACpE,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,IAAI,CAAC;YACH,mDAAmD;YACnD,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACvC,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,IAAI,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;gBACzC,MAAM,IAAI,qDAAyB,CAAC,uBAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YACvE,CAAC;YACD,IACE,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,kBAAkB,CAAC;gBAC3C,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,EAClC,CAAC;gBACD,MAAM,IAAI,mFAAwC,CAAC,uBAAQ,CAAC,MAAM,CAAC,CAAC;YACtE,CAAC;YACD,IAAI,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC3C,MAAM,IAAI,mEAAgC,CAAC,uBAAQ,CAAC,MAAM,CAAC,CAAC;YAC9D,CAAC;YAED,eAAM,CAAC,SAAS,CAAC,KAAK,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAC;YAC1D,MAAM,IAAI,qEAAiC,CACzC,4BAA4B,KAAK,CAAC,OAAO,EAAE,CAC5C,CAAC;QACJ,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,OAAe;QACrC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YACzD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YAEjC,OAAO;gBACL,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE;gBACrB,gBAAgB,EAAE,QAAQ,CAAC,aAAa,EAAE,gBAAgB,IAAI,CAAC;gBAC/D,oBAAoB,EAAE,QAAQ,CAAC,aAAa,EAAE,oBAAoB,IAAI,CAAC;aACxE,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,eAAM,CAAC,SAAS,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;YACpE,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,6BAA6B,CACxC,QAAsB,EACtB,UAAsB;QAEtB,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,IAAI,CAAC,6BAA6B,CAAC,QAAQ,CAAC,CAAC;YAE9D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC;gBAC9C,QAAQ;gBACR,gBAAgB,EAAE;oBAChB,WAAW,EAAE,GAAG;oBAChB,eAAe,EAAE,IAAI;oBACrB,gBAAgB,EAAE,kBAAkB;oBACpC,cAAc,EAAE,UAAoB;iBACrC;aACF,CAAC,CAAC;YAEH,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YACjC,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;YACpC,MAAM,MAAM,GAAG,qBAAS,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;YAEtD,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;YAC7D,CAAC;YAED,OAAO;gBACL,IAAI,EAAE,mBAAmB;gBACzB,MAAM;gBACN,gBAAgB,EAAE,QAAQ,CAAC,aAAa,EAAE,gBAAgB,IAAI,CAAC;gBAC/D,oBAAoB,EAAE,QAAQ,CAAC,aAAa,EAAE,oBAAoB,IAAI,CAAC;aACxE,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,eAAM,CAAC,SAAS,CAAC,KAAK,CACpB,8CAA8C,EAC9C,KAAK,CACN,CAAC;YACF,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,YAAY,CACvB,QAAsB,EACtB,KAA+B;QAE/B,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,IAAI,CAAC,6BAA6B,CAAC,QAAQ,CAAC,CAAC;YAE9D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC;gBAC9C,QAAQ;gBACR,KAAK,EAAE;oBACL;wBACE,oBAAoB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACvC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CACrC;qBACF;iBACF;gBACD,gBAAgB,EAAE;oBAChB,WAAW,EAAE,GAAG;oBAChB,eAAe,EAAE,IAAI;iBACtB;gBACD,UAAU,EAAE;oBACV,qBAAqB,EAAE;wBACrB,IAAI,EAAE,4BAAmB,CAAC,GAAG;qBAC9B;iBACF;aACF,CAAC,CAAC;YAEH,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YACjC,MAAM,aAAa,GAAG,QAAQ,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC;YAErD,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CACrC,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;gBAC7B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC;gBACnD,IAAI,CAAC,IAAI,EAAE,CAAC;oBACV,MAAM,IAAI,KAAK,CAAC,mBAAmB,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;gBAChD,CAAC;gBACD,OAAO,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,IAAA,kCAAqB,GAAE,CAAC,CAAC;YAC5D,CAAC,CAAC,CACH,CAAC;YAEF,OAAO;gBACL,IAAI,EAAE,qBAAqB;gBAC3B,iBAAiB,EAAE,aAAa;gBAChC,gBAAgB,EAAE,QAAQ,CAAC,aAAa,EAAE,gBAAgB,IAAI,CAAC;gBAC/D,oBAAoB,EAAE,QAAQ,CAAC,aAAa,EAAE,oBAAoB,IAAI,CAAC;aACxE,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,eAAM,CAAC,SAAS,CAAC,KAAK,CAAC,uCAAuC,EAAE,KAAK,CAAC,CAAC;YACvE,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAEO,6BAA6B,CACnC,QAAsB;QAEtB,sDAAsD;QACtD,MAAM,aAAa,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,QAAQ,CAErD,CAAC;QAEd,gEAAgE;QAChE,MAAM,iBAAiB,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;QAE1E,MAAM,QAAQ,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAW,EAAE;YACtD,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;gBACjB,KAAK,WAAW;oBACd,OAAO;wBACL,IAAI,EAAE,OAAO;wBACb,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC;qBAC5B,CAAC;gBAEJ,KAAK,MAAM;oBACT,OAAO;wBACL,IAAI,EAAE,MAAM;wBACZ,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;4BAC5B,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gCACzB,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;4BAC7B,CAAC;4BACD,OAAO;gCACL,UAAU,EAAE;oCACV,QAAQ,EAAE,WAAW;oCACrB,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;iCACjD;6BACF,CAAC;wBACJ,CAAC,CAAW;qBACb,CAAC;gBAEJ,KAAK,mBAAmB;oBACtB,OAAO;wBACL,IAAI,EAAE,OAAO;wBACb,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;qBACvD,CAAC;gBAEJ,KAAK,qBAAqB;oBACxB,OAAO;wBACL,IAAI,EAAE,OAAO;wBACb,KAAK,EAAE,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;4BACxC,YAAY,EAAE;gCACZ,IAAI,EAAE,EAAE,CAAC,IAAI;gCACb,IAAI,EAAE,EAAE,CAAC,UAAU;6BACpB;yBACF,CAAC,CAAC;qBACJ,CAAC;gBAEJ,KAAK,kBAAkB;oBACrB,OAAO;wBACL,IAAI,EAAE,UAAU;wBAChB,KAAK,EAAE;4BACL;gCACE,gBAAgB,EAAE;oCAChB,IAAI,EAAE,GAAG,CAAC,QAAQ;oCAClB,QAAQ,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,IAAI,EAAE;iCAC9B;6BACF;yBACF;qBACF,CAAC;gBAEJ;oBACE,MAAM,IAAI,KAAK,CACb,6BAA6B,qBAAS,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAC3D,CAAC;YACN,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,uDAAuD;QACvD,IAAI,aAAa,EAAE,CAAC;YAClB,QAAQ,CAAC,OAAO,CAAC;gBACf,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,CAAC;aACtC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEO,yBAAyB,CAAC,IAAe;QAC/C,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,UAAU,EAAE,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC;SACtD,CAAC;IACJ,CAAC;IAEO,mBAAmB,CAAC,MAAkB;QAC5C,mEAAmE;QACnE,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QACtD,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC,CAAC;QAC5C,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;QACrC,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,0BAA0B,CAAC,GAAQ;QACzC,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO;QAE5C,OAAO,GAAG,CAAC,oBAAoB,CAAC;QAEhC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACnC,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBACvC,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC,CAAC;YACzC,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,mBAAmB,CAAC,GAAQ;QAClC,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO;QAE5C,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,MAAM,WAAW,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC;YAC/D,IAAI,WAAW;gBAAE,GAAG,CAAC,IAAI,GAAG,WAAW,CAAC;QAC1C,CAAC;QAED,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACnC,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBACvC,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;YAClC,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA7QD,0CA6QC"}