-
Notifications
You must be signed in to change notification settings - Fork 6
Add component formatting support with Table class #113
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
Open
chrisdedman
wants to merge
5
commits into
main
Choose a base branch
from
component-formatting-class
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
870fa77
Add support for sending component-formatted messages in Room and Context
chrisdedman e704a20
Add MatrixTable component for structured message rendering
chrisdedman 9be7b1a
renamed MatrixTable to Table class
chrisdedman 016f574
added feature example for Table component
chrisdedman d0ba863
Merge branch 'main' into component-formatting-class
chrisdedman 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 |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| from matrix import Bot, Table | ||
|
|
||
| bot = Bot() | ||
|
|
||
|
|
||
| @bot.command() | ||
| async def weather(ctx): | ||
| weather = Table(title="Los Angeles", columns=2) | ||
|
|
||
| weather.add_field("Description", "Clear Sky") | ||
| weather.add_field("Visibility", "10000m | 32808ft") | ||
| weather.add_field("Temperature", "71.33°F | 21.85°C") | ||
| weather.add_field("Feels Like", "71.33°F | 21.85°C") | ||
| weather.add_field("Atmospheric Pressure", "1012 hPa") | ||
| weather.add_field("Humidity", "66%") | ||
|
|
||
| await ctx.reply(component=weather) | ||
|
|
||
|
|
||
| bot.start(config="config.yaml") |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| from html import escape | ||
| from abc import ABC, abstractmethod | ||
|
|
||
|
|
||
| class Component(ABC): | ||
| """Base class for message components.""" | ||
|
|
||
| @abstractmethod | ||
| def to_plain_text(self) -> str: | ||
| pass | ||
|
|
||
| @abstractmethod | ||
| def render(self) -> str: | ||
| pass | ||
|
|
||
|
|
||
| class Table(Component): | ||
| def __init__(self, *, title: str, columns: int = 2) -> None: | ||
| self.title: str = title | ||
| self.columns: int = columns | ||
| self.fields: list[tuple[str, str]] = [] | ||
|
|
||
| def __str__(self) -> str: | ||
| return self.render() | ||
|
|
||
| def add_field(self, name: str, value: str) -> None: | ||
| self.fields.append((name, value)) | ||
|
|
||
| def to_plain_text(self) -> str: | ||
| return "\n".join( | ||
| [self.title, *[f"{name}: {value}" for name, value in self.fields]] | ||
| ) | ||
|
|
||
| def render(self) -> str: | ||
| cells = [f""" | ||
| <td> | ||
| <strong>{escape(name)}</strong><br> | ||
| {escape(value)} | ||
| </td> | ||
| """ for name, value in self.fields] | ||
|
|
||
| rows = "" | ||
| for i in range(0, len(cells), self.columns): | ||
| row_cells = cells[i : i + self.columns] | ||
|
|
||
| while len(row_cells) < self.columns: | ||
| row_cells.append("<td></td>") | ||
|
|
||
| rows += f"<tr>{''.join(row_cells)}</tr>" | ||
|
|
||
| return f"""<blockquote> | ||
| <h2>{escape(self.title)}</h2> | ||
| <table> | ||
| <tbody> | ||
| {rows} | ||
| </tbody> | ||
| </table> | ||
| </blockquote> | ||
| """.strip() | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,7 @@ | |
|
|
||
| from nio import AsyncClient, MatrixRoom, Event | ||
|
|
||
| from matrix.component import Component | ||
| from matrix.api import matrix_call | ||
| from matrix.message import Message | ||
| from matrix.content import ( | ||
|
|
@@ -14,6 +15,7 @@ | |
| ImageContent, | ||
| AudioContent, | ||
| VideoContent, | ||
| ComponentContent, | ||
| ) | ||
| from matrix.types import File, Image, Audio, Video | ||
|
|
||
|
|
@@ -101,6 +103,7 @@ async def send( | |
| self, | ||
| content: str | None = None, | ||
| *, | ||
| component: Component | None = None, | ||
|
Contributor
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 would prefer this to be after file in the list of parameters/keep raw and notice the 2 first after the * Same for context. |
||
| raw: bool = False, | ||
| notice: bool = False, | ||
| file: File | None = None, | ||
|
|
@@ -117,6 +120,10 @@ async def send( | |
| ## Example | ||
|
|
||
| ```python | ||
| # Send component-formatted message | ||
| table = Table(title="Los Angeles") | ||
| await room.send(component=table) | ||
|
|
||
| # Send a markdown-formatted text message | ||
| await room.send("Hello **world**!") | ||
|
|
||
|
|
@@ -129,13 +136,34 @@ async def send( | |
| await room.send(file=image) | ||
| ``` | ||
| """ | ||
| if component: | ||
| return await self.send_component(component) | ||
|
|
||
| if content: | ||
| return await self.send_text(content, raw=raw, notice=notice) | ||
|
|
||
| if file: | ||
| return await self.send_file(file) | ||
| raise ValueError("You must provide content or file.") | ||
|
|
||
| async def send_component( | ||
| self, | ||
| component: Component, | ||
| ) -> Message: | ||
| """Send a component-formatted message to the room. | ||
|
|
||
| ## Example | ||
|
|
||
| ```python | ||
| # Send component-formatted message | ||
| table = Table(title="Los Angeles") | ||
| await room.send_component(table) | ||
| ``` | ||
| """ | ||
| payload: ComponentContent = ComponentContent(component=component) | ||
|
|
||
| return await self._send_payload(payload) | ||
|
|
||
| async def send_text( | ||
| self, | ||
| content: str, | ||
|
|
||
Oops, something went wrong.
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.
Do we still need the blockquote?