Skip to content

Commit 2b2b688

Browse files
committed
fix chart
1 parent c2ee617 commit 2b2b688

File tree

1 file changed

+28
-22
lines changed

1 file changed

+28
-22
lines changed

β€Žwren-ai-service/src/web/v2/services/conversation.py

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -286,10 +286,10 @@ async def _run_chart_generation(
286286
return [
287287
{
288288
"chart_result": chart_generation_result["post_process"]["results"],
289-
"sql": sql,
290289
}
291290
], {
292291
"chart_result": chart_generation_result["post_process"]["results"],
292+
"sql": sql,
293293
}
294294

295295
async def _run_chart_adjustment(
@@ -311,9 +311,11 @@ async def _run_chart_adjustment(
311311
return [
312312
{
313313
"chart_result": chart_adjustment_result["post_process"]["results"],
314-
"sql": sql,
315314
}
316-
], chart_adjustment_result
315+
], {
316+
"chart_result": chart_adjustment_result["post_process"]["results"],
317+
"sql": sql,
318+
}
317319

318320
async def _run_retrieval(
319321
self,
@@ -742,7 +744,10 @@ async def start_conversation(
742744
)
743745

744746
if chart_schema:
745-
_, index = await self._query_event_manager.emit_content_block(
747+
(
748+
chart_generation_result,
749+
index,
750+
) = await self._query_event_manager.emit_content_block(
746751
query_id,
747752
trace_id,
748753
index=index,
@@ -778,25 +783,26 @@ async def start_conversation(
778783
should_put_in_conversation_history=True,
779784
)
780785

781-
if chart_schema := chart_generation_result.get(
782-
"chart_result", {}
783-
).get("chart_schema"):
784-
(
785-
_,
786-
index,
787-
) = await self._query_event_manager.emit_content_block(
788-
query_id,
789-
trace_id,
790-
index=index,
791-
emit_content_func=self._run_preview_data,
792-
emit_content_func_kwargs={
793-
"data": {
794-
"chart_schema": chart_schema,
795-
},
786+
if chart_schema := chart_generation_result.get(
787+
"chart_result", {}
788+
).get("chart_schema"):
789+
(
790+
_,
791+
index,
792+
) = await self._query_event_manager.emit_content_block(
793+
query_id,
794+
trace_id,
795+
index=index,
796+
emit_content_func=self._run_preview_data,
797+
emit_content_func_kwargs={
798+
"data": {
799+
"chart_schema": chart_schema,
800+
"sql": chart_generation_result.get("sql"),
796801
},
797-
content_block_label="PREVIEW_DATA",
798-
block_type="tool_use",
799-
)
802+
},
803+
content_block_label="PREVIEW_DATA",
804+
block_type="tool_use",
805+
)
800806
else: # TEXT_TO_SQL
801807
(
802808
retrieval_results,

0 commit comments

Comments
Β (0)