Update app.py

app.py

@@ -1,6 +1,3 @@
-import random
-import httpx
-
 from fastapi import FastAPI, Request, HTTPException
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import StreamingResponse, JSONResponse
@@ -31,11 +28,11 @@ logger = logging.getLogger(__name__)
 
 API_KEY = "sk-your-secret-key"
 
-# Timeout لمنع التعليق
-REQUEST_TIMEOUT = 40
+# timeout لمنع التعليق الأبدي
+REQUEST_TIMEOUT = 45
 
-# عدد المحاولات
-MAX_RETRIES = 3
+# إعادة المحاولة
+MAX_RETRIES = 2
 
 
 # =====================================================
@@ -201,7 +198,6 @@ async def safe_completion(
 
             client = Client()
 
-            # timeout لمنع التعليق
             response = await asyncio.wait_for(
                 asyncio.to_thread(
                     client.chat.completions.create,
@@ -214,6 +210,14 @@ async def safe_completion(
 
             return response
 
+        except asyncio.TimeoutError:
+
+            last_error = "Request timeout"
+
+            logger.warning(
+                f"Timeout attempt {attempt + 1}"
+            )
+
         except Exception as e:
 
             last_error = e
@@ -222,7 +226,7 @@ async def safe_completion(
                 f"Attempt failed {attempt + 1}: {e}"
             )
 
-            await asyncio.sleep(1)
+        await asyncio.sleep(1)
 
     raise Exception(last_error)
 
@@ -269,7 +273,7 @@ async def chat_completions(
 
                 chunk_id = f"chatcmpl-{uuid.uuid4().hex}"
 
-                chunk_count = 0
+                has_content = False
 
                 for chunk in response:
 
@@ -287,7 +291,7 @@ async def chat_completions(
 
                         if content:
 
-                            chunk_count += 1
+                            has_content = True
 
                             payload = {
                                 "id": chunk_id,
@@ -318,8 +322,8 @@ async def chat_completions(
                             f"Chunk error: {chunk_error}"
                         )
 
-                # إذا لم يصل أي chunk
-                if chunk_count == 0:
+                # provider لم يرسل أي شيء
+                if not has_content:
 
                     error_payload = {
                         "error": {
@@ -354,22 +358,6 @@ async def chat_completions(
 
                 yield "data: [DONE]\n\n"
 
-            except asyncio.TimeoutError:
-
-                logger.error("Streaming timeout")
-
-                error_payload = {
-                    "error": {
-                        "message": "Request timeout",
-                        "type": "timeout"
-                    }
-                }
-
-                yield (
-                    f"data: "
-                    f"{json.dumps(error_payload)}\n\n"
-                )
-
             except Exception as e:
 
                 logger.error(f"Streaming error: {e}")
@@ -442,15 +430,6 @@ async def chat_completions(
             }
         })
 
-    except asyncio.TimeoutError:
-
-        logger.error("Request timeout")
-
-        raise HTTPException(
-            status_code=408,
-            detail="Request timeout"
-        )
-
     except Exception as e:
 
         logger.error(f"Chat error: {e}")