@celljs/ai-core 3.4.4 → 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/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 {

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,GAAG,OAAO,EAAE,EAAE,GAAG,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CACtF"}
+{"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/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@celljs/ai-core",
-  "version": "3.4.4",
+  "version": "3.5.1",
   "description": "Core domain for AI programming",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
   "dependencies": {
-    "@celljs/core": "3.4.4",
-    "@celljs/http": "3.4.4",
+    "@celljs/core": "3.5.1",
+    "@celljs/http": "3.5.1",
     "rxjs": "^6.6.0",
     "tslib": "^2.8.0"
   },
@@ -38,7 +38,7 @@
     "test": "cell-component test:js"
   },
   "devDependencies": {
-    "@celljs/component": "3.4.4"
+    "@celljs/component": "3.5.1"
   },
-  "gitHead": "5d4a2384da3a67b3c16de24d4692bf754acfeda1"
+  "gitHead": "ed90939e4770c2f6d18bdd1721ffc58a25828777"
 }

package/src/common/chat/model/index.ts

@@ -1 +1,2 @@
 export * from './chat-protocol';
+export * from './proxy-chat-model';

package/src/common/chat/model/proxy-chat-model.ts

@@ -0,0 +1,54 @@
+import { Autowired, Component, IllegalArgumentError } from '@celljs/core';
+import { ChatModel, ChatResponse } from './chat-protocol';
+import { Observable } from 'rxjs';
+import { Prompt } from '../prompt';
+
+@Component(ProxyChatModel)
+export class ProxyChatModel implements ChatModel {
+
+    @Autowired(ChatModel)
+    protected readonly chatModels: ChatModel[];
+
+    protected readonly chatModelMap: Map<string, ChatModel> = new Map();
+
+    protected init() {
+        for (const chatModel of this.chatModels) {
+            if ('provider' in chatModel) {
+                // @ts-ignore
+                this.chatModelMap.set(chatModel.provider as string, chatModel);
+            } else {
+                const provider = chatModel.constructor.name.split('ChatModel')[0].toLowerCase();
+                this.chatModelMap.set(provider, chatModel);
+            }
+        }
+    }
+
+    protected resolveChatModelAndPrompt(prompt: Prompt): [ChatModel, Prompt] {
+        const model = prompt.options.model;
+        if (!model) {
+            throw new IllegalArgumentError('Model not specified in prompt options.');
+        }
+        if (!model.includes(':')) {
+            throw new IllegalArgumentError('Invalid model name format. Expected "<provider>:<model-name>".');
+        }
+        const [provider, modelName] = model.split(':');
+        const chatModel = this.chatModelMap.get(provider);
+        if (!chatModel) {
+            throw new IllegalArgumentError(`Chat model provider "${provider}" not found.`);
+        }
+        const newPrompt = prompt.copy();
+        newPrompt.options.model = modelName;
+        return [chatModel, newPrompt];
+    }
+
+    call(prompt: Prompt): Promise<ChatResponse> {
+        const [chatModel, newPrompt] = this.resolveChatModelAndPrompt(prompt);
+        return chatModel.call(newPrompt);
+    }
+
+    stream(prompt: Prompt): Promise<Observable<ChatResponse>> {
+        const [chatModel, newPrompt] = this.resolveChatModelAndPrompt(prompt);
+        return chatModel.stream(newPrompt);
+    }
+
+}

package/src/common/chat/prompt/prompt-protocol.ts

@@ -19,6 +19,7 @@ export interface ChatOptions extends ModelOptions {
 
 export interface Prompt extends ModelRequest<Message[]> {
     readonly contents: string;
+    readonly options: ChatOptions;
     copy(): Prompt;
 }