perf: build info log messages lazily so raising the log level actually saves work (#27837)
Raising GLOBAL_LOG_LEVEL to WARNING buys quieter output but not less work: 241 INFO call sites interpolate their payload into an f-string before the logging call gets to drop it. The heaviest is get_doc, which logs every chunk id and metadata dict in a collection, so on the full-context retrieval path that is the entire knowledge base, once per chat request.
That one line at WARNING, CPython 3.12:
| knowledge base | payload | before | after |
| -------------- | ------- | -------- | ------- |
| top-k of 3 | 1.2 kB | 3.8 us | 0.07 us |
| 500 chunks | 201 kB | 583.6 us | 0.08 us |
| 5000 chunks | 2.0 MB | 5.8 ms | 0.15 us |
The lazy form log.info('query_doc:result %s %s', result.ids, result.metadatas) hands the payload to record.getMessage(), which the InterceptHandler only reaches once a record has passed the level check. Output at INFO is byte-identical. Two sites that already built their message eagerly, one str concat and one % operator, move to the same lazy form.
This commit is contained in:
1 parent
52145eede9
commit
2d18727ab8
48 files changed
+297
-247
No files matched your search
@@ -31,7 +31,7 @@ def search_exa(
|
||||
count (int): Number of results to return
|
||||
filter_list (Optional[list[str]]): List of domains to filter results by
|
||||
"""
|
||||
log.info(f'Searching with Exa for query: {query}')
|
||||
log.info('Searching with Exa for query: %s', query)
|
||||
|
||||
headers = {'Authorization': f'Bearer {api_key}', 'Content-Type': 'application/json'}
|
||||
|
||||
@@ -58,7 +58,7 @@ def search_exa(
|
||||
)
|
||||
)
|
||||
|
||||
log.info(f'Found {len(results)} results')
|
||||
log.info('Found %s results', len(results))
|
||||
return [
|
||||
SearchResult(
|
||||
link=result.url,
|
||||
|
||||
@@ -53,7 +53,7 @@ def search_external(
|
||||
)
|
||||
for result in results[:count]
|
||||
]
|
||||
log.info(f'External search results: {results}')
|
||||
log.info('External search results: %s', results)
|
||||
return results
|
||||
except Exception as e:
|
||||
log.error(f'Error in External search: {e}')
|
||||
|
||||
@@ -225,7 +225,7 @@ def search_firecrawl(
|
||||
)
|
||||
)
|
||||
|
||||
log.info(f'FireCrawl search results: {search_results}')
|
||||
log.info('FireCrawl search results: %s', search_results)
|
||||
return search_results
|
||||
except Exception as e:
|
||||
log.error(f'Error in FireCrawl search: {e}')
|
||||
|
||||
@@ -23,7 +23,7 @@ def search_ollama_cloud(
|
||||
count (int): Number of results to return
|
||||
filter_list (Optional[list[str]]): List of domains to filter results by
|
||||
"""
|
||||
log.info(f'Searching with Ollama for query: {query}')
|
||||
log.info('Searching with Ollama for query: %s', query)
|
||||
|
||||
headers = {'Authorization': f'Bearer {api_key}', 'Content-Type': 'application/json'}
|
||||
payload = {'query': query, 'max_results': count}
|
||||
@@ -34,7 +34,7 @@ def search_ollama_cloud(
|
||||
data = response.json()
|
||||
|
||||
results = data.get('results', [])
|
||||
log.info(f'Found {len(results)} results')
|
||||
log.info('Found %s results', len(results))
|
||||
|
||||
if filter_list:
|
||||
results = get_filtered_results(results, filter_list)
|
||||
|
||||
@@ -31,7 +31,7 @@ def search_searchapi(
|
||||
response = requests.request('GET', url)
|
||||
|
||||
json_response = response.json()
|
||||
log.info(f'results from searchapi search: {json_response}')
|
||||
log.info('results from searchapi search: %s', json_response)
|
||||
|
||||
results = sorted(json_response.get('organic_results', []), key=lambda x: x.get('position', 0))
|
||||
if filter_list:
|
||||
|
||||
@@ -31,7 +31,7 @@ def search_serpapi(
|
||||
response = requests.request('GET', url)
|
||||
|
||||
json_response = response.json()
|
||||
log.info(f'results from serpapi search: {json_response}')
|
||||
log.info('results from serpapi search: %s', json_response)
|
||||
|
||||
results = sorted(json_response.get('organic_results', []), key=lambda x: x.get('position', 0))
|
||||
if filter_list:
|
||||
|
||||
@@ -51,7 +51,7 @@ def search_serply(
|
||||
response.raise_for_status()
|
||||
|
||||
json_response = response.json()
|
||||
log.info(f'results from serply search: {json_response}')
|
||||
log.info('results from serply search: %s', json_response)
|
||||
|
||||
results = sorted(json_response.get('results', []), key=lambda x: x.get('realPosition', 0))
|
||||
if filter_list:
|
||||
|
||||
@@ -112,7 +112,7 @@ def search_yandex(
|
||||
for result in results[:count]
|
||||
]
|
||||
|
||||
log.info(f'Yandex search results: {results}')
|
||||
log.info('Yandex search results: %s', results)
|
||||
|
||||
return results
|
||||
except Exception as e:
|
||||
|
||||
Reference in new issue
Block a user