@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
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import type { ModelReq, BaseChatModelInput, DoStreamOutput, SimpleChatModel, DoGenerateOutput } from '../../type';
|
|
1
|
+
import type { ModelReq, BaseChatModelInput, DoStreamOutput, SimpleChatModel, DoGenerateOutput, ReqOptions } from '../../type';
|
|
2
2
|
export declare class HunYuanSimpleModel 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 HunYuanSimpleModel = (function () {
|
|
|
66
66
|
enumerable: false,
|
|
67
67
|
configurable: true
|
|
68
68
|
});
|
|
69
|
-
HunYuanSimpleModel.prototype.doGenerate = function (data) {
|
|
69
|
+
HunYuanSimpleModel.prototype.doGenerate = function (data, options) {
|
|
70
70
|
return __awaiter(this, void 0, void 0, function () {
|
|
71
71
|
var res, output;
|
|
72
72
|
return __generator(this, function (_a) {
|
|
@@ -78,6 +78,7 @@ var HunYuanSimpleModel = (function () {
|
|
|
78
78
|
},
|
|
79
79
|
data: __assign(__assign({}, (0, util_1.processInput)(data)), { stream: false }),
|
|
80
80
|
stream: false,
|
|
81
|
+
timeout: options === null || options === void 0 ? void 0 : options.timeout,
|
|
81
82
|
})];
|
|
82
83
|
case 1:
|
|
83
84
|
res = (_a.sent());
|
|
@@ -87,7 +88,7 @@ var HunYuanSimpleModel = (function () {
|
|
|
87
88
|
});
|
|
88
89
|
});
|
|
89
90
|
};
|
|
90
|
-
HunYuanSimpleModel.prototype.doStream = function (data) {
|
|
91
|
+
HunYuanSimpleModel.prototype.doStream = function (data, options) {
|
|
91
92
|
return __awaiter(this, void 0, void 0, function () {
|
|
92
93
|
var isToolCall, _stream, stream, hunyuanStream, streamWithRaw;
|
|
93
94
|
return __generator(this, function (_a) {
|
|
@@ -101,6 +102,7 @@ var HunYuanSimpleModel = (function () {
|
|
|
101
102
|
},
|
|
102
103
|
data: __assign(__assign({}, data), { stream: true }),
|
|
103
104
|
stream: true,
|
|
105
|
+
timeout: options === null || options === void 0 ? void 0 : options.timeout,
|
|
104
106
|
})];
|
|
105
107
|
case 1:
|
|
106
108
|
_stream = _a.sent();
|
|
@@ -130,4 +132,4 @@ var HunYuanSimpleModel = (function () {
|
|
|
130
132
|
return HunYuanSimpleModel;
|
|
131
133
|
}());
|
|
132
134
|
exports.HunYuanSimpleModel = HunYuanSimpleModel;
|
|
133
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
135
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbW9kZWxzL0h1bll1YW4vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxxQ0FNb0I7QUFVcEIsK0JBQTJEO0FBRzNEO0lBRUUsNEJBQW9CLEdBQWEsRUFBUyxPQUFlLEVBQUUsTUFBZTtRQUF0RCxRQUFHLEdBQUgsR0FBRyxDQUFVO1FBQVMsWUFBTyxHQUFQLE9BQU8sQ0FBUTtRQURsRCxXQUFNLEdBQUcsU0FBUyxDQUFBO1FBRXZCLElBQUksTUFBTSxJQUFJLElBQUksRUFBRTtZQUNsQixJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQTtTQUNyQjtJQUNILENBQUM7SUFFRCxzQkFBWSxtQ0FBRzthQUFmO1lBQ0UsT0FBTyxVQUFHLElBQUksQ0FBQyxPQUFPLGNBQUksSUFBSSxDQUFDLE1BQU0sQ0FBRSxDQUFBO1FBQ3pDLENBQUM7OztPQUFBO0lBRVksdUNBQVUsR0FBdkIsVUFBd0IsSUFBd0IsRUFBRSxPQUFvQjs7Ozs7NEJBQ3ZELFdBQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQzs0QkFDMUIsR0FBRyxFQUFFLElBQUksQ0FBQyxHQUFHOzRCQUNiLE9BQU8sRUFBRTtnQ0FDUCxhQUFhLEVBQUUsaUJBQWlCOzZCQUNqQzs0QkFDRCxJQUFJLHdCQUNDLElBQUEsbUJBQVksRUFBQyxJQUFJLENBQUMsS0FDckIsTUFBTSxFQUFFLEtBQUssR0FDZDs0QkFDRCxNQUFNLEVBQUUsS0FBSzs0QkFDYixPQUFPLEVBQUUsT0FBTyxhQUFQLE9BQU8sdUJBQVAsT0FBTyxDQUFFLE9BQU87eUJBQzFCLENBQUMsRUFBQTs7d0JBWEksR0FBRyxHQUFHLENBQUMsU0FXWCxDQUFzQjt3QkFDbEIsTUFBTSxHQUFHLElBQUEsMkJBQW9CLEVBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBOEIsQ0FBQTt3QkFDOUUsaUNBQ0ssTUFBTSxLQUNULFdBQVcsRUFBRSxHQUFHLEtBQ2pCOzs7O0tBQ0Y7SUFFWSxxQ0FBUSxHQUFyQixVQUFzQixJQUF3QixFQUFFLE9BQW9COzs7Ozs7d0JBQzlELFVBQVUsR0FBbUIsSUFBSSxDQUFBO3dCQUVyQixXQUFNLElBQUksQ0FBQyxHQUFHLENBQUM7Z0NBQzdCLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRztnQ0FDYixPQUFPLEVBQUU7b0NBQ1AsYUFBYSxFQUFFLGlCQUFpQjtpQ0FDakM7Z0NBQ0QsSUFBSSx3QkFDQyxJQUFJLEtBQ1AsTUFBTSxFQUFFLElBQUksR0FDYjtnQ0FDRCxNQUFNLEVBQUUsSUFBSTtnQ0FDWixPQUFPLEVBQUUsT0FBTyxhQUFQLE9BQU8sdUJBQVAsT0FBTyxDQUFFLE9BQU87NkJBQzFCLENBQUMsRUFBQTs7d0JBWEksT0FBTyxHQUFHLFNBV2Q7d0JBQ0ksTUFBTSxHQUFHLElBQUEsMEJBQWtCLEVBQUMsT0FBTyxDQUFtQixDQUFBO3dCQUV0RCxhQUFhLEdBQUcsSUFBQSwwQkFBa0IsRUFBQyxNQUFNLENBQUMsQ0FBQTt3QkFDMUMsYUFBYSxHQUFHLGFBQWEsQ0FBQyxXQUFXLENBQUMsSUFBSSx1QkFBZSxDQUEyRDs0QkFDNUgsU0FBUyxZQUFDLE1BQU0sRUFBRSxVQUFVO2dDQUMxQixJQUFNLEtBQUssR0FBRyxJQUFBLDJCQUFvQixFQUFDLE1BQU0sQ0FBNEIsQ0FBQTtnQ0FDckUsSUFBTSxVQUFVLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBQyxNQUFNO29DQUMxQyxJQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFBO29DQUM1QixJQUFJLFVBQVUsSUFBSSxJQUFJO3dDQUFFLFVBQVUsR0FBRyxJQUFBLGtDQUEwQixFQUFDLE9BQU8sQ0FBQyxDQUFBO29DQUN4RSxJQUFJLFVBQVUsRUFBRTt3Q0FDZCw2QkFDSyxNQUFNLEtBQ1QsYUFBYSxFQUFFLFlBQVksRUFDM0IsS0FBSyxFQUFFLE9BQU8sSUFDZjtxQ0FDRjtvQ0FDRCxPQUFPLE1BQU0sQ0FBQTtnQ0FDZixDQUFDLENBQUMsQ0FBQTtnQ0FDRixJQUFNLFFBQVEseUJBQVEsS0FBSyxLQUFFLE9BQU8sRUFBRSxVQUFVLEdBQUUsQ0FBQTtnQ0FDbEQsVUFBVSxDQUFDLE9BQU8sdUJBQU0sUUFBUSxLQUFFLFdBQVcsRUFBRSxNQUFNLElBQUcsQ0FBQTs0QkFDMUQsQ0FBQzt5QkFDRixDQUFDLENBQUUsQ0FBQTt3QkFFSixXQUFPLElBQUEsMkJBQW1CLEVBQUMsYUFBYSxDQUFDLEVBQUE7Ozs7S0FDMUM7SUFDSCx5QkFBQztBQUFELENBQUMsQUF4RUQsSUF3RUM7QUF4RVksZ0RBQWtCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgY3JlYXRlQXN5bmNJdGVyYWJsZSxcbiAgVHJhbnNmb3JtU3RyZWFtLFxuICB0b1BvbHlmaWxsUmVhZGFibGUsXG4gIGludG9TdGFuZGFyZFN0cmVhbSxcbiAgaXNUb29sQ2FsbEFzc2lzdGFudE1lc3NhZ2UsXG59IGZyb20gJy4uLy4uL3V0aWxzJ1xuaW1wb3J0IHR5cGUge1xuICBNb2RlbFJlcSxcbiAgQmFzZUNoYXRNb2RlbElucHV0LFxuICBCYXNlRG9TdHJlYW1PdXRwdXRDaHVuayxcbiAgRG9TdHJlYW1PdXRwdXQsXG4gIFNpbXBsZUNoYXRNb2RlbCxcbiAgRG9HZW5lcmF0ZU91dHB1dCxcbiAgUmVxT3B0aW9ucyxcbn0gZnJvbSAnLi4vLi4vdHlwZSdcbmltcG9ydCB7IHByb2Nlc3NJbnB1dCwgdGl0bGVDYXNlVG9TbmFrZUNhc2UgfSBmcm9tICcuL3V0aWwnXG5pbXBvcnQgeyBIdW5ZdWFuR2VuZXJhdGVUZXh0T3V0cHV0LCBIdW5ZdWFuU3RyZWFtVGV4dE91dHB1dCB9IGZyb20gJy4vdHlwZSdcblxuZXhwb3J0IGNsYXNzIEh1bll1YW5TaW1wbGVNb2RlbCBpbXBsZW1lbnRzIFNpbXBsZUNoYXRNb2RlbCB7XG4gIHB1YmxpYyBzdWJVcmwgPSAnaHVueXVhbidcbiAgY29uc3RydWN0b3IocHJpdmF0ZSByZXE6IE1vZGVsUmVxLCBwdWJsaWMgYmFzZVVybDogc3RyaW5nLCBzdWJVcmw/OiBzdHJpbmcpIHtcbiAgICBpZiAoc3ViVXJsICE9IG51bGwpIHtcbiAgICAgIHRoaXMuc3ViVXJsID0gc3ViVXJsXG4gICAgfVxuICB9XG5cbiAgcHJpdmF0ZSBnZXQgdXJsKCkge1xuICAgIHJldHVybiBgJHt0aGlzLmJhc2VVcmx9LyR7dGhpcy5zdWJVcmx9YFxuICB9XG5cbiAgcHVibGljIGFzeW5jIGRvR2VuZXJhdGUoZGF0YTogQmFzZUNoYXRNb2RlbElucHV0LCBvcHRpb25zPzogUmVxT3B0aW9ucyk6IFByb21pc2U8RG9HZW5lcmF0ZU91dHB1dD4ge1xuICAgIGNvbnN0IHJlcyA9IChhd2FpdCB0aGlzLnJlcSh7XG4gICAgICB1cmw6IHRoaXMudXJsLFxuICAgICAgaGVhZGVyczoge1xuICAgICAgICAnWC1UYy1BY3Rpb24nOiAnQ2hhdENvbXBsZXRpb25zJyxcbiAgICAgIH0sXG4gICAgICBkYXRhOiB7XG4gICAgICAgIC4uLnByb2Nlc3NJbnB1dChkYXRhKSxcbiAgICAgICAgc3RyZWFtOiBmYWxzZSxcbiAgICAgIH0sXG4gICAgICBzdHJlYW06IGZhbHNlLFxuICAgICAgdGltZW91dDogb3B0aW9ucz8udGltZW91dCxcbiAgICB9KSkgYXMgeyBSZXNwb25zZTogYW55IH1cbiAgICBjb25zdCBvdXRwdXQgPSB0aXRsZUNhc2VUb1NuYWtlQ2FzZShyZXMuUmVzcG9uc2UpIGFzIEh1bll1YW5HZW5lcmF0ZVRleHRPdXRwdXRcbiAgICByZXR1cm4ge1xuICAgICAgLi4ub3V0cHV0LFxuICAgICAgcmF3UmVzcG9uc2U6IHJlcyxcbiAgICB9XG4gIH1cblxuICBwdWJsaWMgYXN5bmMgZG9TdHJlYW0oZGF0YTogQmFzZUNoYXRNb2RlbElucHV0LCBvcHRpb25zPzogUmVxT3B0aW9ucyk6IFByb21pc2U8RG9TdHJlYW1PdXRwdXQ+IHtcbiAgICBsZXQgaXNUb29sQ2FsbDogbnVsbCB8IGJvb2xlYW4gPSBudWxsXG5cbiAgICBjb25zdCBfc3RyZWFtID0gYXdhaXQgdGhpcy5yZXEoe1xuICAgICAgdXJsOiB0aGlzLnVybCxcbiAgICAgIGhlYWRlcnM6IHtcbiAgICAgICAgJ1gtVGMtQWN0aW9uJzogJ0NoYXRDb21wbGV0aW9ucycsXG4gICAgICB9LFxuICAgICAgZGF0YToge1xuICAgICAgICAuLi5kYXRhLFxuICAgICAgICBzdHJlYW06IHRydWUsXG4gICAgICB9LFxuICAgICAgc3RyZWFtOiB0cnVlLFxuICAgICAgdGltZW91dDogb3B0aW9ucz8udGltZW91dCxcbiAgICB9KVxuICAgIGNvbnN0IHN0cmVhbSA9IHRvUG9seWZpbGxSZWFkYWJsZShfc3RyZWFtKSBhcyB0eXBlb2YgX3N0cmVhbVxuXG4gICAgY29uc3QgaHVueXVhblN0cmVhbSA9IGludG9TdGFuZGFyZFN0cmVhbShzdHJlYW0pXG4gICAgY29uc3Qgc3RyZWFtV2l0aFJhdyA9IGh1bnl1YW5TdHJlYW0ucGlwZVRocm91Z2gobmV3IFRyYW5zZm9ybVN0cmVhbTx1bmtub3duLCBCYXNlRG9TdHJlYW1PdXRwdXRDaHVuayAmIHsgcmF3UmVzcG9uc2U/OiBhbnkgfT4oe1xuICAgICAgdHJhbnNmb3JtKF9jaHVuaywgY29udHJvbGxlcikge1xuICAgICAgICBjb25zdCBjaHVuayA9IHRpdGxlQ2FzZVRvU25ha2VDYXNlKF9jaHVuaykgYXMgSHVuWXVhblN0cmVhbVRleHRPdXRwdXRcbiAgICAgICAgY29uc3QgbmV3Q2hvaWNlcyA9IGNodW5rLmNob2ljZXMubWFwKChjaG9pY2UpID0+IHtcbiAgICAgICAgICBjb25zdCBtZXNzYWdlID0gY2hvaWNlLmRlbHRhXG4gICAgICAgICAgaWYgKGlzVG9vbENhbGwgPT0gbnVsbCkgaXNUb29sQ2FsbCA9IGlzVG9vbENhbGxBc3Npc3RhbnRNZXNzYWdlKG1lc3NhZ2UpXG4gICAgICAgICAgaWYgKGlzVG9vbENhbGwpIHtcbiAgICAgICAgICAgIHJldHVybiB7XG4gICAgICAgICAgICAgIC4uLmNob2ljZSxcbiAgICAgICAgICAgICAgZmluaXNoX3JlYXNvbjogJ3Rvb2xfY2FsbHMnLFxuICAgICAgICAgICAgICBkZWx0YTogbWVzc2FnZSxcbiAgICAgICAgICAgIH1cbiAgICAgICAgICB9XG4gICAgICAgICAgcmV0dXJuIGNob2ljZVxuICAgICAgICB9KVxuICAgICAgICBjb25zdCBuZXdDaHVuayA9IHsgLi4uY2h1bmssIGNob2ljZXM6IG5ld0Nob2ljZXMgfVxuICAgICAgICBjb250cm9sbGVyLmVucXVldWUoeyAuLi5uZXdDaHVuaywgcmF3UmVzcG9uc2U6IF9jaHVuayB9KVxuICAgICAgfSxcbiAgICB9KSwpXG5cbiAgICByZXR1cm4gY3JlYXRlQXN5bmNJdGVyYWJsZShzdHJlYW1XaXRoUmF3KVxuICB9XG59XG4iXX0=
|
|
@@ -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 HunYuanBetaSimpleModel 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 HunYuanBetaSimpleModel = (function () {
|
|
|
66
66
|
enumerable: false,
|
|
67
67
|
configurable: true
|
|
68
68
|
});
|
|
69
|
-
HunYuanBetaSimpleModel.prototype.doGenerate = function (data) {
|
|
69
|
+
HunYuanBetaSimpleModel.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 HunYuanBetaSimpleModel = (function () {
|
|
|
75
75
|
url: this.url,
|
|
76
76
|
data: __assign(__assign({}, (0, util_1.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 HunYuanBetaSimpleModel = (function () {
|
|
|
83
84
|
});
|
|
84
85
|
});
|
|
85
86
|
};
|
|
86
|
-
HunYuanBetaSimpleModel.prototype.doStream = function (data) {
|
|
87
|
+
HunYuanBetaSimpleModel.prototype.doStream = function (data, options) {
|
|
87
88
|
return __awaiter(this, void 0, void 0, function () {
|
|
88
89
|
var isToolCall, _stream, stream, hunyuanBetaStream, streamWithRaw;
|
|
89
90
|
return __generator(this, function (_a) {
|
|
@@ -94,6 +95,7 @@ var HunYuanBetaSimpleModel = (function () {
|
|
|
94
95
|
url: this.url,
|
|
95
96
|
data: __assign(__assign({}, (0, util_1.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 HunYuanBetaSimpleModel = (function () {
|
|
|
122
124
|
return HunYuanBetaSimpleModel;
|
|
123
125
|
}());
|
|
124
126
|
exports.HunYuanBetaSimpleModel = HunYuanBetaSimpleModel;
|
|
125
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
127
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbW9kZWxzL0h1bll1YW5CZXRhL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEscUNBTW9CO0FBVXBCLHdDQUE4QztBQUc5QztJQUVFLGdDQUFvQixHQUFhLEVBQVMsT0FBZSxFQUFFLE1BQWU7UUFBdEQsUUFBRyxHQUFILEdBQUcsQ0FBVTtRQUFTLFlBQU8sR0FBUCxPQUFPLENBQVE7UUFEbEQsV0FBTSxHQUFHLDBDQUEwQyxDQUFBO1FBRXhELElBQUksTUFBTSxJQUFJLElBQUksRUFBRTtZQUNsQixJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQTtTQUNyQjtJQUNILENBQUM7SUFFRCxzQkFBWSx1Q0FBRzthQUFmO1lBQ0UsT0FBTyxVQUFHLElBQUksQ0FBQyxPQUFPLGNBQUksSUFBSSxDQUFDLE1BQU0sQ0FBRSxDQUFBO1FBQ3pDLENBQUM7OztPQUFBO0lBRVksMkNBQVUsR0FBdkIsVUFBd0IsSUFBd0IsRUFBRSxPQUFvQjs7Ozs7NEJBQ3ZELFdBQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQzs0QkFDMUIsR0FBRyxFQUFFLElBQUksQ0FBQyxHQUFHOzRCQUNiLElBQUksd0JBQ0MsSUFBQSxtQkFBWSxFQUFDLElBQUksQ0FBQyxLQUNyQixNQUFNLEVBQUUsS0FBSyxHQUNkOzRCQUNELE1BQU0sRUFBRSxLQUFLOzRCQUNiLE9BQU8sRUFBRSxPQUFPLGFBQVAsT0FBTyx1QkFBUCxPQUFPLENBQUUsT0FBTzt5QkFDMUIsQ0FBQyxFQUFBOzt3QkFSSSxHQUFHLEdBQUcsQ0FBQyxTQVFYLENBQThCO3dCQUNoQyxpQ0FBWSxHQUFHLEtBQUUsV0FBVyxFQUFFLEdBQUcsS0FBRTs7OztLQUNwQztJQUVZLHlDQUFRLEdBQXJCLFVBQXNCLElBQXdCLEVBQUUsT0FBb0I7Ozs7Ozt3QkFDOUQsVUFBVSxHQUFtQixJQUFJLENBQUE7d0JBRXJCLFdBQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQztnQ0FDN0IsR0FBRyxFQUFFLElBQUksQ0FBQyxHQUFHO2dDQUNiLElBQUksd0JBQ0MsSUFBQSxtQkFBWSxFQUFDLElBQUksQ0FBQyxLQUNyQixNQUFNLEVBQUUsSUFBSSxHQUNiO2dDQUNELE1BQU0sRUFBRSxJQUFJO2dDQUNaLE9BQU8sRUFBRSxPQUFPLGFBQVAsT0FBTyx1QkFBUCxPQUFPLENBQUUsT0FBTzs2QkFDMUIsQ0FBQyxFQUFBOzt3QkFSSSxPQUFPLEdBQUcsU0FRZDt3QkFDSSxNQUFNLEdBQUcsSUFBQSwwQkFBa0IsRUFBQyxPQUFPLENBQW1CLENBQUE7d0JBRXRELGlCQUFpQixHQUFHLElBQUEsMEJBQWtCLEVBQTBCLE1BQU0sQ0FBQyxDQUFBO3dCQUN2RSxhQUFhLEdBQUcsaUJBQWlCLENBQUMsV0FBVyxDQUFDLElBQUksdUJBQWUsQ0FBMkU7NEJBQ2hKLFNBQVMsWUFBQyxLQUFLLEVBQUUsVUFBVTtnQ0FDekIsSUFBTSxVQUFVLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBQyxNQUFNO29DQUMxQyxJQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFBO29DQUM1QixJQUFJLFVBQVUsSUFBSSxJQUFJO3dDQUFFLFVBQVUsR0FBRyxJQUFBLGtDQUEwQixFQUFDLE9BQU8sQ0FBQyxDQUFBO29DQUN4RSxJQUFJLFVBQVUsRUFBRTt3Q0FDZCw2QkFDSyxNQUFNLEtBQ1QsYUFBYSxFQUFFLFlBQVksRUFDM0IsS0FBSyxFQUFFLE9BQU8sSUFDZjtxQ0FDRjtvQ0FDRCxPQUFPLE1BQU0sQ0FBQTtnQ0FDZixDQUFDLENBQUMsQ0FBQTtnQ0FDRixJQUFNLFFBQVEseUJBQVEsS0FBSyxLQUFFLE9BQU8sRUFBRSxVQUFVLEdBQUUsQ0FBQTtnQ0FDbEQsVUFBVSxDQUFDLE9BQU8sdUJBQU0sUUFBUSxLQUFFLFdBQVcsRUFBRSxLQUFLLElBQUcsQ0FBQTs0QkFDekQsQ0FBQzt5QkFDRixDQUFDLENBQUUsQ0FBQTt3QkFFSixXQUFPLElBQUEsMkJBQW1CLEVBQUMsYUFBYSxDQUFDLEVBQUE7Ozs7S0FDMUM7SUFDSCw2QkFBQztBQUFELENBQUMsQUE3REQsSUE2REM7QUE3RFksd0RBQXNCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgY3JlYXRlQXN5bmNJdGVyYWJsZSxcbiAgVHJhbnNmb3JtU3RyZWFtLFxuICB0b1BvbHlmaWxsUmVhZGFibGUsXG4gIGludG9TdGFuZGFyZFN0cmVhbSxcbiAgaXNUb29sQ2FsbEFzc2lzdGFudE1lc3NhZ2UsXG59IGZyb20gJy4uLy4uL3V0aWxzJ1xuaW1wb3J0IHR5cGUge1xuICBNb2RlbFJlcSxcbiAgQmFzZUNoYXRNb2RlbElucHV0LFxuICBTaW1wbGVDaGF0TW9kZWwsXG4gIERvU3RyZWFtT3V0cHV0LFxuICBCYXNlRG9TdHJlYW1PdXRwdXRDaHVuayxcbiAgRG9HZW5lcmF0ZU91dHB1dCxcbiAgUmVxT3B0aW9ucyxcbn0gZnJvbSAnLi4vLi4vdHlwZSdcbmltcG9ydCB7IHByb2Nlc3NJbnB1dCB9IGZyb20gJy4uL0h1bll1YW4vdXRpbCdcbmltcG9ydCB7IEh1bll1YW5HZW5lcmF0ZVRleHRPdXRwdXQsIEh1bll1YW5TdHJlYW1UZXh0T3V0cHV0IH0gZnJvbSAnLi4vSHVuWXVhbi90eXBlJ1xuXG5leHBvcnQgY2xhc3MgSHVuWXVhbkJldGFTaW1wbGVNb2RlbCBpbXBsZW1lbnRzIFNpbXBsZUNoYXRNb2RlbCB7XG4gIHB1YmxpYyBzdWJVcmwgPSAnaHVueXVhbi1iZXRhL29wZW5hcGkvdjEvY2hhdC9jb21wbGV0aW9ucydcbiAgY29uc3RydWN0b3IocHJpdmF0ZSByZXE6IE1vZGVsUmVxLCBwdWJsaWMgYmFzZVVybDogc3RyaW5nLCBzdWJVcmw/OiBzdHJpbmcpIHtcbiAgICBpZiAoc3ViVXJsICE9IG51bGwpIHtcbiAgICAgIHRoaXMuc3ViVXJsID0gc3ViVXJsXG4gICAgfVxuICB9XG5cbiAgcHJpdmF0ZSBnZXQgdXJsKCkge1xuICAgIHJldHVybiBgJHt0aGlzLmJhc2VVcmx9LyR7dGhpcy5zdWJVcmx9YFxuICB9XG5cbiAgcHVibGljIGFzeW5jIGRvR2VuZXJhdGUoZGF0YTogQmFzZUNoYXRNb2RlbElucHV0LCBvcHRpb25zPzogUmVxT3B0aW9ucyk6IFByb21pc2U8RG9HZW5lcmF0ZU91dHB1dD4ge1xuICAgIGNvbnN0IHJlcyA9IChhd2FpdCB0aGlzLnJlcSh7XG4gICAgICB1cmw6IHRoaXMudXJsLFxuICAgICAgZGF0YToge1xuICAgICAgICAuLi5wcm9jZXNzSW5wdXQoZGF0YSksXG4gICAgICAgIHN0cmVhbTogZmFsc2UsXG4gICAgICB9LFxuICAgICAgc3RyZWFtOiBmYWxzZSxcbiAgICAgIHRpbWVvdXQ6IG9wdGlvbnM/LnRpbWVvdXQsXG4gICAgfSkpIGFzIEh1bll1YW5HZW5lcmF0ZVRleHRPdXRwdXRcbiAgICByZXR1cm4geyAuLi5yZXMsIHJhd1Jlc3BvbnNlOiByZXMgfVxuICB9XG5cbiAgcHVibGljIGFzeW5jIGRvU3RyZWFtKGRhdGE6IEJhc2VDaGF0TW9kZWxJbnB1dCwgb3B0aW9ucz86IFJlcU9wdGlvbnMpOiBQcm9taXNlPERvU3RyZWFtT3V0cHV0PiB7XG4gICAgbGV0IGlzVG9vbENhbGw6IG51bGwgfCBib29sZWFuID0gbnVsbFxuXG4gICAgY29uc3QgX3N0cmVhbSA9IGF3YWl0IHRoaXMucmVxKHtcbiAgICAgIHVybDogdGhpcy51cmwsXG4gICAgICBkYXRhOiB7XG4gICAgICAgIC4uLnByb2Nlc3NJbnB1dChkYXRhKSxcbiAgICAgICAgc3RyZWFtOiB0cnVlLFxuICAgICAgfSxcbiAgICAgIHN0cmVhbTogdHJ1ZSxcbiAgICAgIHRpbWVvdXQ6IG9wdGlvbnM/LnRpbWVvdXQsXG4gICAgfSlcbiAgICBjb25zdCBzdHJlYW0gPSB0b1BvbHlmaWxsUmVhZGFibGUoX3N0cmVhbSkgYXMgdHlwZW9mIF9zdHJlYW1cblxuICAgIGNvbnN0IGh1bnl1YW5CZXRhU3RyZWFtID0gaW50b1N0YW5kYXJkU3RyZWFtPEh1bll1YW5TdHJlYW1UZXh0T3V0cHV0PihzdHJlYW0pXG4gICAgY29uc3Qgc3RyZWFtV2l0aFJhdyA9IGh1bnl1YW5CZXRhU3RyZWFtLnBpcGVUaHJvdWdoKG5ldyBUcmFuc2Zvcm1TdHJlYW08SHVuWXVhblN0cmVhbVRleHRPdXRwdXQsIEJhc2VEb1N0cmVhbU91dHB1dENodW5rICYgeyByYXdSZXNwb25zZT86IGFueSB9Pih7XG4gICAgICB0cmFuc2Zvcm0oY2h1bmssIGNvbnRyb2xsZXIpIHtcbiAgICAgICAgY29uc3QgbmV3Q2hvaWNlcyA9IGNodW5rLmNob2ljZXMubWFwKChjaG9pY2UpID0+IHtcbiAgICAgICAgICBjb25zdCBtZXNzYWdlID0gY2hvaWNlLmRlbHRhXG4gICAgICAgICAgaWYgKGlzVG9vbENhbGwgPT0gbnVsbCkgaXNUb29sQ2FsbCA9IGlzVG9vbENhbGxBc3Npc3RhbnRNZXNzYWdlKG1lc3NhZ2UpXG4gICAgICAgICAgaWYgKGlzVG9vbENhbGwpIHtcbiAgICAgICAgICAgIHJldHVybiB7XG4gICAgICAgICAgICAgIC4uLmNob2ljZSxcbiAgICAgICAgICAgICAgZmluaXNoX3JlYXNvbjogJ3Rvb2xfY2FsbHMnLFxuICAgICAgICAgICAgICBkZWx0YTogbWVzc2FnZSxcbiAgICAgICAgICAgIH1cbiAgICAgICAgICB9XG4gICAgICAgICAgcmV0dXJuIGNob2ljZVxuICAgICAgICB9KVxuICAgICAgICBjb25zdCBuZXdDaHVuayA9IHsgLi4uY2h1bmssIGNob2ljZXM6IG5ld0Nob2ljZXMgfVxuICAgICAgICBjb250cm9sbGVyLmVucXVldWUoeyAuLi5uZXdDaHVuaywgcmF3UmVzcG9uc2U6IGNodW5rIH0pXG4gICAgICB9LFxuICAgIH0pLClcblxuICAgIHJldHVybiBjcmVhdGVBc3luY0l0ZXJhYmxlKHN0cmVhbVdpdGhSYXcpXG4gIH1cbn1cbiJdfQ==
|
|
@@ -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
|
}
|
|
@@ -66,7 +66,7 @@ var HunYuanOpenSimpleModel = (function () {
|
|
|
66
66
|
enumerable: false,
|
|
67
67
|
configurable: true
|
|
68
68
|
});
|
|
69
|
-
HunYuanOpenSimpleModel.prototype.doGenerate = function (data) {
|
|
69
|
+
HunYuanOpenSimpleModel.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 HunYuanOpenSimpleModel = (function () {
|
|
|
75
75
|
url: this.url,
|
|
76
76
|
data: __assign(__assign({}, (0, util_1.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 HunYuanOpenSimpleModel = (function () {
|
|
|
83
84
|
});
|
|
84
85
|
});
|
|
85
86
|
};
|
|
86
|
-
HunYuanOpenSimpleModel.prototype.doStream = function (data) {
|
|
87
|
+
HunYuanOpenSimpleModel.prototype.doStream = function (data, options) {
|
|
87
88
|
return __awaiter(this, void 0, void 0, function () {
|
|
88
89
|
var isToolCall, _stream, stream, hunyuanBetaStream, streamWithRaw;
|
|
89
90
|
return __generator(this, function (_a) {
|
|
@@ -94,6 +95,7 @@ var HunYuanOpenSimpleModel = (function () {
|
|
|
94
95
|
url: this.url,
|
|
95
96
|
data: __assign(__assign({}, (0, util_1.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 HunYuanOpenSimpleModel = (function () {
|
|
|
122
124
|
return HunYuanOpenSimpleModel;
|
|
123
125
|
}());
|
|
124
126
|
exports.HunYuanOpenSimpleModel = HunYuanOpenSimpleModel;
|
|
125
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
127
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbW9kZWxzL0h1bll1YW5PcGVuL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEscUNBTW9CO0FBVXBCLHdDQUE4QztBQUc5QztJQUVFLGdDQUFvQixHQUFhLEVBQVMsT0FBZSxFQUFFLE1BQWU7UUFBdEQsUUFBRyxHQUFILEdBQUcsQ0FBVTtRQUFTLFlBQU8sR0FBUCxPQUFPLENBQVE7UUFEbEQsV0FBTSxHQUFHLGtDQUFrQyxDQUFBO1FBRWhELElBQUksTUFBTSxJQUFJLElBQUksRUFBRTtZQUNsQixJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQTtTQUNyQjtJQUNILENBQUM7SUFFRCxzQkFBWSx1Q0FBRzthQUFmO1lBQ0UsT0FBTyxVQUFHLElBQUksQ0FBQyxPQUFPLGNBQUksSUFBSSxDQUFDLE1BQU0sQ0FBRSxDQUFBO1FBQ3pDLENBQUM7OztPQUFBO0lBRVksMkNBQVUsR0FBdkIsVUFBd0IsSUFBd0IsRUFBRSxPQUFvQjs7Ozs7NEJBQ3ZELFdBQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQzs0QkFDMUIsR0FBRyxFQUFFLElBQUksQ0FBQyxHQUFHOzRCQUNiLElBQUksd0JBQ0MsSUFBQSxtQkFBWSxFQUFDLElBQUksQ0FBQyxLQUNyQixNQUFNLEVBQUUsS0FBSyxHQUNkOzRCQUNELE1BQU0sRUFBRSxLQUFLOzRCQUNiLE9BQU8sRUFBRSxPQUFPLGFBQVAsT0FBTyx1QkFBUCxPQUFPLENBQUUsT0FBTzt5QkFDMUIsQ0FBQyxFQUFBOzt3QkFSSSxHQUFHLEdBQUcsQ0FBQyxTQVFYLENBQThCO3dCQUNoQyxpQ0FBWSxHQUFHLEtBQUUsV0FBVyxFQUFFLEdBQUcsS0FBRTs7OztLQUNwQztJQUVZLHlDQUFRLEdBQXJCLFVBQXNCLElBQXdCLEVBQUUsT0FBb0I7Ozs7Ozt3QkFDOUQsVUFBVSxHQUFtQixJQUFJLENBQUE7d0JBRXJCLFdBQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQztnQ0FDN0IsR0FBRyxFQUFFLElBQUksQ0FBQyxHQUFHO2dDQUNiLElBQUksd0JBQ0MsSUFBQSxtQkFBWSxFQUFDLElBQUksQ0FBQyxLQUNyQixNQUFNLEVBQUUsSUFBSSxHQUNiO2dDQUNELE1BQU0sRUFBRSxJQUFJO2dDQUNaLE9BQU8sRUFBRSxPQUFPLGFBQVAsT0FBTyx1QkFBUCxPQUFPLENBQUUsT0FBTzs2QkFDMUIsQ0FBQyxFQUFBOzt3QkFSSSxPQUFPLEdBQUcsU0FRZDt3QkFDSSxNQUFNLEdBQUcsSUFBQSwwQkFBa0IsRUFBQyxPQUFPLENBQW1CLENBQUE7d0JBRXRELGlCQUFpQixHQUFHLElBQUEsMEJBQWtCLEVBQTBCLE1BQU0sQ0FBQyxDQUFBO3dCQUN2RSxhQUFhLEdBQUcsaUJBQWlCLENBQUMsV0FBVyxDQUFDLElBQUksdUJBQWUsQ0FBMkU7NEJBQ2hKLFNBQVMsWUFBQyxLQUFLLEVBQUUsVUFBVTtnQ0FDekIsSUFBTSxVQUFVLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBQyxNQUFNO29DQUMxQyxJQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFBO29DQUM1QixJQUFJLFVBQVUsSUFBSSxJQUFJO3dDQUFFLFVBQVUsR0FBRyxJQUFBLGtDQUEwQixFQUFDLE9BQU8sQ0FBQyxDQUFBO29DQUN4RSxJQUFJLFVBQVUsRUFBRTt3Q0FDZCw2QkFDSyxNQUFNLEtBQ1QsYUFBYSxFQUFFLFlBQVksRUFDM0IsS0FBSyxFQUFFLE9BQU8sSUFDZjtxQ0FDRjtvQ0FDRCxPQUFPLE1BQU0sQ0FBQTtnQ0FDZixDQUFDLENBQUMsQ0FBQTtnQ0FDRixJQUFNLFFBQVEseUJBQVEsS0FBSyxLQUFFLE9BQU8sRUFBRSxVQUFVLEdBQUUsQ0FBQTtnQ0FDbEQsVUFBVSxDQUFDLE9BQU8sdUJBQU0sUUFBUSxLQUFFLFdBQVcsRUFBRSxLQUFLLElBQUcsQ0FBQTs0QkFDekQsQ0FBQzt5QkFDRixDQUFDLENBQUUsQ0FBQTt3QkFFSixXQUFPLElBQUEsMkJBQW1CLEVBQUMsYUFBYSxDQUFDLEVBQUE7Ozs7S0FDMUM7SUFDSCw2QkFBQztBQUFELENBQUMsQUE3REQsSUE2REM7QUE3RFksd0RBQXNCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgY3JlYXRlQXN5bmNJdGVyYWJsZSxcbiAgVHJhbnNmb3JtU3RyZWFtLFxuICB0b1BvbHlmaWxsUmVhZGFibGUsXG4gIGludG9TdGFuZGFyZFN0cmVhbSxcbiAgaXNUb29sQ2FsbEFzc2lzdGFudE1lc3NhZ2UsXG59IGZyb20gJy4uLy4uL3V0aWxzJ1xuaW1wb3J0IHR5cGUge1xuICBNb2RlbFJlcSxcbiAgQmFzZUNoYXRNb2RlbElucHV0LFxuICBTaW1wbGVDaGF0TW9kZWwsXG4gIERvU3RyZWFtT3V0cHV0LFxuICBCYXNlRG9TdHJlYW1PdXRwdXRDaHVuayxcbiAgRG9HZW5lcmF0ZU91dHB1dCxcbiAgUmVxT3B0aW9ucyxcbn0gZnJvbSAnLi4vLi4vdHlwZSdcbmltcG9ydCB7IHByb2Nlc3NJbnB1dCB9IGZyb20gJy4uL0h1bll1YW4vdXRpbCdcbmltcG9ydCB7IEh1bll1YW5HZW5lcmF0ZVRleHRPdXRwdXQsIEh1bll1YW5TdHJlYW1UZXh0T3V0cHV0IH0gZnJvbSAnLi4vSHVuWXVhbi90eXBlJ1xuXG5leHBvcnQgY2xhc3MgSHVuWXVhbk9wZW5TaW1wbGVNb2RlbCBpbXBsZW1lbnRzIFNpbXBsZUNoYXRNb2RlbCB7XG4gIHB1YmxpYyBzdWJVcmwgPSAnaHVueXVhbi1vcGVuL3YxL2NoYXQvY29tcGxldGlvbnMnXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgcmVxOiBNb2RlbFJlcSwgcHVibGljIGJhc2VVcmw6IHN0cmluZywgc3ViVXJsPzogc3RyaW5nKSB7XG4gICAgaWYgKHN1YlVybCAhPSBudWxsKSB7XG4gICAgICB0aGlzLnN1YlVybCA9IHN1YlVybFxuICAgIH1cbiAgfVxuXG4gIHByaXZhdGUgZ2V0IHVybCgpIHtcbiAgICByZXR1cm4gYCR7dGhpcy5iYXNlVXJsfS8ke3RoaXMuc3ViVXJsfWBcbiAgfVxuXG4gIHB1YmxpYyBhc3luYyBkb0dlbmVyYXRlKGRhdGE6IEJhc2VDaGF0TW9kZWxJbnB1dCwgb3B0aW9ucz86IFJlcU9wdGlvbnMpOiBQcm9taXNlPERvR2VuZXJhdGVPdXRwdXQ+IHtcbiAgICBjb25zdCByZXMgPSAoYXdhaXQgdGhpcy5yZXEoe1xuICAgICAgdXJsOiB0aGlzLnVybCxcbiAgICAgIGRhdGE6IHtcbiAgICAgICAgLi4ucHJvY2Vzc0lucHV0KGRhdGEpLFxuICAgICAgICBzdHJlYW06IGZhbHNlLFxuICAgICAgfSxcbiAgICAgIHN0cmVhbTogZmFsc2UsXG4gICAgICB0aW1lb3V0OiBvcHRpb25zPy50aW1lb3V0LFxuICAgIH0pKSBhcyBIdW5ZdWFuR2VuZXJhdGVUZXh0T3V0cHV0XG4gICAgcmV0dXJuIHsgLi4ucmVzLCByYXdSZXNwb25zZTogcmVzIH1cbiAgfVxuXG4gIHB1YmxpYyBhc3luYyBkb1N0cmVhbShkYXRhOiBCYXNlQ2hhdE1vZGVsSW5wdXQsIG9wdGlvbnM/OiBSZXFPcHRpb25zKTogUHJvbWlzZTxEb1N0cmVhbU91dHB1dD4ge1xuICAgIGxldCBpc1Rvb2xDYWxsOiBudWxsIHwgYm9vbGVhbiA9IG51bGxcblxuICAgIGNvbnN0IF9zdHJlYW0gPSBhd2FpdCB0aGlzLnJlcSh7XG4gICAgICB1cmw6IHRoaXMudXJsLFxuICAgICAgZGF0YToge1xuICAgICAgICAuLi5wcm9jZXNzSW5wdXQoZGF0YSksXG4gICAgICAgIHN0cmVhbTogdHJ1ZSxcbiAgICAgIH0sXG4gICAgICBzdHJlYW06IHRydWUsXG4gICAgICB0aW1lb3V0OiBvcHRpb25zPy50aW1lb3V0LFxuICAgIH0pXG4gICAgY29uc3Qgc3RyZWFtID0gdG9Qb2x5ZmlsbFJlYWRhYmxlKF9zdHJlYW0pIGFzIHR5cGVvZiBfc3RyZWFtXG5cbiAgICBjb25zdCBodW55dWFuQmV0YVN0cmVhbSA9IGludG9TdGFuZGFyZFN0cmVhbTxIdW5ZdWFuU3RyZWFtVGV4dE91dHB1dD4oc3RyZWFtKVxuICAgIGNvbnN0IHN0cmVhbVdpdGhSYXcgPSBodW55dWFuQmV0YVN0cmVhbS5waXBlVGhyb3VnaChuZXcgVHJhbnNmb3JtU3RyZWFtPEh1bll1YW5TdHJlYW1UZXh0T3V0cHV0LCBCYXNlRG9TdHJlYW1PdXRwdXRDaHVuayAmIHsgcmF3UmVzcG9uc2U/OiBhbnkgfT4oe1xuICAgICAgdHJhbnNmb3JtKGNodW5rLCBjb250cm9sbGVyKSB7XG4gICAgICAgIGNvbnN0IG5ld0Nob2ljZXMgPSBjaHVuay5jaG9pY2VzLm1hcCgoY2hvaWNlKSA9PiB7XG4gICAgICAgICAgY29uc3QgbWVzc2FnZSA9IGNob2ljZS5kZWx0YVxuICAgICAgICAgIGlmIChpc1Rvb2xDYWxsID09IG51bGwpIGlzVG9vbENhbGwgPSBpc1Rvb2xDYWxsQXNzaXN0YW50TWVzc2FnZShtZXNzYWdlKVxuICAgICAgICAgIGlmIChpc1Rvb2xDYWxsKSB7XG4gICAgICAgICAgICByZXR1cm4ge1xuICAgICAgICAgICAgICAuLi5jaG9pY2UsXG4gICAgICAgICAgICAgIGZpbmlzaF9yZWFzb246ICd0b29sX2NhbGxzJyxcbiAgICAgICAgICAgICAgZGVsdGE6IG1lc3NhZ2UsXG4gICAgICAgICAgICB9XG4gICAgICAgICAgfVxuICAgICAgICAgIHJldHVybiBjaG9pY2VcbiAgICAgICAgfSlcbiAgICAgICAgY29uc3QgbmV3Q2h1bmsgPSB7IC4uLmNodW5rLCBjaG9pY2VzOiBuZXdDaG9pY2VzIH1cbiAgICAgICAgY29udHJvbGxlci5lbnF1ZXVlKHsgLi4ubmV3Q2h1bmssIHJhd1Jlc3BvbnNlOiBjaHVuayB9KVxuICAgICAgfSxcbiAgICB9KSwpXG5cbiAgICByZXR1cm4gY3JlYXRlQXN5bmNJdGVyYWJsZShzdHJlYW1XaXRoUmF3KVxuICB9XG59XG4iXX0=
|
|
@@ -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
|
}
|
|
@@ -69,7 +69,7 @@ var MoonshotSimpleModel = (function () {
|
|
|
69
69
|
enumerable: false,
|
|
70
70
|
configurable: true
|
|
71
71
|
});
|
|
72
|
-
MoonshotSimpleModel.prototype.doGenerate = function (data) {
|
|
72
|
+
MoonshotSimpleModel.prototype.doGenerate = function (data, options) {
|
|
73
73
|
return __awaiter(this, void 0, void 0, function () {
|
|
74
74
|
var res;
|
|
75
75
|
return __generator(this, function (_a) {
|
|
@@ -78,6 +78,7 @@ var MoonshotSimpleModel = (function () {
|
|
|
78
78
|
url: this.url,
|
|
79
79
|
data: __assign(__assign({}, processInput(data)), { stream: false }),
|
|
80
80
|
stream: false,
|
|
81
|
+
timeout: options === null || options === void 0 ? void 0 : options.timeout,
|
|
81
82
|
})];
|
|
82
83
|
case 1:
|
|
83
84
|
res = (_a.sent());
|
|
@@ -86,7 +87,7 @@ var MoonshotSimpleModel = (function () {
|
|
|
86
87
|
});
|
|
87
88
|
});
|
|
88
89
|
};
|
|
89
|
-
MoonshotSimpleModel.prototype.doStream = function (data) {
|
|
90
|
+
MoonshotSimpleModel.prototype.doStream = function (data, options) {
|
|
90
91
|
return __awaiter(this, void 0, void 0, function () {
|
|
91
92
|
var isToolCall, _stream, stream, arkStream, streamWithRaw;
|
|
92
93
|
return __generator(this, function (_a) {
|
|
@@ -97,6 +98,7 @@ var MoonshotSimpleModel = (function () {
|
|
|
97
98
|
url: this.url,
|
|
98
99
|
data: __assign(__assign({}, processInput(data)), { stream: true }),
|
|
99
100
|
stream: true,
|
|
101
|
+
timeout: options === null || options === void 0 ? void 0 : options.timeout,
|
|
100
102
|
})];
|
|
101
103
|
case 1:
|
|
102
104
|
_stream = _a.sent();
|
|
@@ -125,4 +127,4 @@ var MoonshotSimpleModel = (function () {
|
|
|
125
127
|
return MoonshotSimpleModel;
|
|
126
128
|
}());
|
|
127
129
|
exports.MoonshotSimpleModel = MoonshotSimpleModel;
|
|
128
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
130
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbW9kZWxzL01vb25zaG90L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEscUNBTW9CO0FBWXBCLFNBQVMsWUFBWSxDQUFDLEtBQXlCO0lBQ3JDLElBQUEsUUFBUSxHQUF1QyxLQUFLLFNBQTVDLEVBQUUsS0FBSyxHQUFnQyxLQUFLLE1BQXJDLEVBQUUsV0FBVyxHQUFtQixLQUFLLFlBQXhCLEVBQUUsS0FBSyxHQUFZLEtBQUssTUFBakIsRUFBRSxLQUFLLEdBQUssS0FBSyxNQUFWLENBQVU7SUFFNUQsNkJBQ0ssS0FBSyxLQUNSLFFBQVEsVUFBQSxFQUNSLEtBQUssT0FBQSxFQUNMLEtBQUssT0FBQSxFQUNMLEtBQUssT0FBQSxFQUNMLFdBQVcsYUFBQSxJQUNaO0FBQ0gsQ0FBQztBQUVEO0lBRUUsNkJBQW9CLEdBQWEsRUFBUyxPQUFlLEVBQUUsTUFBZTtRQUF0RCxRQUFHLEdBQUgsR0FBRyxDQUFVO1FBQVMsWUFBTyxHQUFQLE9BQU8sQ0FBUTtRQURsRCxXQUFNLEdBQUcsOEJBQThCLENBQUE7UUFFNUMsSUFBSSxNQUFNLElBQUksSUFBSSxFQUFFO1lBQ2xCLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFBO1NBQ3JCO0lBQ0gsQ0FBQztJQUVELHNCQUFZLG9DQUFHO2FBQWY7WUFDRSxPQUFPLFVBQUcsSUFBSSxDQUFDLE9BQU8sY0FBSSxJQUFJLENBQUMsTUFBTSxDQUFFLENBQUE7UUFDekMsQ0FBQzs7O09BQUE7SUFFWSx3Q0FBVSxHQUF2QixVQUF3QixJQUF3QixFQUFFLE9BQW9COzs7Ozs0QkFDdkQsV0FBTSxJQUFJLENBQUMsR0FBRyxDQUFDOzRCQUMxQixHQUFHLEVBQUUsSUFBSSxDQUFDLEdBQUc7NEJBQ2IsSUFBSSx3QkFDQyxZQUFZLENBQUMsSUFBSSxDQUFDLEtBQ3JCLE1BQU0sRUFBRSxLQUFLLEdBQ2Q7NEJBQ0QsTUFBTSxFQUFFLEtBQUs7NEJBQ2IsT0FBTyxFQUFFLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxPQUFPO3lCQUMxQixDQUFDLEVBQUE7O3dCQVJJLEdBQUcsR0FBRyxDQUFDLFNBUVgsQ0FBK0I7d0JBQ2pDLGlDQUFZLEdBQUcsS0FBRSxXQUFXLEVBQUUsR0FBRyxLQUFFOzs7O0tBQ3BDO0lBRVksc0NBQVEsR0FBckIsVUFBc0IsSUFBd0IsRUFBRSxPQUFvQjs7Ozs7O3dCQUM5RCxVQUFVLEdBQW1CLElBQUksQ0FBQTt3QkFDckIsV0FBTSxJQUFJLENBQUMsR0FBRyxDQUFDO2dDQUM3QixHQUFHLEVBQUUsSUFBSSxDQUFDLEdBQUc7Z0NBQ2IsSUFBSSx3QkFDQyxZQUFZLENBQUMsSUFBSSxDQUFDLEtBQ3JCLE1BQU0sRUFBRSxJQUFJLEdBQ2I7Z0NBQ0QsTUFBTSxFQUFFLElBQUk7Z0NBQ1osT0FBTyxFQUFFLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxPQUFPOzZCQUMxQixDQUFDLEVBQUE7O3dCQVJJLE9BQU8sR0FBRyxTQVFkO3dCQUNJLE1BQU0sR0FBRyxJQUFBLDBCQUFrQixFQUFDLE9BQU8sQ0FBbUIsQ0FBQTt3QkFFdEQsU0FBUyxHQUFHLElBQUEsMEJBQWtCLEVBQTJCLE1BQU0sQ0FBQyxDQUFBO3dCQUNoRSxhQUFhLEdBQUcsU0FBUyxDQUFDLFdBQVcsQ0FBQyxJQUFJLHVCQUFlLENBQTRFOzRCQUN6SSxTQUFTLFlBQUMsS0FBSyxFQUFFLFVBQVU7Z0NBQ3pCLElBQU0sVUFBVSxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQUMsTUFBTTtvQ0FDMUMsSUFBTSxPQUFPLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQTtvQ0FDNUIsSUFBSSxVQUFVLElBQUksSUFBSTt3Q0FBRSxVQUFVLEdBQUcsSUFBQSxrQ0FBMEIsRUFBQyxPQUFPLENBQUMsQ0FBQTtvQ0FDeEUsSUFBSSxVQUFVLEVBQUU7d0NBQ2QsNkJBQ0ssTUFBTSxLQUNULGFBQWEsRUFBRSxZQUFxQixFQUNwQyxLQUFLLEVBQUUsT0FBTyxJQUNmO3FDQUNGO29DQUNELE9BQU8sTUFBTSxDQUFBO2dDQUNmLENBQUMsQ0FBQyxDQUFBO2dDQUNGLElBQU0sUUFBUSx5QkFBUSxLQUFLLEtBQUUsT0FBTyxFQUFFLFVBQVUsR0FBRSxDQUFBO2dDQUNsRCxVQUFVLENBQUMsT0FBTyx1QkFBTSxRQUFRLEtBQUUsV0FBVyxFQUFFLEtBQUssSUFBRyxDQUFBOzRCQUN6RCxDQUFDO3lCQUNGLENBQUMsQ0FBRSxDQUFBO3dCQUVKLFdBQU8sSUFBQSwyQkFBbUIsRUFBQyxhQUFhLENBQUMsRUFBQTs7OztLQUMxQztJQUNILDBCQUFDO0FBQUQsQ0FBQyxBQTVERCxJQTREQztBQTVEWSxrREFBbUIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBjcmVhdGVBc3luY0l0ZXJhYmxlLFxuICBUcmFuc2Zvcm1TdHJlYW0sXG4gIHRvUG9seWZpbGxSZWFkYWJsZSxcbiAgaW50b1N0YW5kYXJkU3RyZWFtLFxuICBpc1Rvb2xDYWxsQXNzaXN0YW50TWVzc2FnZSxcbn0gZnJvbSAnLi4vLi4vdXRpbHMnXG5pbXBvcnQgdHlwZSB7IE1vb25zaG90R2VuZXJhdGVUZXh0T3V0cHV0LCBNb29uc2hvdFN0cmVhbVRleHRPdXRwdXQsIE1vb25zaG90SW5wdXREYXRhIH0gZnJvbSAnLi90eXBlJ1xuaW1wb3J0IHR5cGUge1xuICBNb2RlbFJlcSxcbiAgQmFzZURvU3RyZWFtT3V0cHV0Q2h1bmssXG4gIERvR2VuZXJhdGVPdXRwdXQsXG4gIERvU3RyZWFtT3V0cHV0LFxuICBTaW1wbGVDaGF0TW9kZWwsXG4gIEJhc2VDaGF0TW9kZWxJbnB1dCxcbiAgUmVxT3B0aW9ucyxcbn0gZnJvbSAnLi4vLi4vdHlwZSdcblxuZnVuY3Rpb24gcHJvY2Vzc0lucHV0KGlucHV0OiBCYXNlQ2hhdE1vZGVsSW5wdXQpOiBNb29uc2hvdElucHV0RGF0YSB7XG4gIGNvbnN0IHsgbWVzc2FnZXMsIG1vZGVsLCB0ZW1wZXJhdHVyZSwgdG9vbHMsIHRvcF9wIH0gPSBpbnB1dFxuXG4gIHJldHVybiB7XG4gICAgLi4uaW5wdXQsXG4gICAgbWVzc2FnZXMsXG4gICAgbW9kZWwsXG4gICAgdG9vbHMsXG4gICAgdG9wX3AsXG4gICAgdGVtcGVyYXR1cmUsXG4gIH1cbn1cblxuZXhwb3J0IGNsYXNzIE1vb25zaG90U2ltcGxlTW9kZWwgaW1wbGVtZW50cyBTaW1wbGVDaGF0TW9kZWwge1xuICBwdWJsaWMgc3ViVXJsID0gJ21vb25zaG90L3YxL2NoYXQvY29tcGxldGlvbnMnXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgcmVxOiBNb2RlbFJlcSwgcHVibGljIGJhc2VVcmw6IHN0cmluZywgc3ViVXJsPzogc3RyaW5nKSB7XG4gICAgaWYgKHN1YlVybCAhPSBudWxsKSB7XG4gICAgICB0aGlzLnN1YlVybCA9IHN1YlVybFxuICAgIH1cbiAgfVxuXG4gIHByaXZhdGUgZ2V0IHVybCgpIHtcbiAgICByZXR1cm4gYCR7dGhpcy5iYXNlVXJsfS8ke3RoaXMuc3ViVXJsfWBcbiAgfVxuXG4gIHB1YmxpYyBhc3luYyBkb0dlbmVyYXRlKGRhdGE6IEJhc2VDaGF0TW9kZWxJbnB1dCwgb3B0aW9ucz86IFJlcU9wdGlvbnMpOiBQcm9taXNlPERvR2VuZXJhdGVPdXRwdXQ+IHtcbiAgICBjb25zdCByZXMgPSAoYXdhaXQgdGhpcy5yZXEoe1xuICAgICAgdXJsOiB0aGlzLnVybCxcbiAgICAgIGRhdGE6IHtcbiAgICAgICAgLi4ucHJvY2Vzc0lucHV0KGRhdGEpLFxuICAgICAgICBzdHJlYW06IGZhbHNlLFxuICAgICAgfSxcbiAgICAgIHN0cmVhbTogZmFsc2UsXG4gICAgICB0aW1lb3V0OiBvcHRpb25zPy50aW1lb3V0LFxuICAgIH0pKSBhcyBNb29uc2hvdEdlbmVyYXRlVGV4dE91dHB1dFxuICAgIHJldHVybiB7IC4uLnJlcywgcmF3UmVzcG9uc2U6IHJlcyB9XG4gIH1cblxuICBwdWJsaWMgYXN5bmMgZG9TdHJlYW0oZGF0YTogQmFzZUNoYXRNb2RlbElucHV0LCBvcHRpb25zPzogUmVxT3B0aW9ucyk6IFByb21pc2U8RG9TdHJlYW1PdXRwdXQ+IHtcbiAgICBsZXQgaXNUb29sQ2FsbDogbnVsbCB8IGJvb2xlYW4gPSBudWxsXG4gICAgY29uc3QgX3N0cmVhbSA9IGF3YWl0IHRoaXMucmVxKHtcbiAgICAgIHVybDogdGhpcy51cmwsXG4gICAgICBkYXRhOiB7XG4gICAgICAgIC4uLnByb2Nlc3NJbnB1dChkYXRhKSxcbiAgICAgICAgc3RyZWFtOiB0cnVlLFxuICAgICAgfSxcbiAgICAgIHN0cmVhbTogdHJ1ZSxcbiAgICAgIHRpbWVvdXQ6IG9wdGlvbnM/LnRpbWVvdXQsXG4gICAgfSlcbiAgICBjb25zdCBzdHJlYW0gPSB0b1BvbHlmaWxsUmVhZGFibGUoX3N0cmVhbSkgYXMgdHlwZW9mIF9zdHJlYW1cblxuICAgIGNvbnN0IGFya1N0cmVhbSA9IGludG9TdGFuZGFyZFN0cmVhbTxNb29uc2hvdFN0cmVhbVRleHRPdXRwdXQ+KHN0cmVhbSlcbiAgICBjb25zdCBzdHJlYW1XaXRoUmF3ID0gYXJrU3RyZWFtLnBpcGVUaHJvdWdoKG5ldyBUcmFuc2Zvcm1TdHJlYW08TW9vbnNob3RTdHJlYW1UZXh0T3V0cHV0LCBCYXNlRG9TdHJlYW1PdXRwdXRDaHVuayAmIHsgcmF3UmVzcG9uc2U/OiBhbnkgfT4oe1xuICAgICAgdHJhbnNmb3JtKGNodW5rLCBjb250cm9sbGVyKSB7XG4gICAgICAgIGNvbnN0IG5ld0Nob2ljZXMgPSBjaHVuay5jaG9pY2VzLm1hcCgoY2hvaWNlKSA9PiB7XG4gICAgICAgICAgY29uc3QgbWVzc2FnZSA9IGNob2ljZS5kZWx0YVxuICAgICAgICAgIGlmIChpc1Rvb2xDYWxsID09IG51bGwpIGlzVG9vbENhbGwgPSBpc1Rvb2xDYWxsQXNzaXN0YW50TWVzc2FnZShtZXNzYWdlKVxuICAgICAgICAgIGlmIChpc1Rvb2xDYWxsKSB7XG4gICAgICAgICAgICByZXR1cm4ge1xuICAgICAgICAgICAgICAuLi5jaG9pY2UsXG4gICAgICAgICAgICAgIGZpbmlzaF9yZWFzb246ICd0b29sX2NhbGxzJyBhcyBjb25zdCxcbiAgICAgICAgICAgICAgZGVsdGE6IG1lc3NhZ2UsXG4gICAgICAgICAgICB9XG4gICAgICAgICAgfVxuICAgICAgICAgIHJldHVybiBjaG9pY2VcbiAgICAgICAgfSlcbiAgICAgICAgY29uc3QgbmV3Q2h1bmsgPSB7IC4uLmNodW5rLCBjaG9pY2VzOiBuZXdDaG9pY2VzIH1cbiAgICAgICAgY29udHJvbGxlci5lbnF1ZXVlKHsgLi4ubmV3Q2h1bmssIHJhd1Jlc3BvbnNlOiBjaHVuayB9KVxuICAgICAgfSxcbiAgICB9KSwpXG5cbiAgICByZXR1cm4gY3JlYXRlQXN5bmNJdGVyYWJsZShzdHJlYW1XaXRoUmF3KVxuICB9XG59XG4iXX0=
|
|
@@ -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
|
}
|
|
@@ -69,7 +69,7 @@ var YiSimpleModel = (function () {
|
|
|
69
69
|
enumerable: false,
|
|
70
70
|
configurable: true
|
|
71
71
|
});
|
|
72
|
-
YiSimpleModel.prototype.doGenerate = function (data) {
|
|
72
|
+
YiSimpleModel.prototype.doGenerate = function (data, options) {
|
|
73
73
|
return __awaiter(this, void 0, void 0, function () {
|
|
74
74
|
var res;
|
|
75
75
|
return __generator(this, function (_a) {
|
|
@@ -78,6 +78,7 @@ var YiSimpleModel = (function () {
|
|
|
78
78
|
url: this.url,
|
|
79
79
|
data: __assign(__assign({}, processInput(data)), { stream: false }),
|
|
80
80
|
stream: false,
|
|
81
|
+
timeout: options === null || options === void 0 ? void 0 : options.timeout,
|
|
81
82
|
})];
|
|
82
83
|
case 1:
|
|
83
84
|
res = (_a.sent());
|
|
@@ -86,7 +87,7 @@ var YiSimpleModel = (function () {
|
|
|
86
87
|
});
|
|
87
88
|
});
|
|
88
89
|
};
|
|
89
|
-
YiSimpleModel.prototype.doStream = function (data) {
|
|
90
|
+
YiSimpleModel.prototype.doStream = function (data, options) {
|
|
90
91
|
return __awaiter(this, void 0, void 0, function () {
|
|
91
92
|
var isToolCall, _stream, stream, arkStream, streamWithRaw;
|
|
92
93
|
return __generator(this, function (_a) {
|
|
@@ -97,6 +98,7 @@ var YiSimpleModel = (function () {
|
|
|
97
98
|
url: this.url,
|
|
98
99
|
data: __assign(__assign({}, processInput(data)), { stream: true }),
|
|
99
100
|
stream: true,
|
|
101
|
+
timeout: options === null || options === void 0 ? void 0 : options.timeout,
|
|
100
102
|
})];
|
|
101
103
|
case 1:
|
|
102
104
|
_stream = _a.sent();
|
|
@@ -128,4 +130,4 @@ var YiSimpleModel = (function () {
|
|
|
128
130
|
return YiSimpleModel;
|
|
129
131
|
}());
|
|
130
132
|
exports.YiSimpleModel = YiSimpleModel;
|
|
131
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
133
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbW9kZWxzL1lpL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEscUNBTW9CO0FBWXBCLFNBQVMsWUFBWSxDQUFDLEtBQXlCO0lBQ3JDLElBQUEsUUFBUSxHQUF1QyxLQUFLLFNBQTVDLEVBQUUsS0FBSyxHQUFnQyxLQUFLLE1BQXJDLEVBQUUsV0FBVyxHQUFtQixLQUFLLFlBQXhCLEVBQUUsS0FBSyxHQUFZLEtBQUssTUFBakIsRUFBRSxLQUFLLEdBQUssS0FBSyxNQUFWLENBQVU7SUFFNUQsNkJBQ0ssS0FBSyxLQUNSLFFBQVEsVUFBQSxFQUNSLEtBQUssT0FBQSxFQUNMLEtBQUssT0FBQSxFQUNMLEtBQUssT0FBQSxFQUNMLFdBQVcsYUFBQSxJQUNaO0FBQ0gsQ0FBQztBQUVEO0lBR0UsdUJBQW9CLEdBQWEsRUFBUyxPQUFlLEVBQUUsTUFBZTtRQUF0RCxRQUFHLEdBQUgsR0FBRyxDQUFVO1FBQVMsWUFBTyxHQUFQLE9BQU8sQ0FBUTtRQUZsRCxXQUFNLEdBQUcsMkJBQTJCLENBQUE7UUFHekMsSUFBSSxNQUFNLElBQUksSUFBSSxFQUFFO1lBQ2xCLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFBO1NBQ3JCO0lBQ0gsQ0FBQztJQUVELHNCQUFZLDhCQUFHO2FBQWY7WUFDRSxPQUFPLFVBQUcsSUFBSSxDQUFDLE9BQU8sY0FBSSxJQUFJLENBQUMsTUFBTSxDQUFFLENBQUE7UUFDekMsQ0FBQzs7O09BQUE7SUFFWSxrQ0FBVSxHQUF2QixVQUF3QixJQUF3QixFQUFFLE9BQW9COzs7Ozs0QkFDdkQsV0FBTSxJQUFJLENBQUMsR0FBRyxDQUFDOzRCQUMxQixHQUFHLEVBQUUsSUFBSSxDQUFDLEdBQUc7NEJBQ2IsSUFBSSx3QkFDQyxZQUFZLENBQUMsSUFBSSxDQUFDLEtBQ3JCLE1BQU0sRUFBRSxLQUFLLEdBQ2Q7NEJBQ0QsTUFBTSxFQUFFLEtBQUs7NEJBQ2IsT0FBTyxFQUFFLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxPQUFPO3lCQUMxQixDQUFDLEVBQUE7O3dCQVJJLEdBQUcsR0FBRyxDQUFDLFNBUVgsQ0FBcUI7d0JBQ3ZCLGlDQUFZLEdBQUcsS0FBRSxXQUFXLEVBQUUsR0FBRyxLQUFFOzs7O0tBQ3BDO0lBRVksZ0NBQVEsR0FBckIsVUFBc0IsSUFBd0IsRUFBRSxPQUFvQjs7Ozs7O3dCQUM5RCxVQUFVLEdBQW1CLElBQUksQ0FBQTt3QkFDckIsV0FBTSxJQUFJLENBQUMsR0FBRyxDQUFDO2dDQUM3QixHQUFHLEVBQUUsSUFBSSxDQUFDLEdBQUc7Z0NBQ2IsSUFBSSx3QkFDQyxZQUFZLENBQUMsSUFBSSxDQUFDLEtBQ3JCLE1BQU0sRUFBRSxJQUFJLEdBQ2I7Z0NBQ0QsTUFBTSxFQUFFLElBQUk7Z0NBQ1osT0FBTyxFQUFFLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxPQUFPOzZCQUMxQixDQUFDLEVBQUE7O3dCQVJJLE9BQU8sR0FBRyxTQVFkO3dCQUNJLE1BQU0sR0FBRyxJQUFBLDBCQUFrQixFQUFDLE9BQU8sQ0FBbUIsQ0FBQTt3QkFFdEQsU0FBUyxHQUFHLElBQUEsMEJBQWtCLEVBQWlCLE1BQU0sQ0FBQyxDQUFBO3dCQUN0RCxhQUFhLEdBQUcsU0FBUyxDQUFDLFdBQVcsQ0FBQyxJQUFJLHVCQUFlLENBQWtFOzRCQUMvSCxTQUFTLFlBQUMsS0FBSyxFQUFFLFVBQVU7O2dDQUV6QixJQUFJLENBQUMsQ0FBQyxDQUFBLE1BQUEsTUFBQSxNQUFBLEtBQUssYUFBTCxLQUFLLHVCQUFMLEtBQUssQ0FBRSxPQUFPLDBDQUFHLENBQUMsQ0FBQywwQ0FBRSxLQUFLLDBDQUFFLE9BQU8sTUFBSSxNQUFBLE1BQUEsTUFBQSxLQUFLLGFBQUwsS0FBSyx1QkFBTCxLQUFLLENBQUUsT0FBTywwQ0FBRyxDQUFDLENBQUMsMENBQUUsS0FBSywwQ0FBRSxVQUFVLENBQUEsQ0FBQztvQ0FBRSxPQUFNO2dDQUU1RixJQUFNLFVBQVUsR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFDLE1BQU07b0NBQzFDLElBQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRSxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsQ0FFaEUsQ0FBQTtvQ0FDRCxJQUFJLFVBQVUsSUFBSSxJQUFJO3dDQUFFLFVBQVUsR0FBRyxJQUFBLGtDQUEwQixFQUFDLE9BQU8sQ0FBQyxDQUFBO29DQUN4RSxJQUFJLFVBQVUsRUFBRTt3Q0FDZCw2QkFDSyxNQUFNLEtBQ1QsYUFBYSxFQUFFLFlBQXFCLEVBQ3BDLEtBQUssRUFBRSxPQUFPLElBQ2Y7cUNBQ0Y7b0NBQ0QsNkJBQVksTUFBTSxLQUFFLEtBQUssRUFBRSxPQUFPLElBQUU7Z0NBQ3RDLENBQUMsQ0FBQyxDQUFBO2dDQUNGLElBQU0sUUFBUSx5QkFBUSxLQUFLLEtBQUUsT0FBTyxFQUFFLFVBQVUsR0FBRSxDQUFBO2dDQUNsRCxVQUFVLENBQUMsT0FBTyx1QkFBTSxRQUFRLEtBQUUsV0FBVyxFQUFFLEtBQUssSUFBRyxDQUFBOzRCQUN6RCxDQUFDO3lCQUNGLENBQUMsQ0FBRSxDQUFBO3dCQUVKLFdBQU8sSUFBQSwyQkFBbUIsRUFBQyxhQUFhLENBQUMsRUFBQTs7OztLQUMxQztJQUNILG9CQUFDO0FBQUQsQ0FBQyxBQWxFRCxJQWtFQztBQWxFWSxzQ0FBYSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIGNyZWF0ZUFzeW5jSXRlcmFibGUsXG4gIFRyYW5zZm9ybVN0cmVhbSxcbiAgdG9Qb2x5ZmlsbFJlYWRhYmxlLFxuICBpbnRvU3RhbmRhcmRTdHJlYW0sXG4gIGlzVG9vbENhbGxBc3Npc3RhbnRNZXNzYWdlLFxufSBmcm9tICcuLi8uLi91dGlscydcbmltcG9ydCB0eXBlIHsgWWlJbnB1dCwgWWlHZW5lcmF0ZU91dHB1dCwgWWlTdHJlYW1PdXRwdXQgfSBmcm9tICcuL3R5cGUnXG5pbXBvcnQgdHlwZSB7XG4gIE1vZGVsUmVxLFxuICBCYXNlQ2hhdE1vZGVsSW5wdXQsXG4gIERvR2VuZXJhdGVPdXRwdXQsXG4gIERvU3RyZWFtT3V0cHV0LFxuICBCYXNlRG9TdHJlYW1PdXRwdXRDaHVuayxcbiAgU2ltcGxlQ2hhdE1vZGVsLFxuICBSZXFPcHRpb25zLFxufSBmcm9tICcuLi8uLi90eXBlJ1xuXG5mdW5jdGlvbiBwcm9jZXNzSW5wdXQoaW5wdXQ6IEJhc2VDaGF0TW9kZWxJbnB1dCk6IFlpSW5wdXQge1xuICBjb25zdCB7IG1lc3NhZ2VzLCBtb2RlbCwgdGVtcGVyYXR1cmUsIHRvb2xzLCB0b3BfcCB9ID0gaW5wdXRcblxuICByZXR1cm4ge1xuICAgIC4uLmlucHV0LFxuICAgIG1lc3NhZ2VzLFxuICAgIG1vZGVsLFxuICAgIHRvb2xzLFxuICAgIHRvcF9wLFxuICAgIHRlbXBlcmF0dXJlLFxuICB9XG59XG5cbmV4cG9ydCBjbGFzcyBZaVNpbXBsZU1vZGVsIGltcGxlbWVudHMgU2ltcGxlQ2hhdE1vZGVsIHtcbiAgcHVibGljIHN1YlVybCA9ICcwMS1haS92MS9jaGF0L2NvbXBsZXRpb25zJ1xuXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgcmVxOiBNb2RlbFJlcSwgcHVibGljIGJhc2VVcmw6IHN0cmluZywgc3ViVXJsPzogc3RyaW5nKSB7XG4gICAgaWYgKHN1YlVybCAhPSBudWxsKSB7XG4gICAgICB0aGlzLnN1YlVybCA9IHN1YlVybFxuICAgIH1cbiAgfVxuXG4gIHByaXZhdGUgZ2V0IHVybCgpIHtcbiAgICByZXR1cm4gYCR7dGhpcy5iYXNlVXJsfS8ke3RoaXMuc3ViVXJsfWBcbiAgfVxuXG4gIHB1YmxpYyBhc3luYyBkb0dlbmVyYXRlKGRhdGE6IEJhc2VDaGF0TW9kZWxJbnB1dCwgb3B0aW9ucz86IFJlcU9wdGlvbnMpOiBQcm9taXNlPERvR2VuZXJhdGVPdXRwdXQ+IHtcbiAgICBjb25zdCByZXMgPSAoYXdhaXQgdGhpcy5yZXEoe1xuICAgICAgdXJsOiB0aGlzLnVybCxcbiAgICAgIGRhdGE6IHtcbiAgICAgICAgLi4ucHJvY2Vzc0lucHV0KGRhdGEpLFxuICAgICAgICBzdHJlYW06IGZhbHNlLFxuICAgICAgfSxcbiAgICAgIHN0cmVhbTogZmFsc2UsXG4gICAgICB0aW1lb3V0OiBvcHRpb25zPy50aW1lb3V0LFxuICAgIH0pKSBhcyBZaUdlbmVyYXRlT3V0cHV0XG4gICAgcmV0dXJuIHsgLi4ucmVzLCByYXdSZXNwb25zZTogcmVzIH1cbiAgfVxuXG4gIHB1YmxpYyBhc3luYyBkb1N0cmVhbShkYXRhOiBCYXNlQ2hhdE1vZGVsSW5wdXQsIG9wdGlvbnM/OiBSZXFPcHRpb25zKTogUHJvbWlzZTxEb1N0cmVhbU91dHB1dD4ge1xuICAgIGxldCBpc1Rvb2xDYWxsOiBudWxsIHwgYm9vbGVhbiA9IG51bGxcbiAgICBjb25zdCBfc3RyZWFtID0gYXdhaXQgdGhpcy5yZXEoe1xuICAgICAgdXJsOiB0aGlzLnVybCxcbiAgICAgIGRhdGE6IHtcbiAgICAgICAgLi4ucHJvY2Vzc0lucHV0KGRhdGEpLFxuICAgICAgICBzdHJlYW06IHRydWUsXG4gICAgICB9LFxuICAgICAgc3RyZWFtOiB0cnVlLFxuICAgICAgdGltZW91dDogb3B0aW9ucz8udGltZW91dCxcbiAgICB9KVxuICAgIGNvbnN0IHN0cmVhbSA9IHRvUG9seWZpbGxSZWFkYWJsZShfc3RyZWFtKSBhcyB0eXBlb2YgX3N0cmVhbVxuXG4gICAgY29uc3QgYXJrU3RyZWFtID0gaW50b1N0YW5kYXJkU3RyZWFtPFlpU3RyZWFtT3V0cHV0PihzdHJlYW0pXG4gICAgY29uc3Qgc3RyZWFtV2l0aFJhdyA9IGFya1N0cmVhbS5waXBlVGhyb3VnaChuZXcgVHJhbnNmb3JtU3RyZWFtPFlpU3RyZWFtT3V0cHV0LCBCYXNlRG9TdHJlYW1PdXRwdXRDaHVuayAmIHsgcmF3UmVzcG9uc2U/OiBhbnkgfT4oe1xuICAgICAgdHJhbnNmb3JtKGNodW5rLCBjb250cm9sbGVyKSB7XG4gICAgICAgIC8vIOmdnuW4uOWlh+iRqVxuICAgICAgICBpZiAoIShjaHVuaz8uY2hvaWNlcz8uWzBdPy5kZWx0YT8uY29udGVudCB8fCBjaHVuaz8uY2hvaWNlcz8uWzBdPy5kZWx0YT8udG9vbF9jYWxscykpIHJldHVyblxuXG4gICAgICAgIGNvbnN0IG5ld0Nob2ljZXMgPSBjaHVuay5jaG9pY2VzLm1hcCgoY2hvaWNlKSA9PiB7XG4gICAgICAgICAgY29uc3QgbWVzc2FnZSA9IE9iamVjdC5hc3NpZ24oY2hvaWNlLmRlbHRhLCB7IHJvbGU6ICdhc3Npc3RhbnQnIH0pIGFzIHR5cGVvZiBjaG9pY2UuZGVsdGEgJiB7XG4gICAgICAgICAgICByb2xlOiAnYXNzaXN0YW50J1xuICAgICAgICAgIH1cbiAgICAgICAgICBpZiAoaXNUb29sQ2FsbCA9PSBudWxsKSBpc1Rvb2xDYWxsID0gaXNUb29sQ2FsbEFzc2lzdGFudE1lc3NhZ2UobWVzc2FnZSlcbiAgICAgICAgICBpZiAoaXNUb29sQ2FsbCkge1xuICAgICAgICAgICAgcmV0dXJuIHtcbiAgICAgICAgICAgICAgLi4uY2hvaWNlLFxuICAgICAgICAgICAgICBmaW5pc2hfcmVhc29uOiAndG9vbF9jYWxscycgYXMgY29uc3QsXG4gICAgICAgICAgICAgIGRlbHRhOiBtZXNzYWdlLFxuICAgICAgICAgICAgfVxuICAgICAgICAgIH1cbiAgICAgICAgICByZXR1cm4geyAuLi5jaG9pY2UsIGRlbHRhOiBtZXNzYWdlIH1cbiAgICAgICAgfSlcbiAgICAgICAgY29uc3QgbmV3Q2h1bmsgPSB7IC4uLmNodW5rLCBjaG9pY2VzOiBuZXdDaG9pY2VzIH1cbiAgICAgICAgY29udHJvbGxlci5lbnF1ZXVlKHsgLi4ubmV3Q2h1bmssIHJhd1Jlc3BvbnNlOiBjaHVuayB9KVxuICAgICAgfSxcbiAgICB9KSwpXG5cbiAgICByZXR1cm4gY3JlYXRlQXN5bmNJdGVyYWJsZShzdHJlYW1XaXRoUmF3KVxuICB9XG59XG4iXX0=
|
|
@@ -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
|
}
|
|
@@ -75,7 +75,7 @@ var ZhiPuSimpleModel = (function () {
|
|
|
75
75
|
enumerable: false,
|
|
76
76
|
configurable: true
|
|
77
77
|
});
|
|
78
|
-
ZhiPuSimpleModel.prototype.doGenerate = function (_data) {
|
|
78
|
+
ZhiPuSimpleModel.prototype.doGenerate = function (_data, options) {
|
|
79
79
|
return __awaiter(this, void 0, void 0, function () {
|
|
80
80
|
var data, res;
|
|
81
81
|
return __generator(this, function (_a) {
|
|
@@ -86,6 +86,7 @@ var ZhiPuSimpleModel = (function () {
|
|
|
86
86
|
url: this.url,
|
|
87
87
|
data: __assign(__assign({}, data), { stream: false }),
|
|
88
88
|
stream: false,
|
|
89
|
+
timeout: options === null || options === void 0 ? void 0 : options.timeout,
|
|
89
90
|
})];
|
|
90
91
|
case 1:
|
|
91
92
|
res = (_a.sent());
|
|
@@ -94,7 +95,7 @@ var ZhiPuSimpleModel = (function () {
|
|
|
94
95
|
});
|
|
95
96
|
});
|
|
96
97
|
};
|
|
97
|
-
ZhiPuSimpleModel.prototype.doStream = function (_data) {
|
|
98
|
+
ZhiPuSimpleModel.prototype.doStream = function (_data, options) {
|
|
98
99
|
return __awaiter(this, void 0, void 0, function () {
|
|
99
100
|
var data, isToolCall, _stream, stream, zhipuStream, streamWithRaw;
|
|
100
101
|
return __generator(this, function (_a) {
|
|
@@ -106,6 +107,7 @@ var ZhiPuSimpleModel = (function () {
|
|
|
106
107
|
url: this.url,
|
|
107
108
|
data: __assign(__assign({}, data), { stream: true }),
|
|
108
109
|
stream: true,
|
|
110
|
+
timeout: options === null || options === void 0 ? void 0 : options.timeout,
|
|
109
111
|
})];
|
|
110
112
|
case 1:
|
|
111
113
|
_stream = _a.sent();
|
|
@@ -134,4 +136,4 @@ var ZhiPuSimpleModel = (function () {
|
|
|
134
136
|
return ZhiPuSimpleModel;
|
|
135
137
|
}());
|
|
136
138
|
exports.ZhiPuSimpleModel = ZhiPuSimpleModel;
|
|
137
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
139
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvbW9kZWxzL1poaVB1L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEscUNBTW9CO0FBWXBCLFNBQVMsWUFBWSxDQUFDLEtBQXlCO0lBQ3JDLElBQUEsUUFBUSxHQUFvRCxLQUFLLFNBQXpELEVBQUUsS0FBSyxHQUE2QyxLQUFLLE1BQWxELEVBQUUsV0FBVyxHQUFnQyxLQUFLLFlBQXJDLEVBQUUsV0FBVyxHQUFtQixLQUFLLFlBQXhCLEVBQUUsS0FBSyxHQUFZLEtBQUssTUFBakIsRUFBRSxLQUFLLEdBQUssS0FBSyxNQUFWLENBQVU7SUFFekUsSUFBTSxpQkFBaUIsR0FBRztRQUN4QixJQUFJLFdBQVcsSUFBSSxXQUFXLEtBQUssTUFBTSxFQUFFO1lBQ3pDLE9BQU8sQ0FBQyxJQUFJLENBQUMsK0JBQStCLENBQUMsQ0FBQTtTQUM5QztRQUNELE9BQU8sV0FBa0IsQ0FBQTtJQUMzQixDQUFDLENBQUE7SUFFRCw2QkFDSyxLQUFLLEtBQ1IsUUFBUSxVQUFBLEVBQ1IsS0FBSyxPQUFBLEVBQ0wsV0FBVyxhQUFBLEVBQ1gsV0FBVyxFQUFFLGlCQUFpQixFQUFFLEVBQ2hDLEtBQUssT0FBQSxFQUNMLEtBQUssT0FBQSxJQUNOO0FBQ0gsQ0FBQztBQUVEO0lBRUUsMEJBQW9CLEdBQWEsRUFBUyxPQUFlLEVBQUUsTUFBZTtRQUF0RCxRQUFHLEdBQUgsR0FBRyxDQUFVO1FBQVMsWUFBTyxHQUFQLE9BQU8sQ0FBUTtRQURsRCxXQUFNLEdBQUcsb0NBQW9DLENBQUE7UUFFbEQsSUFBSSxNQUFNLElBQUksSUFBSSxFQUFFO1lBQ2xCLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFBO1NBQ3JCO0lBQ0gsQ0FBQztJQUVELHNCQUFZLGlDQUFHO2FBQWY7WUFDRSxPQUFPLFVBQUcsSUFBSSxDQUFDLE9BQU8sY0FBSSxJQUFJLENBQUMsTUFBTSxDQUFFLENBQUE7UUFDekMsQ0FBQzs7O09BQUE7SUFFWSxxQ0FBVSxHQUF2QixVQUF3QixLQUF5QixFQUFFLE9BQW9COzs7Ozs7d0JBQy9ELElBQUksR0FBRyxZQUFZLENBQUMsS0FBSyxDQUFDLENBQUE7d0JBQ25CLFdBQU0sSUFBSSxDQUFDLEdBQUcsQ0FBQztnQ0FDMUIsR0FBRyxFQUFFLElBQUksQ0FBQyxHQUFHO2dDQUNiLElBQUksd0JBQ0MsSUFBSSxLQUNQLE1BQU0sRUFBRSxLQUFLLEdBQ2Q7Z0NBQ0QsTUFBTSxFQUFFLEtBQUs7Z0NBQ2IsT0FBTyxFQUFFLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxPQUFPOzZCQUMxQixDQUFDLEVBQUE7O3dCQVJJLEdBQUcsR0FBRyxDQUFDLFNBUVgsQ0FBNEI7d0JBQzlCLGlDQUFZLEdBQUcsS0FBRSxXQUFXLEVBQUUsR0FBRyxLQUFFOzs7O0tBQ3BDO0lBRVksbUNBQVEsR0FBckIsVUFBc0IsS0FBeUIsRUFBRSxPQUFvQjs7Ozs7O3dCQUM3RCxJQUFJLEdBQUcsWUFBWSxDQUFDLEtBQUssQ0FBQyxDQUFBO3dCQUM1QixVQUFVLEdBQW1CLElBQUksQ0FBQTt3QkFDckIsV0FBTSxJQUFJLENBQUMsR0FBRyxDQUFDO2dDQUM3QixHQUFHLEVBQUUsSUFBSSxDQUFDLEdBQUc7Z0NBQ2IsSUFBSSx3QkFDQyxJQUFJLEtBQ1AsTUFBTSxFQUFFLElBQUksR0FDYjtnQ0FDRCxNQUFNLEVBQUUsSUFBSTtnQ0FDWixPQUFPLEVBQUUsT0FBTyxhQUFQLE9BQU8sdUJBQVAsT0FBTyxDQUFFLE9BQU87NkJBQzFCLENBQUMsRUFBQTs7d0JBUkksT0FBTyxHQUFHLFNBUWQ7d0JBQ0ksTUFBTSxHQUFHLElBQUEsMEJBQWtCLEVBQUMsT0FBTyxDQUFtQixDQUFBO3dCQUV0RCxXQUFXLEdBQUcsSUFBQSwwQkFBa0IsRUFBd0IsTUFBTSxDQUFDLENBQUE7d0JBQy9ELGFBQWEsR0FBRyxXQUFXLENBQUMsV0FBVyxDQUFDLElBQUksdUJBQWUsQ0FBeUU7NEJBQ3hJLFNBQVMsWUFBQyxLQUFLLEVBQUUsVUFBVTtnQ0FDekIsSUFBTSxVQUFVLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBQyxNQUFNO29DQUMxQyxJQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFBO29DQUM1QixJQUFJLFVBQVUsSUFBSSxJQUFJO3dDQUFFLFVBQVUsR0FBRyxJQUFBLGtDQUEwQixFQUFDLE9BQU8sQ0FBQyxDQUFBO29DQUN4RSxJQUFJLFVBQVUsRUFBRTt3Q0FDZCw2QkFDSyxNQUFNLEtBQ1QsYUFBYSxFQUFFLFlBQXFCLEVBQ3BDLEtBQUssRUFBRSxPQUFPLElBQ2Y7cUNBQ0Y7b0NBQ0QsT0FBTyxNQUFNLENBQUE7Z0NBQ2YsQ0FBQyxDQUFDLENBQUE7Z0NBQ0YsSUFBTSxRQUFRLHlCQUFRLEtBQUssS0FBRSxPQUFPLEVBQUUsVUFBVSxHQUFFLENBQUE7Z0NBQ2xELFVBQVUsQ0FBQyxPQUFPLHVCQUFNLFFBQVEsS0FBRSxXQUFXLEVBQUUsS0FBSyxJQUFHLENBQUE7NEJBQ3pELENBQUM7eUJBQ0YsQ0FBQyxDQUFFLENBQUE7d0JBRUosV0FBTyxJQUFBLDJCQUFtQixFQUFDLGFBQWEsQ0FBQyxFQUFBOzs7O0tBQzFDO0lBQ0gsdUJBQUM7QUFBRCxDQUFDLEFBOURELElBOERDO0FBOURZLDRDQUFnQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIGNyZWF0ZUFzeW5jSXRlcmFibGUsXG4gIFRyYW5zZm9ybVN0cmVhbSxcbiAgdG9Qb2x5ZmlsbFJlYWRhYmxlLFxuICBpbnRvU3RhbmRhcmRTdHJlYW0sXG4gIGlzVG9vbENhbGxBc3Npc3RhbnRNZXNzYWdlLFxufSBmcm9tICcuLi8uLi91dGlscydcbmltcG9ydCB0eXBlIHsgWmhpUHVHZW5lcmF0ZVRleHRPdXRwdXQsIFpoaVB1SW5wdXREYXRhLCBaaGlQdVN0cmVhbVRleHRPdXRwdXQgfSBmcm9tICcuL3R5cGUnXG5pbXBvcnQgdHlwZSB7XG4gIE1vZGVsUmVxLFxuICBCYXNlQ2hhdE1vZGVsSW5wdXQsXG4gIFNpbXBsZUNoYXRNb2RlbCxcbiAgRG9TdHJlYW1PdXRwdXQsXG4gIEJhc2VEb1N0cmVhbU91dHB1dENodW5rLFxuICBEb0dlbmVyYXRlT3V0cHV0LFxuICBSZXFPcHRpb25zLFxufSBmcm9tICcuLi8uLi90eXBlJ1xuXG5mdW5jdGlvbiBwcm9jZXNzSW5wdXQoaW5wdXQ6IEJhc2VDaGF0TW9kZWxJbnB1dCk6IFpoaVB1SW5wdXREYXRhIHtcbiAgY29uc3QgeyBtZXNzYWdlcywgbW9kZWwsIHRlbXBlcmF0dXJlLCB0b29sX2Nob2ljZSwgdG9vbHMsIHRvcF9wIH0gPSBpbnB1dFxuXG4gIGNvbnN0IHByb2Nlc3NUb29sQ2hvaWNlID0gKCkgPT4ge1xuICAgIGlmICh0b29sX2Nob2ljZSAmJiB0b29sX2Nob2ljZSAhPT0gJ2F1dG8nKSB7XG4gICAgICBjb25zb2xlLndhcm4oJ2B0b29sX2Nob2ljZWAgaXMgbm90IFxcJ2F1dG9cXCcnKVxuICAgIH1cbiAgICByZXR1cm4gdG9vbF9jaG9pY2UgYXMgYW55XG4gIH1cblxuICByZXR1cm4ge1xuICAgIC4uLmlucHV0LFxuICAgIG1lc3NhZ2VzLFxuICAgIG1vZGVsLFxuICAgIHRlbXBlcmF0dXJlLFxuICAgIHRvb2xfY2hvaWNlOiBwcm9jZXNzVG9vbENob2ljZSgpLFxuICAgIHRvb2xzLFxuICAgIHRvcF9wLFxuICB9XG59XG5cbmV4cG9ydCBjbGFzcyBaaGlQdVNpbXBsZU1vZGVsIGltcGxlbWVudHMgU2ltcGxlQ2hhdE1vZGVsIHtcbiAgcHVibGljIHN1YlVybCA9ICd6aGlwdS9hcGkvcGFhcy92NC9jaGF0L2NvbXBsZXRpb25zJ1xuICBjb25zdHJ1Y3Rvcihwcml2YXRlIHJlcTogTW9kZWxSZXEsIHB1YmxpYyBiYXNlVXJsOiBzdHJpbmcsIHN1YlVybD86IHN0cmluZykge1xuICAgIGlmIChzdWJVcmwgIT0gbnVsbCkge1xuICAgICAgdGhpcy5zdWJVcmwgPSBzdWJVcmxcbiAgICB9XG4gIH1cblxuICBwcml2YXRlIGdldCB1cmwoKSB7XG4gICAgcmV0dXJuIGAke3RoaXMuYmFzZVVybH0vJHt0aGlzLnN1YlVybH1gXG4gIH1cblxuICBwdWJsaWMgYXN5bmMgZG9HZW5lcmF0ZShfZGF0YTogQmFzZUNoYXRNb2RlbElucHV0LCBvcHRpb25zPzogUmVxT3B0aW9ucyk6IFByb21pc2U8RG9HZW5lcmF0ZU91dHB1dD4ge1xuICAgIGNvbnN0IGRhdGEgPSBwcm9jZXNzSW5wdXQoX2RhdGEpXG4gICAgY29uc3QgcmVzID0gKGF3YWl0IHRoaXMucmVxKHtcbiAgICAgIHVybDogdGhpcy51cmwsXG4gICAgICBkYXRhOiB7XG4gICAgICAgIC4uLmRhdGEsXG4gICAgICAgIHN0cmVhbTogZmFsc2UsXG4gICAgICB9LFxuICAgICAgc3RyZWFtOiBmYWxzZSxcbiAgICAgIHRpbWVvdXQ6IG9wdGlvbnM/LnRpbWVvdXQsXG4gICAgfSkpIGFzIFpoaVB1R2VuZXJhdGVUZXh0T3V0cHV0XG4gICAgcmV0dXJuIHsgLi4ucmVzLCByYXdSZXNwb25zZTogcmVzIH1cbiAgfVxuXG4gIHB1YmxpYyBhc3luYyBkb1N0cmVhbShfZGF0YTogQmFzZUNoYXRNb2RlbElucHV0LCBvcHRpb25zPzogUmVxT3B0aW9ucyk6IFByb21pc2U8RG9TdHJlYW1PdXRwdXQ+IHtcbiAgICBjb25zdCBkYXRhID0gcHJvY2Vzc0lucHV0KF9kYXRhKVxuICAgIGxldCBpc1Rvb2xDYWxsOiBudWxsIHwgYm9vbGVhbiA9IG51bGxcbiAgICBjb25zdCBfc3RyZWFtID0gYXdhaXQgdGhpcy5yZXEoe1xuICAgICAgdXJsOiB0aGlzLnVybCxcbiAgICAgIGRhdGE6IHtcbiAgICAgICAgLi4uZGF0YSxcbiAgICAgICAgc3RyZWFtOiB0cnVlLFxuICAgICAgfSxcbiAgICAgIHN0cmVhbTogdHJ1ZSxcbiAgICAgIHRpbWVvdXQ6IG9wdGlvbnM/LnRpbWVvdXQsXG4gICAgfSlcbiAgICBjb25zdCBzdHJlYW0gPSB0b1BvbHlmaWxsUmVhZGFibGUoX3N0cmVhbSkgYXMgdHlwZW9mIF9zdHJlYW1cblxuICAgIGNvbnN0IHpoaXB1U3RyZWFtID0gaW50b1N0YW5kYXJkU3RyZWFtPFpoaVB1U3RyZWFtVGV4dE91dHB1dD4oc3RyZWFtKVxuICAgIGNvbnN0IHN0cmVhbVdpdGhSYXcgPSB6aGlwdVN0cmVhbS5waXBlVGhyb3VnaChuZXcgVHJhbnNmb3JtU3RyZWFtPFpoaVB1U3RyZWFtVGV4dE91dHB1dCwgQmFzZURvU3RyZWFtT3V0cHV0Q2h1bmsgJiB7IHJhd1Jlc3BvbnNlPzogYW55IH0+KHtcbiAgICAgIHRyYW5zZm9ybShjaHVuaywgY29udHJvbGxlcikge1xuICAgICAgICBjb25zdCBuZXdDaG9pY2VzID0gY2h1bmsuY2hvaWNlcy5tYXAoKGNob2ljZSkgPT4ge1xuICAgICAgICAgIGNvbnN0IG1lc3NhZ2UgPSBjaG9pY2UuZGVsdGFcbiAgICAgICAgICBpZiAoaXNUb29sQ2FsbCA9PSBudWxsKSBpc1Rvb2xDYWxsID0gaXNUb29sQ2FsbEFzc2lzdGFudE1lc3NhZ2UobWVzc2FnZSlcbiAgICAgICAgICBpZiAoaXNUb29sQ2FsbCkge1xuICAgICAgICAgICAgcmV0dXJuIHtcbiAgICAgICAgICAgICAgLi4uY2hvaWNlLFxuICAgICAgICAgICAgICBmaW5pc2hfcmVhc29uOiAndG9vbF9jYWxscycgYXMgY29uc3QsXG4gICAgICAgICAgICAgIGRlbHRhOiBtZXNzYWdlLFxuICAgICAgICAgICAgfVxuICAgICAgICAgIH1cbiAgICAgICAgICByZXR1cm4gY2hvaWNlXG4gICAgICAgIH0pXG4gICAgICAgIGNvbnN0IG5ld0NodW5rID0geyAuLi5jaHVuaywgY2hvaWNlczogbmV3Q2hvaWNlcyB9XG4gICAgICAgIGNvbnRyb2xsZXIuZW5xdWV1ZSh7IC4uLm5ld0NodW5rLCByYXdSZXNwb25zZTogY2h1bmsgfSlcbiAgICAgIH0sXG4gICAgfSksKVxuXG4gICAgcmV0dXJuIGNyZWF0ZUFzeW5jSXRlcmFibGUoc3RyZWFtV2l0aFJhdylcbiAgfVxufVxuIl19
|
|
@@ -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>>;
|