From 0f9e2be7b9c423e855b9d4e73efa82971ba75c5c Mon Sep 17 00:00:00 2001
From: based <phrog@riseup.net>
Date: Wed, 5 Jun 2024 12:18:36 +1000
Subject: [PATCH] dead makersuite key detection (perma 429 err)

---
 MakerSuite.py | 11 ++++++++++-
 main.py       |  3 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/MakerSuite.py b/MakerSuite.py
index ccbe440..db437dd 100644
--- a/MakerSuite.py
+++ b/MakerSuite.py
@@ -19,9 +19,12 @@ async def check_makersuite(key: APIKey, session):
 
 
 # rpm limit of 2 on nonbilling keys is hit or miss for me, and rpm isn't returned in headers like oai/anthro so have to check it like this unfortunately.
-# google will also start terminating generation requests on high key batches (40+), so the checker will output errors but recover and check fine still
+# google will also start terminating generation requests on high key batches (50+)
 async def test_makersuite_billing(key: APIKey, session):
     data = {
+        "generationConfig": {
+            "max_output_tokens": 1
+        },
         "contents": {
             "role": "user",
             "parts": [
@@ -33,8 +36,14 @@ async def test_makersuite_billing(key: APIKey, session):
     }
 
     async with session.post(f"https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-pro:generateContent?key={key.api_key}", json=data) as response:
+        resp_json = await response.json()
         if response.status != 429:
             key.enabled_billing = True
+        else:
+            error_details = resp_json.get('error', {}).get('message', '')
+            # different type of 429 error compared to hitting the rpm limit, keys with this seem to never recover and are just perma 429'd, so we mark them as invalid
+            if "limit 'GenerateContent request limit per minute for a region' of service 'generativelanguage.googleapis.com' for consumer" in error_details:
+                return
         return True
 
 
diff --git a/main.py b/main.py
index 89a5737..771e5ba 100644
--- a/main.py
+++ b/main.py
@@ -209,6 +209,7 @@ openrouter_regex = re.compile(r'sk-or-v1-[a-z0-9]{64}')
 # vertex_regex = re.compile(r'^(.+):(ya29.[A-Za-z0-9\-_]{469})$') regex for the oauth tokens, useless since they expire hourly
 executor = ThreadPoolExecutor(max_workers=100)
 concurrent_connections = asyncio.Semaphore(1500)
+makersuite_semaphore = asyncio.Semaphore(50)  # when did google become such a pussy
 
 
 async def validate_keys():
@@ -232,7 +233,7 @@ async def validate_keys():
             if not match:
                 continue
             key_obj = APIKey(Provider.MAKERSUITE, key)
-            tasks.append(execute_with_retries(validate_makersuite, key_obj, concurrent_connections, 5))
+            tasks.append(execute_with_retries(validate_makersuite, key_obj, makersuite_semaphore, 5))
         elif "sk-or-v1-" in key:
             match = openrouter_regex.match(key)
             if not match: