Skip to content

Open-source AI teammates in Slack, Teams, Discord, Telegram and Mattermost. Self-host it, with any agent harness and any model.

fix(metering): don't meter what Switch posts on an agent's behalf

Petr Bauch3f73e2647895
diff --git a/core/switch_core/bridges/agent/protocol/service.py b/core/switch_core/bridges/agent/protocol/service.py
index ad551d5bf..6e12350b9 100644
--- a/core/switch_core/bridges/agent/protocol/service.py
+++ b/core/switch_core/bridges/agent/protocol/service.py
@@ -1142,7 +1142,7 @@ class ProtocolService:
bridges — the resource manager isn't a bridge participant, so its own
notices wouldn't reach Slack/Mattermost."""
try:
- await client.send_message(matrix_room_id, body)
+ await client.send_message(matrix_room_id, body, metered=False)
except Exception:
logger.exception(
"Failed to post agent activity notice to %s", matrix_room_id
@@ -1205,7 +1205,10 @@ class ProtocolService:
client, room.matrix_room_id, thread_id
)
event_id = await client.send_message(
- room.matrix_room_id, content, thread_root_id=thread_root_id
+ room.matrix_room_id,
+ content,
+ thread_root_id=thread_root_id,
+ metered=True,
)
if event_id is None:
raise ValueError("Failed to send message")
@@ -1299,6 +1302,7 @@ class ProtocolService:
if group_id is not None
else None
),
+ metered=True,
)
if event_id is None:
raise ValueError(f"Failed to send media message for '{filename}'")
@@ -1566,7 +1570,9 @@ class ProtocolService:
client = self.client_lifecycle.get_by_agent_id(agent_id)
if client is None:
raise ValueError("Agent client not running")
- await client.send_message(room.matrix_room_id, f"*{detail}*", format="markdown")
+ await client.send_message(
+ room.matrix_room_id, f"*{detail}*", format="markdown", metered=True
+ )
async def set_runtime_state(
self,
@@ -2298,7 +2304,9 @@ class ProtocolService:
"outcome": outcome,
},
)
- await client.send_message(room.matrix_room_id, outcome, format="markdown")
+ await client.send_message(
+ room.matrix_room_id, outcome, format="markdown", metered=True
+ )
async def cancel_task(self, agent_id: str, task_id: str, reason: str) -> None:
"""Cancel a task (requester only)."""
diff --git a/core/switch_core/bridges/collaboration/bridge_core.py b/core/switch_core/bridges/collaboration/bridge_core.py
index 2e64cfba9..07296362f 100644
--- a/core/switch_core/bridges/collaboration/bridge_core.py
+++ b/core/switch_core/bridges/collaboration/bridge_core.py
@@ -810,6 +810,7 @@ class BridgeCore:
content,
format="markdown",
thread_root_id=thread_root_id,
+ metered=True,
)
if event_id is None:
logger.error(
@@ -859,6 +860,7 @@ class BridgeCore:
if group_id is not None
else None
),
+ metered=True,
)
if event_id is None:
logger.error(
diff --git a/core/switch_core/clients/admin_client.py b/core/switch_core/clients/admin_client.py
index 8eefd8547..02942d58c 100644
--- a/core/switch_core/clients/admin_client.py
+++ b/core/switch_core/clients/admin_client.py
@@ -125,6 +125,7 @@ class AdminClient(ClientBase[ClientConfig]):
format=format,
thread_root_id=thread_root_id,
extra_content=admin_extra_content(AdminMessageType.COMMAND_RESULT),
+ metered=False,
)
# ── Platform messages ───────────────────────────────────────────────────
@@ -163,6 +164,7 @@ class AdminClient(ClientBase[ClientConfig]):
format="markdown",
thread_root_id=thread_root_id,
extra_content={PLATFORM_MARKER: marker_value},
+ metered=False,
)
# ── Admin notices ─────────────────────────────────────────────────────────
@@ -283,6 +285,7 @@ class AdminClient(ClientBase[ClientConfig]):
mentions=mentions,
thread_root_id=thread_root_id,
extra_content=admin_extra_content(message_type),
+ metered=False,
)
def _sender_handle(self, event: InboundMessage) -> str:
diff --git a/core/switch_core/clients/agent_client.py b/core/switch_core/clients/agent_client.py
index c311dc9ca..7d3c15f26 100644
--- a/core/switch_core/clients/agent_client.py
+++ b/core/switch_core/clients/agent_client.py
@@ -345,7 +345,9 @@ class AgentClient(ClientBase[ClientConfig]):
greeting = f"Hi! I'm {name} — how can I help?"
else:
greeting = random.choice(AGENT_GREETINGS).format(name=name)
- await self.send_message(room.room_id, greeting, format="markdown")
+ await self.send_message(
+ room.room_id, greeting, format="markdown", metered=False
+ )
async def on_removed(self, room: RoomRef, event: InboundMembership) -> None:
"""Forget the room's events, everywhere this agent could still read them.
@@ -857,7 +859,11 @@ class AgentClient(ClientBase[ClientConfig]):
"""Post a command result as this agent (an agent-owned command like
`!run-cmd` answers in the agent's own voice, not as a system message)."""
await self.send_message(
- room_id, body, format=format, thread_root_id=thread_root_id
+ room_id,
+ body,
+ format=format,
+ thread_root_id=thread_root_id,
+ metered=False,
)
async def _resolve_room_meta(self, matrix_room_id: str) -> RoomMeta | None:
@@ -1126,7 +1132,9 @@ class AgentClient(ClientBase[ClientConfig]):
async def on_task_delegate(self, room: RoomRef, event: TaskDelegate) -> None:
if event.performer_agent_id != self.agent.id:
return
- await self.send_message(room.room_id, "Working on it.", format="markdown")
+ await self.send_message(
+ room.room_id, "Working on it.", format="markdown", metered=False
+ )
meta = await self._resolve_room_meta(room.room_id)
if meta is None:
return
@@ -1359,6 +1367,7 @@ class AgentClient(ClientBase[ClientConfig]):
mentions=[event.sender],
thread_root_id=thread_root_id,
extra_content={AUTO_REPLY_FLAG: True},
+ metered=False,
)
def _args_tag_my_name(self, text: str) -> bool:
diff --git a/core/switch_core/clients/client_base.py b/core/switch_core/clients/client_base.py
index c21634e87..b9cc288b6 100644
--- a/core/switch_core/clients/client_base.py
+++ b/core/switch_core/clients/client_base.py
@@ -476,6 +476,7 @@ class ClientBase[ConfigT: ClientConfig]:
room_id: str,
body: str,
*,
+ metered: bool,
format: Literal["text", "markdown"] = "text",
mentions: list[str] | None = None,
thread_root_id: str | None = None,
@@ -486,6 +487,7 @@ class ClientBase[ConfigT: ClientConfig]:
room_id,
body,
sender_name=self.display_name,
+ metered=metered,
format=format,
mentions=mentions,
thread_root_id=thread_root_id,
@@ -525,6 +527,7 @@ class ClientBase[ConfigT: ClientConfig]:
mimetype: str,
size: int,
*,
+ metered: bool,
msgtype: str,
caption: str | None = None,
thread_root_id: str | None = None,
@@ -552,6 +555,7 @@ class ClientBase[ConfigT: ClientConfig]:
mimetype,
size,
sender_name=self.display_name,
+ metered=metered,
msgtype=msgtype,
caption=caption,
thread_root_id=thread_root_id,
diff --git a/core/switch_core/transport/port.py b/core/switch_core/transport/port.py
index d2f5cb825..a1e5be81c 100644
--- a/core/switch_core/transport/port.py
+++ b/core/switch_core/transport/port.py
@@ -77,12 +77,20 @@ class MessageTransport(Protocol):
body: str,
*,
sender_name: str,
+ metered: bool,
format: MessageFormat = "text",
mentions: list[str] | None = None,
thread_root_id: str | None = None,
extra_content: dict[str, object] | None = None,
) -> SendResult:
- """Post a text message. Raises `TransportError` if it is not accepted."""
+ """Post a text message. Raises `TransportError` if it is not accepted.
+
+ `metered` says whether the message counts toward the tenant's usage. It
+ is false for what Switch posts on a participant's behalf — greetings,
+ command replies, automatic refusals — which the participant never chose
+ to say. It is an argument rather than something read from the content,
+ because a sender controls the content.
+ """
...
async def send_event(
@@ -103,6 +111,7 @@ class MessageTransport(Protocol):
size: int,
*,
sender_name: str,
+ metered: bool,
msgtype: str,
caption: str | None = None,
thread_root_id: str | None = None,
@@ -112,7 +121,7 @@ class MessageTransport(Protocol):
`group` marks this as one part of a multi-attachment message —
`{"id": ..., "index": i, "total": n}` — for transports that cannot
- carry several files on one event.
+ carry several files on one event. `metered` is as for `send_message`.
"""
...
diff --git a/core/switch_core/transport/postgres.py b/core/switch_core/transport/postgres.py
index 2b11c27ca..dbef6b843 100644
--- a/core/switch_core/transport/postgres.py
+++ b/core/switch_core/transport/postgres.py
@@ -594,6 +594,7 @@ class PostgresTransport:
body: str,
*,
sender_name: str,
+ metered: bool,
format: MessageFormat = "text",
mentions: list[str] | None = None,
thread_root_id: str | None = None,
@@ -607,7 +608,9 @@ class PostgresTransport:
thread_root_id=thread_root_id,
extra_content=extra_content,
)
- return await self._send(room_id, "m.room.message", content, sender_name)
+ return await self._send(
+ room_id, "m.room.message", content, sender_name, metered=metered
+ )
async def send_event(
self,
@@ -615,7 +618,9 @@ class PostgresTransport:
event_type: str,
content: dict[str, object],
) -> SendResult:
- return await self._send(room_id, event_type, content, self.display_name)
+ return await self._send(
+ room_id, event_type, content, self.display_name, metered=False
+ )
async def send_media(
self,
@@ -626,6 +631,7 @@ class PostgresTransport:
size: int,
*,
sender_name: str,
+ metered: bool,
msgtype: str,
caption: str | None = None,
thread_root_id: str | None = None,
@@ -642,7 +648,9 @@ class PostgresTransport:
thread_root_id=thread_root_id,
group=group,
)
- return await self._send(room_id, "m.room.message", content, sender_name)
+ return await self._send(
+ room_id, "m.room.message", content, sender_name, metered=metered
+ )
async def _send(
self,
@@ -650,6 +658,8 @@ class PostgresTransport:
event_type: str,
content: dict[str, object],
sender_name: str,
+ *,
+ metered: bool,
) -> SendResult:
"""Write the event, which is what sending it means here.
@@ -700,7 +710,7 @@ class PostgresTransport:
await self._message_store.create(
session, message, attachments_in(content)
)
- if kind in _METERED_KINDS:
+ if metered and kind in _METERED_KINDS:
await self._usage_store.record(
session,
tenant_id=tenant_id,
diff --git a/core/tests/integration/test_removal_stops_delivery_e2e.py b/core/tests/integration/test_removal_stops_delivery_e2e.py
index 08915c1ce..14180b706 100644
--- a/core/tests/integration/test_removal_stops_delivery_e2e.py
+++ b/core/tests/integration/test_removal_stops_delivery_e2e.py
@@ -93,7 +93,9 @@ async def test_removal_stops_every_reader_serving_the_room(harness: Harness) ->
bodies = {}
for label, room in rooms.items():
bodies[label] = f"@e2e-removed-watcher please look at the {label} room"
- await talker_client.send_message(room.matrix_room_id, bodies[label])
+ await talker_client.send_message(
+ room.matrix_room_id, bodies[label], metered=True
+ )
await _wait_buffered(harness, watcher.agent_id, room.id, bodies[label])
# Both rooms are in the buffer and addressed, so every assertion after the
@@ -163,7 +165,9 @@ async def test_a_room_the_agent_is_still_in_is_untouched(harness: Harness) -> No
body = "@e2e-still-in-watcher this one still applies"
await harness.client_for(talker.agent_id).send_message(
- kept.room.matrix_room_id, body
+ kept.room.matrix_room_id,
+ body,
+ metered=True,
)
await _wait_buffered(harness, watcher.agent_id, kept.room.id, body)
diff --git a/core/tests/switch_core/bridges/agent/protocol/test_send_media.py b/core/tests/switch_core/bridges/agent/protocol/test_send_media.py
index f522a9e73..06ed2bc3c 100644
--- a/core/tests/switch_core/bridges/agent/protocol/test_send_media.py
+++ b/core/tests/switch_core/bridges/agent/protocol/test_send_media.py
@@ -26,6 +26,7 @@ class _FakeClient:
mimetype: str,
size: int,
*,
+ metered: bool,
msgtype: str,
caption: str | None = None,
thread_root_id: str | None = None,
@@ -38,6 +39,7 @@ class _FakeClient:
"filename": filename,
"mimetype": mimetype,
"size": size,
+ "metered": metered,
"msgtype": msgtype,
"caption": caption,
"thread_root_id": thread_root_id,
@@ -88,6 +90,7 @@ async def test_send_media_uploads_and_posts_image() -> None:
sent = client.sends[0]
assert sent["room_id"] == "!room"
assert sent["msgtype"] == "m.image"
+ assert sent["metered"] is True
assert sent["caption"] is None
assert sent["thread_root_id"] is None
# A lone attachment carries no group marker.
diff --git a/core/tests/switch_core/bridges/collaboration/test_bridge_inbound_media.py b/core/tests/switch_core/bridges/collaboration/test_bridge_inbound_media.py
index 65fed94ca..4b49d8d47 100644
--- a/core/tests/switch_core/bridges/collaboration/test_bridge_inbound_media.py
+++ b/core/tests/switch_core/bridges/collaboration/test_bridge_inbound_media.py
@@ -30,6 +30,8 @@ class _FakePuppet:
filename,
mimetype,
size,
+ *,
+ metered,
msgtype,
caption=None,
thread_root_id=None,
@@ -51,7 +53,7 @@ class _FakePuppet:
return f"$evt-{len(self.media) - 1}"
async def send_message(
- self, matrix_room_id, content, format=None, thread_root_id=None
+ self, matrix_room_id, content, *, metered, format=None, thread_root_id=None
): # noqa: ANN001, ANN201, A002
self.messages.append({"content": content, "thread_root_id": thread_root_id})
return "$evt-text"
diff --git a/core/tests/switch_core/clients/test_admin_client.py b/core/tests/switch_core/clients/test_admin_client.py
index 6127ceb09..a345d12f9 100644
--- a/core/tests/switch_core/clients/test_admin_client.py
+++ b/core/tests/switch_core/clients/test_admin_client.py
@@ -89,6 +89,7 @@ def _admin_client(
room_id,
body,
*,
+ metered,
format="markdown",
mentions=None,
thread_root_id=None,
@@ -97,6 +98,7 @@ def _admin_client(
sent.append(
{
"body": body,
+ "metered": metered,
"thread_root_id": thread_root_id,
"mentions": mentions,
"extra_content": extra_content,
@@ -366,6 +368,7 @@ class TestAdminCommandDispatch:
await client.reply_command("!m", "the result")
assert sent[0]["body"] == "the result"
assert _marker_type(sent[0]) == AdminMessageType.COMMAND_RESULT.value
+ assert sent[0]["metered"] is False
async def test_admin_owned_command_is_handled(self) -> None:
host, sent = _command_host()
diff --git a/core/tests/switch_core/clients/test_no_session_reply_threading.py b/core/tests/switch_core/clients/test_no_session_reply_threading.py
index 99467989b..1f67a9c74 100644
--- a/core/tests/switch_core/clients/test_no_session_reply_threading.py
+++ b/core/tests/switch_core/clients/test_no_session_reply_threading.py
@@ -127,6 +127,20 @@ async def test_no_session_reply_threads_under_triggering_mention() -> None:
]
# The reply is stamped as an auto-reply so it can't re-trigger another one.
assert send_message.calls[0]["extra_content"] == {AUTO_REPLY_FLAG: True}
+ # Switch said it, not the agent, so the tenant is not charged for it.
+ assert send_message.calls[0]["metered"] is False
+
+
+async def test_a_command_reply_is_not_metered() -> None:
+ send_message = _Recorder()
+ await AgentClient.reply_command(
+ SimpleNamespace(send_message=send_message), # type: ignore[arg-type]
+ "!matrix:server",
+ "the result",
+ )
+
+ assert send_message.calls[0]["metered"] is False
@pytest.mark.asyncio
diff --git a/core/tests/switch_core/clients/test_send_media.py b/core/tests/switch_core/clients/test_send_media.py
index c5d72a44d..2dc94eed8 100644
--- a/core/tests/switch_core/clients/test_send_media.py
+++ b/core/tests/switch_core/clients/test_send_media.py
@@ -54,6 +54,7 @@ async def test_send_media_with_caption_passes_caption_and_filename_through() ->
1234,
msgtype="m.image",
caption="look at this",
+ metered=True,
)
assert event_id == "$fake1"
@@ -75,7 +76,13 @@ async def test_send_media_without_caption_sends_no_caption() -> None:
client = _client(transport)
await client.send_media(
- "!room", "mxc://s/abc", "cat.png", "image/png", 1234, msgtype="m.image"
+ "!room",
+ "mxc://s/abc",
+ "cat.png",
+ "image/png",
+ 1234,
+ msgtype="m.image",
+ metered=True,
)
sent = transport.sent_media[0]
@@ -87,7 +94,13 @@ async def test_send_media_returns_none_when_the_transport_rejects_it() -> None:
client = _client(FakeTransport(fail_send="nope"))
result = await client.send_media(
- "!room", "mxc://s/abc", "cat.png", "image/png", 1234, msgtype="m.image"
+ "!room",
+ "mxc://s/abc",
+ "cat.png",
+ "image/png",
+ 1234,
+ msgtype="m.image",
+ metered=True,
)
assert result is None
diff --git a/core/tests/switch_core/transport/fake.py b/core/tests/switch_core/transport/fake.py
index 34d313b6d..d385e09df 100644
--- a/core/tests/switch_core/transport/fake.py
+++ b/core/tests/switch_core/transport/fake.py
@@ -85,6 +85,7 @@ class FakeTransport:
body: str,
*,
sender_name: str,
+ metered: bool,
format: MessageFormat = "text",
mentions: list[str] | None = None,
thread_root_id: str | None = None,
@@ -97,6 +98,7 @@ class FakeTransport:
"room_id": room_id,
"body": body,
"sender_name": sender_name,
+ "metered": metered,
"format": format,
"mentions": mentions,
"thread_root_id": thread_root_id,
@@ -140,6 +142,7 @@ class FakeTransport:
size: int,
*,
sender_name: str,
+ metered: bool,
msgtype: str,
caption: str | None = None,
thread_root_id: str | None = None,
@@ -155,6 +158,7 @@ class FakeTransport:
"mimetype": mimetype,
"size": size,
"sender_name": sender_name,
+ "metered": metered,
"msgtype": msgtype,
"caption": caption,
"thread_root_id": thread_root_id,
diff --git a/core/tests/switch_core/transport/test_postgres_transport.py b/core/tests/switch_core/transport/test_postgres_transport.py
index c4ebf8bda..5bdea7b80 100644
--- a/core/tests/switch_core/transport/test_postgres_transport.py
+++ b/core/tests/switch_core/transport/test_postgres_transport.py
@@ -25,6 +25,7 @@ from switch_core.db.models import (
TENANT_ZERO_ID,
Client,
ClientRoom,
+ Message,
Room,
Tenant,
TenantUsage,
@@ -229,8 +230,12 @@ class TestMetering:
await session.commit()
transport = _transport(session_factory, client_id=client_id, user_id=user_id)
- await transport.send_message(transport_room_id, "one", sender_name="a")
- await transport.send_message(transport_room_id, "two", sender_name="a")
+ await transport.send_message(
+ transport_room_id, "one", sender_name="a", metered=True
+ )
+ await transport.send_message(
+ transport_room_id, "two", sender_name="a", metered=True
+ )
await transport.send_media(
transport_room_id,
"blob://1",
@@ -239,6 +244,7 @@ class TestMetering:
2048,
sender_name="a",
msgtype="m.file",
+ metered=True,
)
assert await self._usage(session_factory) == [("messages", client_id, 3)]
@@ -259,6 +265,37 @@ class TestMetering:
assert await self._usage(session_factory) == []
+ async def test_an_unmetered_send_is_stored_but_not_counted(
+ self, session_factory: async_sessionmaker[AsyncSession]
+ ) -> None:
+ # What Switch posts on a participant's behalf — a greeting, a command
+ # reply, an automatic refusal — is not something it chose to say.
+ async with session_factory() as session:
+ room_id, transport_room_id, client_id, user_id = await _make_room(session)
+ await session.commit()
+
+ transport = _transport(session_factory, client_id=client_id, user_id=user_id)
+ await transport.send_message(
+ transport_room_id, "unavailable", sender_name="a", metered=False
+ )
+ await transport.send_media(
+ transport_room_id,
+ "blob://1",
+ "report.pdf",
+ "application/pdf",
+ 2048,
+ sender_name="a",
+ msgtype="m.file",
+ metered=False,
+ )
+
+ assert await self._usage(session_factory) == []
+ async with session_factory() as session:
+ stored = await session.scalars(
+ select(Message).where(Message.room_id == room_id)
+ )
+ assert len(list(stored)) == 2
+
async def test_the_count_survives_the_room(
self, session_factory: async_sessionmaker[AsyncSession]
) -> None:
@@ -268,7 +305,9 @@ class TestMetering:
await session.commit()
transport = _transport(session_factory, client_id=client_id, user_id=user_id)
- await transport.send_message(transport_room_id, "spent", sender_name="a")
+ await transport.send_message(
+ transport_room_id, "spent", sender_name="a", metered=True
+ )
async with session_factory() as session:
await session.execute(delete(Room).where(Room.id == room_id))
await session.commit()
@@ -286,7 +325,10 @@ class TestSending:
transport = _transport(session_factory, client_id=client_id, user_id=user_id)
result = await transport.send_message(
- transport_room_id, "hello", sender_name="agent one"
+ transport_room_id,
+ "hello",
+ sender_name="agent one",
+ metered=True,
)
async with session_factory() as session:
@@ -315,10 +357,16 @@ class TestSending:
transport = _transport(session_factory, client_id=client_id, user_id=user_id)
first = await transport.send_message(
- transport_room_id, "one", sender_name="agent one"
+ transport_room_id,
+ "one",
+ sender_name="agent one",
+ metered=True,
)
second = await transport.send_message(
- transport_room_id, "two", sender_name="agent one"
+ transport_room_id,
+ "two",
+ sender_name="agent one",
+ metered=True,
)
async with session_factory() as session:
@@ -342,6 +390,7 @@ class TestSending:
"in the thread",
sender_name="agent one",
thread_root_id="root-1",
+ metered=True,
)
async with session_factory() as session:
@@ -369,6 +418,7 @@ class TestSending:
sender_name="agent one",
msgtype="m.file",
caption="the report",
+ metered=True,
)
async with session_factory() as session:
@@ -438,7 +488,10 @@ class TestSending:
transport = _transport(session_factory, client_id="c", user_id="@a:test")
with pytest.raises(TransportError):
await transport.send_message(
- "!nowhere:test", "hello", sender_name="agent one"
+ "!nowhere:test",
+ "hello",
+ sender_name="agent one",
+ metered=True,
)
@@ -590,7 +643,9 @@ class TestReceiving:
) -> None:
transport, listener, received, room, _ = await self._receiving(session_factory)
- sent = await transport.send_message(room, "hello", sender_name="agent one")
+ sent = await transport.send_message(
+ room, "hello", sender_name="agent one", metered=True
+ )
await listener.announce(await _watched_room(transport))
assert len(received.events) == 1
@@ -617,7 +672,9 @@ class TestReceiving:
listener = _FakeListener()
writer = _transport(session_factory, client_id=client_id, user_id=user_id)
- await writer.send_message(room, "said before anyone listened", sender_name="a")
+ await writer.send_message(
+ room, "said before anyone listened", sender_name="a", metered=True
+ )
received = _Received()
reader = _transport(
@@ -631,7 +688,7 @@ class TestReceiving:
await listener.announce(switch_room_id)
assert received.events == []
- await writer.send_message(room, "said after", sender_name="a")
+ await writer.send_message(room, "said after", sender_name="a", metered=True)
await listener.announce(switch_room_id)
await listener.announce(switch_room_id)
@@ -651,6 +708,7 @@ class TestReceiving:
12,
sender_name="agent one",
msgtype="m.file",
+ metered=True,
)
await listener.announce(await _watched_room(transport))
@@ -845,7 +903,9 @@ class TestOneClientCannotStallAnother:
self._tasks.append(asyncio.create_task(transport.receive_forever()))
switch_room_id = await _watched_room(transport)
- await transport.send_message(room, "hello", sender_name="agent one")
+ await transport.send_message(
+ room, "hello", sender_name="agent one", metered=True
+ )
# The waker itself, rather than the fake's announce, which waits for
# the reading it provokes.
await transport._on_room_advanced(switch_room_id)
@@ -876,7 +936,9 @@ class TestOneClientCannotStallAnother:
self._tasks.append(asyncio.create_task(transport.receive_forever()))
switch_room_id = await _watched_room(transport)
- await transport.send_message(room, "hello", sender_name="agent one")
+ await transport.send_message(
+ room, "hello", sender_name="agent one", metered=True
+ )
await transport._on_room_advanced(switch_room_id)
await transport._on_room_advanced(switch_room_id)
await transport._on_room_advanced(switch_room_id)
@@ -994,7 +1056,9 @@ class TestHearingYourOwnArrival:
talker = _transport(session_factory, client_id=other_id, user_id=other_user)
await talker.join_room(later)
- await talker.send_message(later, "said before anyone joined", sender_name="a")
+ await talker.send_message(
+ later, "said before anyone joined", sender_name="a", metered=True
+ )
listener = _FakeListener()
received = _Received()
@@ -1080,7 +1144,10 @@ class TestDeliveryBindsTheRoomsTenant:
switch_room_id = await _watched_room(transport)
await transport.send_message(
- transport_room_id, "hello", sender_name="agent one"
+ transport_room_id,
+ "hello",
+ sender_name="agent one",
+ metered=True,
)
await listener.announce(switch_room_id)
@@ -1321,8 +1388,8 @@ class TestATransportActsInItsClientsTenant:
self._tasks.append(asyncio.create_task(transport.receive_forever()))
await _watched_room(transport)
- await transport.send_message(mxid_a, "in a", sender_name="puppet")
- await transport.send_message(mxid_b, "in b", sender_name="puppet")
+ await transport.send_message(mxid_a, "in a", sender_name="puppet", metered=True)
+ await transport.send_message(mxid_b, "in b", sender_name="puppet", metered=True)
for room_id in room_ids:
await listener.announce(room_id)
@@ -1379,7 +1446,9 @@ class TestATransportActsInItsClientsTenant:
tenant_id=tenant_id,
)
with pytest.raises(TransportError, match="is not a Switch room"):
- await transport.send_message(elsewhere_mxid, "hello", sender_name="admin")
+ await transport.send_message(
+ elsewhere_mxid, "hello", sender_name="admin", metered=True
+ )
async def test_the_schema_forbids_a_client_row_in_another_tenants_room(
@@ -1472,7 +1541,9 @@ class TestWhatIsMeasured:
) -> None:
transport, listener, room = await self._receiving(session_factory)
- await transport.send_message(room, "hello", sender_name="agent one")
+ await transport.send_message(
+ room, "hello", sender_name="agent one", metered=True
+ )
await listener.announce(await _watched_room(transport))
payloads = {p.name: p for p in _registry.collect()}
@@ -1492,6 +1563,7 @@ class TestWhatIsMeasured:
size=3,
sender_name="agent one",
msgtype="m.image",
+ metered=True,
)
await listener.announce(await _watched_room(transport))
@@ -1506,7 +1578,9 @@ class TestWhatIsMeasured:
) -> None:
transport, listener, room = await self._receiving(session_factory)
- await transport.send_message(room, "hello", sender_name="agent one")
+ await transport.send_message(
+ room, "hello", sender_name="agent one", metered=True
+ )
await listener.announce(await _watched_room(transport))
payload = next(
@@ -1535,7 +1609,9 @@ class TestWhatIsMeasured:
),
)
- await transport.send_message(room, "hello", sender_name="agent one")
+ await transport.send_message(
+ room, "hello", sender_name="agent one", metered=True
+ )
await listener.announce(await _watched_room(transport))
# Swallowing the exception is what keeps the delivery loop alive for
@@ -1558,7 +1634,10 @@ class TestWhatIsMeasured:
with pytest.raises(Exception):
await transport.send_message(
- "!room-that-does-not-exist:test", "hello", sender_name="agent one"
+ "!room-that-does-not-exist:test",
+ "hello",
+ sender_name="agent one",
+ metered=True,
)
recorded = {payload.name for payload in _registry.collect()}
@@ -1572,7 +1651,10 @@ class TestWhatIsMeasured:
with pytest.raises(Exception):
await transport.send_message(
- "!room-that-does-not-exist:test", "hello", sender_name="agent one"
+ "!room-that-does-not-exist:test",
+ "hello",
+ sender_name="agent one",
+ metered=True,
)
payload = next(
@@ -1659,7 +1741,9 @@ class TestBeingRemovedFromARoom:
await _watched_room(member)
# While a member, it hears the room.
- await member.send_message(room, "while a member", sender_name="agent one")
+ await member.send_message(
+ room, "while a member", sender_name="agent one", metered=True
+ )
await listener.announce(room_id)
assert [event.body for event in received.events] == ["while a member"]
@@ -1670,7 +1754,9 @@ class TestBeingRemovedFromARoom:
assert leaving[0] not in members
assert staying[0] in members
- await member.send_message(room, "after removal", sender_name="agent one")
+ await member.send_message(
+ room, "after removal", sender_name="agent one", metered=True
+ )
await listener.announce(room_id)
assert [event.body for event in received.events] == ["while a member"]
@@ -1719,7 +1805,10 @@ class TestBeingRemovedFromARoom:
provisioning = self._provisioning(session_factory, invites)
await provisioning.kick_user(room, leaving[1])
await member.send_message(
- room, "said while it was out", sender_name="agent one"
+ room,
+ "said while it was out",
+ sender_name="agent one",
+ metered=True,
)
await listener.announce(room_id)
@@ -1813,7 +1902,9 @@ class TestBeingRemovedFromARoom:
await _watched_room(member)
for i in range(4):
- await member.send_message(room, f"line {i}", sender_name="agent one")
+ await member.send_message(
+ room, f"line {i}", sender_name="agent one", metered=True
+ )
await listener.announce(room_id)
# The removal landed on the first delivery; the rest of the page is
@@ -1970,7 +2061,9 @@ class TestBeingRemovedFromARoom:
# More than one page, so the loop would come back for another.
for i in range(_DELIVERY_PAGE + 25):
- await member.send_message(room, f"line {i}", sender_name="agent one")
+ await member.send_message(
+ room, f"line {i}", sender_name="agent one", metered=True
+ )
await listener.announce(room_id)
# The whole of page one, and none of page two.