Skip to content

Commit

Permalink
feat(core): Support pass span id to threadpool
Browse files Browse the repository at this point in the history
  • Loading branch information
fangyinc committed Nov 4, 2023
1 parent 23347d5 commit 59ac4ee
Show file tree
Hide file tree
Showing 14 changed files with 70 additions and 18 deletions.
1 change: 1 addition & 0 deletions assets/schema/knowledge_management.sql
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ CREATE TABLE `knowledge_document` (
`content` LONGTEXT NOT NULL COMMENT 'knowledge embedding sync result',
`result` TEXT NULL COMMENT 'knowledge content',
`vector_ids` LONGTEXT NULL COMMENT 'vector_ids',
`summary` LONGTEXT NULL COMMENT 'knowledge summary',
`gmt_created` TIMESTAMP DEFAULT CURRENT_TIMESTAMP COMMENT 'created time',
`gmt_modified` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'update time',
PRIMARY KEY (`id`),
Expand Down
9 changes: 8 additions & 1 deletion pilot/scene/base_chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,14 @@ async def __call_base(self):
)
self.current_message.tokens = 0
if self.prompt_template.template:
current_prompt = self.prompt_template.format(**input_values)
metadata = {
"template_scene": self.prompt_template.template_scene,
"input_values": input_values,
}
with root_tracer.start_span(
"BaseChat.__call_base.prompt_template.format", metadata=metadata
):
current_prompt = self.prompt_template.format(**input_values)
self.current_message.add_system_message(current_prompt)

llm_messages = self.generate_llm_messages()
Expand Down
7 changes: 6 additions & 1 deletion pilot/scene/chat_agent/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from .prompt import prompt
from pilot.component import ComponentType
from pilot.base_modules.agent.controller import ModuleAgent
from pilot.utils.tracer import root_tracer, trace

CFG = Config()

Expand Down Expand Up @@ -51,6 +52,7 @@ def __init__(self, chat_param: Dict):

self.api_call = ApiCall(plugin_generator=self.plugins_prompt_generator)

@trace()
async def generate_input_values(self) -> Dict[str, str]:
input_values = {
"user_goal": self.current_user_input,
Expand All @@ -63,7 +65,10 @@ async def generate_input_values(self) -> Dict[str, str]:

def stream_plugin_call(self, text):
text = text.replace("\n", " ")
return self.api_call.run(text)
with root_tracer.start_span(
"ChatAgent.stream_plugin_call.api_call", metadata={"text": text}
):
return self.api_call.run(text)

def __list_to_prompt_str(self, list: List) -> str:
return "\n".join(f"{i + 1 + 1}. {item}" for i, item in enumerate(list))
2 changes: 2 additions & 0 deletions pilot/scene/chat_dashboard/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
from pilot.scene.chat_dashboard.prompt import prompt
from pilot.scene.chat_dashboard.data_loader import DashboardDataLoader
from pilot.utils.executor_utils import blocking_func_to_async
from pilot.utils.tracer import root_tracer, trace

CFG = Config()

Expand Down Expand Up @@ -53,6 +54,7 @@ def __load_dashboard_template(self, template_name):
data = f.read()
return json.loads(data)

@trace()
async def generate_input_values(self) -> Dict:
try:
from pilot.summary.db_summary_client import DBSummaryClient
Expand Down
9 changes: 8 additions & 1 deletion pilot/scene/chat_data/chat_excel/excel_analyze/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from pilot.common.path_utils import has_path
from pilot.configs.model_config import LLM_MODEL_CONFIG, KNOWLEDGE_UPLOAD_ROOT_PATH
from pilot.base_modules.agent.common.schema import Status
from pilot.utils.tracer import root_tracer, trace

CFG = Config()

Expand Down Expand Up @@ -62,6 +63,7 @@ def _generate_numbered_list(self) -> str:
# ]
return "\n".join(f"{i+1}. {item}" for i, item in enumerate(command_strings))

@trace()
async def generate_input_values(self) -> Dict:
input_values = {
"user_input": self.current_user_input,
Expand All @@ -88,4 +90,9 @@ async def prepare(self):

def stream_plugin_call(self, text):
text = text.replace("\n", " ")
return self.api_call.run_display_sql(text, self.excel_reader.get_df_by_sql_ex)
with root_tracer.start_span(
"ChatExcel.stream_plugin_call.run_display_sql", metadata={"text": text}
):
return self.api_call.run_display_sql(
text, self.excel_reader.get_df_by_sql_ex
)
2 changes: 2 additions & 0 deletions pilot/scene/chat_data/chat_excel/excel_learning/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
from pilot.scene.chat_data.chat_excel.excel_reader import ExcelReader
from pilot.json_utils.utilities import DateTimeEncoder
from pilot.utils.executor_utils import blocking_func_to_async
from pilot.utils.tracer import root_tracer, trace

CFG = Config()

Expand Down Expand Up @@ -44,6 +45,7 @@ def __init__(
if parent_mode:
self.current_message.chat_mode = parent_mode.value()

@trace()
async def generate_input_values(self) -> Dict:
# colunms, datas = self.excel_reader.get_sample_data()
colunms, datas = await blocking_func_to_async(
Expand Down
29 changes: 19 additions & 10 deletions pilot/scene/chat_db/auto_execute/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from pilot.configs.config import Config
from pilot.scene.chat_db.auto_execute.prompt import prompt
from pilot.utils.executor_utils import blocking_func_to_async
from pilot.utils.tracer import root_tracer, trace

CFG = Config()

Expand Down Expand Up @@ -35,10 +36,13 @@ def __init__(self, chat_param: Dict):
raise ValueError(
f"{ChatScene.ChatWithDbExecute.value} mode should chose db!"
)

self.database = CFG.LOCAL_DB_MANAGE.get_connect(self.db_name)
with root_tracer.start_span(
"ChatWithDbAutoExecute.get_connect", metadata={"db_name": self.db_name}
):
self.database = CFG.LOCAL_DB_MANAGE.get_connect(self.db_name)
self.top_k: int = 200

@trace()
async def generate_input_values(self) -> Dict:
"""
generate input values
Expand All @@ -55,13 +59,14 @@ async def generate_input_values(self) -> Dict:
# query=self.current_user_input,
# topk=CFG.KNOWLEDGE_SEARCH_TOP_SIZE,
# )
table_infos = await blocking_func_to_async(
self._executor,
client.get_db_summary,
self.db_name,
self.current_user_input,
CFG.KNOWLEDGE_SEARCH_TOP_SIZE,
)
with root_tracer.start_span("ChatWithDbAutoExecute.get_db_summary"):
table_infos = await blocking_func_to_async(
self._executor,
client.get_db_summary,
self.db_name,
self.current_user_input,
CFG.KNOWLEDGE_SEARCH_TOP_SIZE,
)
except Exception as e:
print("db summary find error!" + str(e))
if not table_infos:
Expand All @@ -80,4 +85,8 @@ async def generate_input_values(self) -> Dict:

def do_action(self, prompt_response):
print(f"do_action:{prompt_response}")
return self.database.run(prompt_response.sql)
with root_tracer.start_span(
"ChatWithDbAutoExecute.do_action.run_sql",
metadata=prompt_response.to_dict(),
):
return self.database.run(prompt_response.sql)
3 changes: 3 additions & 0 deletions pilot/scene/chat_db/auto_execute/out_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ class SqlAction(NamedTuple):
sql: str
thoughts: Dict

def to_dict(self) -> Dict[str, Dict]:
return {"sql": self.sql, "thoughts": self.thoughts}


logger = logging.getLogger(__name__)

Expand Down
2 changes: 2 additions & 0 deletions pilot/scene/chat_db/professional_qa/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from pilot.configs.config import Config
from pilot.scene.chat_db.professional_qa.prompt import prompt
from pilot.utils.executor_utils import blocking_func_to_async
from pilot.utils.tracer import root_tracer, trace

CFG = Config()

Expand Down Expand Up @@ -39,6 +40,7 @@ def __init__(self, chat_param: Dict):
else len(self.tables)
)

@trace()
async def generate_input_values(self) -> Dict:
table_info = ""
dialect = "mysql"
Expand Down
2 changes: 2 additions & 0 deletions pilot/scene/chat_execution/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from pilot.base_modules.agent.commands.command import execute_command
from pilot.base_modules.agent import PluginPromptGenerator
from .prompt import prompt
from pilot.utils.tracer import root_tracer, trace

CFG = Config()

Expand Down Expand Up @@ -50,6 +51,7 @@ def __init__(self, chat_param: Dict):
self.plugins_prompt_generator
)

@trace()
async def generate_input_values(self) -> Dict:
input_values = {
"input": self.current_user_input,
Expand Down
2 changes: 2 additions & 0 deletions pilot/scene/chat_knowledge/inner_db_summary/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from pilot.configs.config import Config

from pilot.scene.chat_knowledge.inner_db_summary.prompt import prompt
from pilot.utils.tracer import root_tracer, trace

CFG = Config()

Expand Down Expand Up @@ -31,6 +32,7 @@ def __init__(
self.db_input = db_select
self.db_summary = db_summary

@trace()
async def generate_input_values(self) -> Dict:
input_values = {
"db_input": self.db_input,
Expand Down
2 changes: 2 additions & 0 deletions pilot/scene/chat_knowledge/v1/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from pilot.scene.chat_knowledge.v1.prompt import prompt
from pilot.server.knowledge.service import KnowledgeService
from pilot.utils.executor_utils import blocking_func_to_async
from pilot.utils.tracer import root_tracer, trace

CFG = Config()

Expand Down Expand Up @@ -92,6 +93,7 @@ def knowledge_reference_call(self, text):
"""return reference"""
return text + f"\n\n{self.parse_source_view(self.sources)}"

@trace()
async def generate_input_values(self) -> Dict:
if self.space_context:
self.prompt_template.template_define = self.space_context["prompt"]["scene"]
Expand Down
11 changes: 9 additions & 2 deletions pilot/utils/executor_utils.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from typing import Callable, Awaitable, Any
import asyncio
import contextvars
from abc import ABC, abstractmethod
from concurrent.futures import Executor, ThreadPoolExecutor
from functools import partial
Expand Down Expand Up @@ -55,6 +56,12 @@ async def blocking_func_to_async(
"""
if asyncio.iscoroutinefunction(func):
raise ValueError(f"The function {func} is not blocking function")

# This function will be called within the new thread, capturing the current context
ctx = contextvars.copy_context()

def run_with_context():
return ctx.run(partial(func, *args, **kwargs))

loop = asyncio.get_event_loop()
sync_function_noargs = partial(func, *args, **kwargs)
return await loop.run_in_executor(executor, sync_function_noargs)
return await loop.run_in_executor(executor, run_with_context)
7 changes: 4 additions & 3 deletions pilot/utils/tracer/tracer_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -303,8 +303,6 @@ def chat(
print(table.get_formatted_string(out_format=output, **out_kwargs))
if sys_table:
print(sys_table.get_formatted_string(out_format=output, **out_kwargs))
if hide_conv:
return

if not found_trace_id:
print(f"Can't found conversation with trace_id: {trace_id}")
Expand All @@ -315,9 +313,12 @@ def chat(
trace_spans = [s for s in reversed(trace_spans)]
hierarchy = _build_trace_hierarchy(trace_spans)
if tree:
print("\nInvoke Trace Tree:\n")
print(f"\nInvoke Trace Tree(trace_id: {trace_id}):\n")
_print_trace_hierarchy(hierarchy)

if hide_conv:
return

trace_spans = _get_ordered_trace_from(hierarchy)
table = PrettyTable(["Key", "Value Value"], title="Chat Trace Details")
split_long_text = output == "text"
Expand Down

0 comments on commit 59ac4ee

Please sign in to comment.