Skip to content

Commit bdf7cc6

Browse files
authored
fix(glm_asr): dedup result keys for duplicate audio basenames (#3014)
The vLLM ASR result key is derived from the audio file basename, so two inputs in different directories that share a basename (e.g. spk1/segment.wav and spk2/segment.wav) both map to the same key. Folding the result list into the canonical {key: text} mapping then silently drops all but the last colliding entry, yielding fewer transcripts than inputs with no error. Add a small _dedup_keys helper that appends a deterministic _N suffix to later collisions (preserving order and first-occurrence names) and wire it into generate(), warning once when a collision is resolved. Add unit tests covering the helper and the end-to-end generate() path.
1 parent 384a556 commit bdf7cc6

2 files changed

Lines changed: 188 additions & 2 deletions

File tree

funasr/models/glm_asr/inference_vllm.py

Lines changed: 64 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,63 @@ def prepare_glmasr_vllm_dir(model_dir: str) -> str:
110110
return output_dir
111111

112112

113+
# Warn only once per process so batch loops do not spam the log.
114+
_warned_dup_keys = False
115+
116+
117+
def _dedup_keys(keys):
118+
"""Make result keys unique while preserving order and first-occurrence names.
119+
120+
Each result key is derived from the audio file basename
121+
(``os.path.splitext(os.path.basename(path))[0]``), so two inputs that live
122+
in different directories but share a basename -- e.g. ``spk1/segment.wav``
123+
and ``spk2/segment.wav`` -- both map to ``"segment"``. A downstream
124+
``{r["key"]: r["text"]}`` mapping (the canonical FunASR result shape) would
125+
then silently drop all but the last colliding entry, returning fewer
126+
transcripts than inputs with no error. Appending a deterministic ``_N``
127+
suffix to later collisions keeps every transcript addressable.
128+
129+
Args:
130+
keys: Result keys in input order.
131+
132+
Returns:
133+
A new list of unique keys, same length and order as ``keys``. The first
134+
occurrence of each key is preserved unchanged; the n-th repeat becomes
135+
``"<key>_<n-1>"`` (e.g. ``"seg"`` -> ``"seg"``, ``"seg_1"``, ``"seg_2"``).
136+
"""
137+
global _warned_dup_keys
138+
139+
seen = set()
140+
out = []
141+
collided = False
142+
for key in keys:
143+
if key not in seen:
144+
seen.add(key)
145+
out.append(key)
146+
continue
147+
# Find the first free "<key>_<n>" so a suffixed key cannot itself clash
148+
# with an existing one (e.g. inputs "seg", "seg_1", "seg").
149+
collided = True
150+
n = 1
151+
candidate = f"{key}_{n}"
152+
while candidate in seen:
153+
n += 1
154+
candidate = f"{key}_{n}"
155+
seen.add(candidate)
156+
out.append(candidate)
157+
158+
if collided and not _warned_dup_keys:
159+
logger.warning(
160+
"Duplicate result keys from audio basenames were made unique with "
161+
"'_N' suffixes (e.g. two files named 'segment.wav' in different "
162+
"directories map to the same key); pass distinct filenames if you "
163+
"rely on the basename as the result key."
164+
)
165+
_warned_dup_keys = True
166+
167+
return out
168+
169+
113170
class GLMASRVLLMEngine:
114171
"""GLM-ASR with vLLM backend.
115172
@@ -263,13 +320,18 @@ def generate(self, inputs, prompt="转录以下音频内容", max_new_tokens=500
263320
t2 = time.perf_counter()
264321
logger.info(f"vLLM generation: {t2-t1:.3f}s")
265322

323+
raw_keys = [
324+
os.path.splitext(os.path.basename(x))[0] if isinstance(x, str) else f"sample_{i}"
325+
for i, x in enumerate(inputs)
326+
]
327+
keys = _dedup_keys(raw_keys)
328+
266329
results = []
267330
for i, output in enumerate(outputs):
268331
token_ids = list(output.outputs[0].token_ids)
269332
text = self.tokenizer.decode(token_ids, skip_special_tokens=True)
270333
text = re.sub(r'\s+', ' ', text).strip()
271-
key = os.path.splitext(os.path.basename(inputs[i]))[0] if isinstance(inputs[i], str) else f"sample_{i}"
272-
results.append({"key": key, "text": text})
334+
results.append({"key": keys[i], "text": text})
273335

274336
return results
275337

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
"""Unit tests for GLM-ASR vLLM result-key deduplication.
2+
3+
These tests exercise ``GLMASRVLLMEngine.generate`` without a GPU or a real
4+
vLLM installation: the vLLM entry points are stubbed in ``sys.modules`` and the
5+
audio/encoder/engine collaborators are mocked, so only the result-key wiring is
6+
under test. The pure ``_dedup_keys`` helper is also tested directly.
7+
"""
8+
9+
import sys
10+
import types
11+
import unittest
12+
from unittest import mock
13+
14+
15+
def _install_vllm_stub():
16+
"""Install a minimal ``vllm`` stub so ``inference_vllm`` imports without GPU."""
17+
18+
class _SamplingParams:
19+
def __init__(self, **kwargs):
20+
self.kwargs = kwargs
21+
22+
class _EmbedsPrompt:
23+
def __init__(self, **kwargs):
24+
self.kwargs = kwargs
25+
26+
vllm_mod = types.ModuleType("vllm")
27+
vllm_mod.SamplingParams = _SamplingParams
28+
vllm_mod.LLM = object
29+
inputs_mod = types.ModuleType("vllm.inputs")
30+
inputs_mod.EmbedsPrompt = _EmbedsPrompt
31+
data_mod = types.ModuleType("vllm.inputs.data")
32+
data_mod.EmbedsPrompt = _EmbedsPrompt
33+
34+
sys.modules["vllm"] = vllm_mod
35+
sys.modules["vllm.inputs"] = inputs_mod
36+
sys.modules["vllm.inputs.data"] = data_mod
37+
38+
39+
class DedupKeysHelperTest(unittest.TestCase):
40+
def setUp(self):
41+
_install_vllm_stub()
42+
from funasr.models.glm_asr import inference_vllm
43+
44+
self.inference_vllm = inference_vllm
45+
# Reset the warn-once flag so warning-related assertions are deterministic.
46+
inference_vllm._warned_dup_keys = False
47+
48+
def test_collision_free_input_unchanged(self):
49+
keys = ["a", "b", "c"]
50+
self.assertEqual(self.inference_vllm._dedup_keys(keys), ["a", "b", "c"])
51+
52+
def test_repeated_keys_get_deterministic_suffix(self):
53+
keys = ["seg", "seg", "other", "seg"]
54+
self.assertEqual(
55+
self.inference_vllm._dedup_keys(keys),
56+
["seg", "seg_1", "other", "seg_2"],
57+
)
58+
59+
def test_suffix_does_not_clash_with_existing_key(self):
60+
# A naive "seg" -> "seg_1" scheme would re-collide with the literal
61+
# "seg_1" input; the result must stay globally unique.
62+
keys = ["seg", "seg_1", "seg"]
63+
result = self.inference_vllm._dedup_keys(keys)
64+
self.assertEqual(result, ["seg", "seg_1", "seg_2"])
65+
self.assertEqual(len(set(result)), len(result))
66+
67+
def test_empty_input(self):
68+
self.assertEqual(self.inference_vllm._dedup_keys([]), [])
69+
70+
def test_sentinel_keys_preserved(self):
71+
keys = ["sample_0", "sample_1", "sample_0"]
72+
self.assertEqual(
73+
self.inference_vllm._dedup_keys(keys),
74+
["sample_0", "sample_1", "sample_0_1"],
75+
)
76+
77+
def test_does_not_mutate_input(self):
78+
keys = ["seg", "seg"]
79+
self.inference_vllm._dedup_keys(keys)
80+
self.assertEqual(keys, ["seg", "seg"])
81+
82+
83+
class DedupResultKeysTest(unittest.TestCase):
84+
def setUp(self):
85+
_install_vllm_stub()
86+
from funasr.models.glm_asr.inference_vllm import GLMASRVLLMEngine
87+
88+
# Build an engine without running __init__ (no model load / GPU needed).
89+
engine = GLMASRVLLMEngine.__new__(GLMASRVLLMEngine)
90+
engine.device = "cpu"
91+
engine._encode_audio = mock.Mock(return_value="audio_embeds")
92+
engine._build_prompt_embeds = mock.Mock(
93+
return_value=mock.Mock(float=lambda: "embeds")
94+
)
95+
engine.tokenizer = mock.Mock()
96+
engine.tokenizer.decode = mock.Mock(return_value="hello world")
97+
self.engine = engine
98+
99+
def _set_outputs(self, n):
100+
token_out = types.SimpleNamespace(token_ids=[1, 2, 3])
101+
outs = [types.SimpleNamespace(outputs=[token_out]) for _ in range(n)]
102+
self.engine.vllm_engine = mock.Mock()
103+
self.engine.vllm_engine.generate = mock.Mock(return_value=outs)
104+
105+
def test_duplicate_basenames_get_unique_keys(self):
106+
self._set_outputs(2)
107+
results = self.engine.generate(["spk1/segment.wav", "spk2/segment.wav"])
108+
self.assertEqual([r["key"] for r in results], ["segment", "segment_1"])
109+
# No transcript is dropped when results are folded into a {key: text} dict.
110+
self.assertEqual(len({r["key"] for r in results}), len(results))
111+
112+
def test_distinct_basenames_unchanged(self):
113+
self._set_outputs(2)
114+
results = self.engine.generate(["a.wav", "b.wav"])
115+
self.assertEqual([r["key"] for r in results], ["a", "b"])
116+
117+
def test_single_input_key(self):
118+
self._set_outputs(1)
119+
results = self.engine.generate("only.wav")
120+
self.assertEqual(results, [{"key": "only", "text": "hello world"}])
121+
122+
123+
if __name__ == "__main__":
124+
unittest.main()

0 commit comments

Comments
 (0)