Upload proxy_handler.py

proxy_handler.py

@@ -37,6 +37,262 @@ class ProxyHandler:
     async def __aexit__(self, exc_type, exc_val, exc_tb):
         await self.client.aclose()
 
+    def transform_content(self, content: str) -> str:
+        """Transform content by replacing HTML tags and optionally removing think tags"""
+        if not content:
+            return content
+
+        logger.debug(f"SHOW_THINK_TAGS setting: {settings.SHOW_THINK_TAGS}")
+        logger.debug(f"Original content: {content[:200]}...")
+
+        # Optionally remove thinking content based on configuration
+        if not settings.SHOW_THINK_TAGS:
+            logger.debug("Removing thinking content from response")
+            original_length = len(content)
+
+            # Remove <details> blocks (thinking content) - handle both closed and unclosed tags
+            # First try to remove complete <details>...</details> blocks
+            content = re.sub(
+                r"<details[^>]*>.*?</details>", "", content, flags=re.DOTALL
+            )
+
+            # Then remove any remaining unclosed <details> tags and their content
+            # Look for <details> tag followed by content until we find what looks like answer content
+            content = re.sub(
+                r"<details[^>]*>.*?(?=\n\s*[A-Z][^<\n]*[.!?]|\n\s*\d+\.|\n\s*[-*]\s|$)",
+                "",
+                content,
+                flags=re.DOTALL,
+            )
+
+            # Remove any remaining <summary> blocks
+            content = re.sub(r"<summary>.*?</summary>", "", content, flags=re.DOTALL)
+
+            content = content.strip()
+
+            logger.debug(
+                f"Content length after removing thinking content: {original_length} -> {len(content)}"
+            )
+        else:
+            logger.debug("Keeping thinking content, converting to <think> tags")
+
+            # First, remove <summary> tags and their content
+            content = re.sub(r"<summary>.*?</summary>", "", content, flags=re.DOTALL)
+
+            # Replace <details> with <think>
+            content = re.sub(r"<details[^>]*>", "<think>", content)
+            content = content.replace("</details>", "</think>")
+
+            # Handle unclosed <think> tags - need better logic to find where thinking ends
+            if "<think>" in content and "</think>" not in content:
+                logger.debug("Found unclosed <think> tag, attempting to close it")
+                
+                # Find the position of <think>
+                think_start = content.find("<think>")
+                if think_start != -1:
+                    # Look for where the actual answer begins
+                    # This is typically after the thinking content, marked by:
+                    # 1. A line that starts with normal text (not continuation of thinking)
+                    # 2. Often starts with a capital letter
+                    # 3. Might be after some whitespace/newlines
+                    
+                    search_content = content[think_start + 7:]  # Skip "<think>"
+                    
+                    # Look for patterns that indicate the start of the answer:
+                    # - New paragraph with capital letter
+                    # - Numbered list
+                    # - Clear sentence structure
+                    patterns = [
+                        r'\n\n+([A-Z][^<\n]*)',  # New paragraph starting with capital
+                        r'\n\n+(\d+\.)',         # Numbered list
+                        r'\n\n+([A-Z][^<\n]*[.!?])', # Complete sentence
+                        r'\n\n+([*-]\s)',        # Bullet point
+                    ]
+                    
+                    answer_start = None
+                    for pattern in patterns:
+                        match = re.search(pattern, search_content)
+                        if match:
+                            answer_start = think_start + 7 + match.start()
+                            logger.debug(f"Found answer start at position {answer_start} with pattern: {pattern}")
+                            break
+                    
+                    if answer_start:
+                        # Insert </think> before the answer
+                        content = content[:answer_start] + "\n</think>\n" + content[answer_start:].lstrip()
+                    else:
+                        # If no clear answer found, close at the end
+                        logger.debug("No clear answer pattern found, closing think tag at end")
+                        content = content.rstrip() + "\n</think>"
+
+            # Clean up multiple newlines and spacing
+            content = re.sub(r'\n\s*\n\s*\n+', '\n\n', content)
+
+        logger.debug(f"Final transformed content: {content[:200]}...")
+        return content.strip()
+
+    async def proxy_request(self, request: ChatCompletionRequest) -> Dict[str, Any]:
+        """Proxy request to Z.AI API"""
+        cookie = await cookie_manager.get_next_cookie()
+        if not cookie:
+            raise HTTPException(status_code=503, detail="No available cookies")
+
+        # Transform model name
+        target_model = (
+            settings.UPSTREAM_MODEL
+            if request.model == settings.MODEL_NAME
+            else request.model
+        )
+
+        # Determine if this should be a streaming response
+        is_streaming = (
+            request.stream if request.stream is not None else settings.DEFAULT_STREAM
+        )
+
+        # Validate parameter compatibility
+        if is_streaming and not settings.SHOW_THINK_TAGS:
+            logger.warning("SHOW_THINK_TAGS=false is ignored for streaming responses")
+
+        # Prepare request data
+        request_data = request.model_dump(exclude_none=True)
+        request_data["model"] = target_model
+
+        # Build request data based on actual Z.AI format from zai-messages.md
+        import uuid
+
+        request_data = {
+            "stream": True,  # Always request streaming from Z.AI for processing
+            "model": target_model,
+            "messages": request_data["messages"],
+            "background_tasks": {"title_generation": True, "tags_generation": True},
+            "chat_id": str(uuid.uuid4()),
+            "features": {
+                "image_generation": False,
+                "code_interpreter": False,
+                "web_search": False,
+                "auto_web_search": False,
+            },
+            "id": str(uuid.uuid4()),
+            "mcp_servers": ["deep-web-search"],
+            "model_item": {"id": target_model, "name": "GLM-4.5", "owned_by": "openai"},
+            "params": {},
+            "tool_servers": [],
+            "variables": {
+                "{{USER_NAME}}": "User",
+                "{{USER_LOCATION}}": "Unknown",
+                "{{CURRENT_DATETIME}}": "2025-08-04 16:46:56",
+            },
+        }
+
+        logger.debug(f"Sending request data: {request_data}")
+
+        headers = {
+            "Content-Type": "application/json",
+            "Authorization": f"Bearer {cookie}",
+            "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36",
+            "Accept": "application/json, text/event-stream",
+            "Accept-Language": "zh-CN",
+            "sec-ch-ua": '"Not)A;Brand";v="8", "Chromium";v="138", "Google Chrome";v="138"',
+            "sec-ch-ua-mobile": "?0",
+            "sec-ch-ua-platform": '"macOS"',
+            "x-fe-version": "prod-fe-1.0.53",
+            "Origin": "https://chat.z.ai",
+            "Referer": "https://chat.z.ai/c/069723d5-060b-404f-992c-4705f1554c4c",
+        }
+
+        try:
+            # Use client.stream() for TRUE streaming response - this is the key fix!
+            async with self.client.stream(
+                "POST",
+                settings.UPSTREAM_URL,
+                json=request_data,
+                headers=headers,
+                timeout=httpx.Timeout(60.0, read=300.0)
+            ) as response:
+
+                if response.status_code == 401:
+                    await cookie_manager.mark_cookie_failed(cookie)
+                    raise HTTPException(status_code=401, detail="Invalid authentication")
+
+                if response.status_code != 200:
+                    # For streaming, we need to read the error response properly
+                    try:
+                        error_text = await response.aread()
+                        error_detail = error_text.decode('utf-8')
+                    except:
+                        error_detail = f"HTTP {response.status_code}"
+
+                    raise HTTPException(
+                        status_code=response.status_code,
+                        detail=f"Upstream error: {error_detail}",
+                    )
+
+                await cookie_manager.mark_cookie_success(cookie)
+                return {"response": response, "cookie": cookie}
+
+        except httpx.RequestError as e:
+            logger.error(f"Request error: {e}")
+            logger.error(f"Request error type: {type(e).__name__}")
+            logger.error(f"Request URL: {settings.UPSTREAM_URL}")
+            logger.error(f"Request timeout: {self.client.timeout}")
+            await cookie_manager.mark_cookie_failed(cookie)
+            raise HTTPException(
+                status_code=503, detail=f"Upstream service unavailable: {str(e)}"
+            )
+
+    async def process_streaming_response(
+        self, response: httpx.Response
+    ) -> AsyncGenerator[Dict[str, Any], None]:
+        """Process streaming response from Z.AI - TRUE real-time processing"""
+        buffer = ""
+
+        # Use aiter_text with small chunk size for real-time processing
+        async for chunk in response.aiter_text(chunk_size=1024):  # Small chunks for responsiveness
+            if not chunk:
+                continue
+
+            buffer += chunk
+
+            # Process complete lines immediately
+            while "\n" in buffer:
+                line, buffer = buffer.split("\n", 1)
+                line = line.strip()
+
+                if not line.startswith("data: "):
+                    continue
+
+                payload = line[6:].strip()
+                if payload == "[DONE]":
+                    return
+
+                try:
+                    parsed = json.loads(payload)
+
+                    # Check for errors first
+                    if parsed.get("error") or (parsed.get("data", {}).get("error")):
+                        error_detail = (
+                            parsed.get("error", {}).get("detail")
+                            or parsed.get("data", {}).get("error", {}).get("detail")
+                            or "Unknown error from upstream"
+                        )
+                        logger.error(f"Upstream error: {error_detail}")
+                        raise HTTPException(
+                            status_code=400, detail=f"Upstream error: {error_detail}"
+                        )
+
+                    # Clean up response data
+                    if parsed.get("data"):
+                        # Remove unwanted fields for cleaner processing
+                        parsed["data"].pop("edit_index", None)
+                        parsed["data"].pop("edit_content", None)
+
+                    # Yield immediately for real-time streaming
+                    yield parsed
+
+                except json.JSONDecodeError as e:
+                    logger.debug(f"JSON decode error (skipping): {e}")
+                    continue  # Skip non-JSON lines
+
     async def handle_chat_completion(self, request: ChatCompletionRequest):
         """Handle chat completion request"""
         # Determine final streaming mode
@@ -55,21 +311,203 @@ class ProxyHandler:
                 },
             )
         else:
-            # For non-streaming, collect and process the full response
-            return await self.aggregate_non_stream_response(request)
+            # For non-streaming responses, collect all streaming data first
+            chunks = []
+            async for chunk_data in self.stream_proxy_response(request):
+                if chunk_data.startswith("data: ") and not chunk_data.startswith("data: [DONE]"):
+                    try:
+                        chunk_json = json.loads(chunk_data[6:])
+                        if chunk_json.get("choices", [{}])[0].get("delta", {}).get("content"):
+                            chunks.append(chunk_json["choices"][0]["delta"]["content"])
+                    except:
+                        continue
+
+            # Combine all content
+            full_content = "".join(chunks)
+
+            # Apply final transformation for non-streaming response
+            transformed_content = self.transform_content(full_content)
+
+            # Return as non-streaming response
+            import time
+            import uuid
+            return ChatCompletionResponse(
+                id=f"chatcmpl-{uuid.uuid4().hex[:29]}",
+                created=int(time.time()),
+                model=request.model,
+                choices=[
+                    {
+                        "index": 0,
+                        "message": {"role": "assistant", "content": transformed_content},
+                        "finish_reason": "stop",
+                    }
+                ],
+            )
 
-    async def _build_request_payload(self, request: ChatCompletionRequest) -> Dict[str, Any]:
-        """Helper to build the Z.AI request payload"""
+    async def stream_response(self, response: httpx.Response, model: str) -> AsyncGenerator[str, None]:
+        """Generate TRUE streaming response in OpenAI format - real-time processing"""
         import uuid
-        target_model = "0727-360B-API"
-        
-        # Correctly serialize ChatMessage objects to dictionaries
-        messages_as_dicts = [msg.model_dump() for msg in request.messages]
+        import time
 
-        return {
-            "stream": True,
+        # Generate a unique completion ID
+        completion_id = f"chatcmpl-{uuid.uuid4().hex[:29]}"
+        current_phase = None
+
+        try:
+            # Real-time streaming: process each chunk immediately as it arrives
+            async for parsed in self.process_streaming_response(response):
+                try:
+                    data = parsed.get("data", {})
+                    delta_content = data.get("delta_content", "")
+                    phase = data.get("phase", "")
+
+                    # Track phase changes
+                    if phase != current_phase:
+                        current_phase = phase
+                        logger.debug(f"Phase changed to: {phase}")
+
+                    # Apply filtering based on SHOW_THINK_TAGS and phase
+                    should_send_content = True
+
+                    if not settings.SHOW_THINK_TAGS and phase == "thinking":
+                        # Skip thinking content when SHOW_THINK_TAGS=false
+                        should_send_content = False
+                        logger.debug(f"Skipping thinking content (SHOW_THINK_TAGS=false)")
+
+                    # Process and send content immediately if we should
+                    if delta_content and should_send_content:
+                        # Minimal transformation for real-time streaming
+                        transformed_delta = delta_content
+
+                        if settings.SHOW_THINK_TAGS:
+                            # Simple tag replacement for streaming
+                            transformed_delta = re.sub(r'<details[^>]*>', '<think>', transformed_delta)
+                            transformed_delta = transformed_delta.replace('</details>', '</think>')
+                            # Remove summary tags for streaming
+                            transformed_delta = re.sub(r"<summary>.*?</summary>", "", transformed_delta, flags=re.DOTALL)
+
+                        # Create and send OpenAI-compatible chunk immediately
+                        openai_chunk = {
+                            "id": completion_id,
+                            "object": "chat.completion.chunk",
+                            "created": int(time.time()),
+                            "model": model,
+                            "choices": [{
+                                "index": 0,
+                                "delta": {
+                                    "content": transformed_delta
+                                },
+                                "finish_reason": None
+                            }]
+                        }
+
+                        # Yield immediately for real-time streaming
+                        yield f"data: {json.dumps(openai_chunk)}\n\n"
+
+                except Exception as e:
+                    logger.error(f"Error processing streaming chunk: {e}")
+                    continue
+
+            # Send final completion chunk
+            final_chunk = {
+                "id": completion_id,
+                "object": "chat.completion.chunk",
+                "created": int(time.time()),
+                "model": model,
+                "choices": [{
+                    "index": 0,
+                    "delta": {},
+                    "finish_reason": "stop"
+                }]
+            }
+
+            yield f"data: {json.dumps(final_chunk)}\n\n"
+            yield "data: [DONE]\n\n"
+
+        except Exception as e:
+            logger.error(f"Streaming error: {e}")
+            # Send error in OpenAI format
+            error_chunk = {
+                "error": {
+                    "message": str(e),
+                    "type": "server_error"
+                }
+            }
+            yield f"data: {json.dumps(error_chunk)}\n\n"
+
+    async def non_stream_response(
+        self, response: httpx.Response, model: str
+    ) -> ChatCompletionResponse:
+        """Generate non-streaming response"""
+        chunks = []
+        async for parsed in self.process_streaming_response(response):
+            chunks.append(parsed)
+            logger.debug(f"Received chunk: {parsed}")  # Debug log
+
+        if not chunks:
+            raise HTTPException(status_code=500, detail="No response from upstream")
+
+        logger.info(f"Total chunks received: {len(chunks)}")
+        logger.debug(f"First chunk structure: {chunks[0] if chunks else 'None'}")
+
+        # Aggregate content based on SHOW_THINK_TAGS setting
+        if settings.SHOW_THINK_TAGS:
+            # Include all content
+            full_content = "".join(
+                chunk.get("data", {}).get("delta_content", "") for chunk in chunks
+            )
+        else:
+            # Only include answer phase content
+            full_content = "".join(
+                chunk.get("data", {}).get("delta_content", "")
+                for chunk in chunks
+                if chunk.get("data", {}).get("phase") == "answer"
+            )
+
+        logger.info(f"Aggregated content length: {len(full_content)}")
+        logger.debug(
+            f"Full aggregated content: {full_content}"
+        )  # Show full content for debugging
+
+        # Apply content transformation (including think tag filtering)
+        transformed_content = self.transform_content(full_content)
+
+        logger.info(f"Transformed content length: {len(transformed_content)}")
+        logger.debug(f"Transformed content: {transformed_content[:200]}...")
+
+        # Create OpenAI-compatible response
+        return ChatCompletionResponse(
+            id=chunks[0].get("data", {}).get("id", "chatcmpl-unknown"),
+            created=int(time.time()),
+            model=model,
+            choices=[
+                {
+                    "index": 0,
+                    "message": {"role": "assistant", "content": transformed_content},
+                    "finish_reason": "stop",
+                }
+            ],
+        )
+
+    async def stream_proxy_response(self, request: ChatCompletionRequest) -> AsyncGenerator[str, None]:
+        """TRUE streaming proxy - direct pass-through with minimal processing"""
+        import uuid
+        import time
+
+        # Get cookie
+        cookie = await cookie_manager.get_next_cookie()
+        if not cookie:
+            raise HTTPException(status_code=503, detail="No valid authentication available")
+
+        # Prepare request data
+        request_data = request.model_dump(exclude_none=True)
+        target_model = "0727-360B-API"  # Map GLM-4.5 to Z.AI model
+
+        # Build Z.AI request format
+        request_data = {
+            "stream": True,  # Always request streaming from Z.AI
             "model": target_model,
-            "messages": messages_as_dicts,
+            "messages": request_data["messages"],
             "background_tasks": {
                 "title_generation": True,
                 "tags_generation": True
@@ -97,10 +535,8 @@ class ProxyHandler:
                 "{{CURRENT_DATETIME}}": "2025-08-04 16:46:56"
             }
         }
-        
-    def _build_request_headers(self, cookie: str) -> Dict[str, str]:
-        """Helper to build request headers"""
-        return {
+
+        headers = {
             "Content-Type": "application/json",
             "Authorization": f"Bearer {cookie}",
             "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36",
@@ -111,191 +547,126 @@ class ProxyHandler:
             "sec-ch-ua-platform": '"macOS"',
             "x-fe-version": "prod-fe-1.0.53",
             "Origin": "https://chat.z.ai",
-            "Referer": "https://chat.z.ai/",
+            "Referer": "https://chat.z.ai/c/069723d5-060b-404f-992c-4705f1554c4c",
         }
 
-    async def stream_proxy_response(self, request: ChatCompletionRequest) -> AsyncGenerator[str, None]:
-        """Handle true streaming response, transforming Z.AI stream to OpenAI format."""
-        import uuid
-        
-        cookie = await cookie_manager.get_next_cookie()
-        if not cookie:
-            raise HTTPException(status_code=503, detail="No valid authentication available")
-
-        request_data = await self._build_request_payload(request)
-        headers = self._build_request_headers(cookie)
         completion_id = f"chatcmpl-{uuid.uuid4().hex[:29]}"
-        
-        is_in_think_block = False
+        current_phase = None
+        collected_content = ""  # For post-processing in non-streaming mode
 
         try:
-            async with self.client.stream("POST", settings.UPSTREAM_URL, json=request_data, headers=headers) as response:
-                if response.status_code == 401:
-                    await cookie_manager.mark_cookie_failed(cookie)
-                    raise HTTPException(status_code=401, detail="Invalid authentication")
-                if response.status_code != 200:
-                    await cookie_manager.mark_cookie_failed(cookie)
-                    error_text = await response.aread()
-                    raise HTTPException(status_code=response.status_code, detail=f"Upstream error: {error_text.decode()}")
-
-                await cookie_manager.mark_cookie_success(cookie)
-
-                buffer = ""
-                async for chunk in response.aiter_text():
-                    buffer += chunk
-                    while "\n" in buffer:
-                        line, buffer = buffer.split("\n", 1)
-                        if not line.startswith("data:"):
+            # Create a new client for this streaming request to avoid conflicts
+            async with httpx.AsyncClient(
+                timeout=httpx.Timeout(60.0, read=300.0),
+                limits=httpx.Limits(max_connections=100, max_keepalive_connections=20),
+                http2=True
+            ) as stream_client:
+                async with stream_client.stream(
+                    "POST",
+                    settings.UPSTREAM_URL,
+                    json=request_data,
+                    headers=headers
+                ) as response:
+
+                    if response.status_code == 401:
+                        await cookie_manager.mark_cookie_failed(cookie)
+                        raise HTTPException(status_code=401, detail="Invalid authentication")
+
+                    if response.status_code != 200:
+                        await cookie_manager.mark_cookie_failed(cookie)
+                        raise HTTPException(status_code=response.status_code, detail="Upstream error")
+
+                    await cookie_manager.mark_cookie_success(cookie)
+
+                    # Process streaming response in real-time
+                    buffer = ""
+                    async for chunk in response.aiter_text(chunk_size=1024):
+                        if not chunk:
                             continue
 
-                        payload = line[6:].strip()
-                        if payload == "[DONE]":
-                            break
-                        
-                        try:
-                            parsed = json.loads(payload)
-                            data = parsed.get("data", {})
-                            delta_content = data.get("delta_content", "")
-                            phase = data.get("phase", "")
-
-                            content_to_send = ""
-
-                            if settings.SHOW_THINK_TAGS:
-                                # State-based think tag management
-                                if phase == "thinking" and not is_in_think_block:
-                                    content_to_send += "<think>"
-                                    is_in_think_block = True
-                                elif phase == "answer" and is_in_think_block:
-                                    content_to_send += "</think>\n"
-                                    is_in_think_block = False
-                                
-                                # Clean up original tags regardless of phase
-                                cleaned_delta = re.sub(r"<details[^>]*>.*?</details>", "", delta_content, flags=re.DOTALL)
-                                cleaned_delta = re.sub(r"<summary>.*?</summary>", "", cleaned_delta, flags=re.DOTALL)
-                                content_to_send += cleaned_delta
-
-                            else: # SHOW_THINK_TAGS is false
-                                if phase == "answer":
-                                    # Still need to clean the first answer chunk which might contain </details>
-                                    cleaned_delta = re.sub(r"</details>", "", delta_content)
-                                    content_to_send += cleaned_delta
-                            
-                            if content_to_send:
-                                openai_chunk = {
-                                    "id": completion_id,
-                                    "object": "chat.completion.chunk",
-                                    "created": int(time.time()),
-                                    "model": request.model,
-                                    "choices": [{"index": 0, "delta": {"content": content_to_send}, "finish_reason": None}]
-                                }
-                                yield f"data: {json.dumps(openai_chunk)}\n\n"
-
-                        except json.JSONDecodeError:
-                            continue
+                        buffer += chunk
+
+                        # Process complete lines immediately
+                        while "\n" in buffer:
+                            line, buffer = buffer.split("\n", 1)
+                            line = line.strip()
+
+                            if not line.startswith("data: "):
+                                continue
+
+                            payload = line[6:].strip()
+                            if payload == "[DONE]":
+                                # For streaming mode, just send the final chunk and done
+                                if request.stream:
+                                    final_chunk = {
+                                        "id": completion_id,
+                                        "object": "chat.completion.chunk",
+                                        "created": int(time.time()),
+                                        "model": request.model,
+                                        "choices": [{
+                                            "index": 0,
+                                            "delta": {},
+                                            "finish_reason": "stop"
+                                        }]
+                                    }
+                                    yield f"data: {json.dumps(final_chunk)}\n\n"
+                                    yield "data: [DONE]\n\n"
+                                return
+
+                            try:
+                                parsed = json.loads(payload)
+                                data = parsed.get("data", {})
+                                delta_content = data.get("delta_content", "")
+                                phase = data.get("phase", "")
+
+                                # Track phase changes
+                                if phase != current_phase:
+                                    current_phase = phase
+                                    logger.debug(f"Phase changed to: {phase}")
+
+                                # Collect content for potential post-processing
+                                if delta_content:
+                                    collected_content += delta_content
+
+                                # Apply filtering based on SHOW_THINK_TAGS and phase
+                                should_send_content = True
+
+                                if not settings.SHOW_THINK_TAGS and phase == "thinking":
+                                    should_send_content = False
+
+                                # Process and send content immediately if we should (for streaming)
+                                if delta_content and should_send_content and request.stream:
+                                    # Minimal transformation for real-time streaming
+                                    transformed_delta = delta_content
+
+                                    if settings.SHOW_THINK_TAGS:
+                                        # Simple tag replacement for streaming
+                                        transformed_delta = re.sub(r'<details[^>]*>', '<think>', transformed_delta)
+                                        transformed_delta = transformed_delta.replace('</details>', '</think>')
+                                        transformed_delta = re.sub(r"<summary>.*?</summary>", "", transformed_delta, flags=re.DOTALL)
+
+                                    # Create and send OpenAI-compatible chunk immediately
+                                    openai_chunk = {
+                                        "id": completion_id,
+                                        "object": "chat.completion.chunk",
+                                        "created": int(time.time()),
+                                        "model": request.model,
+                                        "choices": [{
+                                            "index": 0,
+                                            "delta": {
+                                                "content": transformed_delta
+                                            },
+                                            "finish_reason": None
+                                        }]
+                                    }
+
+                                    # Yield immediately for real-time streaming
+                                    yield f"data: {json.dumps(openai_chunk)}\n\n"
+
+                            except json.JSONDecodeError:
+                                continue  # Skip non-JSON lines
 
         except httpx.RequestError as e:
+            logger.error(f"Streaming request error: {e}")
             await cookie_manager.mark_cookie_failed(cookie)
-            raise HTTPException(status_code=503, detail=f"Upstream service unavailable: {str(e)}")
-        finally:
-            if is_in_think_block:
-                # Ensure the think tag is closed if stream ends unexpectedly
-                closing_chunk = {
-                    "id": completion_id, "object": "chat.completion.chunk", "created": int(time.time()), "model": request.model,
-                    "choices": [{"index": 0, "delta": {"content": "\n</think>"}, "finish_reason": None}]
-                }
-                yield f"data: {json.dumps(closing_chunk)}\n\n"
-
-            # Send final completion chunk
-            final_chunk = {
-                "id": completion_id, "object": "chat.completion.chunk", "created": int(time.time()), "model": request.model,
-                "choices": [{"index": 0, "delta": {}, "finish_reason": "stop"}]
-            }
-            yield f"data: {json.dumps(final_chunk)}\n\n"
-            yield "data: [DONE]\n\n"
-
-
-    async def aggregate_non_stream_response(self, request: ChatCompletionRequest) -> ChatCompletionResponse:
-        """Handle non-streaming response by aggregating the stream."""
-        import uuid
-
-        cookie = await cookie_manager.get_next_cookie()
-        if not cookie:
-            raise HTTPException(status_code=503, detail="No valid authentication available")
-
-        request_data = await self._build_request_payload(request)
-        headers = self._build_request_headers(cookie)
-        
-        content_parts = []
-        is_in_think_block = False
-
-        try:
-            async with self.client.stream("POST", settings.UPSTREAM_URL, json=request_data, headers=headers) as response:
-                if response.status_code == 401:
-                    await cookie_manager.mark_cookie_failed(cookie)
-                    raise HTTPException(status_code=401, detail="Invalid authentication")
-                if response.status_code != 200:
-                    await cookie_manager.mark_cookie_failed(cookie)
-                    error_text = await response.aread()
-                    raise HTTPException(status_code=response.status_code, detail=f"Upstream error: {error_text.decode()}")
-
-                await cookie_manager.mark_cookie_success(cookie)
-
-                buffer = ""
-                async for chunk in response.aiter_text():
-                    buffer += chunk
-                    while "\n" in buffer:
-                        line, buffer = buffer.split("\n", 1)
-                        if not line.startswith("data:"):
-                            continue
-
-                        payload = line[6:].strip()
-                        if payload == "[DONE]":
-                            break
-                        
-                        try:
-                            parsed = json.loads(payload)
-                            data = parsed.get("data", {})
-                            delta_content = data.get("delta_content", "")
-                            phase = data.get("phase", "")
-
-                            if settings.SHOW_THINK_TAGS:
-                                if phase == "thinking" and not is_in_think_block:
-                                    content_parts.append("<think>")
-                                    is_in_think_block = True
-                                elif phase == "answer" and is_in_think_block:
-                                    content_parts.append("</think>\n")
-                                    is_in_think_block = False
-                                
-                                cleaned_delta = re.sub(r"<details[^>]*>.*?</details>", "", delta_content, flags=re.DOTALL)
-                                cleaned_delta = re.sub(r"<summary>.*?</summary>", "", cleaned_delta, flags=re.DOTALL)
-                                content_parts.append(cleaned_delta)
-                            
-                            else: # SHOW_THINK_TAGS is false
-                                if phase == "answer":
-                                    cleaned_delta = re.sub(r"</details>", "", delta_content)
-                                    content_parts.append(cleaned_delta)
-
-                        except json.JSONDecodeError:
-                            continue
-            
-            if is_in_think_block:
-                content_parts.append("</think>")
-
-        except httpx.RequestError as e:
-            await cookie_manager.mark_cookie_failed(cookie)
-            raise HTTPException(status_code=503, detail=f"Upstream service unavailable: {str(e)}")
-
-        full_content = "".join(content_parts).strip()
-
-        return ChatCompletionResponse(
-            id=f"chatcmpl-{uuid.uuid4().hex[:29]}",
-            created=int(time.time()),
-            model=request.model,
-            choices=[
-                {
-                    "index": 0,
-                    "message": {"role": "assistant", "content": full_content},
-                    "finish_reason": "stop",
-                }
-            ],
-        )
+            raise HTTPException(status_code=503, detail=f"Upstream service unavailable: {str(e)}")