Update app.py

app.py

@@ -19,14 +19,12 @@ from fastapi.templating import Jinja2Templates
 HOST = "0.0.0.0"
 PORT = int(os.getenv("PORT", "7860"))
 
-# بيانات حساب Z.AI / Zhipu GLM
+# المفتاح أو الحساب الخاص بـ Z.AI / BigModel
+ZAI_API_KEY = os.getenv("ZAI_API_KEY", "").strip()
 ZAI_EMAIL = os.getenv("ZAI_EMAIL", "").strip()
 ZAI_PASSWORD = os.getenv("ZAI_PASSWORD", "").strip()
-ZAI_API_KEY = os.getenv("ZAI_API_KEY", "").strip()
 
-# روابط الخدمة الخاصة بـ Z.AI / Zhipu AI
 ZAI_BASE_URL = "https://open.bigmodel.cn/api/paas/v4"
-ZAI_AUTH_URL = "https://open.bigmodel.cn/api/paas/v4/auth/login"
 
 ZAI_MODELS = [
     "glm-4",
@@ -56,8 +54,8 @@ logger = logging.getLogger("zai-gateway")
 
 app = FastAPI(
     title="Z.AI / GLM Gateway Engine",
-    version="3.0.0",
-    description="Professional Production Gateway for Z.AI (Zhipu GLM-4) supporting OpenAI & Claude APIs"
+    version="3.1.0",
+    description="Fixed Production Gateway for Z.AI (Zhipu GLM-4)"
 )
 
 app.add_middleware(
@@ -71,60 +69,19 @@ app.add_middleware(
 templates = Jinja2Templates(directory="templates")
 
 # ============================================================
-# Z.AI SESSION & AUTH MANAGER
+# Z.AI AUTHENTICATION MANAGER
 # ============================================================
 
-class ZAISessionManager:
-    def __init__(self, email: str, password: str, api_key: str):
-        self.email = email
-        self.password = password
-        self.api_key = api_key
-        self.access_token: Optional[str] = None
-        self.token_expiry: float = 0
-
-    async def get_token(self) -> str:
-        """إدارة واستخراج التوكن تلقائياً وإعادة التجديد عند انتهاء الصلاحية"""
-        if self.api_key:
-            return self.api_key
-
-        if self.access_token and time.time() < self.token_expiry:
-            return self.access_token
-
-        logger.info(f"[Z.AI Auth] جاري استخراج جلسة جديدة للحساب: {self.email}")
-
-        if not self.email or not self.password:
-            raise HTTPException(
-                status_code=400,
-                detail="بيانات ZAI_EMAIL و ZAI_PASSWORD أو ZAI_API_KEY غير متوفرة في متغيرات البيئة."
-            )
-
-        headers = {
-            "Content-Type": "application/json",
-            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"
-        }
-        
-        payload = {
-            "username": self.email,
-            "password": self.password
-        }
-
-        async with httpx.AsyncClient(timeout=15.0) as client:
-            try:
-                resp = await client.post(ZAI_AUTH_URL, json=payload, headers=headers)
-                if resp.status_code == 200:
-                    data = resp.json()
-                    self.access_token = data.get("token") or data.get("access_token")
-                    self.token_expiry = time.time() + 7200  # صلاحية ساعتين
-                    logger.info("[Z.AI Auth] تم تسجيل الدخول واستخراج الجلسة بنجاح.")
-                    return self.access_token
-                else:
-                    logger.error(f"[Z.AI Auth Error] {resp.status_code}: {resp.text}")
-                    raise HTTPException(status_code=401, detail="فشل المصادقة مع خوادم Z.AI.")
-            except Exception as e:
-                logger.error(f"[Z.AI Connection Exception] {e}")
-                raise HTTPException(status_code=500, detail=f"خطأ في الاتصال بنظام Z.AI: {str(e)}")
-
-session_manager = ZAISessionManager(ZAI_EMAIL, ZAI_PASSWORD, ZAI_API_KEY)
+def get_auth_token() -> str:
+    """الحصول على التوكن الصحيح لـ Z.AI"""
+    token = ZAI_API_KEY or ZAI_PASSWORD or ZAI_EMAIL
+    if not token:
+        logger.error("[Z.AI Auth] لم يتم توفير ZAI_API_KEY أو بيانات الاعتماد!")
+        raise HTTPException(
+            status_code=401,
+            detail="يرجى إضافة ZAI_API_KEY في متغيرات البيئة (Environment Variables)."
+        )
+    return token
 
 # ============================================================
 # HELPER FUNCTIONS
@@ -160,16 +117,17 @@ def normalize_messages(messages: List[Dict]) -> List[Dict]:
 @app.on_event("startup")
 async def startup_event():
     logger.info("=" * 60)
-    logger.info("Z.AI (GLM-4) Gateway Engine Started")
+    logger.info("Z.AI (GLM-4) Gateway Engine Started Successfully")
     logger.info("Port: %s", PORT)
-    logger.info("Auth Configured: %s", bool(ZAI_EMAIL or ZAI_API_KEY))
+    logger.info("API Key/Token Configured: %s", bool(ZAI_API_KEY or ZAI_PASSWORD))
     logger.info("=" * 60)
 
 # ============================================================
-# OPENAI COMPATIBLE ENDPOINTS
+# OPENAI COMPATIBLE ENDPOINTS (مع إضافة التوجيه القصير لعدم حدوث 404)
 # ============================================================
 
 @app.get("/v1/models")
+@app.get("/models")
 async def list_models():
     models_data = [
         {"id": model, "object": "model", "created": int(time.time()), "owned_by": "z-ai-glm"}
@@ -178,6 +136,7 @@ async def list_models():
     return {"object": "list", "data": models_data}
 
 @app.post("/v1/chat/completions")
+@app.post("/chat/completions")
 async def chat_completions(request: Request):
     try:
         req_data = await request.json()
@@ -198,7 +157,7 @@ async def chat_completions(request: Request):
         "temperature": req_data.get("temperature", 0.7)
     }
 
-    token = await session_manager.get_token()
+    token = get_auth_token()
     headers = {
         "Authorization": f"Bearer {token}",
         "Content-Type": "application/json",
@@ -213,6 +172,7 @@ async def chat_completions(request: Request):
                 async with client.stream("POST", endpoint, headers=headers, json=payload) as response:
                     if response.status_code != 200:
                         err_body = await response.aread()
+                        logger.error(f"[Z.AI Error] Status {response.status_code}: {err_body.decode('utf-8')}")
                         yield f"data: {json.dumps({'error': err_body.decode('utf-8')})}\n\n"
                         return
                     async for chunk in response.aiter_bytes():
@@ -228,6 +188,7 @@ async def chat_completions(request: Request):
     async with httpx.AsyncClient(timeout=120.0) as client:
         response = await client.post(endpoint, headers=headers, json=payload)
         if response.status_code != 200:
+            logger.error(f"[Z.AI Error] Status {response.status_code}: {response.text}")
             return JSONResponse(status_code=response.status_code, content={"error": response.text})
         return JSONResponse(content=response.json(), status_code=200)
 
@@ -245,6 +206,7 @@ async def list_claude_models():
     }
 
 @app.post("/anthropic/v1/messages")
+@app.post("/v1/messages")
 async def claude_messages(request: Request):
     try:
         req_data = await request.json()
@@ -268,7 +230,7 @@ async def claude_messages(request: Request):
         "temperature": req_data.get("temperature", 0.7)
     }
 
-    token = await session_manager.get_token()
+    token = get_auth_token()
     headers = {
         "Authorization": f"Bearer {token}",
         "Content-Type": "application/json",
@@ -340,27 +302,18 @@ async def claude_messages(request: Request):
 async def health():
     return {
         "status": "online",
-        "engine": "Z.AI (GLM-4)",
-        "configured": bool(ZAI_EMAIL or ZAI_API_KEY)
+        "engine": "Z.AI (GLM-4)"
     }
 
 @app.get("/")
 async def index(request: Request):
-    template_path = os.path.join("templates", "welcome.html")
-    if os.path.isfile(template_path):
-        return templates.TemplateResponse("welcome.html", {"request": request})
     return {
         "service": "Z.AI Gateway API Engine",
         "status": "running",
         "openai_endpoint": "/v1/chat/completions",
-        "anthropic_endpoint": "/anthropic/v1/messages",
-        "health": "/health"
+        "anthropic_endpoint": "/anthropic/v1/messages"
     }
 
-# ============================================================
-# ENTRYPOINT
-# ============================================================
-
 if __name__ == "__main__":
     import uvicorn
     uvicorn.run(app, host=HOST, port=PORT)