@celljs/ai-core 3.4.3 → 3.5.1

package/README.md

@@ -44,7 +44,7 @@ yarn add @celljs/ai-ollama
 
 ```typescript
 import { AssistantMessage, PromptTemplate } from '@celljs/ai-core';
-import { Component Autowired } from '@celljs/core';
+import { Component, Autowired } from '@celljs/core';
 
 @Component()
 export class OllamaDemo {
@@ -103,6 +103,31 @@ export class OllamaDemo {
 }
 ```
 
+另外也可以使用 `ProxyChatModel` 类统一调用所有的模型服务商的模型：
+
+```typescript
+import { ProxyChatModel } from '@celljs/ai-core';
+import { Component Autowired } from '@celljs/core';
+
+@Component()
+export class OllamaDemo {
+    @Autowired(ProxyChatModel)
+    private chatModel: ChatModel;
+    
+    /**
+     * Chat with Ollama
+     */
+    async chat() {
+        const response = await this.chatModel.call({
+            prompt: 'Hello {name}',
+            variables: { name: 'Ollama' },
+            chatOptions: { model: 'ollama:llama3.2' }
+        });
+        console.log(response.result.output);
+        }
+}
+```
+
 ## 许可证
 
 本项目采用 MIT 许可证。

package/lib/common/chat/index.d.ts

@@ -2,4 +2,5 @@ export * from './message';
 export * from './metadata';
 export * from './prompt';
 export * from './model';
+export * from './tool';
 //# sourceMappingURL=index.d.ts.map

package/lib/common/chat/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/chat/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/chat/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC"}

package/lib/common/chat/index.js

@@ -5,4 +5,5 @@ tslib_1.__exportStar(require("./message"), exports);
 tslib_1.__exportStar(require("./metadata"), exports);
 tslib_1.__exportStar(require("./prompt"), exports);
 tslib_1.__exportStar(require("./model"), exports);
+tslib_1.__exportStar(require("./tool"), exports);
 //# sourceMappingURL=index.js.map

package/lib/common/chat/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/chat/index.ts"],"names":[],"mappings":";;;AAAA,oDAA0B;AAC1B,qDAA2B;AAC3B,mDAAyB;AACzB,kDAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/chat/index.ts"],"names":[],"mappings":";;;AAAA,oDAA0B;AAC1B,qDAA2B;AAC3B,mDAAyB;AACzB,kDAAwB;AACxB,iDAAuB"}

package/lib/common/chat/message/message-protocol.d.ts

@@ -1,5 +1,5 @@
-import { MediaType } from '@celljs/http';
 import { Content } from '../../model/model-protocol';
+import { MimeType } from '@celljs/core';
 /**
  * The Media class represents the data and metadata of a media attachment in a message. It
  * consists of a MIME type and the raw data.
@@ -8,11 +8,36 @@ import { Content } from '../../model/model-protocol';
  *
  */
 export interface Media {
-    readonly mediaType: MediaType;
     /**
-     * Get the media data object
+     * The unique identifier of the media attachment.
      */
-    readonly data: any;
+    id?: string;
+    /**
+     * The MIME type of the media attachment.
+     */
+    mimeType: MimeType;
+    /**
+     * The raw data of the media attachment.
+     */
+    data: any;
+    /**
+     * The name of the media object that can be referenced by the AI model.
+     * <p>
+     * Important security note: This field is vulnerable to prompt injections, as the
+     * model might inadvertently interpret it as instructions. It is recommended to
+     * specify neutral names.
+     *
+     * <p>
+     * The name must only contain:
+     * <ul>
+     * <li>Alphanumeric characters
+     * <li>Whitespace characters (no more than one in a row)
+     * <li>Hyphens
+     * <li>Parentheses
+     * <li>Square brackets
+     * </ul>
+     */
+    name?: string;
 }
 /**
  * The MessageType enum represents the type of a message in a chat application. It can be

package/lib/common/chat/message/message-protocol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message-protocol.d.ts","sourceRoot":"","sources":["../../../../src/common/chat/message/message-protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAErD;;;;;;GAMG;AACH,MAAM,WAAW,KAAK;IAElB,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAE9B;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC;CAEtB;AAED;;;GAGG;AACH,oBAAY,WAAW;IACnB,IAAI,SAAS;IACb,SAAS,cAAc;IACvB,MAAM,WAAW;IACjB,QAAQ,aAAa;IACrB,IAAI,SAAS;CAChB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,OAAQ,SAAQ,OAAO;IACpC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;CACrC;AAED,yBAAiB,OAAO,CAAC;IACrB,SAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,OAAO,CAElD;CACJ;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACrB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;CACrB"}
+{"version":3,"file":"message-protocol.d.ts","sourceRoot":"","sources":["../../../../src/common/chat/message/message-protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC;;;;;;GAMG;AACH,MAAM,WAAW,KAAK;IAElB;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ;;OAEG;IACH,QAAQ,EAAE,QAAQ,CAAC;IAEnB;;OAEG;IACH,IAAI,EAAE,GAAG,CAAC;IAEV;;;;;;;;;;;;;;;;OAgBG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CAEjB;AAED;;;GAGG;AACH,oBAAY,WAAW;IACnB,IAAI,SAAS;IACb,SAAS,cAAc;IACvB,MAAM,WAAW;IACjB,QAAQ,aAAa;IACrB,IAAI,SAAS;CAChB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,OAAQ,SAAQ,OAAO;IACpC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;CACrC;AAED,yBAAiB,OAAO,CAAC;IACrB,SAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,OAAO,CAElD;CACJ;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACrB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;CACrB"}

package/lib/common/chat/message/message-protocol.js.map

@@ -1 +1 @@
-{"version":3,"file":"message-protocol.js","sourceRoot":"","sources":["../../../../src/common/chat/message/message-protocol.ts"],"names":[],"mappings":";;;AAqBA;;;GAGG;AACH,IAAY,WAMX;AAND,WAAY,WAAW;IACnB,4BAAa,CAAA;IACb,sCAAuB,CAAA;IACvB,gCAAiB,CAAA;IACjB,oCAAqB,CAAA;IACrB,4BAAa,CAAA;AACjB,CAAC,EANW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAMtB;AAcD,IAAiB,OAAO,CAIvB;AAJD,WAAiB,OAAO;IACpB,SAAgB,SAAS,CAAC,GAAQ;QAC9B,OAAO,GAAG,IAAI,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC;IAChD,CAAC;IAFe,iBAAS,YAExB,CAAA;AACL,CAAC,EAJgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAIvB"}
+{"version":3,"file":"message-protocol.js","sourceRoot":"","sources":["../../../../src/common/chat/message/message-protocol.ts"],"names":[],"mappings":";;;AAgDA;;;GAGG;AACH,IAAY,WAMX;AAND,WAAY,WAAW;IACnB,4BAAa,CAAA;IACb,sCAAuB,CAAA;IACvB,gCAAiB,CAAA;IACjB,oCAAqB,CAAA;IACrB,4BAAa,CAAA;AACjB,CAAC,EANW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAMtB;AAcD,IAAiB,OAAO,CAIvB;AAJD,WAAiB,OAAO;IACpB,SAAgB,SAAS,CAAC,GAAQ;QAC9B,OAAO,GAAG,IAAI,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC;IAChD,CAAC;IAFe,iBAAS,YAExB,CAAA;AACL,CAAC,EAJgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAIvB"}

package/lib/common/chat/metadata/chat-generation-metadata.d.ts

@@ -12,9 +12,9 @@ export interface ChatGenerationMetadata extends ResultMetadata {
      * The reason this choice completed for the generation.
      */
     readonly finishReason?: string;
+    readonly metadata: Record<string, any>;
 }
 export declare class ChatGenerationMetadata {
-    static EMPTY: ChatGenerationMetadata;
     /**
      * Factory method used to construct a new {@link ChatGenerationMetadata} from the
      * given finish reason and content filter metadata.
@@ -23,6 +23,6 @@ export declare class ChatGenerationMetadata {
      * @param contentFilterMetadata The content filter metadata.
      * @returns A new instance of {@link ChatGenerationMetadata}.
      */
-    static from(finishReason?: string, contentFilterMetadata?: any): ChatGenerationMetadata;
+    static from(finishReason?: string, metadata?: Record<string, any>, contentFilterMetadata?: any): ChatGenerationMetadata;
 }
 //# sourceMappingURL=chat-generation-metadata.d.ts.map

package/lib/common/chat/metadata/chat-generation-metadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chat-generation-metadata.d.ts","sourceRoot":"","sources":["../../../../src/common/chat/metadata/chat-generation-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D;;;GAGG;AACH,MAAM,WAAW,sBAAuB,SAAQ,cAAc;IAE1D;;OAEG;IACH,QAAQ,CAAC,qBAAqB,CAAC,EAAE,GAAG,CAAC;IAErC;;OAEG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;CAClC;AAED,qBAAa,sBAAsB;IAE/B,MAAM,CAAC,KAAK,EAAE,sBAAsB,CAAiC;IAErE;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,qBAAqB,CAAC,EAAE,GAAG,GAAG,sBAAsB;CAK1F"}
+{"version":3,"file":"chat-generation-metadata.d.ts","sourceRoot":"","sources":["../../../../src/common/chat/metadata/chat-generation-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D;;;GAGG;AACH,MAAM,WAAW,sBAAuB,SAAQ,cAAc;IAE1D;;OAEG;IACH,QAAQ,CAAC,qBAAqB,CAAC,EAAE,GAAG,CAAC;IAErC;;OAEG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAE/B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC1C;AAED,qBAAa,sBAAsB;IAE/B;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,EAAE,qBAAqB,CAAC,EAAE,GAAG,GAAG,sBAAsB;CAK9H"}

package/lib/common/chat/metadata/chat-generation-metadata.js

@@ -10,12 +10,11 @@ class ChatGenerationMetadata {
      * @param contentFilterMetadata The content filter metadata.
      * @returns A new instance of {@link ChatGenerationMetadata}.
      */
-    static from(finishReason, contentFilterMetadata) {
+    static from(finishReason, metadata = {}, contentFilterMetadata) {
         return {
-            finishReason, contentFilterMetadata
+            finishReason, contentFilterMetadata, metadata
         };
     }
 }
 exports.ChatGenerationMetadata = ChatGenerationMetadata;
-ChatGenerationMetadata.EMPTY = ChatGenerationMetadata.from();
 //# sourceMappingURL=chat-generation-metadata.js.map

package/lib/common/chat/metadata/chat-generation-metadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"chat-generation-metadata.js","sourceRoot":"","sources":["../../../../src/common/chat/metadata/chat-generation-metadata.ts"],"names":[],"mappings":";;;AAmBA,MAAa,sBAAsB;IAI/B;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,CAAC,YAAqB,EAAE,qBAA2B;QAC1D,OAAO;YACH,YAAY,EAAE,qBAAqB;SACtC,CAAC;IACN,CAAC;;AAhBL,wDAiBC;AAfU,4BAAK,GAA2B,sBAAsB,CAAC,IAAI,EAAE,CAAC"}
+{"version":3,"file":"chat-generation-metadata.js","sourceRoot":"","sources":["../../../../src/common/chat/metadata/chat-generation-metadata.ts"],"names":[],"mappings":";;;AAqBA,MAAa,sBAAsB;IAE/B;;;;;;;OAOG;IACH,MAAM,CAAC,IAAI,CAAC,YAAqB,EAAE,WAAgC,EAAE,EAAE,qBAA2B;QAC9F,OAAO;YACH,YAAY,EAAE,qBAAqB,EAAE,QAAQ;SAChD,CAAC;IACN,CAAC;CACJ;AAfD,wDAeC"}

package/lib/common/chat/metadata/metadata-protocol.d.ts

@@ -7,20 +7,21 @@ export interface Usage {
     /**
      * The number of tokens used in the prompt of the AI request.
      */
-    readonly promptTokens: number;
+    readonly promptTokens?: number;
     /**
      * The number of tokens returned in the generation (aka completion)
      * of the AI's response.
      */
-    readonly generationTokens: number;
+    readonly generationTokens?: number;
     /**
      * The total number of tokens from both the prompt of an AI request
      * and generation of the AI's response.
      */
-    readonly totalTokens: number;
+    readonly totalTokens?: number;
 }
 export declare namespace Usage {
-    function from(promptTokens: number, generationTokens: number): Usage;
+    function createEmpty(): Usage;
+    function from(promptTokens?: number, generationTokens?: number, totalTokens?: number): Usage;
 }
 /**
  * Abstract Data Type (ADT) encapsulating metadata from an AI provider's API rate limits
@@ -31,32 +32,32 @@ export interface RateLimit {
      * The maximum number of requests that are permitted before exhausting the
      * rate limit.
      */
-    readonly requestsLimit: number;
+    readonly requestsLimit?: number;
     /**
      * The remaining number of requests that are permitted before exhausting the
      * requestsLimit rate limit.
      */
-    readonly requestsRemaining: number;
+    readonly requestsRemaining?: number;
     /**
      * The duration time until the rate limit (based on requests) resets
      * to its requestsLimit initial state.
      */
-    readonly requestsReset: number;
+    readonly requestsReset?: number;
     /**
      * The maximum number of tokens that are permitted before exhausting the rate
      * limit.
      */
-    readonly tokensLimit: number;
+    readonly tokensLimit?: number;
     /**
      * The remaining number of tokens that are permitted before exhausting the
      * tokensLimit rate limit.
      */
-    readonly tokensRemaining: number;
+    readonly tokensRemaining?: number;
     /**
      * The duration time until the rate limit (based on tokens) resets to
      * its tokensLimit initial state.
      */
-    readonly tokensReset: number;
+    readonly tokensReset?: number;
 }
 /**
  * Abstract Data Type (ADT) modeling filter metadata for all prompts sent during an AI
@@ -92,6 +93,9 @@ export declare namespace PromptMetadata {
      */
     function findByPromptIndex(promptMetadata: PromptMetadata, promptIndex: number): PromptFilterMetadata | undefined;
 }
+export declare namespace RateLimit {
+    function createEmpty(): RateLimit;
+}
 export interface ChatResponseMetadata extends ResponseMetadata {
     id?: string;
     model?: string;
@@ -118,7 +122,7 @@ export declare class ChatResponseMetadataBuilder {
     build(): ChatResponseMetadata;
 }
 export declare namespace ChatResponseMetadata {
-    const EMPTY: ChatResponseMetadata;
+    function createEmpty(): ChatResponseMetadata;
     function builder(): ChatResponseMetadataBuilder;
 }
 //# sourceMappingURL=metadata-protocol.d.ts.map

package/lib/common/chat/metadata/metadata-protocol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metadata-protocol.d.ts","sourceRoot":"","sources":["../../../../src/common/chat/metadata/metadata-protocol.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D;;;GAGG;AACH,MAAM,WAAW,KAAK;IAElB;;OAEG;IACH,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAE9B;;;OAGG;IACH,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAElC;;;OAGG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAEhC;AAED,yBAAiB,KAAK,CAAC;IACnB,SAAgB,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,KAAK,CAE1E;CACJ;AAED;;;GAGG;AACH,MAAM,WAAW,SAAS;IAEtB;;;OAGG;IACH,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAE/B;;;OAGG;IACH,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IAEnC;;;OAGG;IACH,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAE/B;;;OAGG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAE7B;;;OAGG;IACH,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IAEjC;;;OAGG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAEhC;AAED;;;GAGG;AACH,MAAM,WAAW,oBAAoB,CAAC,CAAC,GAAG,GAAG;IAEzC;;OAEG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAE7B;;;;;;;OAOG;IACH,QAAQ,CAAC,qBAAqB,EAAE,CAAC,CAAC;CAErC;AAED;;;GAGG;AACH,oBAAY,cAAc,GAAG,oBAAoB,EAAE,CAAC;AAEpD,yBAAiB,cAAc,CAAC;IAC5B;;;;;;OAMG;IACH,SAAgB,iBAAiB,CAAC,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,GAAG,oBAAoB,GAAG,SAAS,CAOvH;CACJ;AAED,MAAM,WAAW,oBAAqB,SAAQ,gBAAgB;IAC1D,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,SAAS,EAAE,SAAS,CAAC;IAErB;;;OAGG;IACH,KAAK,EAAE,KAAK,CAAC;IAEb,cAAc,EAAE,cAAc,CAAC;CAElC;AAED,qBAAa,2BAA2B;IAEpC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAkBnC;IAEF,EAAE,CAAC,EAAE,EAAE,MAAM,GAAG,2BAA2B;IAK3C,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,2BAA2B;IAKjD,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,2BAA2B;IAK5D,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,2BAA2B;IAKhD,cAAc,CAAC,cAAc,EAAE,cAAc,GAAG,2BAA2B;IAK3E,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,2BAA2B;IAW9D,KAAK,IAAI,oBAAoB;CAIhC;AAED,yBAAiB,oBAAoB,CAAC;IAC3B,MAAM,KAAK,EAAE,oBAkBnB,CAAC;IAEF,SAAgB,OAAO,IAAI,2BAA2B,CAErD;CACJ"}
+{"version":3,"file":"metadata-protocol.d.ts","sourceRoot":"","sources":["../../../../src/common/chat/metadata/metadata-protocol.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D;;;GAGG;AACH,MAAM,WAAW,KAAK;IAElB;;OAEG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAE/B;;;OAGG;IACH,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAEnC;;;OAGG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;CAEjC;AAED,yBAAiB,KAAK,CAAC;IACnB,SAAgB,WAAW,IAAI,KAAK,CAEnC;IAED,SAAgB,IAAI,CAAC,YAAY,SAAI,EAAE,gBAAgB,SAAI,EAAE,WAAW,SAAI,GAAG,KAAK,CAEnF;CACJ;AAED;;;GAGG;AACH,MAAM,WAAW,SAAS;IAEtB;;;OAGG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAEhC;;;OAGG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAEpC;;;OAGG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAEhC;;;OAGG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAE9B;;;OAGG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAElC;;;OAGG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;CAEjC;AAED;;;GAGG;AACH,MAAM,WAAW,oBAAoB,CAAC,CAAC,GAAG,GAAG;IAEzC;;OAEG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAE7B;;;;;;;OAOG;IACH,QAAQ,CAAC,qBAAqB,EAAE,CAAC,CAAC;CAErC;AAED;;;GAGG;AACH,oBAAY,cAAc,GAAG,oBAAoB,EAAE,CAAC;AAEpD,yBAAiB,cAAc,CAAC;IAC5B;;;;;;OAMG;IACH,SAAgB,iBAAiB,CAAC,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,GAAG,oBAAoB,GAAG,SAAS,CAOvH;CACJ;AAED,yBAAiB,SAAS,CAAC;IACvB,SAAgB,WAAW,IAAI,SAAS,CAEvC;CACJ;AAED,MAAM,WAAW,oBAAqB,SAAQ,gBAAgB;IAC1D,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,SAAS,EAAE,SAAS,CAAC;IAErB;;;OAGG;IACH,KAAK,EAAE,KAAK,CAAC;IAEb,cAAc,EAAE,cAAc,CAAC;CAElC;AAED,qBAAa,2BAA2B;IAEpC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAA4D;IAEjG,EAAE,CAAC,EAAE,EAAE,MAAM,GAAG,2BAA2B;IAK3C,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,2BAA2B;IAKjD,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,2BAA2B;IAK5D,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,2BAA2B;IAKhD,cAAc,CAAC,cAAc,EAAE,cAAc,GAAG,2BAA2B;IAK3E,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,2BAA2B;IAW9D,KAAK,IAAI,oBAAoB;CAIhC;AAED,yBAAiB,oBAAoB,CAAC;IAElC,SAAgB,WAAW,IAAI,oBAAoB,CASlD;IAED,SAAgB,OAAO,IAAI,2BAA2B,CAErD;CACJ"}

package/lib/common/chat/metadata/metadata-protocol.js

@@ -1,11 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChatResponseMetadata = exports.ChatResponseMetadataBuilder = exports.PromptMetadata = exports.Usage = void 0;
+exports.ChatResponseMetadata = exports.ChatResponseMetadataBuilder = exports.RateLimit = exports.PromptMetadata = exports.Usage = void 0;
 const core_1 = require("@celljs/core");
 var Usage;
 (function (Usage) {
-    function from(promptTokens, generationTokens) {
-        return { promptTokens, generationTokens, totalTokens: promptTokens + generationTokens };
+    function createEmpty() {
+        return { promptTokens: 0, generationTokens: 0, totalTokens: 0 };
+    }
+    Usage.createEmpty = createEmpty;
+    function from(promptTokens = 0, generationTokens = 0, totalTokens = 0) {
+        return { promptTokens, generationTokens, totalTokens: totalTokens ? totalTokens : promptTokens + generationTokens };
     }
     Usage.from = from;
 })(Usage = exports.Usage || (exports.Usage = {}));
@@ -26,27 +30,16 @@ var PromptMetadata;
     }
     PromptMetadata.findByPromptIndex = findByPromptIndex;
 })(PromptMetadata = exports.PromptMetadata || (exports.PromptMetadata = {}));
+var RateLimit;
+(function (RateLimit) {
+    function createEmpty() {
+        return { requestsLimit: 0, requestsRemaining: 0, requestsReset: 0, tokensLimit: 0, tokensRemaining: 0, tokensReset: 0 };
+    }
+    RateLimit.createEmpty = createEmpty;
+})(RateLimit = exports.RateLimit || (exports.RateLimit = {}));
 class ChatResponseMetadataBuilder {
     constructor() {
-        this.chatResponseMetadata = {
-            id: '',
-            model: '',
-            rateLimit: {
-                requestsLimit: 0,
-                requestsRemaining: 0,
-                requestsReset: 0,
-                tokensLimit: 0,
-                tokensRemaining: 0,
-                tokensReset: 0
-            },
-            usage: {
-                promptTokens: 0,
-                generationTokens: 0,
-                totalTokens: 0
-            },
-            promptMetadata: [],
-            extra: {}
-        };
+        this.chatResponseMetadata = ChatResponseMetadata.createEmpty();
     }
     id(id) {
         this.chatResponseMetadata.id = id;
@@ -84,25 +77,17 @@ class ChatResponseMetadataBuilder {
 exports.ChatResponseMetadataBuilder = ChatResponseMetadataBuilder;
 var ChatResponseMetadata;
 (function (ChatResponseMetadata) {
-    ChatResponseMetadata.EMPTY = {
-        id: '',
-        model: '',
-        rateLimit: {
-            requestsLimit: 0,
-            requestsRemaining: 0,
-            requestsReset: 0,
-            tokensLimit: 0,
-            tokensRemaining: 0,
-            tokensReset: 0
-        },
-        usage: {
-            promptTokens: 0,
-            generationTokens: 0,
-            totalTokens: 0
-        },
-        promptMetadata: [],
-        extra: {}
-    };
+    function createEmpty() {
+        return {
+            id: '',
+            model: '',
+            rateLimit: RateLimit.createEmpty(),
+            usage: Usage.createEmpty(),
+            promptMetadata: [],
+            extra: {}
+        };
+    }
+    ChatResponseMetadata.createEmpty = createEmpty;
     function builder() {
         return new ChatResponseMetadataBuilder();
     }

package/lib/common/chat/metadata/metadata-protocol.js.map

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

package/lib/common/chat/model/chat-protocol.d.ts

@@ -8,14 +8,17 @@ export declare const ChatModel: unique symbol;
  * Represents a response returned by the AI.
  */
 export interface Generation extends ModelResult<AssistantMessage> {
+    metadata: ChatGenerationMetadata;
 }
 export interface ChatResponse extends ModelResponse<Generation> {
+    metadata: ChatResponseMetadata;
 }
 export declare namespace Generation {
     function from(output: AssistantMessage, metadata?: ChatGenerationMetadata): Generation;
 }
 export declare namespace ChatResponse {
     function from(results: Generation[], metadata?: ChatResponseMetadata): ChatResponse;
+    function isToolCall(chatResponse: ChatResponse, toolCallFinishReasons: Set<string>): boolean;
 }
 export interface StreamingChatModel extends StreamingModel<Prompt, ChatResponse> {
 }

package/lib/common/chat/model/chat-protocol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chat-protocol.d.ts","sourceRoot":"","sources":["../../../../src/common/chat/model/chat-protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC/F,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAC3E,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAEnD,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAC/D,eAAO,MAAM,SAAS,eAAsB,CAAC;AAE7C;;GAEG;AACH,MAAM,WAAW,UAAW,SAAQ,WAAW,CAAC,gBAAgB,CAAC;CAEhE;AAED,MAAM,WAAW,YAAa,SAAQ,aAAa,CAAC,UAAU,CAAC;CAE9D;AAED,yBAAiB,UAAU,CAAC;IACxB,SAAgB,IAAI,CAAC,MAAM,EAAE,gBAAgB,EAAE,QAAQ,yBAA+B,GAAG,UAAU,CAElG;CACJ;AAED,yBAAiB,YAAY,CAAC;IAC1B,SAAgB,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,QAAQ,uBAA6B,GAAG,YAAY,CAE/F;CACJ;AAED,MAAM,WAAW,kBAAmB,SAAQ,cAAc,CAAC,MAAM,EAAE,YAAY,CAAC;CAE/E;AAED,MAAM,WAAW,SAAU,SAAQ,KAAK,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,kBAAkB;CAEjF"}
+{"version":3,"file":"chat-protocol.d.ts","sourceRoot":"","sources":["../../../../src/common/chat/model/chat-protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC/F,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAC3E,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAEnD,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAC/D,eAAO,MAAM,SAAS,eAAsB,CAAC;AAE7C;;GAEG;AACH,MAAM,WAAW,UAAW,SAAQ,WAAW,CAAC,gBAAgB,CAAC;IAC7D,QAAQ,EAAE,sBAAsB,CAAC;CACpC;AAED,MAAM,WAAW,YAAa,SAAQ,aAAa,CAAC,UAAU,CAAC;IAC3D,QAAQ,EAAE,oBAAoB,CAAC;CAClC;AAED,yBAAiB,UAAU,CAAC;IACxB,SAAgB,IAAI,CAAC,MAAM,EAAE,gBAAgB,EAAE,QAAQ,yBAAgC,GAAG,UAAU,CAEnG;CACJ;AAED,yBAAiB,YAAY,CAAC;IAC1B,SAAgB,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,QAAQ,uBAAqC,GAAG,YAAY,CAEvG;IAED,SAAgB,UAAU,CAAC,YAAY,EAAE,YAAY,EAAE,qBAAqB,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,OAAO,CAWlG;CAMJ;AAED,MAAM,WAAW,kBAAmB,SAAQ,cAAc,CAAC,MAAM,EAAE,YAAY,CAAC;CAE/E;AAED,MAAM,WAAW,SAAU,SAAQ,KAAK,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,kBAAkB;CAEjF"}

package/lib/common/chat/model/chat-protocol.js

@@ -6,16 +6,32 @@ exports.StreamingChatModel = Symbol('StreamingChatModel');
 exports.ChatModel = Symbol('ChatModel');
 var Generation;
 (function (Generation) {
-    function from(output, metadata = metadata_1.ChatGenerationMetadata.EMPTY) {
+    function from(output, metadata = metadata_1.ChatGenerationMetadata.from()) {
         return { output, metadata };
     }
     Generation.from = from;
 })(Generation = exports.Generation || (exports.Generation = {}));
 var ChatResponse;
 (function (ChatResponse) {
-    function from(results, metadata = metadata_1.ChatResponseMetadata.EMPTY) {
+    function from(results, metadata = metadata_1.ChatResponseMetadata.createEmpty()) {
         return { result: results[0], results, metadata };
     }
     ChatResponse.from = from;
+    function isToolCall(chatResponse, toolCallFinishReasons) {
+        if (!chatResponse) {
+            return false;
+        }
+        const generations = chatResponse.results;
+        if (!generations || generations.length === 0) {
+            return false;
+        }
+        return generations.some(g => doIsToolCall(g, toolCallFinishReasons));
+    }
+    ChatResponse.isToolCall = isToolCall;
+    function doIsToolCall(generation, toolCallFinishReasons) {
+        var _a, _b;
+        const finishReason = (_a = generation.metadata.finishReason) !== null && _a !== void 0 ? _a : '';
+        return ((_b = generation.output.toolCalls) === null || _b === void 0 ? void 0 : _b.length) > 0 && toolCallFinishReasons.has(finishReason.toLowerCase());
+    }
 })(ChatResponse = exports.ChatResponse || (exports.ChatResponse = {}));
 //# sourceMappingURL=chat-protocol.js.map

package/lib/common/chat/model/chat-protocol.js.map

@@ -1 +1 @@
-{"version":3,"file":"chat-protocol.js","sourceRoot":"","sources":["../../../../src/common/chat/model/chat-protocol.ts"],"names":[],"mappings":";;;AAEA,0CAA2E;AAG9D,QAAA,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAClD,QAAA,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;AAa7C,IAAiB,UAAU,CAI1B;AAJD,WAAiB,UAAU;IACvB,SAAgB,IAAI,CAAC,MAAwB,EAAE,QAAQ,GAAG,iCAAsB,CAAC,KAAK;QAClF,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;IAChC,CAAC;IAFe,eAAI,OAEnB,CAAA;AACL,CAAC,EAJgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAI1B;AAED,IAAiB,YAAY,CAI5B;AAJD,WAAiB,YAAY;IACzB,SAAgB,IAAI,CAAC,OAAqB,EAAE,QAAQ,GAAG,+BAAoB,CAAC,KAAK;QAC7E,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;IACrD,CAAC;IAFe,iBAAI,OAEnB,CAAA;AACL,CAAC,EAJgB,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAI5B"}
+{"version":3,"file":"chat-protocol.js","sourceRoot":"","sources":["../../../../src/common/chat/model/chat-protocol.ts"],"names":[],"mappings":";;;AAEA,0CAA2E;AAG9D,QAAA,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAClD,QAAA,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;AAa7C,IAAiB,UAAU,CAI1B;AAJD,WAAiB,UAAU;IACvB,SAAgB,IAAI,CAAC,MAAwB,EAAE,QAAQ,GAAG,iCAAsB,CAAC,IAAI,EAAE;QACnF,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;IAChC,CAAC;IAFe,eAAI,OAEnB,CAAA;AACL,CAAC,EAJgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAI1B;AAED,IAAiB,YAAY,CAsB5B;AAtBD,WAAiB,YAAY;IACzB,SAAgB,IAAI,CAAC,OAAqB,EAAE,QAAQ,GAAG,+BAAoB,CAAC,WAAW,EAAE;QACrF,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;IACrD,CAAC;IAFe,iBAAI,OAEnB,CAAA;IAED,SAAgB,UAAU,CAAC,YAA0B,EAAE,qBAAkC;QACrF,IAAI,CAAC,YAAY,EAAE;YACf,OAAO,KAAK,CAAC;SAChB;QAED,MAAM,WAAW,GAAG,YAAY,CAAC,OAAO,CAAC;QACzC,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAC1C,OAAO,KAAK,CAAC;SAChB;QAED,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAC,CAAC;IACzE,CAAC;IAXe,uBAAU,aAWzB,CAAA;IAED,SAAS,YAAY,CAAC,UAAsB,EAAE,qBAAkC;;QAC5E,MAAM,YAAY,GAAG,MAAA,UAAU,CAAC,QAAQ,CAAC,YAAY,mCAAI,EAAE,CAAC;QAC5D,OAAO,CAAA,MAAA,UAAU,CAAC,MAAM,CAAC,SAAS,0CAAE,MAAM,IAAG,CAAC,IAAI,qBAAqB,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IAC5G,CAAC;AACL,CAAC,EAtBgB,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAsB5B"}

package/lib/common/chat/model/index.d.ts

@@ -1,2 +1,3 @@
 export * from './chat-protocol';
+export * from './proxy-chat-model';
 //# sourceMappingURL=index.d.ts.map

package/lib/common/chat/model/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/common/chat/model/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/common/chat/model/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC"}

package/lib/common/chat/model/index.js

@@ -2,4 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./chat-protocol"), exports);
+tslib_1.__exportStar(require("./proxy-chat-model"), exports);
 //# sourceMappingURL=index.js.map

package/lib/common/chat/model/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/common/chat/model/index.ts"],"names":[],"mappings":";;;AAAA,0DAAgC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/common/chat/model/index.ts"],"names":[],"mappings":";;;AAAA,0DAAgC;AAChC,6DAAmC"}

package/lib/common/chat/model/proxy-chat-model.d.ts

@@ -0,0 +1,12 @@
+import { ChatModel, ChatResponse } from './chat-protocol';
+import { Observable } from 'rxjs';
+import { Prompt } from '../prompt';
+export declare class ProxyChatModel implements ChatModel {
+    protected readonly chatModels: ChatModel[];
+    protected readonly chatModelMap: Map<string, ChatModel>;
+    protected init(): void;
+    protected resolveChatModelAndPrompt(prompt: Prompt): [ChatModel, Prompt];
+    call(prompt: Prompt): Promise<ChatResponse>;
+    stream(prompt: Prompt): Promise<Observable<ChatResponse>>;
+}
+//# sourceMappingURL=proxy-chat-model.d.ts.map

package/lib/common/chat/model/proxy-chat-model.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"proxy-chat-model.d.ts","sourceRoot":"","sources":["../../../../src/common/chat/model/proxy-chat-model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,qBACa,cAAe,YAAW,SAAS;IAG5C,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,SAAS,EAAE,CAAC;IAE3C,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAEpE,SAAS,CAAC,IAAI;IAYd,SAAS,CAAC,yBAAyB,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC;IAkBxE,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAK3C,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;CAK5D"}

package/lib/common/chat/model/proxy-chat-model.js

@@ -0,0 +1,58 @@
+"use strict";
+var ProxyChatModel_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProxyChatModel = void 0;
+const tslib_1 = require("tslib");
+const core_1 = require("@celljs/core");
+const chat_protocol_1 = require("./chat-protocol");
+let ProxyChatModel = ProxyChatModel_1 = class ProxyChatModel {
+    constructor() {
+        this.chatModelMap = new Map();
+    }
+    init() {
+        for (const chatModel of this.chatModels) {
+            if ('provider' in chatModel) {
+                // @ts-ignore
+                this.chatModelMap.set(chatModel.provider, chatModel);
+            }
+            else {
+                const provider = chatModel.constructor.name.split('ChatModel')[0].toLowerCase();
+                this.chatModelMap.set(provider, chatModel);
+            }
+        }
+    }
+    resolveChatModelAndPrompt(prompt) {
+        const model = prompt.options.model;
+        if (!model) {
+            throw new core_1.IllegalArgumentError('Model not specified in prompt options.');
+        }
+        if (!model.includes(':')) {
+            throw new core_1.IllegalArgumentError('Invalid model name format. Expected "<provider>:<model-name>".');
+        }
+        const [provider, modelName] = model.split(':');
+        const chatModel = this.chatModelMap.get(provider);
+        if (!chatModel) {
+            throw new core_1.IllegalArgumentError(`Chat model provider "${provider}" not found.`);
+        }
+        const newPrompt = prompt.copy();
+        newPrompt.options.model = modelName;
+        return [chatModel, newPrompt];
+    }
+    call(prompt) {
+        const [chatModel, newPrompt] = this.resolveChatModelAndPrompt(prompt);
+        return chatModel.call(newPrompt);
+    }
+    stream(prompt) {
+        const [chatModel, newPrompt] = this.resolveChatModelAndPrompt(prompt);
+        return chatModel.stream(newPrompt);
+    }
+};
+tslib_1.__decorate([
+    (0, core_1.Autowired)(chat_protocol_1.ChatModel),
+    tslib_1.__metadata("design:type", Array)
+], ProxyChatModel.prototype, "chatModels", void 0);
+ProxyChatModel = ProxyChatModel_1 = tslib_1.__decorate([
+    (0, core_1.Component)(ProxyChatModel_1)
+], ProxyChatModel);
+exports.ProxyChatModel = ProxyChatModel;
+//# sourceMappingURL=proxy-chat-model.js.map

package/lib/common/chat/model/proxy-chat-model.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"proxy-chat-model.js","sourceRoot":"","sources":["../../../../src/common/chat/model/proxy-chat-model.ts"],"names":[],"mappings":";;;;;AAAA,uCAA0E;AAC1E,mDAA0D;AAKnD,IAAM,cAAc,sBAApB,MAAM,cAAc;IAApB;QAKgB,iBAAY,GAA2B,IAAI,GAAG,EAAE,CAAC;IA0CxE,CAAC;IAxCa,IAAI;QACV,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE;YACrC,IAAI,UAAU,IAAI,SAAS,EAAE;gBACzB,aAAa;gBACb,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,QAAkB,EAAE,SAAS,CAAC,CAAC;aAClE;iBAAM;gBACH,MAAM,QAAQ,GAAG,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;gBAChF,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;aAC9C;SACJ;IACL,CAAC;IAES,yBAAyB,CAAC,MAAc;QAC9C,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;QACnC,IAAI,CAAC,KAAK,EAAE;YACR,MAAM,IAAI,2BAAoB,CAAC,wCAAwC,CAAC,CAAC;SAC5E;QACD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACtB,MAAM,IAAI,2BAAoB,CAAC,gEAAgE,CAAC,CAAC;SACpG;QACD,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/C,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,CAAC,SAAS,EAAE;YACZ,MAAM,IAAI,2BAAoB,CAAC,wBAAwB,QAAQ,cAAc,CAAC,CAAC;SAClF;QACD,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;QAChC,SAAS,CAAC,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;QACpC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,CAAC,MAAc;QACf,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC;QACtE,OAAO,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACrC,CAAC;IAED,MAAM,CAAC,MAAc;QACjB,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC;QACtE,OAAO,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACvC,CAAC;CAEJ,CAAA;AA7CG;IAAC,IAAA,gBAAS,EAAC,yBAAS,CAAC;;kDACsB;AAHlC,cAAc;IAD1B,IAAA,gBAAS,EAAC,gBAAc,CAAC;GACb,cAAc,CA+C1B;AA/CY,wCAAc"}

package/lib/common/chat/prompt/prompt-protocol.d.ts

@@ -16,6 +16,7 @@ export interface ChatOptions extends ModelOptions {
 }
 export interface Prompt extends ModelRequest<Message[]> {
     readonly contents: string;
+    readonly options: ChatOptions;
     copy(): Prompt;
 }
 export interface PromptTemplateContext {
@@ -25,6 +26,6 @@ export interface PromptTemplateContext {
 }
 export interface PromptTemplate {
     render(template: string, ctx?: PromptTemplateContext): Promise<string>;
-    create(template: string, ctx?: PromptTemplateContext): Promise<Prompt>;
+    create(template: string | Message[], ctx?: PromptTemplateContext): Promise<Prompt>;
 }
 //# sourceMappingURL=prompt-protocol.d.ts.map

package/lib/common/chat/prompt/prompt-protocol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-protocol.d.ts","sourceRoot":"","sources":["../../../../src/common/chat/prompt/prompt-protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAEnE,eAAO,MAAM,cAAc,eAA2B,CAAC;AAEvD;;GAEG;AACH,MAAM,WAAW,WAAY,SAAQ,YAAY;IAC7C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,MAAO,SAAQ,YAAY,CAAC,OAAO,EAAE,CAAC;IACnD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,IAAI,IAAI,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,qBAAqB;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC7B;AAED,MAAM,WAAW,cAAc;IAC3B,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACvE,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC1E"}
+{"version":3,"file":"prompt-protocol.d.ts","sourceRoot":"","sources":["../../../../src/common/chat/prompt/prompt-protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAEnE,eAAO,MAAM,cAAc,eAA2B,CAAC;AAEvD;;GAEG;AACH,MAAM,WAAW,WAAY,SAAQ,YAAY;IAC7C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,MAAO,SAAQ,YAAY,CAAC,OAAO,EAAE,CAAC;IACnD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;IAC9B,IAAI,IAAI,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,qBAAqB;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC7B;AAED,MAAM,WAAW,cAAc;IAC3B,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACvE,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,EAAE,EAAE,GAAG,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CACtF"}

package/lib/common/chat/prompt/prompt-template.d.ts

@@ -1,8 +1,9 @@
 import { ExpressionHandler } from '@celljs/core';
 import { Prompt, PromptTemplate, PromptTemplateContext } from './prompt-protocol';
+import { Message } from '../message';
 export declare class PromptTemplateImpl implements PromptTemplate {
     protected readonly expressionHandler: ExpressionHandler;
     render(template: string, ctx?: PromptTemplateContext): Promise<string>;
-    create(template: string, ctx?: PromptTemplateContext): Promise<Prompt>;
+    create(template: string | Message[], ctx?: PromptTemplateContext): Promise<Prompt>;
 }
 //# sourceMappingURL=prompt-template.d.ts.map

package/lib/common/chat/prompt/prompt-template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-template.d.ts","sourceRoot":"","sources":["../../../../src/common/chat/prompt/prompt-template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,iBAAiB,EAAwB,MAAM,cAAc,CAAC;AAC7F,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAIlF,qBACa,kBAAmB,YAAW,cAAc;IAGrD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAElD,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAMtE,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;CAQ/E"}
+{"version":3,"file":"prompt-template.d.ts","sourceRoot":"","sources":["../../../../src/common/chat/prompt/prompt-template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,iBAAiB,EAAwB,MAAM,cAAc,CAAC;AAC7F,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAElF,OAAO,EAAE,OAAO,EAA8B,MAAM,YAAY,CAAC;AAEjE,qBACa,kBAAmB,YAAW,cAAc;IAGrD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAElD,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAMtE,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,EAAE,EAAE,GAAG,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;CAc3F"}

package/lib/common/chat/prompt/prompt-template.js

@@ -14,11 +14,17 @@ let PromptTemplateImpl = class PromptTemplateImpl {
         return template;
     }
     async create(template, ctx) {
-        if (!(ctx === null || ctx === void 0 ? void 0 : ctx.messageType) || (ctx === null || ctx === void 0 ? void 0 : ctx.messageType) === message_1.MessageType.USER) {
-            return new prompt_1.PromptImpl(await this.render(template, ctx), ctx === null || ctx === void 0 ? void 0 : ctx.chatOptions);
+        if (Array.isArray(template)
+            && template.some(message => message_1.Message.isMessage(message))) {
+            return new prompt_1.PromptImpl(template, ctx === null || ctx === void 0 ? void 0 : ctx.chatOptions);
         }
-        else if ((ctx === null || ctx === void 0 ? void 0 : ctx.messageType) === message_1.MessageType.SYSTEM) {
-            return new prompt_1.PromptImpl(new message_1.SystemMessage(await this.render(template, ctx)), ctx === null || ctx === void 0 ? void 0 : ctx.chatOptions);
+        else if (typeof template === 'string') {
+            if (!(ctx === null || ctx === void 0 ? void 0 : ctx.messageType) || (ctx === null || ctx === void 0 ? void 0 : ctx.messageType) === message_1.MessageType.USER) {
+                return new prompt_1.PromptImpl(await this.render(template, ctx), ctx === null || ctx === void 0 ? void 0 : ctx.chatOptions);
+            }
+            else if ((ctx === null || ctx === void 0 ? void 0 : ctx.messageType) === message_1.MessageType.SYSTEM) {
+                return new prompt_1.PromptImpl(new message_1.SystemMessage(await this.render(template, ctx)), ctx === null || ctx === void 0 ? void 0 : ctx.chatOptions);
+            }
         }
         throw new core_1.IllegalArgumentError(`Invalid message type: ${ctx === null || ctx === void 0 ? void 0 : ctx.messageType}`);
     }