@cloudbase/ai 2.11.0 → 2.12.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/AI.js +6 -4
- package/dist/cjs/bot/index.d.ts +15 -15
- package/dist/cjs/bot/index.js +56 -22
- package/dist/cjs/models/Ark/index.d.ts +3 -3
- package/dist/cjs/models/Ark/index.js +5 -3
- package/dist/cjs/models/DashScope/index.d.ts +3 -3
- package/dist/cjs/models/DashScope/index.js +5 -3
- package/dist/cjs/models/DeepSeek/index.d.ts +3 -3
- package/dist/cjs/models/DeepSeek/index.js +5 -3
- package/dist/cjs/models/HunYuan/index.d.ts +3 -3
- package/dist/cjs/models/HunYuan/index.js +5 -3
- package/dist/cjs/models/HunYuanBeta/index.d.ts +3 -3
- package/dist/cjs/models/HunYuanBeta/index.js +5 -3
- package/dist/cjs/models/HunYuanOpen/index.d.ts +3 -3
- package/dist/cjs/models/HunYuanOpen/index.js +5 -3
- package/dist/cjs/models/Moonshot/index.d.ts +3 -3
- package/dist/cjs/models/Moonshot/index.js +5 -3
- package/dist/cjs/models/Yi/index.d.ts +3 -3
- package/dist/cjs/models/Yi/index.js +5 -3
- package/dist/cjs/models/ZhiPu/index.d.ts +3 -3
- package/dist/cjs/models/ZhiPu/index.js +5 -3
- package/dist/cjs/models/model.d.ts +3 -3
- package/dist/cjs/models/model.js +5 -5
- package/dist/cjs/type.d.ts +7 -2
- package/dist/cjs/type.js +1 -1
- package/dist/esm/AI.js +6 -4
- package/dist/esm/bot/index.d.ts +15 -15
- package/dist/esm/bot/index.js +56 -22
- package/dist/esm/models/Ark/index.d.ts +3 -3
- package/dist/esm/models/Ark/index.js +5 -3
- package/dist/esm/models/DashScope/index.d.ts +3 -3
- package/dist/esm/models/DashScope/index.js +5 -3
- package/dist/esm/models/DeepSeek/index.d.ts +3 -3
- package/dist/esm/models/DeepSeek/index.js +5 -3
- package/dist/esm/models/HunYuan/index.d.ts +3 -3
- package/dist/esm/models/HunYuan/index.js +5 -3
- package/dist/esm/models/HunYuanBeta/index.d.ts +3 -3
- package/dist/esm/models/HunYuanBeta/index.js +5 -3
- package/dist/esm/models/HunYuanOpen/index.d.ts +3 -3
- package/dist/esm/models/HunYuanOpen/index.js +5 -3
- package/dist/esm/models/Moonshot/index.d.ts +3 -3
- package/dist/esm/models/Moonshot/index.js +5 -3
- package/dist/esm/models/Yi/index.d.ts +3 -3
- package/dist/esm/models/Yi/index.js +5 -3
- package/dist/esm/models/ZhiPu/index.d.ts +3 -3
- package/dist/esm/models/ZhiPu/index.js +5 -3
- package/dist/esm/models/model.d.ts +3 -3
- package/dist/esm/models/model.js +5 -5
- package/dist/esm/type.d.ts +7 -2
- package/dist/esm/type.js +1 -1
- package/package.json +4 -4
- package/src/AI.ts +5 -3
- package/src/bot/index.ts +56 -22
- package/src/models/Ark/index.ts +5 -2
- package/src/models/DashScope/index.ts +5 -2
- package/src/models/DeepSeek/index.ts +5 -2
- package/src/models/HunYuan/index.ts +5 -2
- package/src/models/HunYuanBeta/index.ts +5 -2
- package/src/models/HunYuanOpen/index.ts +5 -2
- package/src/models/Moonshot/index.ts +5 -2
- package/src/models/Yi/index.ts +5 -2
- package/src/models/ZhiPu/index.ts +5 -2
- package/src/models/model.ts +5 -4
- package/src/type.ts +9 -3
|
@@ -63,7 +63,7 @@ var HunYuanBetaSimpleModel = (function () {
|
|
|
63
63
|
enumerable: false,
|
|
64
64
|
configurable: true
|
|
65
65
|
});
|
|
66
|
-
HunYuanBetaSimpleModel.prototype.doGenerate = function (data) {
|
|
66
|
+
HunYuanBetaSimpleModel.prototype.doGenerate = function (data, options) {
|
|
67
67
|
return __awaiter(this, void 0, void 0, function () {
|
|
68
68
|
var res;
|
|
69
69
|
return __generator(this, function (_a) {
|
|
@@ -72,6 +72,7 @@ var HunYuanBetaSimpleModel = (function () {
|
|
|
72
72
|
url: this.url,
|
|
73
73
|
data: __assign(__assign({}, processInput(data)), { stream: false }),
|
|
74
74
|
stream: false,
|
|
75
|
+
timeout: options === null || options === void 0 ? void 0 : options.timeout,
|
|
75
76
|
})];
|
|
76
77
|
case 1:
|
|
77
78
|
res = (_a.sent());
|
|
@@ -80,7 +81,7 @@ var HunYuanBetaSimpleModel = (function () {
|
|
|
80
81
|
});
|
|
81
82
|
});
|
|
82
83
|
};
|
|
83
|
-
HunYuanBetaSimpleModel.prototype.doStream = function (data) {
|
|
84
|
+
HunYuanBetaSimpleModel.prototype.doStream = function (data, options) {
|
|
84
85
|
return __awaiter(this, void 0, void 0, function () {
|
|
85
86
|
var isToolCall, _stream, stream, hunyuanBetaStream, streamWithRaw;
|
|
86
87
|
return __generator(this, function (_a) {
|
|
@@ -91,6 +92,7 @@ var HunYuanBetaSimpleModel = (function () {
|
|
|
91
92
|
url: this.url,
|
|
92
93
|
data: __assign(__assign({}, processInput(data)), { stream: true }),
|
|
93
94
|
stream: true,
|
|
95
|
+
timeout: options === null || options === void 0 ? void 0 : options.timeout,
|
|
94
96
|
})];
|
|
95
97
|
case 1:
|
|
96
98
|
_stream = _a.sent();
|
|
@@ -119,4 +121,4 @@ var HunYuanBetaSimpleModel = (function () {
|
|
|
119
121
|
return HunYuanBetaSimpleModel;
|
|
120
122
|
}());
|
|
121
123
|
export { HunYuanBetaSimpleModel };
|
|
122
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
124
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbW9kZWxzL0h1bll1YW5CZXRhL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsT0FBTyxFQUNMLG1CQUFtQixFQUNuQixlQUFlLEVBQ2Ysa0JBQWtCLEVBQ2xCLGtCQUFrQixFQUNsQiwwQkFBMEIsR0FDM0IsTUFBTSxhQUFhLENBQUE7QUFVcEIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlCQUFpQixDQUFBO0FBRzlDO0lBRUUsZ0NBQW9CLEdBQWEsRUFBUyxPQUFlLEVBQUUsTUFBZTtRQUF0RCxRQUFHLEdBQUgsR0FBRyxDQUFVO1FBQVMsWUFBTyxHQUFQLE9BQU8sQ0FBUTtRQURsRCxXQUFNLEdBQUcsMENBQTBDLENBQUE7UUFFeEQsSUFBSSxNQUFNLElBQUksSUFBSSxFQUFFO1lBQ2xCLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFBO1NBQ3JCO0lBQ0gsQ0FBQztJQUVELHNCQUFZLHVDQUFHO2FBQWY7WUFDRSxPQUFPLFVBQUcsSUFBSSxDQUFDLE9BQU8sY0FBSSxJQUFJLENBQUMsTUFBTSxDQUFFLENBQUE7UUFDekMsQ0FBQzs7O09BQUE7SUFFWSwyQ0FBVSxHQUF2QixVQUF3QixJQUF3QixFQUFFLE9BQW9COzs7Ozs0QkFDdkQsV0FBTSxJQUFJLENBQUMsR0FBRyxDQUFDOzRCQUMxQixHQUFHLEVBQUUsSUFBSSxDQUFDLEdBQUc7NEJBQ2IsSUFBSSx3QkFDQyxZQUFZLENBQUMsSUFBSSxDQUFDLEtBQ3JCLE1BQU0sRUFBRSxLQUFLLEdBQ2Q7NEJBQ0QsTUFBTSxFQUFFLEtBQUs7NEJBQ2IsT0FBTyxFQUFFLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxPQUFPO3lCQUMxQixDQUFDLEVBQUE7O3dCQVJJLEdBQUcsR0FBRyxDQUFDLFNBUVgsQ0FBOEI7d0JBQ2hDLGlDQUFZLEdBQUcsS0FBRSxXQUFXLEVBQUUsR0FBRyxLQUFFOzs7O0tBQ3BDO0lBRVkseUNBQVEsR0FBckIsVUFBc0IsSUFBd0IsRUFBRSxPQUFvQjs7Ozs7O3dCQUM5RCxVQUFVLEdBQW1CLElBQUksQ0FBQTt3QkFFckIsV0FBTSxJQUFJLENBQUMsR0FBRyxDQUFDO2dDQUM3QixHQUFHLEVBQUUsSUFBSSxDQUFDLEdBQUc7Z0NBQ2IsSUFBSSx3QkFDQyxZQUFZLENBQUMsSUFBSSxDQUFDLEtBQ3JCLE1BQU0sRUFBRSxJQUFJLEdBQ2I7Z0NBQ0QsTUFBTSxFQUFFLElBQUk7Z0NBQ1osT0FBTyxFQUFFLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxPQUFPOzZCQUMxQixDQUFDLEVBQUE7O3dCQVJJLE9BQU8sR0FBRyxTQVFkO3dCQUNJLE1BQU0sR0FBRyxrQkFBa0IsQ0FBQyxPQUFPLENBQW1CLENBQUE7d0JBRXRELGlCQUFpQixHQUFHLGtCQUFrQixDQUEwQixNQUFNLENBQUMsQ0FBQTt3QkFDdkUsYUFBYSxHQUFHLGlCQUFpQixDQUFDLFdBQVcsQ0FBQyxJQUFJLGVBQWUsQ0FBMkU7NEJBQ2hKLFNBQVMsWUFBQyxLQUFLLEVBQUUsVUFBVTtnQ0FDekIsSUFBTSxVQUFVLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBQyxNQUFNO29DQUMxQyxJQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFBO29DQUM1QixJQUFJLFVBQVUsSUFBSSxJQUFJO3dDQUFFLFVBQVUsR0FBRywwQkFBMEIsQ0FBQyxPQUFPLENBQUMsQ0FBQTtvQ0FDeEUsSUFBSSxVQUFVLEVBQUU7d0NBQ2QsNkJBQ0ssTUFBTSxLQUNULGFBQWEsRUFBRSxZQUFZLEVBQzNCLEtBQUssRUFBRSxPQUFPLElBQ2Y7cUNBQ0Y7b0NBQ0QsT0FBTyxNQUFNLENBQUE7Z0NBQ2YsQ0FBQyxDQUFDLENBQUE7Z0NBQ0YsSUFBTSxRQUFRLHlCQUFRLEtBQUssS0FBRSxPQUFPLEVBQUUsVUFBVSxHQUFFLENBQUE7Z0NBQ2xELFVBQVUsQ0FBQyxPQUFPLHVCQUFNLFFBQVEsS0FBRSxXQUFXLEVBQUUsS0FBSyxJQUFHLENBQUE7NEJBQ3pELENBQUM7eUJBQ0YsQ0FBQyxDQUFFLENBQUE7d0JBRUosV0FBTyxtQkFBbUIsQ0FBQyxhQUFhLENBQUMsRUFBQTs7OztLQUMxQztJQUNILDZCQUFDO0FBQUQsQ0FBQyxBQTdERCxJQTZEQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIGNyZWF0ZUFzeW5jSXRlcmFibGUsXG4gIFRyYW5zZm9ybVN0cmVhbSxcbiAgdG9Qb2x5ZmlsbFJlYWRhYmxlLFxuICBpbnRvU3RhbmRhcmRTdHJlYW0sXG4gIGlzVG9vbENhbGxBc3Npc3RhbnRNZXNzYWdlLFxufSBmcm9tICcuLi8uLi91dGlscydcbmltcG9ydCB0eXBlIHtcbiAgTW9kZWxSZXEsXG4gIEJhc2VDaGF0TW9kZWxJbnB1dCxcbiAgU2ltcGxlQ2hhdE1vZGVsLFxuICBEb1N0cmVhbU91dHB1dCxcbiAgQmFzZURvU3RyZWFtT3V0cHV0Q2h1bmssXG4gIERvR2VuZXJhdGVPdXRwdXQsXG4gIFJlcU9wdGlvbnMsXG59IGZyb20gJy4uLy4uL3R5cGUnXG5pbXBvcnQgeyBwcm9jZXNzSW5wdXQgfSBmcm9tICcuLi9IdW5ZdWFuL3V0aWwnXG5pbXBvcnQgeyBIdW5ZdWFuR2VuZXJhdGVUZXh0T3V0cHV0LCBIdW5ZdWFuU3RyZWFtVGV4dE91dHB1dCB9IGZyb20gJy4uL0h1bll1YW4vdHlwZSdcblxuZXhwb3J0IGNsYXNzIEh1bll1YW5CZXRhU2ltcGxlTW9kZWwgaW1wbGVtZW50cyBTaW1wbGVDaGF0TW9kZWwge1xuICBwdWJsaWMgc3ViVXJsID0gJ2h1bnl1YW4tYmV0YS9vcGVuYXBpL3YxL2NoYXQvY29tcGxldGlvbnMnXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgcmVxOiBNb2RlbFJlcSwgcHVibGljIGJhc2VVcmw6IHN0cmluZywgc3ViVXJsPzogc3RyaW5nKSB7XG4gICAgaWYgKHN1YlVybCAhPSBudWxsKSB7XG4gICAgICB0aGlzLnN1YlVybCA9IHN1YlVybFxuICAgIH1cbiAgfVxuXG4gIHByaXZhdGUgZ2V0IHVybCgpIHtcbiAgICByZXR1cm4gYCR7dGhpcy5iYXNlVXJsfS8ke3RoaXMuc3ViVXJsfWBcbiAgfVxuXG4gIHB1YmxpYyBhc3luYyBkb0dlbmVyYXRlKGRhdGE6IEJhc2VDaGF0TW9kZWxJbnB1dCwgb3B0aW9ucz86IFJlcU9wdGlvbnMpOiBQcm9taXNlPERvR2VuZXJhdGVPdXRwdXQ+IHtcbiAgICBjb25zdCByZXMgPSAoYXdhaXQgdGhpcy5yZXEoe1xuICAgICAgdXJsOiB0aGlzLnVybCxcbiAgICAgIGRhdGE6IHtcbiAgICAgICAgLi4ucHJvY2Vzc0lucHV0KGRhdGEpLFxuICAgICAgICBzdHJlYW06IGZhbHNlLFxuICAgICAgfSxcbiAgICAgIHN0cmVhbTogZmFsc2UsXG4gICAgICB0aW1lb3V0OiBvcHRpb25zPy50aW1lb3V0LFxuICAgIH0pKSBhcyBIdW5ZdWFuR2VuZXJhdGVUZXh0T3V0cHV0XG4gICAgcmV0dXJuIHsgLi4ucmVzLCByYXdSZXNwb25zZTogcmVzIH1cbiAgfVxuXG4gIHB1YmxpYyBhc3luYyBkb1N0cmVhbShkYXRhOiBCYXNlQ2hhdE1vZGVsSW5wdXQsIG9wdGlvbnM/OiBSZXFPcHRpb25zKTogUHJvbWlzZTxEb1N0cmVhbU91dHB1dD4ge1xuICAgIGxldCBpc1Rvb2xDYWxsOiBudWxsIHwgYm9vbGVhbiA9IG51bGxcblxuICAgIGNvbnN0IF9zdHJlYW0gPSBhd2FpdCB0aGlzLnJlcSh7XG4gICAgICB1cmw6IHRoaXMudXJsLFxuICAgICAgZGF0YToge1xuICAgICAgICAuLi5wcm9jZXNzSW5wdXQoZGF0YSksXG4gICAgICAgIHN0cmVhbTogdHJ1ZSxcbiAgICAgIH0sXG4gICAgICBzdHJlYW06IHRydWUsXG4gICAgICB0aW1lb3V0OiBvcHRpb25zPy50aW1lb3V0LFxuICAgIH0pXG4gICAgY29uc3Qgc3RyZWFtID0gdG9Qb2x5ZmlsbFJlYWRhYmxlKF9zdHJlYW0pIGFzIHR5cGVvZiBfc3RyZWFtXG5cbiAgICBjb25zdCBodW55dWFuQmV0YVN0cmVhbSA9IGludG9TdGFuZGFyZFN0cmVhbTxIdW5ZdWFuU3RyZWFtVGV4dE91dHB1dD4oc3RyZWFtKVxuICAgIGNvbnN0IHN0cmVhbVdpdGhSYXcgPSBodW55dWFuQmV0YVN0cmVhbS5waXBlVGhyb3VnaChuZXcgVHJhbnNmb3JtU3RyZWFtPEh1bll1YW5TdHJlYW1UZXh0T3V0cHV0LCBCYXNlRG9TdHJlYW1PdXRwdXRDaHVuayAmIHsgcmF3UmVzcG9uc2U/OiBhbnkgfT4oe1xuICAgICAgdHJhbnNmb3JtKGNodW5rLCBjb250cm9sbGVyKSB7XG4gICAgICAgIGNvbnN0IG5ld0Nob2ljZXMgPSBjaHVuay5jaG9pY2VzLm1hcCgoY2hvaWNlKSA9PiB7XG4gICAgICAgICAgY29uc3QgbWVzc2FnZSA9IGNob2ljZS5kZWx0YVxuICAgICAgICAgIGlmIChpc1Rvb2xDYWxsID09IG51bGwpIGlzVG9vbENhbGwgPSBpc1Rvb2xDYWxsQXNzaXN0YW50TWVzc2FnZShtZXNzYWdlKVxuICAgICAgICAgIGlmIChpc1Rvb2xDYWxsKSB7XG4gICAgICAgICAgICByZXR1cm4ge1xuICAgICAgICAgICAgICAuLi5jaG9pY2UsXG4gICAgICAgICAgICAgIGZpbmlzaF9yZWFzb246ICd0b29sX2NhbGxzJyxcbiAgICAgICAgICAgICAgZGVsdGE6IG1lc3NhZ2UsXG4gICAgICAgICAgICB9XG4gICAgICAgICAgfVxuICAgICAgICAgIHJldHVybiBjaG9pY2VcbiAgICAgICAgfSlcbiAgICAgICAgY29uc3QgbmV3Q2h1bmsgPSB7IC4uLmNodW5rLCBjaG9pY2VzOiBuZXdDaG9pY2VzIH1cbiAgICAgICAgY29udHJvbGxlci5lbnF1ZXVlKHsgLi4ubmV3Q2h1bmssIHJhd1Jlc3BvbnNlOiBjaHVuayB9KVxuICAgICAgfSxcbiAgICB9KSwpXG5cbiAgICByZXR1cm4gY3JlYXRlQXN5bmNJdGVyYWJsZShzdHJlYW1XaXRoUmF3KVxuICB9XG59XG4iXX0=
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import type { ModelReq, BaseChatModelInput, SimpleChatModel, DoStreamOutput, DoGenerateOutput } from '../../type';
|
|
1
|
+
import type { ModelReq, BaseChatModelInput, SimpleChatModel, DoStreamOutput, DoGenerateOutput, ReqOptions } from '../../type';
|
|
2
2
|
export declare class HunYuanOpenSimpleModel implements SimpleChatModel {
|
|
3
3
|
private req;
|
|
4
4
|
baseUrl: string;
|
|
5
5
|
subUrl: string;
|
|
6
6
|
constructor(req: ModelReq, baseUrl: string, subUrl?: string);
|
|
7
7
|
private get url();
|
|
8
|
-
doGenerate(data: BaseChatModelInput): Promise<DoGenerateOutput>;
|
|
9
|
-
doStream(data: BaseChatModelInput): Promise<DoStreamOutput>;
|
|
8
|
+
doGenerate(data: BaseChatModelInput, options?: ReqOptions): Promise<DoGenerateOutput>;
|
|
9
|
+
doStream(data: BaseChatModelInput, options?: ReqOptions): Promise<DoStreamOutput>;
|
|
10
10
|
}
|
|
@@ -63,7 +63,7 @@ var HunYuanOpenSimpleModel = (function () {
|
|
|
63
63
|
enumerable: false,
|
|
64
64
|
configurable: true
|
|
65
65
|
});
|
|
66
|
-
HunYuanOpenSimpleModel.prototype.doGenerate = function (data) {
|
|
66
|
+
HunYuanOpenSimpleModel.prototype.doGenerate = function (data, options) {
|
|
67
67
|
return __awaiter(this, void 0, void 0, function () {
|
|
68
68
|
var res;
|
|
69
69
|
return __generator(this, function (_a) {
|
|
@@ -72,6 +72,7 @@ var HunYuanOpenSimpleModel = (function () {
|
|
|
72
72
|
url: this.url,
|
|
73
73
|
data: __assign(__assign({}, processInput(data)), { stream: false }),
|
|
74
74
|
stream: false,
|
|
75
|
+
timeout: options === null || options === void 0 ? void 0 : options.timeout,
|
|
75
76
|
})];
|
|
76
77
|
case 1:
|
|
77
78
|
res = (_a.sent());
|
|
@@ -80,7 +81,7 @@ var HunYuanOpenSimpleModel = (function () {
|
|
|
80
81
|
});
|
|
81
82
|
});
|
|
82
83
|
};
|
|
83
|
-
HunYuanOpenSimpleModel.prototype.doStream = function (data) {
|
|
84
|
+
HunYuanOpenSimpleModel.prototype.doStream = function (data, options) {
|
|
84
85
|
return __awaiter(this, void 0, void 0, function () {
|
|
85
86
|
var isToolCall, _stream, stream, hunyuanBetaStream, streamWithRaw;
|
|
86
87
|
return __generator(this, function (_a) {
|
|
@@ -91,6 +92,7 @@ var HunYuanOpenSimpleModel = (function () {
|
|
|
91
92
|
url: this.url,
|
|
92
93
|
data: __assign(__assign({}, processInput(data)), { stream: true }),
|
|
93
94
|
stream: true,
|
|
95
|
+
timeout: options === null || options === void 0 ? void 0 : options.timeout,
|
|
94
96
|
})];
|
|
95
97
|
case 1:
|
|
96
98
|
_stream = _a.sent();
|
|
@@ -119,4 +121,4 @@ var HunYuanOpenSimpleModel = (function () {
|
|
|
119
121
|
return HunYuanOpenSimpleModel;
|
|
120
122
|
}());
|
|
121
123
|
export { HunYuanOpenSimpleModel };
|
|
122
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
124
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbW9kZWxzL0h1bll1YW5PcGVuL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsT0FBTyxFQUNMLG1CQUFtQixFQUNuQixlQUFlLEVBQ2Ysa0JBQWtCLEVBQ2xCLGtCQUFrQixFQUNsQiwwQkFBMEIsR0FDM0IsTUFBTSxhQUFhLENBQUE7QUFVcEIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlCQUFpQixDQUFBO0FBRzlDO0lBRUUsZ0NBQW9CLEdBQWEsRUFBUyxPQUFlLEVBQUUsTUFBZTtRQUF0RCxRQUFHLEdBQUgsR0FBRyxDQUFVO1FBQVMsWUFBTyxHQUFQLE9BQU8sQ0FBUTtRQURsRCxXQUFNLEdBQUcsa0NBQWtDLENBQUE7UUFFaEQsSUFBSSxNQUFNLElBQUksSUFBSSxFQUFFO1lBQ2xCLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFBO1NBQ3JCO0lBQ0gsQ0FBQztJQUVELHNCQUFZLHVDQUFHO2FBQWY7WUFDRSxPQUFPLFVBQUcsSUFBSSxDQUFDLE9BQU8sY0FBSSxJQUFJLENBQUMsTUFBTSxDQUFFLENBQUE7UUFDekMsQ0FBQzs7O09BQUE7SUFFWSwyQ0FBVSxHQUF2QixVQUF3QixJQUF3QixFQUFFLE9BQW9COzs7Ozs0QkFDdkQsV0FBTSxJQUFJLENBQUMsR0FBRyxDQUFDOzRCQUMxQixHQUFHLEVBQUUsSUFBSSxDQUFDLEdBQUc7NEJBQ2IsSUFBSSx3QkFDQyxZQUFZLENBQUMsSUFBSSxDQUFDLEtBQ3JCLE1BQU0sRUFBRSxLQUFLLEdBQ2Q7NEJBQ0QsTUFBTSxFQUFFLEtBQUs7NEJBQ2IsT0FBTyxFQUFFLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxPQUFPO3lCQUMxQixDQUFDLEVBQUE7O3dCQVJJLEdBQUcsR0FBRyxDQUFDLFNBUVgsQ0FBOEI7d0JBQ2hDLGlDQUFZLEdBQUcsS0FBRSxXQUFXLEVBQUUsR0FBRyxLQUFFOzs7O0tBQ3BDO0lBRVkseUNBQVEsR0FBckIsVUFBc0IsSUFBd0IsRUFBRSxPQUFvQjs7Ozs7O3dCQUM5RCxVQUFVLEdBQW1CLElBQUksQ0FBQTt3QkFFckIsV0FBTSxJQUFJLENBQUMsR0FBRyxDQUFDO2dDQUM3QixHQUFHLEVBQUUsSUFBSSxDQUFDLEdBQUc7Z0NBQ2IsSUFBSSx3QkFDQyxZQUFZLENBQUMsSUFBSSxDQUFDLEtBQ3JCLE1BQU0sRUFBRSxJQUFJLEdBQ2I7Z0NBQ0QsTUFBTSxFQUFFLElBQUk7Z0NBQ1osT0FBTyxFQUFFLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxPQUFPOzZCQUMxQixDQUFDLEVBQUE7O3dCQVJJLE9BQU8sR0FBRyxTQVFkO3dCQUNJLE1BQU0sR0FBRyxrQkFBa0IsQ0FBQyxPQUFPLENBQW1CLENBQUE7d0JBRXRELGlCQUFpQixHQUFHLGtCQUFrQixDQUEwQixNQUFNLENBQUMsQ0FBQTt3QkFDdkUsYUFBYSxHQUFHLGlCQUFpQixDQUFDLFdBQVcsQ0FBQyxJQUFJLGVBQWUsQ0FBMkU7NEJBQ2hKLFNBQVMsWUFBQyxLQUFLLEVBQUUsVUFBVTtnQ0FDekIsSUFBTSxVQUFVLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBQyxNQUFNO29DQUMxQyxJQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFBO29DQUM1QixJQUFJLFVBQVUsSUFBSSxJQUFJO3dDQUFFLFVBQVUsR0FBRywwQkFBMEIsQ0FBQyxPQUFPLENBQUMsQ0FBQTtvQ0FDeEUsSUFBSSxVQUFVLEVBQUU7d0NBQ2QsNkJBQ0ssTUFBTSxLQUNULGFBQWEsRUFBRSxZQUFZLEVBQzNCLEtBQUssRUFBRSxPQUFPLElBQ2Y7cUNBQ0Y7b0NBQ0QsT0FBTyxNQUFNLENBQUE7Z0NBQ2YsQ0FBQyxDQUFDLENBQUE7Z0NBQ0YsSUFBTSxRQUFRLHlCQUFRLEtBQUssS0FBRSxPQUFPLEVBQUUsVUFBVSxHQUFFLENBQUE7Z0NBQ2xELFVBQVUsQ0FBQyxPQUFPLHVCQUFNLFFBQVEsS0FBRSxXQUFXLEVBQUUsS0FBSyxJQUFHLENBQUE7NEJBQ3pELENBQUM7eUJBQ0YsQ0FBQyxDQUFFLENBQUE7d0JBRUosV0FBTyxtQkFBbUIsQ0FBQyxhQUFhLENBQUMsRUFBQTs7OztLQUMxQztJQUNILDZCQUFDO0FBQUQsQ0FBQyxBQTdERCxJQTZEQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIGNyZWF0ZUFzeW5jSXRlcmFibGUsXG4gIFRyYW5zZm9ybVN0cmVhbSxcbiAgdG9Qb2x5ZmlsbFJlYWRhYmxlLFxuICBpbnRvU3RhbmRhcmRTdHJlYW0sXG4gIGlzVG9vbENhbGxBc3Npc3RhbnRNZXNzYWdlLFxufSBmcm9tICcuLi8uLi91dGlscydcbmltcG9ydCB0eXBlIHtcbiAgTW9kZWxSZXEsXG4gIEJhc2VDaGF0TW9kZWxJbnB1dCxcbiAgU2ltcGxlQ2hhdE1vZGVsLFxuICBEb1N0cmVhbU91dHB1dCxcbiAgQmFzZURvU3RyZWFtT3V0cHV0Q2h1bmssXG4gIERvR2VuZXJhdGVPdXRwdXQsXG4gIFJlcU9wdGlvbnMsXG59IGZyb20gJy4uLy4uL3R5cGUnXG5pbXBvcnQgeyBwcm9jZXNzSW5wdXQgfSBmcm9tICcuLi9IdW5ZdWFuL3V0aWwnXG5pbXBvcnQgeyBIdW5ZdWFuR2VuZXJhdGVUZXh0T3V0cHV0LCBIdW5ZdWFuU3RyZWFtVGV4dE91dHB1dCB9IGZyb20gJy4uL0h1bll1YW4vdHlwZSdcblxuZXhwb3J0IGNsYXNzIEh1bll1YW5PcGVuU2ltcGxlTW9kZWwgaW1wbGVtZW50cyBTaW1wbGVDaGF0TW9kZWwge1xuICBwdWJsaWMgc3ViVXJsID0gJ2h1bnl1YW4tb3Blbi92MS9jaGF0L2NvbXBsZXRpb25zJ1xuICBjb25zdHJ1Y3Rvcihwcml2YXRlIHJlcTogTW9kZWxSZXEsIHB1YmxpYyBiYXNlVXJsOiBzdHJpbmcsIHN1YlVybD86IHN0cmluZykge1xuICAgIGlmIChzdWJVcmwgIT0gbnVsbCkge1xuICAgICAgdGhpcy5zdWJVcmwgPSBzdWJVcmxcbiAgICB9XG4gIH1cblxuICBwcml2YXRlIGdldCB1cmwoKSB7XG4gICAgcmV0dXJuIGAke3RoaXMuYmFzZVVybH0vJHt0aGlzLnN1YlVybH1gXG4gIH1cblxuICBwdWJsaWMgYXN5bmMgZG9HZW5lcmF0ZShkYXRhOiBCYXNlQ2hhdE1vZGVsSW5wdXQsIG9wdGlvbnM/OiBSZXFPcHRpb25zKTogUHJvbWlzZTxEb0dlbmVyYXRlT3V0cHV0PiB7XG4gICAgY29uc3QgcmVzID0gKGF3YWl0IHRoaXMucmVxKHtcbiAgICAgIHVybDogdGhpcy51cmwsXG4gICAgICBkYXRhOiB7XG4gICAgICAgIC4uLnByb2Nlc3NJbnB1dChkYXRhKSxcbiAgICAgICAgc3RyZWFtOiBmYWxzZSxcbiAgICAgIH0sXG4gICAgICBzdHJlYW06IGZhbHNlLFxuICAgICAgdGltZW91dDogb3B0aW9ucz8udGltZW91dCxcbiAgICB9KSkgYXMgSHVuWXVhbkdlbmVyYXRlVGV4dE91dHB1dFxuICAgIHJldHVybiB7IC4uLnJlcywgcmF3UmVzcG9uc2U6IHJlcyB9XG4gIH1cblxuICBwdWJsaWMgYXN5bmMgZG9TdHJlYW0oZGF0YTogQmFzZUNoYXRNb2RlbElucHV0LCBvcHRpb25zPzogUmVxT3B0aW9ucyk6IFByb21pc2U8RG9TdHJlYW1PdXRwdXQ+IHtcbiAgICBsZXQgaXNUb29sQ2FsbDogbnVsbCB8IGJvb2xlYW4gPSBudWxsXG5cbiAgICBjb25zdCBfc3RyZWFtID0gYXdhaXQgdGhpcy5yZXEoe1xuICAgICAgdXJsOiB0aGlzLnVybCxcbiAgICAgIGRhdGE6IHtcbiAgICAgICAgLi4ucHJvY2Vzc0lucHV0KGRhdGEpLFxuICAgICAgICBzdHJlYW06IHRydWUsXG4gICAgICB9LFxuICAgICAgc3RyZWFtOiB0cnVlLFxuICAgICAgdGltZW91dDogb3B0aW9ucz8udGltZW91dCxcbiAgICB9KVxuICAgIGNvbnN0IHN0cmVhbSA9IHRvUG9seWZpbGxSZWFkYWJsZShfc3RyZWFtKSBhcyB0eXBlb2YgX3N0cmVhbVxuXG4gICAgY29uc3QgaHVueXVhbkJldGFTdHJlYW0gPSBpbnRvU3RhbmRhcmRTdHJlYW08SHVuWXVhblN0cmVhbVRleHRPdXRwdXQ+KHN0cmVhbSlcbiAgICBjb25zdCBzdHJlYW1XaXRoUmF3ID0gaHVueXVhbkJldGFTdHJlYW0ucGlwZVRocm91Z2gobmV3IFRyYW5zZm9ybVN0cmVhbTxIdW5ZdWFuU3RyZWFtVGV4dE91dHB1dCwgQmFzZURvU3RyZWFtT3V0cHV0Q2h1bmsgJiB7IHJhd1Jlc3BvbnNlPzogYW55IH0+KHtcbiAgICAgIHRyYW5zZm9ybShjaHVuaywgY29udHJvbGxlcikge1xuICAgICAgICBjb25zdCBuZXdDaG9pY2VzID0gY2h1bmsuY2hvaWNlcy5tYXAoKGNob2ljZSkgPT4ge1xuICAgICAgICAgIGNvbnN0IG1lc3NhZ2UgPSBjaG9pY2UuZGVsdGFcbiAgICAgICAgICBpZiAoaXNUb29sQ2FsbCA9PSBudWxsKSBpc1Rvb2xDYWxsID0gaXNUb29sQ2FsbEFzc2lzdGFudE1lc3NhZ2UobWVzc2FnZSlcbiAgICAgICAgICBpZiAoaXNUb29sQ2FsbCkge1xuICAgICAgICAgICAgcmV0dXJuIHtcbiAgICAgICAgICAgICAgLi4uY2hvaWNlLFxuICAgICAgICAgICAgICBmaW5pc2hfcmVhc29uOiAndG9vbF9jYWxscycsXG4gICAgICAgICAgICAgIGRlbHRhOiBtZXNzYWdlLFxuICAgICAgICAgICAgfVxuICAgICAgICAgIH1cbiAgICAgICAgICByZXR1cm4gY2hvaWNlXG4gICAgICAgIH0pXG4gICAgICAgIGNvbnN0IG5ld0NodW5rID0geyAuLi5jaHVuaywgY2hvaWNlczogbmV3Q2hvaWNlcyB9XG4gICAgICAgIGNvbnRyb2xsZXIuZW5xdWV1ZSh7IC4uLm5ld0NodW5rLCByYXdSZXNwb25zZTogY2h1bmsgfSlcbiAgICAgIH0sXG4gICAgfSksKVxuXG4gICAgcmV0dXJuIGNyZWF0ZUFzeW5jSXRlcmFibGUoc3RyZWFtV2l0aFJhdylcbiAgfVxufVxuIl19
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import type { ModelReq, DoGenerateOutput, DoStreamOutput, SimpleChatModel, BaseChatModelInput } from '../../type';
|
|
1
|
+
import type { ModelReq, DoGenerateOutput, DoStreamOutput, SimpleChatModel, BaseChatModelInput, ReqOptions } from '../../type';
|
|
2
2
|
export declare class MoonshotSimpleModel implements SimpleChatModel {
|
|
3
3
|
private req;
|
|
4
4
|
baseUrl: string;
|
|
5
5
|
subUrl: string;
|
|
6
6
|
constructor(req: ModelReq, baseUrl: string, subUrl?: string);
|
|
7
7
|
private get url();
|
|
8
|
-
doGenerate(data: BaseChatModelInput): Promise<DoGenerateOutput>;
|
|
9
|
-
doStream(data: BaseChatModelInput): Promise<DoStreamOutput>;
|
|
8
|
+
doGenerate(data: BaseChatModelInput, options?: ReqOptions): Promise<DoGenerateOutput>;
|
|
9
|
+
doStream(data: BaseChatModelInput, options?: ReqOptions): Promise<DoStreamOutput>;
|
|
10
10
|
}
|
|
@@ -66,7 +66,7 @@ var MoonshotSimpleModel = (function () {
|
|
|
66
66
|
enumerable: false,
|
|
67
67
|
configurable: true
|
|
68
68
|
});
|
|
69
|
-
MoonshotSimpleModel.prototype.doGenerate = function (data) {
|
|
69
|
+
MoonshotSimpleModel.prototype.doGenerate = function (data, options) {
|
|
70
70
|
return __awaiter(this, void 0, void 0, function () {
|
|
71
71
|
var res;
|
|
72
72
|
return __generator(this, function (_a) {
|
|
@@ -75,6 +75,7 @@ var MoonshotSimpleModel = (function () {
|
|
|
75
75
|
url: this.url,
|
|
76
76
|
data: __assign(__assign({}, processInput(data)), { stream: false }),
|
|
77
77
|
stream: false,
|
|
78
|
+
timeout: options === null || options === void 0 ? void 0 : options.timeout,
|
|
78
79
|
})];
|
|
79
80
|
case 1:
|
|
80
81
|
res = (_a.sent());
|
|
@@ -83,7 +84,7 @@ var MoonshotSimpleModel = (function () {
|
|
|
83
84
|
});
|
|
84
85
|
});
|
|
85
86
|
};
|
|
86
|
-
MoonshotSimpleModel.prototype.doStream = function (data) {
|
|
87
|
+
MoonshotSimpleModel.prototype.doStream = function (data, options) {
|
|
87
88
|
return __awaiter(this, void 0, void 0, function () {
|
|
88
89
|
var isToolCall, _stream, stream, arkStream, streamWithRaw;
|
|
89
90
|
return __generator(this, function (_a) {
|
|
@@ -94,6 +95,7 @@ var MoonshotSimpleModel = (function () {
|
|
|
94
95
|
url: this.url,
|
|
95
96
|
data: __assign(__assign({}, processInput(data)), { stream: true }),
|
|
96
97
|
stream: true,
|
|
98
|
+
timeout: options === null || options === void 0 ? void 0 : options.timeout,
|
|
97
99
|
})];
|
|
98
100
|
case 1:
|
|
99
101
|
_stream = _a.sent();
|
|
@@ -122,4 +124,4 @@ var MoonshotSimpleModel = (function () {
|
|
|
122
124
|
return MoonshotSimpleModel;
|
|
123
125
|
}());
|
|
124
126
|
export { MoonshotSimpleModel };
|
|
125
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
127
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbW9kZWxzL01vb25zaG90L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsT0FBTyxFQUNMLG1CQUFtQixFQUNuQixlQUFlLEVBQ2Ysa0JBQWtCLEVBQ2xCLGtCQUFrQixFQUNsQiwwQkFBMEIsR0FDM0IsTUFBTSxhQUFhLENBQUE7QUFZcEIsU0FBUyxZQUFZLENBQUMsS0FBeUI7SUFDckMsSUFBQSxRQUFRLEdBQXVDLEtBQUssU0FBNUMsRUFBRSxLQUFLLEdBQWdDLEtBQUssTUFBckMsRUFBRSxXQUFXLEdBQW1CLEtBQUssWUFBeEIsRUFBRSxLQUFLLEdBQVksS0FBSyxNQUFqQixFQUFFLEtBQUssR0FBSyxLQUFLLE1BQVYsQ0FBVTtJQUU1RCw2QkFDSyxLQUFLLEtBQ1IsUUFBUSxVQUFBLEVBQ1IsS0FBSyxPQUFBLEVBQ0wsS0FBSyxPQUFBLEVBQ0wsS0FBSyxPQUFBLEVBQ0wsV0FBVyxhQUFBLElBQ1o7QUFDSCxDQUFDO0FBRUQ7SUFFRSw2QkFBb0IsR0FBYSxFQUFTLE9BQWUsRUFBRSxNQUFlO1FBQXRELFFBQUcsR0FBSCxHQUFHLENBQVU7UUFBUyxZQUFPLEdBQVAsT0FBTyxDQUFRO1FBRGxELFdBQU0sR0FBRyw4QkFBOEIsQ0FBQTtRQUU1QyxJQUFJLE1BQU0sSUFBSSxJQUFJLEVBQUU7WUFDbEIsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUE7U0FDckI7SUFDSCxDQUFDO0lBRUQsc0JBQVksb0NBQUc7YUFBZjtZQUNFLE9BQU8sVUFBRyxJQUFJLENBQUMsT0FBTyxjQUFJLElBQUksQ0FBQyxNQUFNLENBQUUsQ0FBQTtRQUN6QyxDQUFDOzs7T0FBQTtJQUVZLHdDQUFVLEdBQXZCLFVBQXdCLElBQXdCLEVBQUUsT0FBb0I7Ozs7OzRCQUN2RCxXQUFNLElBQUksQ0FBQyxHQUFHLENBQUM7NEJBQzFCLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRzs0QkFDYixJQUFJLHdCQUNDLFlBQVksQ0FBQyxJQUFJLENBQUMsS0FDckIsTUFBTSxFQUFFLEtBQUssR0FDZDs0QkFDRCxNQUFNLEVBQUUsS0FBSzs0QkFDYixPQUFPLEVBQUUsT0FBTyxhQUFQLE9BQU8sdUJBQVAsT0FBTyxDQUFFLE9BQU87eUJBQzFCLENBQUMsRUFBQTs7d0JBUkksR0FBRyxHQUFHLENBQUMsU0FRWCxDQUErQjt3QkFDakMsaUNBQVksR0FBRyxLQUFFLFdBQVcsRUFBRSxHQUFHLEtBQUU7Ozs7S0FDcEM7SUFFWSxzQ0FBUSxHQUFyQixVQUFzQixJQUF3QixFQUFFLE9BQW9COzs7Ozs7d0JBQzlELFVBQVUsR0FBbUIsSUFBSSxDQUFBO3dCQUNyQixXQUFNLElBQUksQ0FBQyxHQUFHLENBQUM7Z0NBQzdCLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRztnQ0FDYixJQUFJLHdCQUNDLFlBQVksQ0FBQyxJQUFJLENBQUMsS0FDckIsTUFBTSxFQUFFLElBQUksR0FDYjtnQ0FDRCxNQUFNLEVBQUUsSUFBSTtnQ0FDWixPQUFPLEVBQUUsT0FBTyxhQUFQLE9BQU8sdUJBQVAsT0FBTyxDQUFFLE9BQU87NkJBQzFCLENBQUMsRUFBQTs7d0JBUkksT0FBTyxHQUFHLFNBUWQ7d0JBQ0ksTUFBTSxHQUFHLGtCQUFrQixDQUFDLE9BQU8sQ0FBbUIsQ0FBQTt3QkFFdEQsU0FBUyxHQUFHLGtCQUFrQixDQUEyQixNQUFNLENBQUMsQ0FBQTt3QkFDaEUsYUFBYSxHQUFHLFNBQVMsQ0FBQyxXQUFXLENBQUMsSUFBSSxlQUFlLENBQTRFOzRCQUN6SSxTQUFTLFlBQUMsS0FBSyxFQUFFLFVBQVU7Z0NBQ3pCLElBQU0sVUFBVSxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQUMsTUFBTTtvQ0FDMUMsSUFBTSxPQUFPLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQTtvQ0FDNUIsSUFBSSxVQUFVLElBQUksSUFBSTt3Q0FBRSxVQUFVLEdBQUcsMEJBQTBCLENBQUMsT0FBTyxDQUFDLENBQUE7b0NBQ3hFLElBQUksVUFBVSxFQUFFO3dDQUNkLDZCQUNLLE1BQU0sS0FDVCxhQUFhLEVBQUUsWUFBcUIsRUFDcEMsS0FBSyxFQUFFLE9BQU8sSUFDZjtxQ0FDRjtvQ0FDRCxPQUFPLE1BQU0sQ0FBQTtnQ0FDZixDQUFDLENBQUMsQ0FBQTtnQ0FDRixJQUFNLFFBQVEseUJBQVEsS0FBSyxLQUFFLE9BQU8sRUFBRSxVQUFVLEdBQUUsQ0FBQTtnQ0FDbEQsVUFBVSxDQUFDLE9BQU8sdUJBQU0sUUFBUSxLQUFFLFdBQVcsRUFBRSxLQUFLLElBQUcsQ0FBQTs0QkFDekQsQ0FBQzt5QkFDRixDQUFDLENBQUUsQ0FBQTt3QkFFSixXQUFPLG1CQUFtQixDQUFDLGFBQWEsQ0FBQyxFQUFBOzs7O0tBQzFDO0lBQ0gsMEJBQUM7QUFBRCxDQUFDLEFBNURELElBNERDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgY3JlYXRlQXN5bmNJdGVyYWJsZSxcbiAgVHJhbnNmb3JtU3RyZWFtLFxuICB0b1BvbHlmaWxsUmVhZGFibGUsXG4gIGludG9TdGFuZGFyZFN0cmVhbSxcbiAgaXNUb29sQ2FsbEFzc2lzdGFudE1lc3NhZ2UsXG59IGZyb20gJy4uLy4uL3V0aWxzJ1xuaW1wb3J0IHR5cGUgeyBNb29uc2hvdEdlbmVyYXRlVGV4dE91dHB1dCwgTW9vbnNob3RTdHJlYW1UZXh0T3V0cHV0LCBNb29uc2hvdElucHV0RGF0YSB9IGZyb20gJy4vdHlwZSdcbmltcG9ydCB0eXBlIHtcbiAgTW9kZWxSZXEsXG4gIEJhc2VEb1N0cmVhbU91dHB1dENodW5rLFxuICBEb0dlbmVyYXRlT3V0cHV0LFxuICBEb1N0cmVhbU91dHB1dCxcbiAgU2ltcGxlQ2hhdE1vZGVsLFxuICBCYXNlQ2hhdE1vZGVsSW5wdXQsXG4gIFJlcU9wdGlvbnMsXG59IGZyb20gJy4uLy4uL3R5cGUnXG5cbmZ1bmN0aW9uIHByb2Nlc3NJbnB1dChpbnB1dDogQmFzZUNoYXRNb2RlbElucHV0KTogTW9vbnNob3RJbnB1dERhdGEge1xuICBjb25zdCB7IG1lc3NhZ2VzLCBtb2RlbCwgdGVtcGVyYXR1cmUsIHRvb2xzLCB0b3BfcCB9ID0gaW5wdXRcblxuICByZXR1cm4ge1xuICAgIC4uLmlucHV0LFxuICAgIG1lc3NhZ2VzLFxuICAgIG1vZGVsLFxuICAgIHRvb2xzLFxuICAgIHRvcF9wLFxuICAgIHRlbXBlcmF0dXJlLFxuICB9XG59XG5cbmV4cG9ydCBjbGFzcyBNb29uc2hvdFNpbXBsZU1vZGVsIGltcGxlbWVudHMgU2ltcGxlQ2hhdE1vZGVsIHtcbiAgcHVibGljIHN1YlVybCA9ICdtb29uc2hvdC92MS9jaGF0L2NvbXBsZXRpb25zJ1xuICBjb25zdHJ1Y3Rvcihwcml2YXRlIHJlcTogTW9kZWxSZXEsIHB1YmxpYyBiYXNlVXJsOiBzdHJpbmcsIHN1YlVybD86IHN0cmluZykge1xuICAgIGlmIChzdWJVcmwgIT0gbnVsbCkge1xuICAgICAgdGhpcy5zdWJVcmwgPSBzdWJVcmxcbiAgICB9XG4gIH1cblxuICBwcml2YXRlIGdldCB1cmwoKSB7XG4gICAgcmV0dXJuIGAke3RoaXMuYmFzZVVybH0vJHt0aGlzLnN1YlVybH1gXG4gIH1cblxuICBwdWJsaWMgYXN5bmMgZG9HZW5lcmF0ZShkYXRhOiBCYXNlQ2hhdE1vZGVsSW5wdXQsIG9wdGlvbnM/OiBSZXFPcHRpb25zKTogUHJvbWlzZTxEb0dlbmVyYXRlT3V0cHV0PiB7XG4gICAgY29uc3QgcmVzID0gKGF3YWl0IHRoaXMucmVxKHtcbiAgICAgIHVybDogdGhpcy51cmwsXG4gICAgICBkYXRhOiB7XG4gICAgICAgIC4uLnByb2Nlc3NJbnB1dChkYXRhKSxcbiAgICAgICAgc3RyZWFtOiBmYWxzZSxcbiAgICAgIH0sXG4gICAgICBzdHJlYW06IGZhbHNlLFxuICAgICAgdGltZW91dDogb3B0aW9ucz8udGltZW91dCxcbiAgICB9KSkgYXMgTW9vbnNob3RHZW5lcmF0ZVRleHRPdXRwdXRcbiAgICByZXR1cm4geyAuLi5yZXMsIHJhd1Jlc3BvbnNlOiByZXMgfVxuICB9XG5cbiAgcHVibGljIGFzeW5jIGRvU3RyZWFtKGRhdGE6IEJhc2VDaGF0TW9kZWxJbnB1dCwgb3B0aW9ucz86IFJlcU9wdGlvbnMpOiBQcm9taXNlPERvU3RyZWFtT3V0cHV0PiB7XG4gICAgbGV0IGlzVG9vbENhbGw6IG51bGwgfCBib29sZWFuID0gbnVsbFxuICAgIGNvbnN0IF9zdHJlYW0gPSBhd2FpdCB0aGlzLnJlcSh7XG4gICAgICB1cmw6IHRoaXMudXJsLFxuICAgICAgZGF0YToge1xuICAgICAgICAuLi5wcm9jZXNzSW5wdXQoZGF0YSksXG4gICAgICAgIHN0cmVhbTogdHJ1ZSxcbiAgICAgIH0sXG4gICAgICBzdHJlYW06IHRydWUsXG4gICAgICB0aW1lb3V0OiBvcHRpb25zPy50aW1lb3V0LFxuICAgIH0pXG4gICAgY29uc3Qgc3RyZWFtID0gdG9Qb2x5ZmlsbFJlYWRhYmxlKF9zdHJlYW0pIGFzIHR5cGVvZiBfc3RyZWFtXG5cbiAgICBjb25zdCBhcmtTdHJlYW0gPSBpbnRvU3RhbmRhcmRTdHJlYW08TW9vbnNob3RTdHJlYW1UZXh0T3V0cHV0PihzdHJlYW0pXG4gICAgY29uc3Qgc3RyZWFtV2l0aFJhdyA9IGFya1N0cmVhbS5waXBlVGhyb3VnaChuZXcgVHJhbnNmb3JtU3RyZWFtPE1vb25zaG90U3RyZWFtVGV4dE91dHB1dCwgQmFzZURvU3RyZWFtT3V0cHV0Q2h1bmsgJiB7IHJhd1Jlc3BvbnNlPzogYW55IH0+KHtcbiAgICAgIHRyYW5zZm9ybShjaHVuaywgY29udHJvbGxlcikge1xuICAgICAgICBjb25zdCBuZXdDaG9pY2VzID0gY2h1bmsuY2hvaWNlcy5tYXAoKGNob2ljZSkgPT4ge1xuICAgICAgICAgIGNvbnN0IG1lc3NhZ2UgPSBjaG9pY2UuZGVsdGFcbiAgICAgICAgICBpZiAoaXNUb29sQ2FsbCA9PSBudWxsKSBpc1Rvb2xDYWxsID0gaXNUb29sQ2FsbEFzc2lzdGFudE1lc3NhZ2UobWVzc2FnZSlcbiAgICAgICAgICBpZiAoaXNUb29sQ2FsbCkge1xuICAgICAgICAgICAgcmV0dXJuIHtcbiAgICAgICAgICAgICAgLi4uY2hvaWNlLFxuICAgICAgICAgICAgICBmaW5pc2hfcmVhc29uOiAndG9vbF9jYWxscycgYXMgY29uc3QsXG4gICAgICAgICAgICAgIGRlbHRhOiBtZXNzYWdlLFxuICAgICAgICAgICAgfVxuICAgICAgICAgIH1cbiAgICAgICAgICByZXR1cm4gY2hvaWNlXG4gICAgICAgIH0pXG4gICAgICAgIGNvbnN0IG5ld0NodW5rID0geyAuLi5jaHVuaywgY2hvaWNlczogbmV3Q2hvaWNlcyB9XG4gICAgICAgIGNvbnRyb2xsZXIuZW5xdWV1ZSh7IC4uLm5ld0NodW5rLCByYXdSZXNwb25zZTogY2h1bmsgfSlcbiAgICAgIH0sXG4gICAgfSksKVxuXG4gICAgcmV0dXJuIGNyZWF0ZUFzeW5jSXRlcmFibGUoc3RyZWFtV2l0aFJhdylcbiAgfVxufVxuIl19
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import type { ModelReq, BaseChatModelInput, DoGenerateOutput, DoStreamOutput, SimpleChatModel } from '../../type';
|
|
1
|
+
import type { ModelReq, BaseChatModelInput, DoGenerateOutput, DoStreamOutput, SimpleChatModel, ReqOptions } from '../../type';
|
|
2
2
|
export declare class YiSimpleModel implements SimpleChatModel {
|
|
3
3
|
private req;
|
|
4
4
|
baseUrl: string;
|
|
5
5
|
subUrl: string;
|
|
6
6
|
constructor(req: ModelReq, baseUrl: string, subUrl?: string);
|
|
7
7
|
private get url();
|
|
8
|
-
doGenerate(data: BaseChatModelInput): Promise<DoGenerateOutput>;
|
|
9
|
-
doStream(data: BaseChatModelInput): Promise<DoStreamOutput>;
|
|
8
|
+
doGenerate(data: BaseChatModelInput, options?: ReqOptions): Promise<DoGenerateOutput>;
|
|
9
|
+
doStream(data: BaseChatModelInput, options?: ReqOptions): Promise<DoStreamOutput>;
|
|
10
10
|
}
|
|
@@ -66,7 +66,7 @@ var YiSimpleModel = (function () {
|
|
|
66
66
|
enumerable: false,
|
|
67
67
|
configurable: true
|
|
68
68
|
});
|
|
69
|
-
YiSimpleModel.prototype.doGenerate = function (data) {
|
|
69
|
+
YiSimpleModel.prototype.doGenerate = function (data, options) {
|
|
70
70
|
return __awaiter(this, void 0, void 0, function () {
|
|
71
71
|
var res;
|
|
72
72
|
return __generator(this, function (_a) {
|
|
@@ -75,6 +75,7 @@ var YiSimpleModel = (function () {
|
|
|
75
75
|
url: this.url,
|
|
76
76
|
data: __assign(__assign({}, processInput(data)), { stream: false }),
|
|
77
77
|
stream: false,
|
|
78
|
+
timeout: options === null || options === void 0 ? void 0 : options.timeout,
|
|
78
79
|
})];
|
|
79
80
|
case 1:
|
|
80
81
|
res = (_a.sent());
|
|
@@ -83,7 +84,7 @@ var YiSimpleModel = (function () {
|
|
|
83
84
|
});
|
|
84
85
|
});
|
|
85
86
|
};
|
|
86
|
-
YiSimpleModel.prototype.doStream = function (data) {
|
|
87
|
+
YiSimpleModel.prototype.doStream = function (data, options) {
|
|
87
88
|
return __awaiter(this, void 0, void 0, function () {
|
|
88
89
|
var isToolCall, _stream, stream, arkStream, streamWithRaw;
|
|
89
90
|
return __generator(this, function (_a) {
|
|
@@ -94,6 +95,7 @@ var YiSimpleModel = (function () {
|
|
|
94
95
|
url: this.url,
|
|
95
96
|
data: __assign(__assign({}, processInput(data)), { stream: true }),
|
|
96
97
|
stream: true,
|
|
98
|
+
timeout: options === null || options === void 0 ? void 0 : options.timeout,
|
|
97
99
|
})];
|
|
98
100
|
case 1:
|
|
99
101
|
_stream = _a.sent();
|
|
@@ -125,4 +127,4 @@ var YiSimpleModel = (function () {
|
|
|
125
127
|
return YiSimpleModel;
|
|
126
128
|
}());
|
|
127
129
|
export { YiSimpleModel };
|
|
128
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
130
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbW9kZWxzL1lpL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsT0FBTyxFQUNMLG1CQUFtQixFQUNuQixlQUFlLEVBQ2Ysa0JBQWtCLEVBQ2xCLGtCQUFrQixFQUNsQiwwQkFBMEIsR0FDM0IsTUFBTSxhQUFhLENBQUE7QUFZcEIsU0FBUyxZQUFZLENBQUMsS0FBeUI7SUFDckMsSUFBQSxRQUFRLEdBQXVDLEtBQUssU0FBNUMsRUFBRSxLQUFLLEdBQWdDLEtBQUssTUFBckMsRUFBRSxXQUFXLEdBQW1CLEtBQUssWUFBeEIsRUFBRSxLQUFLLEdBQVksS0FBSyxNQUFqQixFQUFFLEtBQUssR0FBSyxLQUFLLE1BQVYsQ0FBVTtJQUU1RCw2QkFDSyxLQUFLLEtBQ1IsUUFBUSxVQUFBLEVBQ1IsS0FBSyxPQUFBLEVBQ0wsS0FBSyxPQUFBLEVBQ0wsS0FBSyxPQUFBLEVBQ0wsV0FBVyxhQUFBLElBQ1o7QUFDSCxDQUFDO0FBRUQ7SUFHRSx1QkFBb0IsR0FBYSxFQUFTLE9BQWUsRUFBRSxNQUFlO1FBQXRELFFBQUcsR0FBSCxHQUFHLENBQVU7UUFBUyxZQUFPLEdBQVAsT0FBTyxDQUFRO1FBRmxELFdBQU0sR0FBRywyQkFBMkIsQ0FBQTtRQUd6QyxJQUFJLE1BQU0sSUFBSSxJQUFJLEVBQUU7WUFDbEIsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUE7U0FDckI7SUFDSCxDQUFDO0lBRUQsc0JBQVksOEJBQUc7YUFBZjtZQUNFLE9BQU8sVUFBRyxJQUFJLENBQUMsT0FBTyxjQUFJLElBQUksQ0FBQyxNQUFNLENBQUUsQ0FBQTtRQUN6QyxDQUFDOzs7T0FBQTtJQUVZLGtDQUFVLEdBQXZCLFVBQXdCLElBQXdCLEVBQUUsT0FBb0I7Ozs7OzRCQUN2RCxXQUFNLElBQUksQ0FBQyxHQUFHLENBQUM7NEJBQzFCLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRzs0QkFDYixJQUFJLHdCQUNDLFlBQVksQ0FBQyxJQUFJLENBQUMsS0FDckIsTUFBTSxFQUFFLEtBQUssR0FDZDs0QkFDRCxNQUFNLEVBQUUsS0FBSzs0QkFDYixPQUFPLEVBQUUsT0FBTyxhQUFQLE9BQU8sdUJBQVAsT0FBTyxDQUFFLE9BQU87eUJBQzFCLENBQUMsRUFBQTs7d0JBUkksR0FBRyxHQUFHLENBQUMsU0FRWCxDQUFxQjt3QkFDdkIsaUNBQVksR0FBRyxLQUFFLFdBQVcsRUFBRSxHQUFHLEtBQUU7Ozs7S0FDcEM7SUFFWSxnQ0FBUSxHQUFyQixVQUFzQixJQUF3QixFQUFFLE9BQW9COzs7Ozs7d0JBQzlELFVBQVUsR0FBbUIsSUFBSSxDQUFBO3dCQUNyQixXQUFNLElBQUksQ0FBQyxHQUFHLENBQUM7Z0NBQzdCLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRztnQ0FDYixJQUFJLHdCQUNDLFlBQVksQ0FBQyxJQUFJLENBQUMsS0FDckIsTUFBTSxFQUFFLElBQUksR0FDYjtnQ0FDRCxNQUFNLEVBQUUsSUFBSTtnQ0FDWixPQUFPLEVBQUUsT0FBTyxhQUFQLE9BQU8sdUJBQVAsT0FBTyxDQUFFLE9BQU87NkJBQzFCLENBQUMsRUFBQTs7d0JBUkksT0FBTyxHQUFHLFNBUWQ7d0JBQ0ksTUFBTSxHQUFHLGtCQUFrQixDQUFDLE9BQU8sQ0FBbUIsQ0FBQTt3QkFFdEQsU0FBUyxHQUFHLGtCQUFrQixDQUFpQixNQUFNLENBQUMsQ0FBQTt3QkFDdEQsYUFBYSxHQUFHLFNBQVMsQ0FBQyxXQUFXLENBQUMsSUFBSSxlQUFlLENBQWtFOzRCQUMvSCxTQUFTLFlBQUMsS0FBSyxFQUFFLFVBQVU7O2dDQUV6QixJQUFJLENBQUMsQ0FBQyxDQUFBLE1BQUEsTUFBQSxNQUFBLEtBQUssYUFBTCxLQUFLLHVCQUFMLEtBQUssQ0FBRSxPQUFPLDBDQUFHLENBQUMsQ0FBQywwQ0FBRSxLQUFLLDBDQUFFLE9BQU8sTUFBSSxNQUFBLE1BQUEsTUFBQSxLQUFLLGFBQUwsS0FBSyx1QkFBTCxLQUFLLENBQUUsT0FBTywwQ0FBRyxDQUFDLENBQUMsMENBQUUsS0FBSywwQ0FBRSxVQUFVLENBQUEsQ0FBQztvQ0FBRSxPQUFNO2dDQUU1RixJQUFNLFVBQVUsR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFDLE1BQU07b0NBQzFDLElBQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRSxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsQ0FFaEUsQ0FBQTtvQ0FDRCxJQUFJLFVBQVUsSUFBSSxJQUFJO3dDQUFFLFVBQVUsR0FBRywwQkFBMEIsQ0FBQyxPQUFPLENBQUMsQ0FBQTtvQ0FDeEUsSUFBSSxVQUFVLEVBQUU7d0NBQ2QsNkJBQ0ssTUFBTSxLQUNULGFBQWEsRUFBRSxZQUFxQixFQUNwQyxLQUFLLEVBQUUsT0FBTyxJQUNmO3FDQUNGO29DQUNELDZCQUFZLE1BQU0sS0FBRSxLQUFLLEVBQUUsT0FBTyxJQUFFO2dDQUN0QyxDQUFDLENBQUMsQ0FBQTtnQ0FDRixJQUFNLFFBQVEseUJBQVEsS0FBSyxLQUFFLE9BQU8sRUFBRSxVQUFVLEdBQUUsQ0FBQTtnQ0FDbEQsVUFBVSxDQUFDLE9BQU8sdUJBQU0sUUFBUSxLQUFFLFdBQVcsRUFBRSxLQUFLLElBQUcsQ0FBQTs0QkFDekQsQ0FBQzt5QkFDRixDQUFDLENBQUUsQ0FBQTt3QkFFSixXQUFPLG1CQUFtQixDQUFDLGFBQWEsQ0FBQyxFQUFBOzs7O0tBQzFDO0lBQ0gsb0JBQUM7QUFBRCxDQUFDLEFBbEVELElBa0VDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgY3JlYXRlQXN5bmNJdGVyYWJsZSxcbiAgVHJhbnNmb3JtU3RyZWFtLFxuICB0b1BvbHlmaWxsUmVhZGFibGUsXG4gIGludG9TdGFuZGFyZFN0cmVhbSxcbiAgaXNUb29sQ2FsbEFzc2lzdGFudE1lc3NhZ2UsXG59IGZyb20gJy4uLy4uL3V0aWxzJ1xuaW1wb3J0IHR5cGUgeyBZaUlucHV0LCBZaUdlbmVyYXRlT3V0cHV0LCBZaVN0cmVhbU91dHB1dCB9IGZyb20gJy4vdHlwZSdcbmltcG9ydCB0eXBlIHtcbiAgTW9kZWxSZXEsXG4gIEJhc2VDaGF0TW9kZWxJbnB1dCxcbiAgRG9HZW5lcmF0ZU91dHB1dCxcbiAgRG9TdHJlYW1PdXRwdXQsXG4gIEJhc2VEb1N0cmVhbU91dHB1dENodW5rLFxuICBTaW1wbGVDaGF0TW9kZWwsXG4gIFJlcU9wdGlvbnMsXG59IGZyb20gJy4uLy4uL3R5cGUnXG5cbmZ1bmN0aW9uIHByb2Nlc3NJbnB1dChpbnB1dDogQmFzZUNoYXRNb2RlbElucHV0KTogWWlJbnB1dCB7XG4gIGNvbnN0IHsgbWVzc2FnZXMsIG1vZGVsLCB0ZW1wZXJhdHVyZSwgdG9vbHMsIHRvcF9wIH0gPSBpbnB1dFxuXG4gIHJldHVybiB7XG4gICAgLi4uaW5wdXQsXG4gICAgbWVzc2FnZXMsXG4gICAgbW9kZWwsXG4gICAgdG9vbHMsXG4gICAgdG9wX3AsXG4gICAgdGVtcGVyYXR1cmUsXG4gIH1cbn1cblxuZXhwb3J0IGNsYXNzIFlpU2ltcGxlTW9kZWwgaW1wbGVtZW50cyBTaW1wbGVDaGF0TW9kZWwge1xuICBwdWJsaWMgc3ViVXJsID0gJzAxLWFpL3YxL2NoYXQvY29tcGxldGlvbnMnXG5cbiAgY29uc3RydWN0b3IocHJpdmF0ZSByZXE6IE1vZGVsUmVxLCBwdWJsaWMgYmFzZVVybDogc3RyaW5nLCBzdWJVcmw/OiBzdHJpbmcpIHtcbiAgICBpZiAoc3ViVXJsICE9IG51bGwpIHtcbiAgICAgIHRoaXMuc3ViVXJsID0gc3ViVXJsXG4gICAgfVxuICB9XG5cbiAgcHJpdmF0ZSBnZXQgdXJsKCkge1xuICAgIHJldHVybiBgJHt0aGlzLmJhc2VVcmx9LyR7dGhpcy5zdWJVcmx9YFxuICB9XG5cbiAgcHVibGljIGFzeW5jIGRvR2VuZXJhdGUoZGF0YTogQmFzZUNoYXRNb2RlbElucHV0LCBvcHRpb25zPzogUmVxT3B0aW9ucyk6IFByb21pc2U8RG9HZW5lcmF0ZU91dHB1dD4ge1xuICAgIGNvbnN0IHJlcyA9IChhd2FpdCB0aGlzLnJlcSh7XG4gICAgICB1cmw6IHRoaXMudXJsLFxuICAgICAgZGF0YToge1xuICAgICAgICAuLi5wcm9jZXNzSW5wdXQoZGF0YSksXG4gICAgICAgIHN0cmVhbTogZmFsc2UsXG4gICAgICB9LFxuICAgICAgc3RyZWFtOiBmYWxzZSxcbiAgICAgIHRpbWVvdXQ6IG9wdGlvbnM/LnRpbWVvdXQsXG4gICAgfSkpIGFzIFlpR2VuZXJhdGVPdXRwdXRcbiAgICByZXR1cm4geyAuLi5yZXMsIHJhd1Jlc3BvbnNlOiByZXMgfVxuICB9XG5cbiAgcHVibGljIGFzeW5jIGRvU3RyZWFtKGRhdGE6IEJhc2VDaGF0TW9kZWxJbnB1dCwgb3B0aW9ucz86IFJlcU9wdGlvbnMpOiBQcm9taXNlPERvU3RyZWFtT3V0cHV0PiB7XG4gICAgbGV0IGlzVG9vbENhbGw6IG51bGwgfCBib29sZWFuID0gbnVsbFxuICAgIGNvbnN0IF9zdHJlYW0gPSBhd2FpdCB0aGlzLnJlcSh7XG4gICAgICB1cmw6IHRoaXMudXJsLFxuICAgICAgZGF0YToge1xuICAgICAgICAuLi5wcm9jZXNzSW5wdXQoZGF0YSksXG4gICAgICAgIHN0cmVhbTogdHJ1ZSxcbiAgICAgIH0sXG4gICAgICBzdHJlYW06IHRydWUsXG4gICAgICB0aW1lb3V0OiBvcHRpb25zPy50aW1lb3V0LFxuICAgIH0pXG4gICAgY29uc3Qgc3RyZWFtID0gdG9Qb2x5ZmlsbFJlYWRhYmxlKF9zdHJlYW0pIGFzIHR5cGVvZiBfc3RyZWFtXG5cbiAgICBjb25zdCBhcmtTdHJlYW0gPSBpbnRvU3RhbmRhcmRTdHJlYW08WWlTdHJlYW1PdXRwdXQ+KHN0cmVhbSlcbiAgICBjb25zdCBzdHJlYW1XaXRoUmF3ID0gYXJrU3RyZWFtLnBpcGVUaHJvdWdoKG5ldyBUcmFuc2Zvcm1TdHJlYW08WWlTdHJlYW1PdXRwdXQsIEJhc2VEb1N0cmVhbU91dHB1dENodW5rICYgeyByYXdSZXNwb25zZT86IGFueSB9Pih7XG4gICAgICB0cmFuc2Zvcm0oY2h1bmssIGNvbnRyb2xsZXIpIHtcbiAgICAgICAgLy8g6Z2e5bi45aWH6JGpXG4gICAgICAgIGlmICghKGNodW5rPy5jaG9pY2VzPy5bMF0/LmRlbHRhPy5jb250ZW50IHx8IGNodW5rPy5jaG9pY2VzPy5bMF0/LmRlbHRhPy50b29sX2NhbGxzKSkgcmV0dXJuXG5cbiAgICAgICAgY29uc3QgbmV3Q2hvaWNlcyA9IGNodW5rLmNob2ljZXMubWFwKChjaG9pY2UpID0+IHtcbiAgICAgICAgICBjb25zdCBtZXNzYWdlID0gT2JqZWN0LmFzc2lnbihjaG9pY2UuZGVsdGEsIHsgcm9sZTogJ2Fzc2lzdGFudCcgfSkgYXMgdHlwZW9mIGNob2ljZS5kZWx0YSAmIHtcbiAgICAgICAgICAgIHJvbGU6ICdhc3Npc3RhbnQnXG4gICAgICAgICAgfVxuICAgICAgICAgIGlmIChpc1Rvb2xDYWxsID09IG51bGwpIGlzVG9vbENhbGwgPSBpc1Rvb2xDYWxsQXNzaXN0YW50TWVzc2FnZShtZXNzYWdlKVxuICAgICAgICAgIGlmIChpc1Rvb2xDYWxsKSB7XG4gICAgICAgICAgICByZXR1cm4ge1xuICAgICAgICAgICAgICAuLi5jaG9pY2UsXG4gICAgICAgICAgICAgIGZpbmlzaF9yZWFzb246ICd0b29sX2NhbGxzJyBhcyBjb25zdCxcbiAgICAgICAgICAgICAgZGVsdGE6IG1lc3NhZ2UsXG4gICAgICAgICAgICB9XG4gICAgICAgICAgfVxuICAgICAgICAgIHJldHVybiB7IC4uLmNob2ljZSwgZGVsdGE6IG1lc3NhZ2UgfVxuICAgICAgICB9KVxuICAgICAgICBjb25zdCBuZXdDaHVuayA9IHsgLi4uY2h1bmssIGNob2ljZXM6IG5ld0Nob2ljZXMgfVxuICAgICAgICBjb250cm9sbGVyLmVucXVldWUoeyAuLi5uZXdDaHVuaywgcmF3UmVzcG9uc2U6IGNodW5rIH0pXG4gICAgICB9LFxuICAgIH0pLClcblxuICAgIHJldHVybiBjcmVhdGVBc3luY0l0ZXJhYmxlKHN0cmVhbVdpdGhSYXcpXG4gIH1cbn1cbiJdfQ==
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import type { ModelReq, BaseChatModelInput, SimpleChatModel, DoStreamOutput, DoGenerateOutput } from '../../type';
|
|
1
|
+
import type { ModelReq, BaseChatModelInput, SimpleChatModel, DoStreamOutput, DoGenerateOutput, ReqOptions } from '../../type';
|
|
2
2
|
export declare class ZhiPuSimpleModel implements SimpleChatModel {
|
|
3
3
|
private req;
|
|
4
4
|
baseUrl: string;
|
|
5
5
|
subUrl: string;
|
|
6
6
|
constructor(req: ModelReq, baseUrl: string, subUrl?: string);
|
|
7
7
|
private get url();
|
|
8
|
-
doGenerate(_data: BaseChatModelInput): Promise<DoGenerateOutput>;
|
|
9
|
-
doStream(_data: BaseChatModelInput): Promise<DoStreamOutput>;
|
|
8
|
+
doGenerate(_data: BaseChatModelInput, options?: ReqOptions): Promise<DoGenerateOutput>;
|
|
9
|
+
doStream(_data: BaseChatModelInput, options?: ReqOptions): Promise<DoStreamOutput>;
|
|
10
10
|
}
|
|
@@ -72,7 +72,7 @@ var ZhiPuSimpleModel = (function () {
|
|
|
72
72
|
enumerable: false,
|
|
73
73
|
configurable: true
|
|
74
74
|
});
|
|
75
|
-
ZhiPuSimpleModel.prototype.doGenerate = function (_data) {
|
|
75
|
+
ZhiPuSimpleModel.prototype.doGenerate = function (_data, options) {
|
|
76
76
|
return __awaiter(this, void 0, void 0, function () {
|
|
77
77
|
var data, res;
|
|
78
78
|
return __generator(this, function (_a) {
|
|
@@ -83,6 +83,7 @@ var ZhiPuSimpleModel = (function () {
|
|
|
83
83
|
url: this.url,
|
|
84
84
|
data: __assign(__assign({}, data), { stream: false }),
|
|
85
85
|
stream: false,
|
|
86
|
+
timeout: options === null || options === void 0 ? void 0 : options.timeout,
|
|
86
87
|
})];
|
|
87
88
|
case 1:
|
|
88
89
|
res = (_a.sent());
|
|
@@ -91,7 +92,7 @@ var ZhiPuSimpleModel = (function () {
|
|
|
91
92
|
});
|
|
92
93
|
});
|
|
93
94
|
};
|
|
94
|
-
ZhiPuSimpleModel.prototype.doStream = function (_data) {
|
|
95
|
+
ZhiPuSimpleModel.prototype.doStream = function (_data, options) {
|
|
95
96
|
return __awaiter(this, void 0, void 0, function () {
|
|
96
97
|
var data, isToolCall, _stream, stream, zhipuStream, streamWithRaw;
|
|
97
98
|
return __generator(this, function (_a) {
|
|
@@ -103,6 +104,7 @@ var ZhiPuSimpleModel = (function () {
|
|
|
103
104
|
url: this.url,
|
|
104
105
|
data: __assign(__assign({}, data), { stream: true }),
|
|
105
106
|
stream: true,
|
|
107
|
+
timeout: options === null || options === void 0 ? void 0 : options.timeout,
|
|
106
108
|
})];
|
|
107
109
|
case 1:
|
|
108
110
|
_stream = _a.sent();
|
|
@@ -131,4 +133,4 @@ var ZhiPuSimpleModel = (function () {
|
|
|
131
133
|
return ZhiPuSimpleModel;
|
|
132
134
|
}());
|
|
133
135
|
export { ZhiPuSimpleModel };
|
|
134
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
136
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbW9kZWxzL1poaVB1L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsT0FBTyxFQUNMLG1CQUFtQixFQUNuQixlQUFlLEVBQ2Ysa0JBQWtCLEVBQ2xCLGtCQUFrQixFQUNsQiwwQkFBMEIsR0FDM0IsTUFBTSxhQUFhLENBQUE7QUFZcEIsU0FBUyxZQUFZLENBQUMsS0FBeUI7SUFDckMsSUFBQSxRQUFRLEdBQW9ELEtBQUssU0FBekQsRUFBRSxLQUFLLEdBQTZDLEtBQUssTUFBbEQsRUFBRSxXQUFXLEdBQWdDLEtBQUssWUFBckMsRUFBRSxXQUFXLEdBQW1CLEtBQUssWUFBeEIsRUFBRSxLQUFLLEdBQVksS0FBSyxNQUFqQixFQUFFLEtBQUssR0FBSyxLQUFLLE1BQVYsQ0FBVTtJQUV6RSxJQUFNLGlCQUFpQixHQUFHO1FBQ3hCLElBQUksV0FBVyxJQUFJLFdBQVcsS0FBSyxNQUFNLEVBQUU7WUFDekMsT0FBTyxDQUFDLElBQUksQ0FBQywrQkFBK0IsQ0FBQyxDQUFBO1NBQzlDO1FBQ0QsT0FBTyxXQUFrQixDQUFBO0lBQzNCLENBQUMsQ0FBQTtJQUVELDZCQUNLLEtBQUssS0FDUixRQUFRLFVBQUEsRUFDUixLQUFLLE9BQUEsRUFDTCxXQUFXLGFBQUEsRUFDWCxXQUFXLEVBQUUsaUJBQWlCLEVBQUUsRUFDaEMsS0FBSyxPQUFBLEVBQ0wsS0FBSyxPQUFBLElBQ047QUFDSCxDQUFDO0FBRUQ7SUFFRSwwQkFBb0IsR0FBYSxFQUFTLE9BQWUsRUFBRSxNQUFlO1FBQXRELFFBQUcsR0FBSCxHQUFHLENBQVU7UUFBUyxZQUFPLEdBQVAsT0FBTyxDQUFRO1FBRGxELFdBQU0sR0FBRyxvQ0FBb0MsQ0FBQTtRQUVsRCxJQUFJLE1BQU0sSUFBSSxJQUFJLEVBQUU7WUFDbEIsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUE7U0FDckI7SUFDSCxDQUFDO0lBRUQsc0JBQVksaUNBQUc7YUFBZjtZQUNFLE9BQU8sVUFBRyxJQUFJLENBQUMsT0FBTyxjQUFJLElBQUksQ0FBQyxNQUFNLENBQUUsQ0FBQTtRQUN6QyxDQUFDOzs7T0FBQTtJQUVZLHFDQUFVLEdBQXZCLFVBQXdCLEtBQXlCLEVBQUUsT0FBb0I7Ozs7Ozt3QkFDL0QsSUFBSSxHQUFHLFlBQVksQ0FBQyxLQUFLLENBQUMsQ0FBQTt3QkFDbkIsV0FBTSxJQUFJLENBQUMsR0FBRyxDQUFDO2dDQUMxQixHQUFHLEVBQUUsSUFBSSxDQUFDLEdBQUc7Z0NBQ2IsSUFBSSx3QkFDQyxJQUFJLEtBQ1AsTUFBTSxFQUFFLEtBQUssR0FDZDtnQ0FDRCxNQUFNLEVBQUUsS0FBSztnQ0FDYixPQUFPLEVBQUUsT0FBTyxhQUFQLE9BQU8sdUJBQVAsT0FBTyxDQUFFLE9BQU87NkJBQzFCLENBQUMsRUFBQTs7d0JBUkksR0FBRyxHQUFHLENBQUMsU0FRWCxDQUE0Qjt3QkFDOUIsaUNBQVksR0FBRyxLQUFFLFdBQVcsRUFBRSxHQUFHLEtBQUU7Ozs7S0FDcEM7SUFFWSxtQ0FBUSxHQUFyQixVQUFzQixLQUF5QixFQUFFLE9BQW9COzs7Ozs7d0JBQzdELElBQUksR0FBRyxZQUFZLENBQUMsS0FBSyxDQUFDLENBQUE7d0JBQzVCLFVBQVUsR0FBbUIsSUFBSSxDQUFBO3dCQUNyQixXQUFNLElBQUksQ0FBQyxHQUFHLENBQUM7Z0NBQzdCLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRztnQ0FDYixJQUFJLHdCQUNDLElBQUksS0FDUCxNQUFNLEVBQUUsSUFBSSxHQUNiO2dDQUNELE1BQU0sRUFBRSxJQUFJO2dDQUNaLE9BQU8sRUFBRSxPQUFPLGFBQVAsT0FBTyx1QkFBUCxPQUFPLENBQUUsT0FBTzs2QkFDMUIsQ0FBQyxFQUFBOzt3QkFSSSxPQUFPLEdBQUcsU0FRZDt3QkFDSSxNQUFNLEdBQUcsa0JBQWtCLENBQUMsT0FBTyxDQUFtQixDQUFBO3dCQUV0RCxXQUFXLEdBQUcsa0JBQWtCLENBQXdCLE1BQU0sQ0FBQyxDQUFBO3dCQUMvRCxhQUFhLEdBQUcsV0FBVyxDQUFDLFdBQVcsQ0FBQyxJQUFJLGVBQWUsQ0FBeUU7NEJBQ3hJLFNBQVMsWUFBQyxLQUFLLEVBQUUsVUFBVTtnQ0FDekIsSUFBTSxVQUFVLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBQyxNQUFNO29DQUMxQyxJQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFBO29DQUM1QixJQUFJLFVBQVUsSUFBSSxJQUFJO3dDQUFFLFVBQVUsR0FBRywwQkFBMEIsQ0FBQyxPQUFPLENBQUMsQ0FBQTtvQ0FDeEUsSUFBSSxVQUFVLEVBQUU7d0NBQ2QsNkJBQ0ssTUFBTSxLQUNULGFBQWEsRUFBRSxZQUFxQixFQUNwQyxLQUFLLEVBQUUsT0FBTyxJQUNmO3FDQUNGO29DQUNELE9BQU8sTUFBTSxDQUFBO2dDQUNmLENBQUMsQ0FBQyxDQUFBO2dDQUNGLElBQU0sUUFBUSx5QkFBUSxLQUFLLEtBQUUsT0FBTyxFQUFFLFVBQVUsR0FBRSxDQUFBO2dDQUNsRCxVQUFVLENBQUMsT0FBTyx1QkFBTSxRQUFRLEtBQUUsV0FBVyxFQUFFLEtBQUssSUFBRyxDQUFBOzRCQUN6RCxDQUFDO3lCQUNGLENBQUMsQ0FBRSxDQUFBO3dCQUVKLFdBQU8sbUJBQW1CLENBQUMsYUFBYSxDQUFDLEVBQUE7Ozs7S0FDMUM7SUFDSCx1QkFBQztBQUFELENBQUMsQUE5REQsSUE4REMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBjcmVhdGVBc3luY0l0ZXJhYmxlLFxuICBUcmFuc2Zvcm1TdHJlYW0sXG4gIHRvUG9seWZpbGxSZWFkYWJsZSxcbiAgaW50b1N0YW5kYXJkU3RyZWFtLFxuICBpc1Rvb2xDYWxsQXNzaXN0YW50TWVzc2FnZSxcbn0gZnJvbSAnLi4vLi4vdXRpbHMnXG5pbXBvcnQgdHlwZSB7IFpoaVB1R2VuZXJhdGVUZXh0T3V0cHV0LCBaaGlQdUlucHV0RGF0YSwgWmhpUHVTdHJlYW1UZXh0T3V0cHV0IH0gZnJvbSAnLi90eXBlJ1xuaW1wb3J0IHR5cGUge1xuICBNb2RlbFJlcSxcbiAgQmFzZUNoYXRNb2RlbElucHV0LFxuICBTaW1wbGVDaGF0TW9kZWwsXG4gIERvU3RyZWFtT3V0cHV0LFxuICBCYXNlRG9TdHJlYW1PdXRwdXRDaHVuayxcbiAgRG9HZW5lcmF0ZU91dHB1dCxcbiAgUmVxT3B0aW9ucyxcbn0gZnJvbSAnLi4vLi4vdHlwZSdcblxuZnVuY3Rpb24gcHJvY2Vzc0lucHV0KGlucHV0OiBCYXNlQ2hhdE1vZGVsSW5wdXQpOiBaaGlQdUlucHV0RGF0YSB7XG4gIGNvbnN0IHsgbWVzc2FnZXMsIG1vZGVsLCB0ZW1wZXJhdHVyZSwgdG9vbF9jaG9pY2UsIHRvb2xzLCB0b3BfcCB9ID0gaW5wdXRcblxuICBjb25zdCBwcm9jZXNzVG9vbENob2ljZSA9ICgpID0+IHtcbiAgICBpZiAodG9vbF9jaG9pY2UgJiYgdG9vbF9jaG9pY2UgIT09ICdhdXRvJykge1xuICAgICAgY29uc29sZS53YXJuKCdgdG9vbF9jaG9pY2VgIGlzIG5vdCBcXCdhdXRvXFwnJylcbiAgICB9XG4gICAgcmV0dXJuIHRvb2xfY2hvaWNlIGFzIGFueVxuICB9XG5cbiAgcmV0dXJuIHtcbiAgICAuLi5pbnB1dCxcbiAgICBtZXNzYWdlcyxcbiAgICBtb2RlbCxcbiAgICB0ZW1wZXJhdHVyZSxcbiAgICB0b29sX2Nob2ljZTogcHJvY2Vzc1Rvb2xDaG9pY2UoKSxcbiAgICB0b29scyxcbiAgICB0b3BfcCxcbiAgfVxufVxuXG5leHBvcnQgY2xhc3MgWmhpUHVTaW1wbGVNb2RlbCBpbXBsZW1lbnRzIFNpbXBsZUNoYXRNb2RlbCB7XG4gIHB1YmxpYyBzdWJVcmwgPSAnemhpcHUvYXBpL3BhYXMvdjQvY2hhdC9jb21wbGV0aW9ucydcbiAgY29uc3RydWN0b3IocHJpdmF0ZSByZXE6IE1vZGVsUmVxLCBwdWJsaWMgYmFzZVVybDogc3RyaW5nLCBzdWJVcmw/OiBzdHJpbmcpIHtcbiAgICBpZiAoc3ViVXJsICE9IG51bGwpIHtcbiAgICAgIHRoaXMuc3ViVXJsID0gc3ViVXJsXG4gICAgfVxuICB9XG5cbiAgcHJpdmF0ZSBnZXQgdXJsKCkge1xuICAgIHJldHVybiBgJHt0aGlzLmJhc2VVcmx9LyR7dGhpcy5zdWJVcmx9YFxuICB9XG5cbiAgcHVibGljIGFzeW5jIGRvR2VuZXJhdGUoX2RhdGE6IEJhc2VDaGF0TW9kZWxJbnB1dCwgb3B0aW9ucz86IFJlcU9wdGlvbnMpOiBQcm9taXNlPERvR2VuZXJhdGVPdXRwdXQ+IHtcbiAgICBjb25zdCBkYXRhID0gcHJvY2Vzc0lucHV0KF9kYXRhKVxuICAgIGNvbnN0IHJlcyA9IChhd2FpdCB0aGlzLnJlcSh7XG4gICAgICB1cmw6IHRoaXMudXJsLFxuICAgICAgZGF0YToge1xuICAgICAgICAuLi5kYXRhLFxuICAgICAgICBzdHJlYW06IGZhbHNlLFxuICAgICAgfSxcbiAgICAgIHN0cmVhbTogZmFsc2UsXG4gICAgICB0aW1lb3V0OiBvcHRpb25zPy50aW1lb3V0LFxuICAgIH0pKSBhcyBaaGlQdUdlbmVyYXRlVGV4dE91dHB1dFxuICAgIHJldHVybiB7IC4uLnJlcywgcmF3UmVzcG9uc2U6IHJlcyB9XG4gIH1cblxuICBwdWJsaWMgYXN5bmMgZG9TdHJlYW0oX2RhdGE6IEJhc2VDaGF0TW9kZWxJbnB1dCwgb3B0aW9ucz86IFJlcU9wdGlvbnMpOiBQcm9taXNlPERvU3RyZWFtT3V0cHV0PiB7XG4gICAgY29uc3QgZGF0YSA9IHByb2Nlc3NJbnB1dChfZGF0YSlcbiAgICBsZXQgaXNUb29sQ2FsbDogbnVsbCB8IGJvb2xlYW4gPSBudWxsXG4gICAgY29uc3QgX3N0cmVhbSA9IGF3YWl0IHRoaXMucmVxKHtcbiAgICAgIHVybDogdGhpcy51cmwsXG4gICAgICBkYXRhOiB7XG4gICAgICAgIC4uLmRhdGEsXG4gICAgICAgIHN0cmVhbTogdHJ1ZSxcbiAgICAgIH0sXG4gICAgICBzdHJlYW06IHRydWUsXG4gICAgICB0aW1lb3V0OiBvcHRpb25zPy50aW1lb3V0LFxuICAgIH0pXG4gICAgY29uc3Qgc3RyZWFtID0gdG9Qb2x5ZmlsbFJlYWRhYmxlKF9zdHJlYW0pIGFzIHR5cGVvZiBfc3RyZWFtXG5cbiAgICBjb25zdCB6aGlwdVN0cmVhbSA9IGludG9TdGFuZGFyZFN0cmVhbTxaaGlQdVN0cmVhbVRleHRPdXRwdXQ+KHN0cmVhbSlcbiAgICBjb25zdCBzdHJlYW1XaXRoUmF3ID0gemhpcHVTdHJlYW0ucGlwZVRocm91Z2gobmV3IFRyYW5zZm9ybVN0cmVhbTxaaGlQdVN0cmVhbVRleHRPdXRwdXQsIEJhc2VEb1N0cmVhbU91dHB1dENodW5rICYgeyByYXdSZXNwb25zZT86IGFueSB9Pih7XG4gICAgICB0cmFuc2Zvcm0oY2h1bmssIGNvbnRyb2xsZXIpIHtcbiAgICAgICAgY29uc3QgbmV3Q2hvaWNlcyA9IGNodW5rLmNob2ljZXMubWFwKChjaG9pY2UpID0+IHtcbiAgICAgICAgICBjb25zdCBtZXNzYWdlID0gY2hvaWNlLmRlbHRhXG4gICAgICAgICAgaWYgKGlzVG9vbENhbGwgPT0gbnVsbCkgaXNUb29sQ2FsbCA9IGlzVG9vbENhbGxBc3Npc3RhbnRNZXNzYWdlKG1lc3NhZ2UpXG4gICAgICAgICAgaWYgKGlzVG9vbENhbGwpIHtcbiAgICAgICAgICAgIHJldHVybiB7XG4gICAgICAgICAgICAgIC4uLmNob2ljZSxcbiAgICAgICAgICAgICAgZmluaXNoX3JlYXNvbjogJ3Rvb2xfY2FsbHMnIGFzIGNvbnN0LFxuICAgICAgICAgICAgICBkZWx0YTogbWVzc2FnZSxcbiAgICAgICAgICAgIH1cbiAgICAgICAgICB9XG4gICAgICAgICAgcmV0dXJuIGNob2ljZVxuICAgICAgICB9KVxuICAgICAgICBjb25zdCBuZXdDaHVuayA9IHsgLi4uY2h1bmssIGNob2ljZXM6IG5ld0Nob2ljZXMgfVxuICAgICAgICBjb250cm9sbGVyLmVucXVldWUoeyAuLi5uZXdDaHVuaywgcmF3UmVzcG9uc2U6IGNodW5rIH0pXG4gICAgICB9LFxuICAgIH0pLClcblxuICAgIHJldHVybiBjcmVhdGVBc3luY0l0ZXJhYmxlKHN0cmVhbVdpdGhSYXcpXG4gIH1cbn1cbiJdfQ==
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BaseChatModelInput, DoStreamOutput, SimpleChatModel, ToolCall, ChatModelMessage, AsyncIterableReadableStream, Usage, ModelTool, FunctionTool } from '../type';
|
|
1
|
+
import { BaseChatModelInput, DoStreamOutput, SimpleChatModel, ToolCall, ChatModelMessage, AsyncIterableReadableStream, Usage, ModelTool, FunctionTool, ReqOptions } from '../type';
|
|
2
2
|
type ReactModelInput = ReactProps & Omit<BaseChatModelInput, 'tools'> & {
|
|
3
3
|
tools?: Array<ModelTool | FunctionTool>;
|
|
4
4
|
topP?: number;
|
|
@@ -21,14 +21,14 @@ interface ReactProps {
|
|
|
21
21
|
export declare class ReactModel {
|
|
22
22
|
private model;
|
|
23
23
|
constructor(model: SimpleChatModel);
|
|
24
|
-
generateText(_input: ReactModelInput): Promise<{
|
|
24
|
+
generateText(_input: ReactModelInput, options?: ReqOptions): Promise<{
|
|
25
25
|
text: string;
|
|
26
26
|
messages: Array<ChatModelMessage>;
|
|
27
27
|
usage: Usage;
|
|
28
28
|
rawResponses: Array<unknown>;
|
|
29
29
|
error?: any;
|
|
30
30
|
}>;
|
|
31
|
-
streamText(_input: ReactModelInput): Promise<{
|
|
31
|
+
streamText(_input: ReactModelInput, options?: ReqOptions): Promise<{
|
|
32
32
|
dataStream: DoStreamOutput;
|
|
33
33
|
textStream: AsyncIterableReadableStream<string>;
|
|
34
34
|
messages: Promise<Array<ChatModelMessage>>;
|