Update api_usage.py

api_usage.py

@@ -11,7 +11,7 @@ import asyncio
 import aiohttp
 
 BASE_URL = 'https://api.openai.com/v1'
-GPT_TYPES = ["gpt-3.5-turbo", "gpt-4", "gpt-4-32k", "gpt-4-32k-0314"]
+GPT_TYPES = ["gpt-3.5-turbo", "gpt-4", "gpt-4-32k", "gpt-4-32k-0314", "gpt-4o", "gpt-4-turbo"]
 
 TOKEN_LIMIT_PER_TIER_TURBO = {
     "free": 40000,
@@ -73,28 +73,28 @@ def get_subscription(key, session, org_list):
                 org.append(f"{org_in['id']} ({org_in['name']}, {org_in['title']}, {org_in['role']})")
             if has_gpt4_32k:
                 list_models_avai.update(GPT_TYPES)
-                status_formated = format_status([GPT_TYPES[2], GPT_TYPES[1], GPT_TYPES[0]], session, headers)
+                status_formated = format_status([GPT_TYPES[2], GPT_TYPES[4], GPT_TYPES[5], GPT_TYPES[1], GPT_TYPES[0]], session, headers)
                 rpm.append(status_formated[0])
                 tpm.append(status_formated[1])
                 quota.append(status_formated[2])
-                list_models.append(f"gpt-4-32k, gpt-4, gpt-3.5-turbo ({len(available_models)} total)")
+                list_models.append(f"gpt-4-32k, gpt-4o, gpt-4-turbo, gpt-4, gpt-3.5-turbo ({len(available_models)} total)")
             else:
                 list_models_avai.update([GPT_TYPES[3], GPT_TYPES[1], GPT_TYPES[0]])
-                status_formated = format_status([GPT_TYPES[3], GPT_TYPES[1], GPT_TYPES[0]], session, headers)
+                status_formated = format_status([GPT_TYPES[3], GPT_TYPES[4], GPT_TYPES[5], GPT_TYPES[1], GPT_TYPES[0]], session, headers)
                 rpm.append(status_formated[0])
                 tpm.append(status_formated[1])
                 quota.append(status_formated[2])
-                list_models.append(f"gpt-4-32k-0314, gpt-4, gpt-3.5-turbo ({len(available_models)} total)")
+                list_models.append(f"gpt-4-32k-0314, gpt-4o, gpt-4-turbo, gpt-4, gpt-3.5-turbo ({len(available_models)} total)")
             
         elif has_gpt4:
             if org_in['id']:
                 org.append(f"{org_in['id']} ({org_in['name']}, {org_in['title']}, {org_in['role']})")
             list_models_avai.update([GPT_TYPES[1], GPT_TYPES[0]])
-            status_formated = format_status([GPT_TYPES[1], GPT_TYPES[0]], session, headers)
+            status_formated = format_status([GPT_TYPES[4], GPT_TYPES[5], GPT_TYPES[1], GPT_TYPES[0]], session, headers)
             rpm.append(status_formated[0])
             tpm.append(status_formated[1])
             quota.append(status_formated[2])
-            list_models.append(f"gpt-4, gpt-3.5-turbo ({len(available_models)} total)")
+            list_models.append(f"gpt-4o, gpt-4-turbo, gpt-4, gpt-3.5-turbo ({len(available_models)} total)")
             
         else:
             if org_in['id']:
@@ -137,7 +137,8 @@ def send_oai_completions(oai_stuff):
                 _tpm = '{:,}'.format(tpm_num).replace(',', ' ')
                 _tpm_left = '{:,}'.format(tpm_left).replace(',', ' ')
                 rpm_string = f"{_rpm} ({model})"
-                tpm_string = f"{_tpm} ({_tpm_left} left, {model})"
+                #tpm_string = f"{_tpm} ({_tpm_left} left, {model})"
+                tpm_string = f"{_tpm} ({model})"
                 dictCount = 0
                 dictLength = len(TOKEN_LIMIT_PER_TIER_GPT4)
                             
@@ -178,8 +179,8 @@ def format_status(list_models_avai, session, headers):
     rpm_str = ""
     tpm_str = ""
     for i in range(len(rpm)):                
-        rpm_str += rpm[i] + (", " if i < len(rpm)-1 else "")
-        tpm_str += tpm[i] + (", " if i < len(rpm)-1 else "")
+        rpm_str += rpm[i] + (" | " if i < len(rpm)-1 else "")
+        tpm_str += tpm[i] + (" | " if i < len(rpm)-1 else "")
     return rpm_str, tpm_str, quota
 
 def check_key_tier(rpm, tpm, dict, headers):