From a25dc9c4e7632673f3332bcf8878d4f0393da9c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Cavalcanti?= Date: Thu, 23 Jan 2025 15:54:21 -0300 Subject: [PATCH] ajuste para verificar formdata e json na chamada groq --- groq_handler.py | 57 +++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/groq_handler.py b/groq_handler.py index aaf670b..6d53cf9 100644 --- a/groq_handler.py +++ b/groq_handler.py @@ -40,9 +40,10 @@ async def get_working_groq_key(storage) -> Optional[str]: storage.add_log("ERROR", "No working GROQ keys available") return None -async def handle_groq_request(url: str, headers: dict, data: dict, storage) -> Tuple[bool, dict, str]: +async def handle_groq_request(url: str, headers: dict, data, storage, is_form_data: bool = False) -> Tuple[bool, dict, str]: """ Handle GROQ API request with retries and key rotation. + Suporta tanto JSON quanto FormData. Returns: (success, response_data, error_message) """ max_retries = len(storage.get_groq_keys()) @@ -50,31 +51,35 @@ async def handle_groq_request(url: str, headers: dict, data: dict, storage) -> T for attempt in range(max_retries): try: async with aiohttp.ClientSession() as session: - async with session.post(url, headers=headers, json=data) as response: - response_data = await response.json() - - if response.status == 200: - # Validate response content - if "choices" in response_data and response_data["choices"]: - content = response_data["choices"][0].get("message", {}).get("content") - if content and await validate_transcription_response(content): - return True, response_data, "" - - # Handle specific error cases - error_msg = response_data.get("error", {}).get("message", "") - if "organization_restricted" in error_msg or "invalid_api_key" in error_msg: - # Try next key - new_key = await get_working_groq_key(storage) - if new_key: - headers["Authorization"] = f"Bearer {new_key}" - storage.add_log("INFO", "Tentando nova chave GROQ após erro", { - "error": error_msg, - "attempt": attempt + 1 - }) - continue - - return False, {}, f"API Error: {error_msg}" - + if is_form_data: + async with session.post(url, headers=headers, data=data) as response: + response_data = await response.json() + else: + async with session.post(url, headers=headers, json=data) as response: + response_data = await response.json() + + if response.status == 200: + # Validate response content + if "choices" in response_data and response_data["choices"]: + content = response_data["choices"][0].get("message", {}).get("content") + if content and await validate_transcription_response(content): + return True, response_data, "" + + # Handle specific error cases + error_msg = response_data.get("error", {}).get("message", "") + if "organization_restricted" in error_msg or "invalid_api_key" in error_msg: + # Try next key + new_key = await get_working_groq_key(storage) + if new_key: + headers["Authorization"] = f"Bearer {new_key}" + storage.add_log("INFO", "Tentando nova chave GROQ após erro", { + "error": error_msg, + "attempt": attempt + 1 + }) + continue + + return False, {}, f"API Error: {error_msg}" + except Exception as e: # Tratamento específico para erros de conexão if "Connection" in str(e) and attempt < max_retries - 1: