chore: add unit test for router and implement command router
ref: N25B-205
This commit is contained in:
@@ -32,9 +32,9 @@ class RICommandAgent(Agent):
|
||||
|
||||
# Try to get body
|
||||
try:
|
||||
message_json = json.loads(body.decode("utf-8"))
|
||||
message = SpeechCommand.model_validate(message_json)
|
||||
|
||||
message = SpeechCommand.model_validate(body)
|
||||
|
||||
|
||||
# Send to the robot.
|
||||
await self.agent.pubsocket.send_json(message)
|
||||
except Exception as e:
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
import json
|
||||
import logging
|
||||
from spade.agent import Agent
|
||||
from spade.behaviour import CyclicBehaviour
|
||||
import zmq
|
||||
|
||||
from control_backend.core.config import settings
|
||||
from control_backend.core.zmq_context import context
|
||||
from control_backend.schemas.message import Message
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
class TestAgent(Agent):
|
||||
socket: zmq.Socket
|
||||
|
||||
class ListenBehaviour(CyclicBehaviour):
|
||||
async def run(self):
|
||||
assert self.agent is not None
|
||||
topic, body = await self.agent.socket.recv_multipart()
|
||||
|
||||
try:
|
||||
message_json = json.loads(body.decode("utf-8"))
|
||||
message = Message.model_validate(message_json)
|
||||
logger.info("Received message \"%s\"", message.message)
|
||||
except Exception as e:
|
||||
logger.error("Error processing message: %s", e)
|
||||
|
||||
async def setup(self):
|
||||
logger.info("Setting up %s", self.jid)
|
||||
self.socket = context.socket(zmq.SUB)
|
||||
self.socket.connect(settings.zmq_settings.internal_comm_address)
|
||||
self.socket.setsockopt(zmq.SUBSCRIBE, b"message")
|
||||
|
||||
b = self.ListenBehaviour()
|
||||
self.add_behaviour(b)
|
||||
|
||||
logger.info("Finished setting up %s", self.jid)
|
||||
@@ -3,21 +3,18 @@ import logging
|
||||
|
||||
from zmq import Socket
|
||||
|
||||
from control_backend.schemas.message import Message
|
||||
from control_backend.schemas.ri_message import SpeechCommand, RIEndpoint
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
@router.post("/message", status_code=202)
|
||||
async def receive_message(message: Message, request: Request):
|
||||
logger.info("Received message: %s", message.message)
|
||||
|
||||
topic = b"message"
|
||||
body = message.model_dump_json().encode("utf-8")
|
||||
|
||||
@router.post("/command", status_code=202)
|
||||
async def receive_command(command: SpeechCommand, request: Request):
|
||||
# Validate and retrieve data.
|
||||
SpeechCommand.model_validate(command)
|
||||
topic = b"command"
|
||||
pub_socket: Socket = request.app.state.internal_comm_socket
|
||||
pub_socket.send_multipart([topic, command])
|
||||
|
||||
pub_socket.send_multipart([topic, body])
|
||||
|
||||
return {"status": "Message received"}
|
||||
return {"status": "Command received"}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from fastapi.routing import APIRouter
|
||||
|
||||
from control_backend.api.v1.endpoints import message, sse
|
||||
from control_backend.api.v1.endpoints import message, sse, command
|
||||
|
||||
api_router = APIRouter()
|
||||
|
||||
@@ -12,4 +12,9 @@ api_router.include_router(
|
||||
api_router.include_router(
|
||||
sse.router,
|
||||
tags=["SSE"]
|
||||
)
|
||||
|
||||
api_router.include_router(
|
||||
command.router,
|
||||
tags=["Commands"]
|
||||
)
|
||||
Reference in New Issue
Block a user