Skip to content

refactor: change public functions to protected in PromptTransform #16143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 19, 2025
Merged

refactor: change public functions to protected in PromptTransform #16143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c460e8a
Change public func to protected func
hyongtao-db Mar 18, 2025
66c9213
Remove useless ut codes
hyongtao-db Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions api/core/prompt/simple_prompt_transform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def get_prompt(

return prompt_messages, stops

def get_prompt_str_and_rules(
def _get_prompt_str_and_rules(
self,
app_mode: AppMode,
model_config: ModelConfigWithCredentialsEntity,
Expand Down Expand Up @@ -184,7 +184,7 @@ def _get_chat_model_prompt_messages(
prompt_messages: list[PromptMessage] = []

# get prompt
prompt, _ = self.get_prompt_str_and_rules(
prompt, _ = self._get_prompt_str_and_rules(
app_mode=app_mode,
model_config=model_config,
pre_prompt=pre_prompt,
Expand All @@ -209,9 +209,9 @@ def _get_chat_model_prompt_messages(
)

if query:
prompt_messages.append(self.get_last_user_message(query, files, image_detail_config))
prompt_messages.append(self._get_last_user_message(query, files, image_detail_config))
else:
prompt_messages.append(self.get_last_user_message(prompt, files, image_detail_config))
prompt_messages.append(self._get_last_user_message(prompt, files, image_detail_config))

return prompt_messages, None

Expand All @@ -228,7 +228,7 @@ def _get_completion_model_prompt_messages(
image_detail_config: Optional[ImagePromptMessageContent.DETAIL] = None,
) -> tuple[list[PromptMessage], Optional[list[str]]]:
# get prompt
prompt, prompt_rules = self.get_prompt_str_and_rules(
prompt, prompt_rules = self._get_prompt_str_and_rules(
app_mode=app_mode,
model_config=model_config,
pre_prompt=pre_prompt,
Expand All @@ -254,7 +254,7 @@ def _get_completion_model_prompt_messages(
)

# get prompt
prompt, prompt_rules = self.get_prompt_str_and_rules(
prompt, prompt_rules = self._get_prompt_str_and_rules(
app_mode=app_mode,
model_config=model_config,
pre_prompt=pre_prompt,
Expand All @@ -268,9 +268,9 @@ def _get_completion_model_prompt_messages(
if stops is not None and len(stops) == 0:
stops = None

return [self.get_last_user_message(prompt, files, image_detail_config)], stops
return [self._get_last_user_message(prompt, files, image_detail_config)], stops

def get_last_user_message(
def _get_last_user_message(
self,
prompt: str,
files: Sequence["File"],
Expand Down
2 changes: 0 additions & 2 deletions api/tests/unit_tests/core/prompt/test_agent_history_prompt_transform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,10 @@ def side_effect_get_num_tokens(*args):
transform._calculate_rest_token = MagicMock(return_value=max_token_limit)
result = transform.get_prompt()

assert len(result) <= max_token_limit
assert len(result) == 4

max_token_limit = 20
transform._calculate_rest_token = MagicMock(return_value=max_token_limit)
result = transform.get_prompt()

assert len(result) <= max_token_limit
assert len(result) == 12
1 change: 0 additions & 1 deletion api/tests/unit_tests/core/prompt/test_simple_prompt_transform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ def test_get_baichuan_completion_app_prompt_template_with_pcq():
query_in_prompt=True,
with_memory_prompt=False,
)
print(prompt_template["prompt_template"].template)
prompt_rules = prompt_template["prompt_rules"]
assert prompt_template["prompt_template"].template == (
prompt_rules["context_prompt"] + pre_prompt + "\n" + prompt_rules["query_prompt"]
Expand Down
Loading