@zimtsui/typechat 0.0.93 → 0.0.95

package/build/engine.js

@@ -1,6 +1,7 @@
 import { Agent, ProxyAgent } from 'undici';
 import { env } from 'node:process';
 import { loggers } from "./telemetry.js";
+import * as SessionModule from "./engine/session.js";
 export var Engine;
 (function (Engine) {
     class Instance {
@@ -12,138 +13,204 @@ export var Engine;
         vdm;
         throttle;
         constructor(options) {
-            const proxyUrl = options.proxy || env.https_proxy || env.HTTPS_PROXY;
+            const proxyUrl = options.endpointSpec.proxy || env.https_proxy || env.HTTPS_PROXY;
             const dispatcher = proxyUrl
                 ? new ProxyAgent({
                     uri: proxyUrl,
-                    headersTimeout: 0,
+                    headersTimeout: 10000,
                     bodyTimeout: 0,
                 })
                 : new Agent({
-                    headersTimeout: 0,
+                    headersTimeout: 10000,
                     bodyTimeout: 0,
                 });
             this.providerSpec = {
-                baseUrl: options.baseUrl,
-                apiKey: options.apiKey,
+                baseUrl: options.endpointSpec.baseUrl,
+                apiKey: options.endpointSpec.apiKey,
                 dispatcher,
+                retry: options.providerRetry ?? 2,
             };
-            this.name = options.name;
+            this.name = options.endpointSpec.name;
             this.inferenceParams = {
-                model: options.model,
-                additionalOptions: options.additionalOptions,
-                timeout: options.timeout,
-                parallelToolCall: options.parallelToolCall,
-                retry: options.retry ?? 3,
+                model: options.endpointSpec.model,
+                additionalOptions: options.endpointSpec.additionalOptions,
+                timeout: options.endpointSpec.timeout,
+                parallelToolCall: options.endpointSpec.parallelToolCall,
+                retry: options.inferenceRetry ?? 2,
             };
             this.pricing = {
-                inputPrice: options.inputPrice ?? 0,
-                outputPrice: options.outputPrice ?? 0,
-                cachePrice: options.cachePrice ?? options.inputPrice ?? 0,
+                inputPrice: options.endpointSpec.inputPrice ?? 0,
+                outputPrice: options.endpointSpec.outputPrice ?? 0,
+                cachePrice: options.endpointSpec.cachePrice ?? options.endpointSpec.inputPrice ?? 0,
             };
             this.fdm = options.functionDeclarationMap;
             this.vdm = options.verbatimDeclarationMap;
             this.throttle = options.throttle;
         }
-        async infer(wfctx, session, signal) {
-            const aiMessage = await this.transport.fetch(wfctx, session, signal);
-            this.partsValidator.validate(aiMessage);
-            return aiMessage;
+        /**
+        * @throws {@link SyntaxError} 模型抽风
+        * @throws {@link Recoverable} 模型抽风但可恢复
+        * @throws {@link TypeError} 网络故障
+        */
+        async infer(wfctx, session) {
+            const signalTimeout = this.inferenceParams.timeout ? AbortSignal.timeout(this.inferenceParams.timeout) : null;
+            const signals = [];
+            if (signalTimeout)
+                signals.push(signalTimeout);
+            if (wfctx.signal)
+                signals.push(wfctx.signal);
+            const signal = AbortSignal.any(signals);
+            try {
+                const aiMessage = await this.transport.fetch(wfctx, session, signal);
+                this.partsValidator.validate(aiMessage);
+                const rejection = this.structuringValidator.validate(aiMessage);
+                if (rejection)
+                    throw new Recoverable(aiMessage, rejection);
+                return aiMessage;
+            }
+            catch (e) {
+                if (signalTimeout?.aborted)
+                    throw new InferenceTimeout(undefined, { cause: e });
+                else
+                    throw e;
+            }
         }
         /**
         * @throws {@link InferenceTimeout} 推理超时
-        * @throws {@link ResponseInvalid} 模型抽风
-        * @throws {@link NetworkError} 网络故障
-        * @throws {@link CustomRetry} 自定义重试
+        * @throws {@link SyntaxError} 模型抽风
+        * @throws {@link TypeError} 网络故障
         */
-        async stateless(wfctx, session, validate = () => Promise.resolve(true)) {
-            for (let retry = 0;; retry++) {
-                const signalTimeout = this.inferenceParams.timeout ? AbortSignal.timeout(this.inferenceParams.timeout) : undefined;
-                const signals = [];
-                if (signalTimeout)
-                    signals.push(signalTimeout);
-                if (wfctx.signal)
-                    signals.push(wfctx.signal);
-                const signal = AbortSignal.any(signals);
+        async stateless(wfctx, session) {
+            const middleware = this.compose(this.middlewares);
+            for (let retryProvider = 0, retryInference = 0;;)
                 try {
-                    const response = await this.infer(wfctx, session, signal);
-                    const rejection = this.structuringValidator.validate(response);
-                    if (rejection)
-                        throw new ResponseInvalid.Recoverable();
-                    if (await validate(response)) { }
-                    else
-                        throw new CustomRetry(undefined, { cause: response });
-                    return response;
+                    const next = () => this.infer(wfctx, session);
+                    return await middleware(wfctx, session, next);
                 }
                 catch (e) {
-                    if (signalTimeout?.aborted)
-                        e = new InferenceTimeout(undefined, { cause: e }); // 推理超时
-                    else if (e instanceof ResponseInvalid) { } // 模型抽风
-                    else if (e instanceof NetworkError) { } // 网络故障
-                    else if (e instanceof CustomRetry) { } // 自定义重试
-                    else
-                        throw e;
-                    if (retry < this.inferenceParams.retry)
+                    if (e instanceof InferenceTimeout) { // 推理超时
+                        if (retryInference < this.inferenceParams.retry) { }
+                        else
+                            throw e;
                         loggers.message.warn(e);
+                        retryInference++;
+                    }
+                    else if (e instanceof SyntaxError) { // 模型抽风
+                        if (retryInference < this.inferenceParams.retry) { }
+                        else
+                            throw e;
+                        loggers.message.warn(e);
+                        retryInference++;
+                    }
+                    else if (e instanceof TypeError) { // 网络故障
+                        if (retryProvider < this.providerSpec.retry) { }
+                        else
+                            throw e;
+                        loggers.message.warn(e);
+                        retryProvider++;
+                    }
                     else
                         throw e;
                 }
-            }
         }
         /**
+        * @throws {@link InferenceTimeout} 推理超时
+        * @throws {@link SyntaxError} 模型抽风
+        * @throws {@link TypeError} 网络故障
         * @param session mutable
         */
-        async stateful(wfctx, session, validate = () => Promise.resolve(true)) {
-            for (let retry = 0;; retry++) {
-                const signalTimeout = this.inferenceParams.timeout ? AbortSignal.timeout(this.inferenceParams.timeout) : undefined;
-                const signals = [];
-                if (signalTimeout)
-                    signals.push(signalTimeout);
-                if (wfctx.signal)
-                    signals.push(wfctx.signal);
-                const signal = AbortSignal.any(signals);
+        async stateful(wfctx, session) {
+            const middleware = this.compose(this.middlewares);
+            const statefulMiddleware = this.compose(this.statefulMiddlewares);
+            for (let retryProvider = 0, retryInference = 0;;)
                 try {
-                    const response = await this.infer(wfctx, session, signal);
-                    const rejection = this.structuringValidator.validate(response);
-                    if (rejection) {
-                        session.chatMessages.push(response, rejection);
-                        throw new ResponseInvalid.Recoverable();
-                    }
-                    if (await validate(response)) { }
-                    else
-                        throw new CustomRetry(undefined, { cause: response });
-                    session.chatMessages.push(response);
-                    return response;
+                    const next = () => this.infer(wfctx, session);
+                    const statefulNext = async () => {
+                        const aiMessage = await middleware(wfctx, session, next);
+                        session.chatMessages.push(aiMessage);
+                        return aiMessage;
+                    };
+                    return await statefulMiddleware(wfctx, session, statefulNext);
                 }
                 catch (e) {
-                    if (signalTimeout?.aborted)
-                        e = new InferenceTimeout(undefined, { cause: e }); // 推理超时
-                    else if (e instanceof ResponseInvalid) { } // 模型抽风
-                    else if (e instanceof NetworkError) { } // 网络故障
-                    else if (e instanceof CustomRetry) { } // 自定义重试
-                    else
-                        throw e;
-                    if (retry < this.inferenceParams.retry) { }
+                    if (e instanceof InferenceTimeout) { // 推理超时
+                        if (retryInference < this.inferenceParams.retry) { }
+                        else
+                            throw e;
+                        loggers.message.warn(e);
+                        retryInference++;
+                    }
+                    else if (e instanceof SyntaxError) { // 模型抽风
+                        if (retryInference < this.inferenceParams.retry) { }
+                        else
+                            throw e;
+                        loggers.message.warn(e);
+                        retryInference++;
+                    }
+                    else if (e instanceof TypeError) { // 网络故障
+                        if (retryProvider < this.providerSpec.retry) { }
+                        else
+                            throw e;
+                        loggers.message.warn(e);
+                        retryProvider++;
+                    }
                     else
                         throw e;
-                    loggers.message.warn(e);
                 }
-            }
+        }
+        middlewares = [];
+        use(middleware) {
+            const engine = this.clone();
+            engine.middlewares.push(middleware);
+            return engine;
+        }
+        statefulMiddlewares = [];
+        statefulUse(middleware) {
+            const engine = this.clone();
+            engine.statefulMiddlewares.push(middleware);
+            return engine;
+        }
+        compose(middlewares, i = 0) {
+            if (i < middlewares.length)
+                return async (wfctx, session, next) => {
+                    const middleware = middlewares[i];
+                    const nextMiddlewares = this.compose(middlewares, i + 1);
+                    return middleware(wfctx, session, () => nextMiddlewares(wfctx, session, next));
+                };
+            else
+                return (wfctx, session, next) => next();
         }
     }
     Engine.Instance = Instance;
+    Engine.RoleMessage = SessionModule.RoleMessage;
 })(Engine || (Engine = {}));
 export class InferenceTimeout extends Error {
 }
-export class NetworkError extends Error {
-}
-export class CustomRetry extends Error {
-}
-export class ResponseInvalid extends Error {
-}
-(function (ResponseInvalid) {
-    class Recoverable extends ResponseInvalid {
+export class Recoverable extends SyntaxError {
+    response;
+    rejection;
+    constructor(response, rejection, ...rest) {
+        super(...rest);
+        this.response = response;
+        this.rejection = rejection;
+    }
+    resume() {
+        return this.response;
+    }
+    recover() {
+        return this.rejection;
     }
-    ResponseInvalid.Recoverable = Recoverable;
-})(ResponseInvalid || (ResponseInvalid = {}));
+    static async recover(wfctx, session, next) {
+        try {
+            return await next();
+        }
+        catch (e) {
+            if (e instanceof Recoverable) { }
+            else
+                throw e;
+            session.chatMessages.push(e.resume(), e.recover());
+            throw e;
+        }
+    }
+}
 //# sourceMappingURL=engine.js.map

package/build/engine.js.map

@@ -1 +1 @@
-{"version":3,"file":"engine.js","sourceRoot":"","sources":["../src/engine.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAc,MAAM,QAAQ,CAAC;AACvD,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAEnC,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AA+BzC,MAAM,KAAW,MAAM,CAsKtB;AAtKD,WAAiB,MAAM;IACnB,MAAsB,QAAQ;QAMhB,YAAY,CAAe;QAC3B,eAAe,CAAkB;QACpC,IAAI,CAAS;QACb,OAAO,CAAU;QACjB,GAAG,CAAM;QACT,GAAG,CAAM;QACN,QAAQ,CAAW;QAK7B,YAAmB,OAAiC;YAChD,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,IAAI,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,WAAW,CAAC;YAErE,MAAM,UAAU,GAAG,QAAQ;gBACvB,CAAC,CAAC,IAAI,UAAU,CAAC;oBACb,GAAG,EAAE,QAAQ;oBACb,cAAc,EAAE,CAAC;oBACjB,WAAW,EAAE,CAAC;iBACjB,CAAC;gBACF,CAAC,CAAC,IAAI,KAAK,CAAC;oBACR,cAAc,EAAE,CAAC;oBACjB,WAAW,EAAE,CAAC;iBACjB,CAAC,CAAC;YACP,IAAI,CAAC,YAAY,GAAG;gBAChB,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,UAAU;aACb,CAAC;YAEF,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YACzB,IAAI,CAAC,eAAe,GAAG;gBACnB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;gBAC5C,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;aAC5B,CAAC;YAEF,IAAI,CAAC,OAAO,GAAG;gBACX,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,CAAC;gBACnC,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,CAAC;gBACrC,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,IAAI,CAAC;aAC5D,CAAC;YACF,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,sBAAsB,CAAC;YAC1C,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,sBAAsB,CAAC;YAC1C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACrC,CAAC;QAES,KAAK,CAAC,KAAK,CACjB,KAAuB,EACvB,OAAgB,EAChB,MAAoB;YAEpB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YACrE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACxC,OAAO,SAAS,CAAC;QACrB,CAAC;QAED;;;;;UAKE;QACK,KAAK,CAAC,SAAS,CAClB,KAAuB,EACvB,OAAgB,EAChB,WAAgD,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;YAE3E,KAAK,IAAI,KAAK,GAAG,CAAC,GAAG,KAAK,EAAE,EAAE,CAAC;gBAC3B,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBACnH,MAAM,OAAO,GAAkB,EAAE,CAAC;gBAClC,IAAI,aAAa;oBAAE,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBAC/C,IAAI,KAAK,CAAC,MAAM;oBAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBAC7C,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACxC,IAAI,CAAC;oBACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;oBAC1D,MAAM,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;oBAC/D,IAAI,SAAS;wBAAE,MAAM,IAAI,eAAe,CAAC,WAAW,EAAE,CAAC;oBACvD,IAAI,MAAM,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA,CAAC;;wBAAM,MAAM,IAAI,WAAW,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;oBAC5F,OAAO,QAAQ,CAAC;gBACpB,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACT,IAAI,aAAa,EAAE,OAAO;wBAAE,CAAC,GAAG,IAAI,gBAAgB,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAM,OAAO;yBACtF,IAAI,CAAC,YAAY,eAAe,EAAE,CAAC,CAAA,CAAC,CAAmC,OAAO;yBAC9E,IAAI,CAAC,YAAY,YAAY,EAAE,CAAC,CAAA,CAAC,CAA2C,OAAO;yBACnF,IAAI,CAAC,YAAY,WAAW,EAAE,CAAC,CAAA,CAAC,CAA2C,QAAQ;;wBACnF,MAAM,CAAC,CAAC;oBACb,IAAI,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK;wBAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;;wBAAM,MAAM,CAAC,CAAC;gBAClF,CAAC;YACL,CAAC;QACL,CAAC;QAED;;UAEE;QACK,KAAK,CAAC,QAAQ,CACjB,KAAuB,EACvB,OAAgB,EAChB,WAAgD,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;YAE3E,KAAK,IAAI,KAAK,GAAG,CAAC,GAAG,KAAK,EAAE,EAAE,CAAC;gBAC3B,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBACnH,MAAM,OAAO,GAAkB,EAAE,CAAC;gBAClC,IAAI,aAAa;oBAAE,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBAC/C,IAAI,KAAK,CAAC,MAAM;oBAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBAC7C,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACxC,IAAI,CAAC;oBACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;oBAC1D,MAAM,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;oBAC/D,IAAI,SAAS,EAAE,CAAC;wBACZ,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;wBAC/C,MAAM,IAAI,eAAe,CAAC,WAAW,EAAE,CAAC;oBAC5C,CAAC;oBACD,IAAI,MAAM,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA,CAAC;;wBAAM,MAAM,IAAI,WAAW,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;oBAC5F,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACpC,OAAO,QAAQ,CAAC;gBACpB,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACT,IAAI,aAAa,EAAE,OAAO;wBAAE,CAAC,GAAG,IAAI,gBAAgB,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAM,OAAO;yBACtF,IAAI,CAAC,YAAY,eAAe,EAAE,CAAC,CAAA,CAAC,CAAmC,OAAO;yBAC9E,IAAI,CAAC,YAAY,YAAY,EAAE,CAAC,CAAA,CAAC,CAA2C,OAAO;yBACnF,IAAI,CAAC,YAAY,WAAW,EAAE,CAAC,CAAA,CAAC,CAA2C,QAAQ;;wBACnF,MAAM,CAAC,CAAC;oBACb,IAAI,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC,CAAA,CAAC;;wBAAM,MAAM,CAAC,CAAC;oBACxD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC5B,CAAC;YACL,CAAC;QACL,CAAC;KAcJ;IAnJqB,eAAQ,WAmJ7B,CAAA;AAkBL,CAAC,EAtKgB,MAAM,KAAN,MAAM,QAsKtB;AAED,MAAM,OAAO,gBAAiB,SAAQ,KAAK;CAAG;AAC9C,MAAM,OAAO,YAAa,SAAQ,KAAK;CAAG;AAC1C,MAAM,OAAO,WAAY,SAAQ,KAAK;CAAG;AACzC,MAAM,OAAO,eAAgB,SAAQ,KAAK;CAAG;AAC7C,WAAiB,eAAe;IAC5B,MAAa,WAAY,SAAQ,eAAe;KAAG;IAAtC,2BAAW,cAA2B,CAAA;AACvD,CAAC,EAFgB,eAAe,KAAf,eAAe,QAE/B"}
+{"version":3,"file":"engine.js","sourceRoot":"","sources":["../src/engine.ts"],"names":[],"mappings":"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"}

package/build/function.d.ts

@@ -1,4 +1,4 @@
-import { type Static, type TObject, type TSchema } from '@sinclair/typebox';
+import { type Static, type TObject, type TSchema } from 'typebox';
 declare const NOMINAL: unique symbol;
 export interface Function<in out fd extends Function.Decl.Proto> {
     (params: Static<fd['parameters']>): Promise<string>;

package/build/native-engines.d/google/message-codec.d.ts

@@ -5,8 +5,11 @@ import { MessageCodec as CompatibleMessageCodec } from '../../compatible-engine.
 import type { ToolCodec } from '../../api-types/google/tool-codec.ts';
 import { Verbatim } from '../../verbatim.ts';
 export declare class MessageCodec<in out fdm extends Function.Decl.Map.Proto, in out vdm extends Verbatim.Decl.Map.Proto> {
-    protected ctx: MessageCodec.Context<fdm, vdm>;
-    constructor(ctx: MessageCodec.Context<fdm, vdm>);
+    protected toolCodec: ToolCodec<fdm>;
+    protected compatibleMessageCodec: CompatibleMessageCodec<fdm, vdm>;
+    protected codeExecution: boolean;
+    protected vdm: vdm;
+    constructor(options: MessageCodec.Options<fdm, vdm>);
     encodeAiMessage(aiMessage: RoleMessage.Ai.From<fdm, vdm>): Google.Content;
     encodeUserMessage(userMessage: RoleMessage.User.From<fdm>): Google.Content;
     encodeDeveloperMessage(developerMessage: RoleMessage.Developer): Google.Content;
@@ -14,7 +17,7 @@ export declare class MessageCodec<in out fdm extends Function.Decl.Map.Proto, in
     decodeAiMessage(content: Google.Content): RoleMessage.Ai.From<fdm, vdm>;
 }
 export declare namespace MessageCodec {
-    interface Context<in out fdm extends Function.Decl.Map.Proto, in out vdm extends Verbatim.Decl.Map.Proto> {
+    interface Options<in out fdm extends Function.Decl.Map.Proto, in out vdm extends Verbatim.Decl.Map.Proto> {
         toolCodec: ToolCodec<fdm>;
         compatibleMessageCodec: CompatibleMessageCodec<fdm, vdm>;
         codeExecution: boolean;

package/build/native-engines.d/google/message-codec.js

@@ -1,19 +1,24 @@
-import { ResponseInvalid } from "../../engine.js";
 import { RoleMessage } from "./session.js";
 import * as VerbatimCodec from "../../verbatim/codec.js";
 export class MessageCodec {
-    ctx;
-    constructor(ctx) {
-        this.ctx = ctx;
+    toolCodec;
+    compatibleMessageCodec;
+    codeExecution;
+    vdm;
+    constructor(options) {
+        this.toolCodec = options.toolCodec;
+        this.compatibleMessageCodec = options.compatibleMessageCodec;
+        this.codeExecution = options.codeExecution;
+        this.vdm = options.vdm;
     }
     encodeAiMessage(aiMessage) {
         return aiMessage.getRaw();
     }
     encodeUserMessage(userMessage) {
-        return this.ctx.compatibleMessageCodec.encodeUserMessage(userMessage);
+        return this.compatibleMessageCodec.encodeUserMessage(userMessage);
     }
     encodeDeveloperMessage(developerMessage) {
-        return this.ctx.compatibleMessageCodec.encodeDeveloperMessage(developerMessage);
+        return this.compatibleMessageCodec.encodeDeveloperMessage(developerMessage);
     }
     encodeChatMessages(chatMessages) {
         return chatMessages.map(chatMessage => {
@@ -29,26 +34,18 @@ export class MessageCodec {
         if (content.parts) { }
         else
             throw new Error();
-        const parts = content.parts.flatMap(part => {
-            const parts = [];
-            if (part.text)
-                try {
-                    const vrs = VerbatimCodec.Request.decode(part.text, this.ctx.vdm);
-                    parts.push(new RoleMessage.Part.Text(part.text, vrs));
-                }
-                catch (e) {
-                    if (e instanceof SyntaxError)
-                        throw new ResponseInvalid('Invalid verbatim message', { cause: content });
-                    else
-                        throw e;
-                }
-            if (part.functionCall) {
-                parts.push(this.ctx.toolCodec.decodeFunctionCall(part.functionCall));
+        const parts = [];
+        for (const part of content.parts) {
+            if (part.text) {
+                const vrs = VerbatimCodec.Request.decode(part.text, this.vdm);
+                parts.push(new RoleMessage.Part.Text(part.text, vrs));
             }
+            if (part.functionCall)
+                parts.push(this.toolCodec.decodeFunctionCall(part.functionCall));
             if (part.executableCode) {
-                if (this.ctx.codeExecution) { }
+                if (this.codeExecution) { }
                 else
-                    throw new ResponseInvalid('Unexpected code execution', { cause: content });
+                    throw new SyntaxError('Unexpected code execution', { cause: content });
                 if (part.executableCode.code) { }
                 else
                     throw new Error();
@@ -58,16 +55,15 @@ export class MessageCodec {
                 parts.push(new RoleMessage.Ai.Part.ExecutableCode(part.executableCode.code, part.executableCode.language));
             }
             if (part.codeExecutionResult) {
-                if (this.ctx.codeExecution) { }
+                if (this.codeExecution) { }
                 else
-                    throw new ResponseInvalid('Unexpected code execution result', { cause: content });
+                    throw new SyntaxError('Unexpected code execution result', { cause: content });
                 if (part.codeExecutionResult.outcome) { }
                 else
                     throw new Error();
                 parts.push(new RoleMessage.Ai.Part.CodeExecutionResult(part.codeExecutionResult.outcome, part.codeExecutionResult.output));
             }
-            return parts;
-        });
+        }
         return new RoleMessage.Ai(parts, content);
     }
 }

package/build/native-engines.d/google/message-codec.js.map

@@ -1 +1 @@
-{"version":3,"file":"message-codec.js","sourceRoot":"","sources":["../../../src/native-engines.d/google/message-codec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"message-codec.js","sourceRoot":"","sources":["../../../src/native-engines.d/google/message-codec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAgB,MAAM,cAAc,CAAC;AAMzD,OAAO,KAAK,aAAa,MAAM,yBAAyB,CAAC;AAIzD,MAAM,OAAO,YAAY;IAIX,SAAS,CAAiB;IAC1B,sBAAsB,CAAmC;IACzD,aAAa,CAAU;IACvB,GAAG,CAAM;IACnB,YAAmB,OAAuC;QACtD,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,sBAAsB,GAAG,OAAO,CAAC,sBAAsB,CAAC;QAC7D,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;QAC3C,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAC3B,CAAC;IAGM,eAAe,CAClB,SAAwC;QAExC,OAAO,SAAS,CAAC,MAAM,EAAE,CAAC;IAC9B,CAAC;IAEM,iBAAiB,CACpB,WAAuC;QAEvC,OAAO,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IACtE,CAAC;IAEM,sBAAsB,CACzB,gBAAuC;QAEvC,OAAO,IAAI,CAAC,sBAAsB,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,CAAC;IAChF,CAAC;IAEM,kBAAkB,CACrB,YAAkD;QAElD,OAAO,YAAY,CAAC,GAAG,CACnB,WAAW,CAAC,EAAE;YACV,IAAI,WAAW,YAAY,WAAW,CAAC,IAAI;gBAAE,OAAO,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;iBACnF,IAAI,WAAW,YAAY,WAAW,CAAC,EAAE;gBAAE,OAAO,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;;gBACpF,MAAM,IAAI,KAAK,EAAE,CAAC;QAC3B,CAAC,CACJ,CAAC;IACN,CAAC;IAEM,eAAe,CAClB,OAAuB;QAEvB,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,CAAA,CAAC;;YAAM,MAAM,IAAI,KAAK,EAAE,CAAC;QAC7C,MAAM,KAAK,GAAyC,EAAE,CAAC;QACvD,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YAC/B,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACZ,MAAM,GAAG,GAAG,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC9D,KAAK,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;YAC1D,CAAC;YACD,IAAI,IAAI,CAAC,YAAY;gBACjB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;YACrE,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;gBACtB,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC,CAAA,CAAC;;oBAAM,MAAM,IAAI,WAAW,CAAC,2BAA2B,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;gBACvG,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAA,CAAC;;oBAAM,MAAM,IAAI,KAAK,EAAE,CAAC;gBACxD,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAA,CAAC;;oBAAM,MAAM,IAAI,KAAK,EAAE,CAAC;gBAC5D,KAAK,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC/G,CAAC;YACD,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAC3B,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC,CAAA,CAAC;;oBAAM,MAAM,IAAI,WAAW,CAAC,kCAAkC,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;gBAC9G,IAAI,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC,CAAA,CAAC;;oBAAM,MAAM,IAAI,KAAK,EAAE,CAAC;gBAChE,KAAK,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;YAC/H,CAAC;QACL,CAAC;QACD,OAAO,IAAI,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC;CACJ"}

package/build/native-engines.d/google/transport.d.ts

@@ -10,13 +10,23 @@ import type { Verbatim } from '../../verbatim.ts';
 import type { Structuring } from '../../compatible-engine/structuring.ts';
 import type { Engine } from '../../engine.ts';
 export declare class GoogleNativeTransport<in out fdm extends Function.Decl.Map.Proto, in out vdm extends Verbatim.Decl.Map.Proto> implements Engine.Transport<RoleMessage.User.From<fdm>, RoleMessage.Ai.From<fdm, vdm>, RoleMessage.Developer, Session.From<fdm, vdm>> {
-    protected ctx: GoogleNativeTransport.Context<fdm, vdm>;
     protected apiURL: URL;
-    constructor(ctx: GoogleNativeTransport.Context<fdm, vdm>);
+    protected inferenceParams: InferenceParams;
+    protected providerSpec: ProviderSpec;
+    protected fdm: fdm;
+    protected throttle: Throttle;
+    protected choice: Structuring.Choice.From<fdm, vdm>;
+    protected codeExecution: boolean;
+    protected urlContext: boolean;
+    protected googleSearch: boolean;
+    protected messageCodec: MessageCodec<fdm, vdm>;
+    protected toolCodec: ToolCodec<fdm>;
+    protected billing: Billing;
+    constructor(options: GoogleNativeTransport.Options<fdm, vdm>);
     fetch(wfctx: InferenceContext, session: Session.From<fdm, vdm>, signal?: AbortSignal): Promise<RoleMessage.Ai.From<fdm, vdm>>;
 }
 export declare namespace GoogleNativeTransport {
-    interface Context<in out fdm extends Function.Decl.Map.Proto, in out vdm extends Verbatim.Decl.Map.Proto> {
+    interface Options<in out fdm extends Function.Decl.Map.Proto, in out vdm extends Verbatim.Decl.Map.Proto> {
         inferenceParams: InferenceParams;
         providerSpec: ProviderSpec;
         fdm: fdm;

package/build/native-engines.d/google/transport.js

@@ -1,55 +1,69 @@
-import { NetworkError, ResponseInvalid } from "../../engine.js";
 import * as Google from '@google/genai';
 import * as Undici from 'undici';
 import { loggers } from "../../telemetry.js";
 import * as ChoiceCodec from "../../compatible-engine.d/google/choice-codec.js";
 import { MIMEType } from 'whatwg-mimetype';
 export class GoogleNativeTransport {
-    ctx;
     apiURL;
-    constructor(ctx) {
-        this.ctx = ctx;
-        this.apiURL = new URL(`${this.ctx.providerSpec.baseUrl}/v1beta/models/${this.ctx.inferenceParams.model}:generateContent`);
+    inferenceParams;
+    providerSpec;
+    fdm;
+    throttle;
+    choice;
+    codeExecution;
+    urlContext;
+    googleSearch;
+    messageCodec;
+    toolCodec;
+    billing;
+    constructor(options) {
+        this.apiURL = new URL(`${options.providerSpec.baseUrl}/v1beta/models/${options.inferenceParams.model}:generateContent`);
+        this.inferenceParams = options.inferenceParams;
+        this.providerSpec = options.providerSpec;
+        this.fdm = options.fdm;
+        this.throttle = options.throttle;
+        this.choice = options.choice;
+        this.codeExecution = options.codeExecution;
+        this.urlContext = options.urlContext;
+        this.googleSearch = options.googleSearch;
+        this.messageCodec = options.messageCodec;
+        this.toolCodec = options.toolCodec;
+        this.billing = options.billing;
     }
     async fetch(wfctx, session, signal) {
-        const systemInstruction = session.developerMessage && this.ctx.messageCodec.encodeDeveloperMessage(session.developerMessage);
-        const contents = this.ctx.messageCodec.encodeChatMessages(session.chatMessages);
-        await this.ctx.throttle.requests(wfctx);
-        const apifds = this.ctx.toolCodec.encodeFunctionDeclarationMap(this.ctx.fdm);
+        const systemInstruction = session.developerMessage && this.messageCodec.encodeDeveloperMessage(session.developerMessage);
+        const contents = this.messageCodec.encodeChatMessages(session.chatMessages);
+        await this.throttle.requests(wfctx);
+        const apifds = this.toolCodec.encodeFunctionDeclarationMap(this.fdm);
         const apiTools = [];
         if (apifds.length)
             apiTools.push({ functionDeclarations: apifds });
-        if (this.ctx.urlContext)
+        if (this.urlContext)
             apiTools.push({ urlContext: {} });
-        if (this.ctx.googleSearch)
+        if (this.googleSearch)
             apiTools.push({ googleSearch: {} });
-        if (this.ctx.codeExecution)
+        if (this.codeExecution)
             apiTools.push({ codeExecution: {} });
         const apiToolConfig = {};
         if (apifds.length)
-            apiToolConfig.functionCallingConfig = ChoiceCodec.encode(this.ctx.choice);
+            apiToolConfig.functionCallingConfig = ChoiceCodec.encode(this.choice);
         const reqbody = {
             contents,
             tools: apiTools.length ? apiTools : undefined,
             toolConfig: apiToolConfig,
             systemInstruction,
-            generationConfig: this.ctx.inferenceParams.additionalOptions,
+            generationConfig: this.inferenceParams.additionalOptions,
         };
         loggers.message.debug(reqbody);
         const res = await Undici.fetch(this.apiURL, {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
-                'x-goog-api-key': this.ctx.providerSpec.apiKey,
+                'x-goog-api-key': this.providerSpec.apiKey,
             },
             body: JSON.stringify(reqbody),
-            dispatcher: this.ctx.providerSpec.dispatcher,
+            dispatcher: this.providerSpec.dispatcher,
             signal,
-        }).catch(e => {
-            if (e instanceof TypeError)
-                throw new NetworkError(undefined, { cause: e });
-            else
-                throw e;
         });
         loggers.message.debug(res);
         if (res.ok) { }
@@ -69,12 +83,12 @@ export class GoogleNativeTransport {
         const response = await res.json();
         if (response.candidates?.[0]?.content?.parts?.length) { }
         else
-            throw new ResponseInvalid('Content missing', { cause: response });
+            throw new SyntaxError('Content missing', { cause: response });
         if (response.candidates[0].finishReason === Google.FinishReason.MAX_TOKENS)
-            throw new ResponseInvalid('Token limit exceeded.', { cause: response });
+            throw new SyntaxError('Token limit exceeded.', { cause: response });
         if (response.candidates[0].finishReason === Google.FinishReason.STOP) { }
         else
-            throw new ResponseInvalid('Abnormal finish reason', { cause: response });
+            throw new SyntaxError('Abnormal finish reason', { cause: response });
         for (const part of response.candidates[0].content.parts) {
             if (part.text)
                 loggers.inference.info(part.text);
@@ -83,9 +97,9 @@ export class GoogleNativeTransport {
         }
         if (response.usageMetadata) { }
         else
-            throw new ResponseInvalid('Usage metadata missing', { cause: response });
-        wfctx.cost?.(this.ctx.billing.charge(response.usageMetadata));
-        return this.ctx.messageCodec.decodeAiMessage(response.candidates[0].content);
+            throw new SyntaxError('Usage metadata missing', { cause: response });
+        wfctx.cost?.(this.billing.charge(response.usageMetadata));
+        return this.messageCodec.decodeAiMessage(response.candidates[0].content);
     }
 }
 //# sourceMappingURL=transport.js.map