28594_usage_tracking

@@ -6,7 +6,7 @@ require('dotenv').config()
 const rateLimit = require('express-rate-limit')
 const rateLimit = require('express-rate-limit')
 const anchorme = require("anchorme").default;
 const anchorme = require("anchorme").default;
 const axios = require('axios');
 const axios = require('axios');
-const tiktoken = require('@dqbd/tiktoken');
+const { encodingForModel } = require('js-tiktoken');
 const tiktokenModels = [
 const tiktokenModels = [
   'text-davinci-003',
   'text-davinci-003',
   'text-davinci-002',
   'text-davinci-002',
@@ -45,7 +45,6 @@ const tiktokenModels = [
   'gpt-3.5-turbo',
   'gpt-3.5-turbo',
   'gpt-3.5-turbo-0301'
   'gpt-3.5-turbo-0301'
 ];
 ];
-const encoding_for_model = tiktoken.encoding_for_model;
 
 
 // Open AI Configuration
 // Open AI Configuration
 // console.log(process.env.OPENAI_API_ORG)
 // console.log(process.env.OPENAI_API_ORG)
@@ -70,16 +69,6 @@ app.use(cors())
 app.use(require('morgan')('dev'))
 app.use(require('morgan')('dev'))
 app.use(rateLimiter)
 app.use(rateLimiter)
 
 
-const cleanString = async (input) => {
-  var output = "";
-  for (var i=0; i<input.length; i++) {
-      if (input.charCodeAt(i) <= 127) {
-          output += input.charAt(i);
-      }
-  }
-  return output;
-};
-
 // Routing
 // Routing
 
 
 // Primary Open AI Route
 // Primary Open AI Route
@@ -132,9 +121,9 @@ app.post('/api', async (req, res) => {
 		let usage = {};
 		let usage = {};
 		let enc = null;
 		let enc = null;
 		try {
 		try {
-			enc = encoding_for_model(tiktokenModels.includes(currentModel) ? currentModel : 'gpt-3.5-turbo');
-			usage.prompt_tokens = (enc.encode(await cleanString(query_prompt))).length;
-			usage.completion_tokens = (enc.encode(await cleanString(input))).length;
+			enc = encodingForModel(tiktokenModels.includes(currentModel) ? currentModel : 'gpt-3.5-turbo');
+			usage.prompt_tokens = (enc.encode(query_prompt)).length;
+			usage.completion_tokens = (enc.encode(input)).length;
 			usage.total_tokens = usage.prompt_tokens + usage.completion_tokens;
 			usage.total_tokens = usage.prompt_tokens + usage.completion_tokens;
 		} catch (e) {
 		} catch (e) {
 			console.log('Error encoding prompt text', e);
 			console.log('Error encoding prompt text', e);