Update api_usage.py

api_usage.py

@@ -17,29 +17,32 @@ def get_subscription(key):
     if check_key_availability():
         has_payment_method = results["has_payment_method"]
         # hard_limit = results["hard_limit"]
+        soft_limit_usd = results["soft_limit_usd"]
         hard_limit_usd = results["hard_limit_usd"]
-        plan = results["plan"]["title"]
+        plan_title = results["plan"]["title"]
+        plan_id = results["plan"]["id"]
         account_name = results["account_name"]
         return {"account_name": account_name,
                 "has_payment_method": has_payment_method,
+                "soft_limit_usd": soft_limit_usd,
                 "hard_limit_usd": hard_limit_usd,
-                "plan": plan}
+                "plan": plan_title + ", " + plan_id}
     else:
         return {"account_name": "",
                 "has_payment_method": False,
                 "hard_limit_usd": "",
                 "plan": ""}
 
-def get_usage(key):
-    if check_key_availability():
-        start_date = datetime.now().strftime('%Y-%m-01')
-        end_date = (datetime.now() + relativedelta(months=1)).strftime('%Y-%m-01')
-        queryUrl = f'https://api.openai.com/dashboard/billing/usage?start_date={start_date}&end_date={end_date}'
-        headers = get_headers(key)
-        r = requests.get(queryUrl, headers=headers)
-        return r.json()
-    else:
-        return ""
+#def get_usage(key):
+#    if check_key_availability():
+#        start_date = datetime.now().strftime('%Y-%m-01')
+#        end_date = (datetime.now() + relativedelta(months=1)).strftime('%Y-%m-01')
+#        queryUrl = f'https://api.openai.com/dashboard/billing/usage?start_date={start_date}&end_date={end_date}'
+#        headers = get_headers(key)
+#        r = requests.get(queryUrl, headers=headers)
+#        return r.json()
+#    else:
+#        return ""
 
 def check_gpt4_availability():
     if check_key_availability():