Merge branch '28594_usage_tracking' into 'master'

28594_usage_tracking

See merge request !78

@@ -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,8 +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;
-const user_secret_id = process.env.USER_SECRET_ID ? process.env.USER_SECRET_ID : "aiwp_logged_in";
 
 
 // Open AI Configuration
 // Open AI Configuration
 // console.log(process.env.OPENAI_API_ORG)
 // console.log(process.env.OPENAI_API_ORG)
@@ -123,7 +121,7 @@ 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');
+			enc = encodingForModel(tiktokenModels.includes(currentModel) ? currentModel : 'gpt-3.5-turbo');
 			usage.prompt_tokens = (enc.encode(query_prompt)).length;
 			usage.prompt_tokens = (enc.encode(query_prompt)).length;
 			usage.completion_tokens = (enc.encode(input)).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;

@@ -9,7 +9,7 @@
   "author": "",
   "author": "",
   "license": "ISC",
   "license": "ISC",
   "dependencies": {
   "dependencies": {
-    "@dqbd/tiktoken": "^1.0.7",
+    "js-tiktoken": "1.0.7",
     "anchorme": "^2.1.2",
     "anchorme": "^2.1.2",
     "axios": "^1.5.1",
     "axios": "^1.5.1",
     "body-parser": "^1.20.1",
     "body-parser": "^1.20.1",