Update main.py

main.py

@@ -2,11 +2,10 @@ from fastapi import FastAPI, Request, Header, HTTPException
 from fastapi.responses import JSONResponse, Response, StreamingResponse
 import httpx
 import socket
-import asyncio
 
 app = FastAPI()
 
-REAL_API_KEY = "sk-94NDKhKQkhKoYnY65mg4NAIFK5BqNiCtxo8u3PsDpb0IucZt"  # Replace this with your actual key
+REAL_API_KEY = "sk-94NDKhKQkhKoYnY65mg4NAIFK5BqNiCtxo8u3PsDpb0IucZt"
 BASE_URL = "https://fast.typegpt.net"
 PUBLIC_AUTH_TOKEN = "TypeGPT-Free4ALL"
 
@@ -30,7 +29,6 @@ async def proxy(request: Request, path: str, authorization: str = Header(None)):
         raise HTTPException(status_code=401, detail="Invalid Authorization token. Use 'TypeGPT-Free4ALL'.")
 
     target_url = f"{BASE_URL}/{path}"
-
     headers = {
         "Authorization": f"Bearer {REAL_API_KEY}",
         "Content-Type": request.headers.get("content-type", "application/json"),
@@ -39,8 +37,6 @@ async def proxy(request: Request, path: str, authorization: str = Header(None)):
     }
 
     body = await request.body()
-
-    # Detect stream mode
     is_stream = b'"stream":true' in body or b'"stream": true' in body
 
     print(f"🔄 Forwarding to: {target_url}")
@@ -49,29 +45,39 @@ async def proxy(request: Request, path: str, authorization: str = Header(None)):
 
     async with httpx.AsyncClient(timeout=60) as client:
         try:
-            response = await client.request(
-                method=request.method,
-                url=target_url,
-                headers=headers,
-                content=body,
-                stream=is_stream,
-            )
+            if is_stream:
+                # For streaming, use .stream()
+                upstream_response = await client.stream(
+                    method=request.method,
+                    url=target_url,
+                    headers=headers,
+                    content=body
+                )
+
+                async def stream_generator():
+                    async for chunk in upstream_response.aiter_bytes():
+                        yield chunk
+
+                return StreamingResponse(stream_generator(), status_code=upstream_response.status_code, media_type="text/event-stream")
+            else:
+                # For normal response, use .request()
+                response = await client.request(
+                    method=request.method,
+                    url=target_url,
+                    headers=headers,
+                    content=body
+                )
         except httpx.RequestError as e:
             raise HTTPException(status_code=502, detail=f"Backend request failed: {e}")
 
-        if is_stream:
-            async def event_generator():
-                async for chunk in response.aiter_bytes():
-                    yield chunk
+    print(f"↩️ TypeGPT Status: {response.status_code}")
+    print(f"🧾 Response Snippet: {response.text[:200]}")
 
-            return StreamingResponse(event_generator(), status_code=response.status_code, media_type="text/event-stream")
-
-        # For non-streamed response
-        try:
-            return JSONResponse(content=response.json(), status_code=response.status_code)
-        except Exception:
-            return Response(
-                content=response.content,
-                status_code=response.status_code,
-                media_type=response.headers.get("content-type", "text/plain")
-            )
+    try:
+        return JSONResponse(content=response.json(), status_code=response.status_code)
+    except Exception:
+        return Response(
+            content=response.content,
+            status_code=response.status_code,
+            media_type=response.headers.get("content-type", "text/plain")
+        )