From 3c9f240821098fe935554e275531d262c0f5f5dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=9F=E6=B5=B7?= Date: Thu, 19 Jun 2025 15:10:39 +0800 Subject: [PATCH 1/2] fix stop_str bugfix --- python/sglang/srt/openai_api/adapter.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python/sglang/srt/openai_api/adapter.py b/python/sglang/srt/openai_api/adapter.py index aba1a5afd2e..15192450d1a 100644 --- a/python/sglang/srt/openai_api/adapter.py +++ b/python/sglang/srt/openai_api/adapter.py @@ -15,6 +15,7 @@ import asyncio import base64 +import copy import json import logging import os @@ -1182,7 +1183,7 @@ def v1_chat_generate_request( image_data = conv.image_data audio_data = conv.audio_data modalities = conv.modalities - stop = conv.stop_str or [] if not request.ignore_eos else [] + stop = copy.copy(conv.stop_str or [] if not request.ignore_eos else []) if request.stop: if isinstance(request.stop, str): From 2db294554e1cbcf24b9570baac3990fba08128f9 Mon Sep 17 00:00:00 2001 From: Chang Su Date: Mon, 23 Jun 2025 19:20:51 -0700 Subject: [PATCH 2/2] Resolve merge conflicts --- python/sglang/srt/entrypoints/openai/serving_chat.py | 3 ++- python/sglang/srt/openai_api/adapter.py | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python/sglang/srt/entrypoints/openai/serving_chat.py b/python/sglang/srt/entrypoints/openai/serving_chat.py index 54b490131ab..bfb4bcfa4b9 100644 --- a/python/sglang/srt/entrypoints/openai/serving_chat.py +++ b/python/sglang/srt/entrypoints/openai/serving_chat.py @@ -1,4 +1,5 @@ import base64 +import copy import json import logging import time @@ -378,7 +379,7 @@ def _apply_conversation_template( image_data = conv.image_data audio_data = conv.audio_data modalities = conv.modalities - stop = conv.stop_str or [] if not request.ignore_eos else [] + stop = copy.copy(conv.stop_str or [] if not request.ignore_eos else []) if request.stop: if isinstance(request.stop, str): diff --git a/python/sglang/srt/openai_api/adapter.py b/python/sglang/srt/openai_api/adapter.py index 15192450d1a..aba1a5afd2e 100644 --- a/python/sglang/srt/openai_api/adapter.py +++ b/python/sglang/srt/openai_api/adapter.py @@ -15,7 +15,6 @@ import asyncio import base64 -import copy import json import logging import os @@ -1183,7 +1182,7 @@ def v1_chat_generate_request( image_data = conv.image_data audio_data = conv.audio_data modalities = conv.modalities - stop = copy.copy(conv.stop_str or [] if not request.ignore_eos else []) + stop = conv.stop_str or [] if not request.ignore_eos else [] if request.stop: if isinstance(request.stop, str):