MurasameNoa/chatgpt-plugin
1
0
Fork 0
mirror of https://github.com/ikechan8370/chatgpt-plugin.git synced 2025-12-17 13:57:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: 修复token计算方法

Browse source
This commit is contained in:
ikechan8370 2023-07-01 16:36:51 +08:00
parent a94017e6e5
commit f01d1d3998
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
utils/openai/chatgpt-api.js
View file

@ -517,7 +517,7 @@ var ChatGPTAPI = /** @class */ (function () {
return [3 /*break*/, 27]; return [3 /*break*/, 27];
} }
messages = nextMessages; messages = nextMessages;
numTokens = nextNumTokensEstimate; numTokens = nextNumTokensEstimate + functionToken;
if (!isValidPrompt) { if (!isValidPrompt) {
return [3 /*break*/, 27]; return [3 /*break*/, 27];
} }

2
utils/openai/chatgpt-api.ts
View file

@ -477,7 +477,7 @@ export class ChatGPTAPI {
break break
} }
messages = nextMessages messages = nextMessages
numTokens = nextNumTokensEstimate numTokens = nextNumTokensEstimate + functionToken
if (!isValidPrompt) { if (!isValidPrompt) {
break break

12
utils/openai/fetch-sse.js
View file

@ -53,19 +53,19 @@ var __asyncValues = (this && this.__asyncValues) || function (o) {
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); } function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
}; };
import { createParser } from 'eventsource-parser'; import { createParser } from 'eventsource-parser';
import * as types from './types.js'; import * as types from './types';
import fetch from 'node-fetch'; import { fetch as nodefetch } from 'node-fetch';
import { streamAsyncIterable } from './stream-async-iterable.js'; import { streamAsyncIterable } from './stream-async-iterable';
export function fetchSSE(url, options, fetchFn) { export function fetchSSE(url, options, fetch) {
var _a, e_1, _b, _c; var _a, e_1, _b, _c;
if (fetchFn === void 0) { fetchFn = fetch; } if (fetch === void 0) { fetch = nodefetch; }
return __awaiter(this, void 0, void 0, function () { return __awaiter(this, void 0, void 0, function () {
var onMessage, onError, fetchOptions, res, reason, err_1, msg, error, parser, feed, body_1, _d, _e, _f, chunk, str, e_1_1; var onMessage, onError, fetchOptions, res, reason, err_1, msg, error, parser, feed, body_1, _d, _e, _f, chunk, str, e_1_1;
return __generator(this, function (_g) { return __generator(this, function (_g) {
switch (_g.label) { switch (_g.label) {
case 0: case 0:
onMessage = options.onMessage, onError = options.onError, fetchOptions = __rest(options, ["onMessage", "onError"]); onMessage = options.onMessage, onError = options.onError, fetchOptions = __rest(options, ["onMessage", "onError"]);
return [4 /*yield*/, fetchFn(url, fetchOptions)]; return [4 /*yield*/, fetch(url, fetchOptions)];
case 1: case 1:
res = _g.sent(); res = _g.sent();
if (!!res.ok) return [3 /*break*/, 6]; if (!!res.ok) return [3 /*break*/, 6];