Commit f900969c authored by nanahira's avatar nanahira

fix tiktoken

parent 397a408a
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
"pino": "^10.3.1", "pino": "^10.3.1",
"pino-pretty": "^13.1.3", "pino-pretty": "^13.1.3",
"rxjs": "^7.8.2", "rxjs": "^7.8.2",
"tiktoken": "^1.0.22",
"typed-reflector": "^1.0.14", "typed-reflector": "^1.0.14",
"typed-struct": "^2.7.1", "typed-struct": "^2.7.1",
"typeorm": "^0.3.28", "typeorm": "^0.3.28",
...@@ -8226,6 +8227,12 @@ ...@@ -8226,6 +8227,12 @@
"node": ">=20" "node": ">=20"
} }
}, },
"node_modules/tiktoken": {
"version": "1.0.22",
"resolved": "https://registry.npmjs.org/tiktoken/-/tiktoken-1.0.22.tgz",
"integrity": "sha512-PKvy1rVF1RibfF3JlXBSP0Jrcw2uq3yXdgcEXtKTYn3QJ/cBRBHDnrJ5jHky+MENZ6DIPwNUGWpkVx+7joCpNA==",
"license": "MIT"
},
"node_modules/tinyglobby": { "node_modules/tinyglobby": {
"version": "0.2.15", "version": "0.2.15",
"resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz", "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
......
...@@ -103,11 +103,12 @@ export class ChatgptService { ...@@ -103,11 +103,12 @@ export class ChatgptService {
} }
const moduleName = 'tiktoken'; const moduleName = 'tiktoken';
this.tiktokenModulePromise = import(moduleName).catch(() => { this.tiktokenModulePromise = import(moduleName).catch((e) => {
this.tiktokenUnavailable = true; this.tiktokenUnavailable = true;
if (!this.tiktokenUnavailableLogged) { if (!this.tiktokenUnavailableLogged) {
this.tiktokenUnavailableLogged = true; this.tiktokenUnavailableLogged = true;
this.logger.warn( this.logger.warn(
{ error: (e as Error).toString() },
'tiktoken is unavailable, using approximate token counting', 'tiktoken is unavailable, using approximate token counting',
); );
} }
...@@ -377,11 +378,12 @@ export class ChatgptService { ...@@ -377,11 +378,12 @@ export class ChatgptService {
} }
this.tokenizerByModel.set(model, encoder); this.tokenizerByModel.set(model, encoder);
return encoder; return encoder;
} catch { } catch(e) {
this.tiktokenUnavailable = true; this.tiktokenUnavailable = true;
if (!this.tiktokenUnavailableLogged) { if (!this.tiktokenUnavailableLogged) {
this.tiktokenUnavailableLogged = true; this.tiktokenUnavailableLogged = true;
this.logger.warn( this.logger.warn(
{ error: (e as Error).toString() },
'tiktoken is unavailable, using approximate token counting', 'tiktoken is unavailable, using approximate token counting',
); );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment