Update api_usage.py

api_usage.py

@@ -7,13 +7,17 @@ import openai
 queryUrl = 'https://api.openai.com/v1/chat/completions'
 GPT_TYPES = ["gpt-3.5-turbo", "gpt-4", "gpt-4-32k"]
 rate_limit_per_model = {
-    "gpt-3.5-turbo-new": 2000,
-    "gpt-3.5-turbo-old": 3500,
+    "gpt-3.5-turbo-trial": 2000,
+    "gpt-3.5-turbo-pay": 3500,
     "gpt-4": 200,
     "gpt-4-32k": 1000  # No actual clue, rare enough
 }
-body_turbo = {"model": "gpt-3.5-turbo", "max_tokens": 1, "messages": [{'role':'user', 'content': ''}]}
-body_gpt4 = {"model": "gpt-4", "max_tokens": 1, "messages": [{'role':'user', 'content': ''}]}
+body_gpt = {
+    "gpt-3.5-turbo": {"model": "gpt-3.5-turbo", "max_tokens": 1, "messages": [{'role':'user', 'content': ''}]}
+    "gpt-4": {"model": "gpt-4", "max_tokens": 1, "messages": [{'role':'user', 'content': ''}]}
+    "gpt-4-32k": {"model": "gpt-4", "max_tokens": 1, "messages": [{'role':'user', 'content': ''}]}
+}
+
 
 def get_headers(key):
     headers = {'Authorization': f'Bearer {key}'}
@@ -22,18 +26,25 @@ def get_headers(key):
 def get_subscription(key):    
     headers = get_headers(key)    
     #results = r.json()
-    gpt4_avai = check_gpt4_availability()
+    
+    key_highest_model = ""
+    if check_gpt4_32k_availability():
+        key_highest_model = GPT_TYPES[2]
+    elif check_gpt4_availability():
+        key_highest_model = GPT_TYPES[1]
+    else:
+        key_highest_model = GPT_TYPES[0]    
 
     if check_key_availability():
         rpm = ""
         org = ""
         quota = ""
-        r = requests.post(queryUrl, headers=headers, json=body_gpt4 if gpt4_avai else body_turbo)
+        r = requests.post(queryUrl, headers=headers, json=body_gpt[key_highest_model])
         result = r.json()
         if "id" in result:
             rpm = r.headers['x-ratelimit-limit-requests']
             org = r.headers['openai-organization']
-            quota = check_key_type("gpt-4" if gpt4_avai else "gpt-3.5-turbo", int(rpm))         
+            quota = check_key_type(key_highest_model, int(rpm))         
         else:
             e = result["error"]["code"]
             quota = f"Error: {e}"
@@ -61,10 +72,10 @@ def get_subscription(key):
 #        return ""
 
 def check_key_type(model, rpm):
-    if model == "gpt-3.5-turbo":
-        if rpm > rate_limit_per_model['gpt-3.5-turbo-old']:
+    if model == GPT_TYPES[0]:
+        if rpm > rate_limit_per_model['gpt-3.5-turbo-pay']:
             return "yes | pay, possibly big key"
-        elif rpm == rate_limit_per_model['gpt-3.5-turbo-new'] or rpm == rate_limit_per_model['gpt-3.5-turbo-old']:
+        elif rpm > rate_limit_per_model['gpt-3.5-turbo-trial'] and rpm <= rate_limit_per_model['gpt-3.5-turbo-pay']:
             return "yes | pay"
         else:
             return "yes | trial"