stellarium-ts 0.15.0 → 0.17.0

package/dist/resource/invoker.js

@@ -1,4 +1,5 @@
 import { hashData, signData } from "../crypto/utils.js";
+import { inferenceCharge, isInferenceFunction, isInferenceManifest, parseInferenceResult, parseMaxTokens } from "./inference.js";
 /**
  * Hash binding a voucher to one function call. Providers recompute it from the
  * request they receive and compare it to `voucher.invocationHash`.
@@ -12,23 +13,39 @@ export function invocationHash(resourcePath, resourceName, functionName, paramet
  * Key order is part of the signed bytes.
  */
 export function paymentVoucherPayload(voucher) {
-    const { requestId, invocationId, amount, recipientAddress, expiresAt, invocationHash, publicKey } = voucher;
-    return { requestId, invocationId, amount, recipientAddress, expiresAt, invocationHash, publicKey };
+    const { requestId, invocationId, amount, recipientOrganizationId, expiresAt, invocationHash, publicKey } = voucher;
+    return { requestId, invocationId, amount, recipientOrganizationId, expiresAt, invocationHash, publicKey };
 }
+/**
+ * The object `createInferenceVoucher` signs: every inference voucher field except `signature`.
+ * Key order is part of the signed bytes.
+ */
+export function inferenceVoucherPayload(voucher) {
+    const { kind, requestId, invocationId, maxAmount, inputCostMicroUsdPerMillionTokens, outputCostMicroUsdPerMillionTokens, maxTokens, recipientOrganizationId, expiresAt, invocationHash, publicKey } = voucher;
+    return { kind, requestId, invocationId, maxAmount, inputCostMicroUsdPerMillionTokens, outputCostMicroUsdPerMillionTokens, maxTokens, recipientOrganizationId, expiresAt, invocationHash, publicKey };
+}
+export function isInferenceVoucher(voucher) {
+    return voucher.kind === 'inference';
+}
+export const PAYMENT_VOUCHER_LIFETIME_MS = 1000 * 60 * 2;
+/** Inference can run for minutes, and the operator refuses a voucher that expired before the provider settled it. */
+export const INFERENCE_VOUCHER_LIFETIME_MS = 1000 * 60 * 10;
 export const EXTERNAL_INVOKE_MAX_RETRIES = 3;
 export const EXTERNAL_INVOKE_BASE_DELAY_MS = 500;
 /** Per attempt. A timed-out attempt is retried like a network error. */
 export const EXTERNAL_INVOKE_TIMEOUT_MS = 30_000;
+/** Per attempt, for calls to inference functions. Every attempt fits within `INFERENCE_VOUCHER_LIFETIME_MS`. */
+export const INFERENCE_INVOKE_TIMEOUT_MS = 120_000;
 /**
  * POST to a remote resource, retrying network errors, 429s, and 5xx responses up to
  * `EXTERNAL_INVOKE_MAX_RETRIES` times with exponential backoff (500ms, 1s, 2s).
  * Other 4xx responses are returned immediately since retrying won't change them.
  * Throws the last network error if every attempt fails to connect.
  */
-async function fetchWithRetry(url, init) {
+async function fetchWithRetry(url, init, timeoutMs = EXTERNAL_INVOKE_TIMEOUT_MS) {
     for (let attempt = 0;; attempt++) {
         try {
-            const response = await fetch(url, { ...init(), signal: AbortSignal.timeout(EXTERNAL_INVOKE_TIMEOUT_MS) });
+            const response = await fetch(url, { ...init(), signal: AbortSignal.timeout(timeoutMs) });
             if (response.status !== 429 && response.status < 500) {
                 return response;
             }
@@ -46,24 +63,30 @@ async function fetchWithRetry(url, init) {
 }
 export class CombinationResourceInvoker {
     resourceRepository;
-    costLimitMicroUsdc;
+    costLimitMicroUsd;
     publicKey;
     privateKey;
     grantService;
-    /** Without a `grantService`, calls to restricted remote functions fail. */
-    constructor(resourceRepository, costLimitMicroUsdc, publicKey, privateKey, grantService) {
+    inferenceCostLimitMicroUsd;
+    /**
+     * Without a `grantService`, calls to restricted remote functions fail.
+     * `inferenceCostLimitMicroUsd` caps an inference voucher's `maxAmount`, and defaults to `costLimitMicroUsd`.
+     */
+    constructor(resourceRepository, costLimitMicroUsd, publicKey, privateKey, grantService, inferenceCostLimitMicroUsd = costLimitMicroUsd) {
         this.resourceRepository = resourceRepository;
-        this.costLimitMicroUsdc = costLimitMicroUsdc;
+        this.costLimitMicroUsd = costLimitMicroUsd;
         this.publicKey = publicKey;
         this.privateKey = privateKey;
         this.grantService = grantService;
+        this.inferenceCostLimitMicroUsd = inferenceCostLimitMicroUsd;
     }
     /**
      * Invoke a function on a resource.
      * If the resource has a baseUrl, it will be invoked as a remote function.
      * If the function is restricted, it attaches an authorization from a held grant.
      * If the resource has a paymentManifest, it will create a payment voucher and pass it to the resource.
-     * Otherwise, it will be invoked as a local function.
+     * A paid inference function is first priced by the provider's estimate endpoint.
+     * Otherwise, it will be invoked as a local function. A local inference function's usage is returned beside its value.
      *
      * @param resource - The resource to invoke
      * @param functionName - The name of the function to invoke
@@ -92,14 +115,44 @@ export class CombinationResourceInvoker {
             if (resourceFunction.restricted && !chain) {
                 return { value: null, error: { message: `Failed to invoke ${resource.name}.${functionName}: it requires a grant from ${url}, and this node holds none that covers the call` } };
             }
-            let paymentVoucher;
-            if (resourceFunction.paymentManifest) {
+            const manifest = resourceFunction.paymentManifest;
+            const inference = isInferenceFunction(resourceFunction);
+            if (manifest && !manifest.recipientOrganizationId) {
+                return { value: null, error: { message: `Failed to invoke ${resource.name}.${functionName}: its payment manifest names no recipient organization` } };
+            }
+            if (manifest && inference) {
+                console.log(`Resource function ${resource.name}.${functionName} is a paid inference function, creating payment voucher...`);
+                // Peers' manifests aren't validated on receipt.
+                if (!isInferenceManifest(manifest) || !Number.isSafeInteger(manifest.inputCostMicroUsdPerMillionTokens) || manifest.inputCostMicroUsdPerMillionTokens < 0
+                    || !Number.isSafeInteger(manifest.outputCostMicroUsdPerMillionTokens) || manifest.outputCostMicroUsdPerMillionTokens < 0) {
+                    return { value: null, error: { message: `Failed to invoke ${resource.name}.${functionName}: its payment manifest has no valid per-token pricing` } };
+                }
+                const maxTokens = parseMaxTokens(parameters);
+                if (maxTokens === undefined) {
+                    return { value: null, error: { message: `Failed to invoke ${resource.name}.${functionName}: maxTokens must be a positive int32` } };
+                }
+                const estimate = await this.estimate(url, target, chain);
+                if ('error' in estimate) {
+                    return { value: null, error: { message: `Failed to invoke ${resource.name}.${functionName}: ${estimate.error}` } };
+                }
+                // The provider may pick the input estimate, but maxAmount must follow from it at the advertised rates.
+                if (inferenceCharge(manifest, estimate.inputTokens, maxTokens) !== estimate.maxAmount) {
+                    return { value: null, error: { message: `Failed to invoke ${resource.name}.${functionName}: the provider's estimate doesn't match its advertised rates` } };
+                }
+                if (estimate.maxAmount > this.inferenceCostLimitMicroUsd) {
+                    throw new Error(`Function ${functionName} may cost up to ${estimate.maxAmount} micro-USD, which exceeds the inference cost limit of ${this.inferenceCostLimitMicroUsd} micro-USD`);
+                }
+                requestBody.paymentVoucher = this.createInferenceVoucher(manifest, estimate.maxAmount, maxTokens, resource.path, resource.name, functionName, parameters);
+            }
+            else if (manifest) {
                 console.log(`Resource function ${resource.name}.${functionName} has a payment manifest, creating payment voucher...`);
-                if (resourceFunction.paymentManifest.costMicroUsdc > this.costLimitMicroUsdc) {
-                    throw new Error(`Function ${functionName} cost ${resourceFunction.paymentManifest.costMicroUsdc} micro-USDC, which exceeds the cost limit of ${this.costLimitMicroUsdc} micro-USDC`);
+                if (isInferenceManifest(manifest)) {
+                    return { value: null, error: { message: `Failed to invoke ${resource.name}.${functionName}: it has per-token pricing but isn't an inference function` } };
+                }
+                if (manifest.costMicroUsd > this.costLimitMicroUsd) {
+                    throw new Error(`Function ${functionName} cost ${manifest.costMicroUsd} micro-USD, which exceeds the cost limit of ${this.costLimitMicroUsd} micro-USD`);
                 }
-                paymentVoucher = this.createPaymentVoucher(resourceFunction.paymentManifest.recipientAddress, resourceFunction.paymentManifest.costMicroUsdc, resource.path, resource.name, functionName, parameters);
-                requestBody.paymentVoucher = paymentVoucher;
+                requestBody.paymentVoucher = this.createPaymentVoucher(manifest.recipientOrganizationId, manifest.costMicroUsd, resource.path, resource.name, functionName, parameters);
             }
             // The voucher is created once and reused on every attempt, so the operator's
             // requestId/invocationId check prevents a retried call from being settled twice.
@@ -110,7 +163,7 @@ export class CombinationResourceInvoker {
                 headers: {
                     'Content-Type': 'application/json',
                 },
-            }));
+            }), inference ? INFERENCE_INVOKE_TIMEOUT_MS : EXTERNAL_INVOKE_TIMEOUT_MS);
             if (!result.ok) {
                 // The provider's JSON error is more useful than the status text, which can be empty.
                 const detail = await result.json().then((body) => body?.error, () => undefined);
@@ -126,16 +179,62 @@ export class CombinationResourceInvoker {
                 return { value: null, error: { message: `Function ${functionName} not found in resource ${resource.name}` } };
             }
             const result = await fn.exec(parameters);
+            if (isInferenceFunction(fn)) {
+                const inferenceResult = parseInferenceResult(result);
+                if (!inferenceResult) {
+                    return { value: null, error: { message: `Inference function ${functionName} must return { value, usage: { inputTokens, outputTokens } }` } };
+                }
+                return { value: inferenceResult.value, error: null, usage: inferenceResult.usage };
+            }
             return { value: result, error: null };
         }
     }
-    createPaymentVoucher(recipientAddress, amount, resourcePath, resourceName, functionName, parameters) {
+    /** Asks the provider what a call to a paid inference function will cost at most. */
+    async estimate(url, target, chain) {
+        let response;
+        try {
+            // The authorization is signed per attempt, since the provider refuses a reused nonce.
+            response = await fetchWithRetry(`${url}/v1/run/resource/estimate`, () => ({
+                method: 'POST',
+                body: JSON.stringify(chain && this.grantService ? { ...target, authorization: this.grantService.authorize(chain, target) } : target),
+                headers: { 'Content-Type': 'application/json' },
+            }));
+        }
+        catch (error) {
+            return { error: `estimate failed: ${error instanceof Error ? error.message : String(error)}` };
+        }
+        const body = await response.json().catch(() => undefined);
+        if (!response.ok) {
+            return { error: `estimate failed: ${typeof body?.error === 'string' ? body.error : `${response.status} ${response.statusText}`.trim()}` };
+        }
+        const { inputTokens, maxAmount } = body ?? {};
+        if (!Number.isSafeInteger(inputTokens) || inputTokens < 0 || !Number.isSafeInteger(maxAmount) || maxAmount < 0) {
+            return { error: 'the provider returned an invalid estimate' };
+        }
+        return { inputTokens: inputTokens, maxAmount: maxAmount };
+    }
+    createPaymentVoucher(recipientOrganizationId, amount, resourcePath, resourceName, functionName, parameters) {
         const requestId = crypto.randomUUID();
         const invocationId = crypto.randomUUID();
-        // Expire in 2 minutes
-        const expiresAt = new Date(Date.now() + 1000 * 60 * 2).toISOString();
+        const expiresAt = new Date(Date.now() + PAYMENT_VOUCHER_LIFETIME_MS).toISOString();
         const hash = invocationHash(resourcePath, resourceName, functionName, parameters);
-        const signature = signData(paymentVoucherPayload({ requestId, invocationId, amount, recipientAddress, expiresAt, invocationHash: hash, publicKey: this.publicKey }), this.privateKey);
-        return { requestId, invocationId, amount, recipientAddress, signature, expiresAt, invocationHash: hash, publicKey: this.publicKey };
+        const signature = signData(paymentVoucherPayload({ requestId, invocationId, amount, recipientOrganizationId, expiresAt, invocationHash: hash, publicKey: this.publicKey }), this.privateKey);
+        return { requestId, invocationId, amount, recipientOrganizationId, signature, expiresAt, invocationHash: hash, publicKey: this.publicKey };
+    }
+    createInferenceVoucher(manifest, maxAmount, maxTokens, resourcePath, resourceName, functionName, parameters) {
+        const unsigned = {
+            kind: 'inference',
+            requestId: crypto.randomUUID(),
+            invocationId: crypto.randomUUID(),
+            maxAmount,
+            inputCostMicroUsdPerMillionTokens: manifest.inputCostMicroUsdPerMillionTokens,
+            outputCostMicroUsdPerMillionTokens: manifest.outputCostMicroUsdPerMillionTokens,
+            maxTokens,
+            recipientOrganizationId: manifest.recipientOrganizationId,
+            expiresAt: new Date(Date.now() + INFERENCE_VOUCHER_LIFETIME_MS).toISOString(),
+            invocationHash: invocationHash(resourcePath, resourceName, functionName, parameters),
+            publicKey: this.publicKey,
+        };
+        return { ...unsigned, signature: signData(inferenceVoucherPayload(unsigned), this.privateKey) };
     }
 }

package/dist/resource/repository.d.ts

@@ -1,11 +1,25 @@
-import { Resource, ResourceFunction, ResourceFunctionParameter } from "requestscript";
+import { Resource, ResourceFunction, ResourceFunctionCallParameter, ResourceFunctionParameter } from "requestscript";
 import { Database } from "sqlite";
 import type { StoredPeer } from "../peer/repository.js";
-export interface StellariumResourceFunctionPaymentManifest {
+/**
+ * A flat price per call. `recipientOrganizationId` is filled in by the hosting node when it advertises
+ * the function, from the organization it is enrolled in; resource authors leave it out.
+ */
+export interface StellariumFixedPaymentManifest {
+    id?: number;
+    costMicroUsd: number;
+    recipientOrganizationId?: string;
+}
+/** Per-token pricing for an inference function. Either rate may be 0. */
+export interface StellariumInferencePaymentManifest {
     id?: number;
-    costMicroUsdc: number;
-    recipientAddress: string;
+    inputCostMicroUsdPerMillionTokens: number;
+    outputCostMicroUsdPerMillionTokens: number;
+    recipientOrganizationId?: string;
 }
+export type StellariumResourceFunctionPaymentManifest = StellariumFixedPaymentManifest | StellariumInferencePaymentManifest;
+/** Fixed functions return one value. Inference functions run AI inference and are priced per token. */
+export type StellariumResourceFunctionKind = 'fixed' | 'inference';
 export interface StellariumResourceFunctionParameter extends ResourceFunctionParameter {
     description?: string;
 }
@@ -16,6 +30,13 @@ export interface StellariumResourceFunction extends ResourceFunction {
     paymentManifest?: StellariumResourceFunctionPaymentManifest;
     /** Callers need a grant from the hosting node. Announced to peers so callers can tell. */
     restricted?: boolean;
+    /** Absent means 'fixed'. An inference function takes a `maxTokens: int32` parameter and its `exec` returns `{ value, usage }`. */
+    kind?: StellariumResourceFunctionKind;
+    /**
+     * Input tokens a call will use, for pricing its voucher before inference runs. Required on paid inference
+     * functions. It runs only on the hosting node and, like `exec`, is never announced.
+     */
+    estimateInputTokens?: (args: ResourceFunctionCallParameter[]) => Promise<number>;
 }
 export interface StellariumResource extends Resource {
     id: number;
@@ -43,8 +64,10 @@ export declare class ResourceRepository {
     private readonly db;
     private resources;
     private readonly baseUrl;
+    private readonly organizationId?;
     private writes;
-    constructor(db: Database, resources?: StellariumResource[], baseUrl?: string);
+    /** `organizationId` is the operator organization this node is enrolled in, which is paid for its functions. */
+    constructor(db: Database, resources?: StellariumResource[], baseUrl?: string, organizationId?: string | undefined);
     private serialize;
     private transaction;
     private isInternal;
@@ -66,6 +89,7 @@ export declare class ResourceRepository {
     private deleteFunctions;
     getInternalResource(path: string, name: string): Promise<StellariumResource | undefined>;
     getResource(key: string): Promise<Resource | undefined>;
+    /** This node's resources, with its base URL and its organization as the recipient of every paid function. */
     getInternalResources(): Promise<StellariumResource[]>;
     /** Learned resources in insertion order. A negative `limit` means no limit. */
     getExternalResources(offset?: number, limit?: number): Promise<StellariumResource[]>;

package/dist/resource/repository.d.ts.map

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

package/dist/resource/repository.js

@@ -1,4 +1,5 @@
 import { isFreshExpiry, safeVerifyData } from "../crypto/utils.js";
+import { isInferenceManifest } from "./inference.js";
 /**
  * The object a node signs to broadcast its resources. Key order is part of the signed bytes.
  * Functions' `exec` implementations are dropped by JSON serialization on both ends.
@@ -23,12 +24,15 @@ export class ResourceRepository {
     db;
     resources;
     baseUrl;
+    organizationId;
     // The connection is shared, so transactions are serialized to keep them from nesting.
     writes = Promise.resolve();
-    constructor(db, resources = [], baseUrl = '') {
+    /** `organizationId` is the operator organization this node is enrolled in, which is paid for its functions. */
+    constructor(db, resources = [], baseUrl = '', organizationId) {
         this.db = db;
         this.resources = resources;
         this.baseUrl = baseUrl;
+        this.organizationId = organizationId;
     }
     serialize(work) {
         const run = this.writes.then(work, work);
@@ -114,13 +118,23 @@ export class ResourceRepository {
     async insertFunctions(resourceId, functions) {
         const createdAt = new Date().toISOString();
         for (const fn of functions) {
-            const functionResult = await this.db.run('INSERT INTO resource_function (resource_id, name, return_type, description, restricted, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?)', [resourceId, fn.name, fn.returnType, optionalText(fn.description), fn.restricted === true ? 1 : 0, createdAt, createdAt]);
+            const functionResult = await this.db.run('INSERT INTO resource_function (resource_id, name, return_type, description, restricted, kind, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?)', [resourceId, fn.name, fn.returnType, optionalText(fn.description), fn.restricted === true ? 1 : 0, fn.kind === 'inference' ? 'inference' : 'fixed', createdAt, createdAt]);
             const functionId = functionResult.lastID;
             for (const parameter of fn.parameters) {
                 await this.db.run('INSERT INTO resource_function_parameter (resource_function_id, name, parameter_type, description, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?)', [functionId, parameter.name, parameter.type, optionalText(parameter.description), createdAt, createdAt]);
             }
-            if (fn.paymentManifest) {
-                await this.db.run('INSERT INTO resource_function_payment_manifest (resource_function_id, cost_micro_usdc, recipient_address, created_at, updated_at) VALUES (?, ?, ?, ?, ?)', [functionId, fn.paymentManifest.costMicroUsdc, fn.paymentManifest.recipientAddress, createdAt, createdAt]);
+            const manifest = fn.paymentManifest;
+            if (manifest) {
+                const inference = isInferenceManifest(manifest);
+                await this.db.run('INSERT INTO resource_function_payment_manifest (resource_function_id, cost_micro_usd, input_cost_micro_usd_per_million_tokens, output_cost_micro_usd_per_million_tokens, recipient_organization_id, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?)', [
+                    functionId,
+                    inference ? null : manifest.costMicroUsd,
+                    inference ? manifest.inputCostMicroUsdPerMillionTokens : null,
+                    inference ? manifest.outputCostMicroUsdPerMillionTokens : null,
+                    manifest.recipientOrganizationId ?? null,
+                    createdAt,
+                    createdAt,
+                ]);
             }
         }
     }
@@ -156,8 +170,15 @@ export class ResourceRepository {
             }
         };
     }
+    /** This node's resources, with its base URL and its organization as the recipient of every paid function. */
     async getInternalResources() {
-        return this.resources.map(r => ({ ...r, baseUrl: this.baseUrl }));
+        return this.resources.map(r => ({
+            ...r,
+            baseUrl: this.baseUrl,
+            functions: r.functions.map((fn) => fn.paymentManifest
+                ? { ...fn, paymentManifest: { ...fn.paymentManifest, recipientOrganizationId: this.organizationId } }
+                : fn),
+        }));
     }
     /** Learned resources in insertion order. A negative `limit` means no limit. */
     async getExternalResources(offset = 0, limit = -1) {
@@ -191,6 +212,7 @@ export class ResourceRepository {
             exec: async () => undefined,
             paymentManifest: await this.getResourceFunctionPaymentManifest(fn.id),
             restricted: fn.restricted === 1 || undefined,
+            kind: fn.kind === 'inference' ? 'inference' : undefined,
         };
     }
     async getResourceFunctions(resourceId) {
@@ -204,6 +226,7 @@ export class ResourceRepository {
             exec: async () => undefined,
             paymentManifest: await this.getResourceFunctionPaymentManifest(f.id),
             restricted: f.restricted === 1 || undefined,
+            kind: f.kind === 'inference' ? 'inference' : undefined,
         })));
     }
     async getResourceParameters(resourceFunctionId) {
@@ -218,10 +241,18 @@ export class ResourceRepository {
         if (!result) {
             return undefined;
         }
+        if (result.cost_micro_usd === null) {
+            return {
+                id: result.id,
+                inputCostMicroUsdPerMillionTokens: result.input_cost_micro_usd_per_million_tokens,
+                outputCostMicroUsdPerMillionTokens: result.output_cost_micro_usd_per_million_tokens,
+                recipientOrganizationId: result.recipient_organization_id ?? undefined,
+            };
+        }
         return {
             id: result.id,
-            costMicroUsdc: result.cost_micro_usdc,
-            recipientAddress: result.recipient_address,
+            costMicroUsd: result.cost_micro_usd,
+            recipientOrganizationId: result.recipient_organization_id ?? undefined,
         };
     }
     /**

package/dist/routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAgC,MAAM,SAAS,CAAC;AAKhF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAK5C,MAAM,WAAW,eAAe;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,oDAAoD;IACpD,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC;CAC/B;AAED,UAAU,YAAY;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,eAAe,CAAC;CAC/B;AAiDD,eAAO,MAAM,iBAAiB,MAAM,CAAC;AACrC,eAAO,MAAM,aAAa,MAAM,CAAC;AAsHjC;;;;GAIG;AACH,QAAA,MAAM,MAAM,EAAE,kBAAkB,CAAC,YAAY,CAqS5C,CAAC;eAGa,MAAM"}
+{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAgC,MAAM,SAAS,CAAC;AAMhF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAM5C,MAAM,WAAW,eAAe;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,oDAAoD;IACpD,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC;CAC/B;AAED,UAAU,YAAY;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,eAAe,CAAC;CAC/B;AAoDD,eAAO,MAAM,iBAAiB,MAAM,CAAC;AACrC,eAAO,MAAM,aAAa,MAAM,CAAC;AA4LjC;;;;GAIG;AACH,QAAA,MAAM,MAAM,EAAE,kBAAkB,CAAC,YAAY,CAgY5C,CAAC;eAGa,MAAM"}