-
Notifications
You must be signed in to change notification settings - Fork 40
chore: extract message text content #11
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.
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
Closed
daoyuly
wants to merge
1
commit into
MoonshotAI:main
from
daoyuly:dev-add-extract-message-text-content
+235
−1
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -212,6 +212,33 @@ class Message(BaseModel): | |
|
|
||
| partial: bool | None = None | ||
|
|
||
| def extract_text(self, include_think: bool = False) -> str: | ||
| """ | ||
| Extract plain text from the message content. | ||
|
|
||
| For string content, returns the string as-is. | ||
| For ContentPart list, extracts text from TextPart and optionally ThinkPart. | ||
| Other content types (ImageURLPart, AudioURLPart) are ignored. | ||
|
|
||
| Args: | ||
| include_think: If True, includes ThinkPart content (only when encrypted is None). | ||
| If False, ThinkPart content is ignored. | ||
|
|
||
| Returns: | ||
| Extracted plain text string. | ||
| """ | ||
|
|
||
| if isinstance(self.content, str): | ||
| return self.content | ||
|
|
||
| text_parts: list[str] = [] | ||
| for part in self.content: | ||
| if isinstance(part, TextPart): | ||
| text_parts.append(part.text) | ||
| elif isinstance(part, ThinkPart) and include_think and part.encrypted is None: | ||
| text_parts.append(part.think) | ||
| return "".join(text_parts) | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What about joining with |
||
|
|
||
| @field_serializer("content") | ||
| def serialize_content( | ||
| self, content: str | list[ContentPart] | ||
|
|
||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I just moved the whole |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why only when
part.encrypted is None?encryptedis the raw encrypted message in base64 but doesn't mean that thethinkfield is "encrypted".