diff --git a/src/meshcore_hub/api/routes/advertisements.py b/src/meshcore_hub/api/routes/advertisements.py index e70f3bf..44fb44e 100644 --- a/src/meshcore_hub/api/routes/advertisements.py +++ b/src/meshcore_hub/api/routes/advertisements.py @@ -20,7 +20,7 @@ async def list_advertisements( _: RequireRead, session: DbSession, public_key: Optional[str] = Query(None, description="Filter by public key"), - receiver_public_key: Optional[str] = Query( + received_by: Optional[str] = Query( None, description="Filter by receiver node public key" ), since: Optional[datetime] = Query(None, description="Start timestamp"), @@ -40,8 +40,8 @@ async def list_advertisements( if public_key: query = query.where(Advertisement.public_key == public_key) - if receiver_public_key: - query = query.where(ReceiverNode.public_key == receiver_public_key) + if received_by: + query = query.where(ReceiverNode.public_key == received_by) if since: query = query.where(Advertisement.received_at >= since) @@ -59,13 +59,13 @@ async def list_advertisements( # Execute results = session.execute(query).all() - # Build response with receiver_public_key + # Build response with received_by items = [] for adv, receiver_pk in results: data = { "id": adv.id, "receiver_node_id": adv.receiver_node_id, - "receiver_public_key": receiver_pk, + "received_by": receiver_pk, "node_id": adv.node_id, "public_key": adv.public_key, "name": adv.name, @@ -106,7 +106,7 @@ async def get_advertisement( data = { "id": adv.id, "receiver_node_id": adv.receiver_node_id, - "receiver_public_key": receiver_pk, + "received_by": receiver_pk, "node_id": adv.node_id, "public_key": adv.public_key, "name": adv.name, diff --git a/src/meshcore_hub/api/routes/messages.py b/src/meshcore_hub/api/routes/messages.py index 1e5e981..98bfc04 100644 --- a/src/meshcore_hub/api/routes/messages.py +++ b/src/meshcore_hub/api/routes/messages.py @@ -22,7 +22,7 @@ async def list_messages( message_type: Optional[str] = Query(None, description="Filter by message type"), pubkey_prefix: Optional[str] = Query(None, description="Filter by sender prefix"), channel_idx: Optional[int] = Query(None, description="Filter by channel"), - receiver_public_key: Optional[str] = Query( + received_by: Optional[str] = Query( None, description="Filter by receiver node public key" ), since: Optional[datetime] = Query(None, description="Start timestamp"), @@ -49,8 +49,8 @@ async def list_messages( if channel_idx is not None: query = query.where(Message.channel_idx == channel_idx) - if receiver_public_key: - query = query.where(ReceiverNode.public_key == receiver_public_key) + if received_by: + query = query.where(ReceiverNode.public_key == received_by) if since: query = query.where(Message.received_at >= since) @@ -96,13 +96,13 @@ async def list_messages( for public_key, value in session.execute(friendly_name_query).all(): friendly_names[public_key[:12]] = value - # Build response with sender info and receiver_public_key + # Build response with sender info and received_by items = [] for m, receiver_pk in results: msg_dict = { "id": m.id, "receiver_node_id": m.receiver_node_id, - "receiver_public_key": receiver_pk, + "received_by": receiver_pk, "message_type": m.message_type, "pubkey_prefix": m.pubkey_prefix, "sender_name": ( @@ -153,7 +153,7 @@ async def get_message( data = { "id": message.id, "receiver_node_id": message.receiver_node_id, - "receiver_public_key": receiver_pk, + "received_by": receiver_pk, "message_type": message.message_type, "pubkey_prefix": message.pubkey_prefix, "channel_idx": message.channel_idx, diff --git a/src/meshcore_hub/api/routes/telemetry.py b/src/meshcore_hub/api/routes/telemetry.py index 3aba139..adab7db 100644 --- a/src/meshcore_hub/api/routes/telemetry.py +++ b/src/meshcore_hub/api/routes/telemetry.py @@ -20,7 +20,7 @@ async def list_telemetry( _: RequireRead, session: DbSession, node_public_key: Optional[str] = Query(None, description="Filter by node"), - receiver_public_key: Optional[str] = Query( + received_by: Optional[str] = Query( None, description="Filter by receiver node public key" ), since: Optional[datetime] = Query(None, description="Start timestamp"), @@ -40,8 +40,8 @@ async def list_telemetry( if node_public_key: query = query.where(Telemetry.node_public_key == node_public_key) - if receiver_public_key: - query = query.where(ReceiverNode.public_key == receiver_public_key) + if received_by: + query = query.where(ReceiverNode.public_key == received_by) if since: query = query.where(Telemetry.received_at >= since) @@ -59,13 +59,13 @@ async def list_telemetry( # Execute results = session.execute(query).all() - # Build response with receiver_public_key + # Build response with received_by items = [] for tel, receiver_pk in results: data = { "id": tel.id, "receiver_node_id": tel.receiver_node_id, - "receiver_public_key": receiver_pk, + "received_by": receiver_pk, "node_id": tel.node_id, "node_public_key": tel.node_public_key, "parsed_data": tel.parsed_data, @@ -104,7 +104,7 @@ async def get_telemetry( data = { "id": tel.id, "receiver_node_id": tel.receiver_node_id, - "receiver_public_key": receiver_pk, + "received_by": receiver_pk, "node_id": tel.node_id, "node_public_key": tel.node_public_key, "parsed_data": tel.parsed_data, diff --git a/src/meshcore_hub/api/routes/trace_paths.py b/src/meshcore_hub/api/routes/trace_paths.py index 5cdba46..e72569e 100644 --- a/src/meshcore_hub/api/routes/trace_paths.py +++ b/src/meshcore_hub/api/routes/trace_paths.py @@ -19,7 +19,7 @@ router = APIRouter() async def list_trace_paths( _: RequireRead, session: DbSession, - receiver_public_key: Optional[str] = Query( + received_by: Optional[str] = Query( None, description="Filter by receiver node public key" ), since: Optional[datetime] = Query(None, description="Start timestamp"), @@ -36,8 +36,8 @@ async def list_trace_paths( ReceiverNode, TracePath.receiver_node_id == ReceiverNode.id ) - if receiver_public_key: - query = query.where(ReceiverNode.public_key == receiver_public_key) + if received_by: + query = query.where(ReceiverNode.public_key == received_by) if since: query = query.where(TracePath.received_at >= since) @@ -55,13 +55,13 @@ async def list_trace_paths( # Execute results = session.execute(query).all() - # Build response with receiver_public_key + # Build response with received_by items = [] for tp, receiver_pk in results: data = { "id": tp.id, "receiver_node_id": tp.receiver_node_id, - "receiver_public_key": receiver_pk, + "received_by": receiver_pk, "initiator_tag": tp.initiator_tag, "path_len": tp.path_len, "flags": tp.flags, @@ -104,7 +104,7 @@ async def get_trace_path( data = { "id": tp.id, "receiver_node_id": tp.receiver_node_id, - "receiver_public_key": receiver_pk, + "received_by": receiver_pk, "initiator_tag": tp.initiator_tag, "path_len": tp.path_len, "flags": tp.flags, diff --git a/src/meshcore_hub/common/schemas/messages.py b/src/meshcore_hub/common/schemas/messages.py index 87246ae..b57a526 100644 --- a/src/meshcore_hub/common/schemas/messages.py +++ b/src/meshcore_hub/common/schemas/messages.py @@ -9,7 +9,7 @@ from pydantic import BaseModel, Field class MessageRead(BaseModel): """Schema for reading a message.""" - receiver_public_key: Optional[str] = Field( + received_by: Optional[str] = Field( default=None, description="Receiving interface node public key" ) message_type: str = Field(..., description="Message type (contact, channel)") @@ -81,7 +81,7 @@ class MessageFilters(BaseModel): class AdvertisementRead(BaseModel): """Schema for reading an advertisement.""" - receiver_public_key: Optional[str] = Field( + received_by: Optional[str] = Field( default=None, description="Receiving interface node public key" ) public_key: str = Field(..., description="Advertised public key") @@ -107,7 +107,7 @@ class AdvertisementList(BaseModel): class TracePathRead(BaseModel): """Schema for reading a trace path.""" - receiver_public_key: Optional[str] = Field( + received_by: Optional[str] = Field( default=None, description="Receiving interface node public key" ) initiator_tag: int = Field(..., description="Trace identifier") @@ -140,7 +140,7 @@ class TracePathList(BaseModel): class TelemetryRead(BaseModel): """Schema for reading a telemetry record.""" - receiver_public_key: Optional[str] = Field( + received_by: Optional[str] = Field( default=None, description="Receiving interface node public key" ) node_public_key: str = Field(..., description="Reporting node public key") diff --git a/src/meshcore_hub/web/templates/messages.html b/src/meshcore_hub/web/templates/messages.html index c30b4c3..2d7471c 100644 --- a/src/meshcore_hub/web/templates/messages.html +++ b/src/meshcore_hub/web/templates/messages.html @@ -90,8 +90,8 @@ {{ msg.text or '-' }} - {% if msg.receiver_public_key %} - {{ msg.receiver_public_key[:8] }}... + {% if msg.received_by %} + {{ msg.received_by[:8] }}... {% else %} - {% endif %} diff --git a/src/meshcore_hub/web/templates/node_detail.html b/src/meshcore_hub/web/templates/node_detail.html index 59568fa..499692b 100644 --- a/src/meshcore_hub/web/templates/node_detail.html +++ b/src/meshcore_hub/web/templates/node_detail.html @@ -113,8 +113,8 @@ {{ adv.adv_type or '-' }} {{ adv.name or '-' }} - {% if adv.receiver_public_key %} - {{ adv.receiver_public_key[:8] }}... + {% if adv.received_by %} + {{ adv.received_by[:8] }}... {% else %} - {% endif %} @@ -156,8 +156,8 @@ {% endif %} - {% if tel.receiver_public_key %} - {{ tel.receiver_public_key[:8] }}... + {% if tel.received_by %} + {{ tel.received_by[:8] }}... {% else %} - {% endif %}