gmakstutis/ragflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: duplicate output by async_chat_streamly

Browse source
This commit is contained in:
Billy Bao 2025-12-09 16:48:18 +08:00
parent 28bc87c5e2
commit ca7a0fd5cb
2 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
rag/app/manual.py
View file

@ -219,31 +219,26 @@ def chunk(filename, binary=None, from_page=0, to_page=100000,
) )
def _normalize_section(section): def _normalize_section(section):
# Pad/normalize to (txt, layout, positions) # pad section to length 3: (txt, sec_id, poss)
if not isinstance(section, (list, tuple)): if len(section) == 1:
section = (section, "", [])
elif len(section) == 1:
section = (section[0], "", []) section = (section[0], "", [])
elif len(section) == 2: elif len(section) == 2:
section = (section[0], "", section[1]) section = (section[0], "", section[1])
else: elif len(section) != 3:
section = (section[0], section[1], section[2]) raise ValueError(f"Unexpected section length: {len(section)} (value={section!r})")
txt, layoutno, poss = section txt, layoutno, poss = section
if isinstance(poss, str): if isinstance(poss, str):
poss = pdf_parser.extract_positions(poss) poss = pdf_parser.extract_positions(poss)
if poss: first = poss[0] # tuple: ([pn], x1, x2, y1, y2)
first = poss[0] # tuple: ([pn], x1, x2, y1, y2) pn = first[0]
pn = first[0]
if isinstance(pn, list) and pn: if isinstance(pn, list):
pn = pn[0] # [pn] -> pn pn = pn[0] # [pn] -> pn
poss[0] = (pn, *first[1:]) poss[0] = (pn, *first[1:])
if not poss:
poss = []
return (txt, layoutno, poss) return (txt, layoutno, poss)
sections = [_normalize_section(sec) for sec in sections] sections = [_normalize_section(sec) for sec in sections]
if not sections and not tbls: if not sections and not tbls:
@ -350,4 +345,4 @@ if __name__ == "__main__":
pass pass
chunk(sys.argv[1], callback=dummy) chunk(sys.argv[1], callback=dummy)

6
rag/llm/chat_model.py
View file

@ -146,7 +146,6 @@ class Base(ABC):
request_kwargs["stop"] = stop request_kwargs["stop"] = stop
response = await self.async_client.chat.completions.create(**request_kwargs) response = await self.async_client.chat.completions.create(**request_kwargs)
async for resp in response: async for resp in response:
if not resp.choices: if not resp.choices:
continue continue
@ -161,7 +160,6 @@ class Base(ABC):
else: else:
reasoning_start = False reasoning_start = False
ans = resp.choices[0].delta.content ans = resp.choices[0].delta.content
tol = total_token_count_from_response(resp) tol = total_token_count_from_response(resp)
if not tol: if not tol:
tol = num_tokens_from_string(resp.choices[0].delta.content) tol = num_tokens_from_string(resp.choices[0].delta.content)
@ -187,12 +185,12 @@ class Base(ABC):
ans = delta_ans ans = delta_ans
total_tokens += tol total_tokens += tol
yield ans yield ans
yield total_tokens
return
except Exception as e: except Exception as e:
e = await self._exceptions_async(e, attempt) e = await self._exceptions_async(e, attempt)
if e: if e:
yield e yield e
yield total_tokens
return
yield total_tokens yield total_tokens