mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-10-06 15:02:20 +02:00
Preserve all fetched search sources before transport truncation
This commit is contained in:
@@ -304,6 +304,10 @@ class WebSearchTool:
|
||||
"elapsed_s": 30,
|
||||
"tail": "Search completed; preparing sources.",
|
||||
})
|
||||
# Compact the complete report before the transport cap. Otherwise
|
||||
# repeated summaries from early sources permanently erase later pages.
|
||||
from src.search_passages import bounded_search_observation
|
||||
text = bounded_search_observation(text, MAX_OUTPUT_CHARS)
|
||||
output = text[:MAX_OUTPUT_CHARS] if len(text) > MAX_OUTPUT_CHARS else text
|
||||
if sources:
|
||||
output += "\n\n<!-- SOURCES:" + json.dumps(sources) + " -->"
|
||||
|
||||
@@ -182,37 +182,8 @@ def search_tool_choice_request(request):
|
||||
|
||||
|
||||
def bounded_search_observation(output, budget=8000):
|
||||
"""Share the observation budget across fetched sources, not prefix order.
|
||||
|
||||
Search's full report repeats bodies in summaries/quotes/statistics. Retain
|
||||
source attribution and an excerpt of every fetched page before truncating.
|
||||
This is evidence selection, never answer generation.
|
||||
"""
|
||||
if len(output) <= budget:
|
||||
return output
|
||||
pattern = re.compile(r'\n(\[CONTENT(?: \d+)?\] From: [^\n]+\nTitle: [^\n]*\n-+\n)')
|
||||
matches = list(pattern.finditer(output))
|
||||
if not matches:
|
||||
return output
|
||||
source_match = re.search(r'```sources\n.*?```', output, re.DOTALL)
|
||||
query_match = re.search(r'^Query: .*$', output, re.MULTILINE)
|
||||
prefix = '\n'.join(match.group(0) for match in (source_match, query_match) if match)
|
||||
suffix = '\n[Excerpts shortened across sources; use web_fetch on a source URL for full details.]'
|
||||
headers = [match.group(1) for match in matches]
|
||||
room = budget - len(prefix) - len(suffix) - sum(len(h) + 2 for h in headers)
|
||||
if room < 100 * len(matches):
|
||||
return output # Unusually large metadata: preserve existing hard cap.
|
||||
per_page = room // len(matches)
|
||||
blocks = []
|
||||
for index, match in enumerate(matches):
|
||||
end = matches[index + 1].start() if index + 1 < len(matches) else len(output)
|
||||
body = output[match.end():end]
|
||||
body = re.split(r'\n(?:Key Points:|TL;DR:|Important Quotes:|Data / Statistics:|={20,}|<!-- SOURCES:)', body, maxsplit=1)[0].strip()
|
||||
if len(body) > per_page:
|
||||
from src.search_passages import search_excerpt
|
||||
body = search_excerpt(body, query_match.group(0) if query_match else '', per_page)
|
||||
blocks.append(headers[index] + body)
|
||||
return prefix + '\n\n' + '\n\n'.join(blocks) + suffix
|
||||
from src.search_passages import bounded_search_observation as compact
|
||||
return compact(output, budget)
|
||||
|
||||
|
||||
def preview_tool_result_text(result, tool, args):
|
||||
|
||||
@@ -5,6 +5,34 @@ import re
|
||||
_FILLER = frozenset('the and for with from this that what which how find search compare explain latest current recent official source sources documentation document please about'.split())
|
||||
|
||||
|
||||
def bounded_search_observation(output, budget=8000):
|
||||
"""Budget all fetched sources before any transport-level prefix truncation."""
|
||||
if len(output) <= budget:
|
||||
return output
|
||||
pattern = re.compile(r'\n(\[CONTENT(?: \d+)?\] From: [^\n]+\nTitle: [^\n]*\n-+\n)')
|
||||
matches = list(pattern.finditer(output))
|
||||
if not matches:
|
||||
return output
|
||||
source_match = re.search(r'```sources\n.*?```', output, re.DOTALL)
|
||||
query_match = re.search(r'^Query: .*$', output, re.MULTILINE)
|
||||
prefix = '\n'.join(match.group(0) for match in (source_match, query_match) if match)
|
||||
suffix = '\n[Excerpts shortened across sources; use web_fetch on a source URL for full details.]'
|
||||
headers = [match.group(1) for match in matches]
|
||||
room = budget - len(prefix) - len(suffix) - sum(len(h) + 2 for h in headers) - 2
|
||||
if room < 100 * len(matches):
|
||||
return output # Caller retains its hard cap for exceptional metadata.
|
||||
per_page = room // len(matches)
|
||||
blocks = []
|
||||
for index, match in enumerate(matches):
|
||||
end = matches[index + 1].start() if index + 1 < len(matches) else len(output)
|
||||
body = output[match.end():end]
|
||||
body = re.split(r'\n(?:Key Points:|TL;DR:|Important Quotes:|Data / Statistics:|={20,}|<!-- SOURCES:)', body, maxsplit=1)[0].strip()
|
||||
if len(body) > per_page:
|
||||
body = search_excerpt(body, query_match.group(0) if query_match else '', per_page)
|
||||
blocks.append(headers[index] + body)
|
||||
return prefix + '\n\n' + '\n\n'.join(blocks) + suffix
|
||||
|
||||
|
||||
def search_excerpt(text: str, query: str, max_chars: int) -> str:
|
||||
"""Keep the opening plus relevant, non-overlapping literal page excerpts.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user