From 552143e3458bdbd0890fb95a4f38c73bf4e9b22d Mon Sep 17 00:00:00 2001
From: Wroclaw <wroclaw223@outlook.com>
Date: Mon, 25 Sep 2023 09:30:52 +0200
Subject: [PATCH 1/2] quota/tokenCount: Rename single variable name to
 something that has more sense

I forgot to rename it when I commited it last time ;-;
---
 src/quota/tokenCount.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/quota/tokenCount.ts b/src/quota/tokenCount.ts
index 47e9e99..4c24fbb 100644
--- a/src/quota/tokenCount.ts
+++ b/src/quota/tokenCount.ts
@@ -121,14 +121,14 @@ export default class tokenCount implements IQuota {
   ): Promise<userQuotaRecoveryData> {
     const userId = typeof user ==="string" ? user : user.id;
 
-    const [userQuota, renameMebecause] = await Promise.all([
+    const [userQuota, overUnitCountRecord] = await Promise.all([
       this.checkUser(userId, request),
       this.findNthUsage(userId, request.createdTimestamp, unitCount)
     ]);
 
     return {
       ...userQuota,
-      recoveryTimestamp: (renameMebecause.at(0)?.timestamp.valueOf() ?? Infinity) + this.lookback,
+      recoveryTimestamp: (overUnitCountRecord.at(0)?.timestamp.valueOf() ?? Infinity) + this.lookback,
     };
   }
 

From dc91830fae71f00713a6106aa326c8bba40c1a44 Mon Sep 17 00:00:00 2001
From: Wroclaw <wroclaw223@outlook.com>
Date: Mon, 25 Sep 2023 09:52:22 +0200
Subject: [PATCH 2/2] quota/tokenCount: allow arbitrary multipliers for tokens

I didn't notice that OpenAI changed pricing again
---
 src/quota/tokenCount.ts | 42 +++++++++++++----------------------------
 1 file changed, 13 insertions(+), 29 deletions(-)

diff --git a/src/quota/tokenCount.ts b/src/quota/tokenCount.ts
index 4c24fbb..70ab318 100644
--- a/src/quota/tokenCount.ts
+++ b/src/quota/tokenCount.ts
@@ -12,16 +12,19 @@ import { Usage } from "@prisma/client";
 export default class tokenCount implements IQuota {
   defaultQuota: number;
   lookback: number;
-  considerInputTokensAsHalf: boolean;
-
+  requestTokenMultiplier: number;
+  responseTokenMultiplier: number;
+  
   constructor(
     defaultQuota: number = 512 * 25,
     lookback: number = 1000 * 60 * 60 * 24,
-    considerInputTokensAsHalf: boolean = true,
+    requestTokenMultiplier: number = 1,
+    responseTokenMultiplier: number = 1,
   ) {
     this.defaultQuota = defaultQuota;
     this.lookback = lookback;
-    this.considerInputTokensAsHalf = considerInputTokensAsHalf;
+    this.requestTokenMultiplier = requestTokenMultiplier;
+    this.responseTokenMultiplier = responseTokenMultiplier;
   }
 
   private getUserQuota(id: string) {
@@ -55,9 +58,7 @@ export default class tokenCount implements IQuota {
     const usageResponse = usedTokens.usageResponse === null ? 0 : usedTokens.usageResponse;
 
     const usedUnits = (() => {
-      if (this.considerInputTokensAsHalf)
-        return usageResponse + usageRequest / 2;
-      return usageResponse + usageRequest;
+      return usageRequest * this.requestTokenMultiplier + usageResponse * this.responseTokenMultiplier;
     })();
 
     if (userQuota?.vip) return this.createUserQuotaData(Infinity, usedUnits);
@@ -74,30 +75,13 @@ export default class tokenCount implements IQuota {
    * @returns promise of giving out the record
    */
   findNthUsage(user: string, requestTimestamp: number, unitCount: number) {
-    if (this.considerInputTokensAsHalf)
-      return database.$queryRaw<Array<Usage & {usage: number}>>`
-        SELECT t1.*, (
-            SELECT
-              SUM(usageResponse + usageRequest/2) AS usage
-            FROM \`usage\`
-            WHERE 
-              user = ${user} AND
-              timestamp >= ${requestTimestamp - this.lookback} AND
-              timestamp <= t1.timestamp
-          ) as usage
-        FROM
-          \`usage\` AS t1
-        WHERE 
-          user = ${user} AND
-          timestamp >= ${requestTimestamp - this.lookback} AND
-          usage >= ${unitCount}
-        ORDER BY timestamp ASC
-        LIMIT 1
-      `;
-    return database.$queryRaw<Array<Usage & {usage: bigint}>>`
+    return database.$queryRaw<Array<Usage & {usage: number | bigint}>>`
       SELECT t1.*, (
           SELECT
-            SUM(usageResponse + usageRequest) AS usage
+            SUM(
+              usageRequest * ${this.requestTokenMultiplier} +
+              usageResponse * ${this.responseTokenMultiplier}
+            ) AS usage
           FROM \`usage\`
           WHERE 
             user = ${user} AND