### What problem does this PR solve?

As title

### Type of change

- [x] Refactoring

Signed-off-by: Jin Hai <haijin.chn@gmail.com>
This commit is contained in:
Jin Hai
2025-08-27 18:56:40 +08:00
committed by GitHub
parent 2d89863fdd
commit 5abd0bbac1
9 changed files with 25 additions and 24 deletions

View File

@ -554,8 +554,8 @@ def naive_merge(sections, chunk_token_num=128, delimiter="\n。", overl
if num_tokens_from_string(sec) < chunk_token_num:
add_chunk(sec, pos)
continue
splited_sec = re.split(r"(%s)" % dels, sec, flags=re.DOTALL)
for sub_sec in splited_sec:
split_sec = re.split(r"(%s)" % dels, sec, flags=re.DOTALL)
for sub_sec in split_sec:
if re.match(f"^{dels}$", sub_sec):
continue
add_chunk(sub_sec, pos)
@ -600,14 +600,14 @@ def naive_merge_with_images(texts, images, chunk_token_num=128, delimiter="\n。
if isinstance(text, tuple):
text_str = text[0]
text_pos = text[1] if len(text) > 1 else ""
splited_sec = re.split(r"(%s)" % dels, text_str)
for sub_sec in splited_sec:
split_sec = re.split(r"(%s)" % dels, text_str)
for sub_sec in split_sec:
if re.match(f"^{dels}$", sub_sec):
continue
add_chunk(sub_sec, image, text_pos)
else:
splited_sec = re.split(r"(%s)" % dels, text)
for sub_sec in splited_sec:
split_sec = re.split(r"(%s)" % dels, text)
for sub_sec in split_sec:
if re.match(f"^{dels}$", sub_sec):
continue
add_chunk(sub_sec, image)
@ -684,8 +684,8 @@ def naive_merge_docx(sections, chunk_token_num=128, delimiter="\n。"):
dels = get_delimiters(delimiter)
for sec, image in sections:
splited_sec = re.split(r"(%s)" % dels, sec)
for sub_sec in splited_sec:
split_sec = re.split(r"(%s)" % dels, sec)
for sub_sec in split_sec:
if re.match(f"^{dels}$", sub_sec):
continue
add_chunk(sub_sec, image,"")

View File

@ -148,7 +148,7 @@ class MCPToolCallSession(ToolCallSession):
if result.isError:
return f"MCP server error: {result.content}"
# For now we only support text content
# For now, we only support text content
if isinstance(result.content[0], TextContent):
return result.content[0].text
else:

View File

@ -336,7 +336,7 @@ class RedisDB:
def delete_if_equal(self, key: str, expected_value: str) -> bool:
"""
Do follwing atomically:
Do following atomically:
Delete a key if its value is equals to the given one, do nothing otherwise.
"""
return bool(self.lua_delete_if_equal(keys=[key], args=[expected_value], client=self.REDIS))