Skip to content

Commit ad720f4

Browse files
committed
Update maisaka_generator_multi.py
1 parent b28481d commit ad720f4

1 file changed

Lines changed: 3 additions & 25 deletions

File tree

src/chat/replyer/maisaka_generator_multi.py

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,7 @@
2424
from src.common.utils.utils_session import SessionUtils
2525
from src.config.config import global_config
2626
from src.core.types import ActionInfo
27-
from src.llm_models.payload_content.message import (
28-
ImageMessagePart,
29-
Message,
30-
MessageBuilder,
31-
RoleType,
32-
TextMessagePart,
33-
)
27+
from src.llm_models.payload_content.message import Message, MessageBuilder, RoleType
3428
from src.services.llm_service import LLMServiceClient
3529

3630
from src.maisaka.context_messages import (
@@ -266,7 +260,6 @@ def _build_reply_instruction(self) -> str:
266260
def _build_multimodal_user_message(
267261
self,
268262
message: SessionBackedMessage,
269-
default_user_name: str,
270263
) -> Optional[Message]:
271264
raw_message = clone_message_sequence(message.raw_message)
272265
if not raw_message.components:
@@ -299,7 +292,7 @@ def _build_history_messages(self, chat_history: List[LLMContextMessage]) -> List
299292
)
300293
continue
301294

302-
multimodal_message = self._build_multimodal_user_message(message, default_user_name)
295+
multimodal_message = self._build_multimodal_user_message(message)
303296
if multimodal_message is not None:
304297
messages.append(multimodal_message)
305298
continue
@@ -351,21 +344,6 @@ def _build_request_messages(
351344
messages.append(MessageBuilder().set_role(RoleType.User).add_text_content(instruction).build())
352345
return messages
353346

354-
@staticmethod
355-
def _build_request_prompt_preview(messages: List[Message]) -> str:
356-
preview_lines: List[str] = []
357-
for message in messages:
358-
role_name = message.role.value.capitalize()
359-
part_previews: List[str] = []
360-
for part in message.parts:
361-
if isinstance(part, TextMessagePart):
362-
part_previews.append(part.text)
363-
continue
364-
if isinstance(part, ImageMessagePart):
365-
part_previews.append(f"[图片:{part.normalized_image_format}]")
366-
preview_lines.append(f"{role_name}: {''.join(part_previews)}")
367-
return "\n\n".join(preview_lines)
368-
369347
def _resolve_session_id(self, stream_id: Optional[str]) -> str:
370348
if stream_id:
371349
return stream_id
@@ -505,7 +483,7 @@ def finalize(success_value: bool) -> Tuple[bool, ReplyGenerationResult]:
505483
return finalize(False)
506484

507485
prompt_ms = round((time.perf_counter() - prompt_started_at) * 1000, 2)
508-
prompt_preview = self._build_request_prompt_preview(request_messages)
486+
prompt_preview = PromptCLIVisualizer._build_prompt_dump_text(request_messages)
509487
show_replyer_prompt = bool(getattr(global_config.debug, "show_replyer_prompt", False))
510488
show_replyer_reasoning = bool(getattr(global_config.debug, "show_replyer_reasoning", False))
511489

0 commit comments

Comments
 (0)