Commit Graph

120 Commits

Author SHA1 Message Date
Twirre Meulenbelt
5f3d290fb6 fix: use the correct name in the transcription agent
ref: N25B-257
2025-11-19 16:29:13 +01:00
Twirre Meulenbelt
6c401a18b4 Merge remote-tracking branch 'origin/dev' into refactor/agent-naming 2025-11-19 16:00:11 +01:00
Twirre Meulenbelt
efe49c219c feat: apply new agent naming standards
Expanding abbreviations to remove ambiguity, simplifying agent names to reduce repetition.

ref: N25B-257
2025-11-19 15:56:09 +01:00
JobvAlewijk
964997f801 Merge branch 'dev' of https://git.science.uu.nl/ics/sp/2025/n25b/pepperplus-cb into feat/recieve-programs-ui 2025-11-19 13:16:41 +01:00
Björn Otgaar
f4dbca5b94 Merge branch 'dev' into refactor/agent-naming 2025-11-18 19:32:15 +01:00
JobvAlewijk
39c07dd3cf refactor: made pydantic check the input.
no longer by the code itself.

ref: N25B-198
2025-11-18 12:35:44 +01:00
Björn Otgaar
2eefcc4553 chore: fix error messages to be warnings. 2025-11-17 16:09:02 +01:00
JobvAlewijk
2ed2a84f13 style: compacted program and reworked tests
ref: N25B-198
2025-11-12 18:04:39 +01:00
JobvAlewijk
79d3bfb3a6 test: added tests for programs and its scheme
ref: N25B-198
2025-11-12 17:36:00 +01:00
JobvAlewijk
43f3cba1a8 feat: ui program to cb connection
ref: N25B-198
2025-11-12 13:18:56 +01:00
Björn Otgaar
9152985bdb fix: send correct asl path to BDI agent
ref: N25B-257
2025-11-12 12:46:47 +01:00
Björn Otgaar
7a707cf9a0 refactor: change test folder structure, rename functions to account for (non)changing behaviours and clarity
ref: N25B-257
2025-11-12 12:42:54 +01:00
Björn Otgaar
9365f109ab refactor: restructure to make sure the Bel agents are also part of BDI.
ref: N25B-257
2025-11-12 12:01:37 +01:00
Björn Otgaar
dfebe6f772 refactor: make sure that in main the correct names and passwords are called for starting the agents
ref: N25B-257
2025-11-12 11:36:51 +01:00
Björn Otgaar
0e45383027 refactor: rename all agents and improve structure pt1
ref: N25B-257
2025-11-12 11:04:49 +01:00
Björn Otgaar
debc87c0bb fix: Fix up merging request changes and make sure that there is no racing condition errors, and UI always gets correct information.
ref: N25B-256
2025-11-11 10:18:43 +01:00
Björn Otgaar
2d1a25e4ae chore: fixing up logging messages 2025-11-06 14:49:54 +01:00
Björn Otgaar
6cc03efdaf feat: new integration tests for robot, making sure to get 100% code coverage
ref: N25B-256
2025-11-06 14:42:02 +01:00
Björn Otgaar
00d3e893f4 chore: merge dev and make sure vs doesnt cry 2025-11-06 14:27:52 +01:00
Björn Otgaar
feb6875a4c fix: make sure that the communication agent reboots propperly.
ref: N25B-256
2025-11-06 14:16:55 +01:00
Luijkx,S.O.H. (Storm)
1c756474f2 test: added tests for text_belief_extractor 2025-11-06 12:57:09 +00:00
Björn Otgaar
276ccfbf78 chore: merged dev into branch and updated logging 2025-11-06 13:52:12 +01:00
Björn Otgaar
ca8b57fec5 fix: robot pings to router
ref: N25B-256
2025-11-05 16:59:36 +01:00
df7dc8fdf3 fix: no double json
ref: N25B-242
2025-11-05 16:38:03 +01:00
Björn Otgaar
8638523980 fix: fixed new tests and merged dev into branch
ref: N25B-256
2025-11-05 16:29:56 +01:00
d9fef22090 Merge branch 'dev' into refactor/logging 2025-11-05 15:09:14 +01:00
Twirre Meulenbelt
262376fb58 fix: break LLM response with fewer types of punctuation
ref: N25B-207
2025-11-05 15:01:01 +01:00
Twirre Meulenbelt
06e9e4fd15 chore: ruff format 2025-11-05 14:15:03 +01:00
220c5c7739 feat: send logs to UI
Added SSE endpoint `/logs/stream` for the UI to listen to logs.

ref: N25B-242
2025-11-05 13:57:51 +01:00
e49ccb213e Merge branch 'dev' into refactor/logging 2025-11-05 12:40:31 +01:00
Twirre Meulenbelt
689a0d35da Merge remote-tracking branch 'origin/dev' into demo 2025-11-05 12:38:08 +01:00
Twirre Meulenbelt
f854a60e46 style: import order and lines too long
ref: N25B-217
2025-11-05 12:34:30 +01:00
Twirre Meulenbelt
a1918049e5 Merge remote-tracking branch 'origin/dev' into refactor/zmq-internal-socket-behaviour
# Conflicts:
#	src/control_backend/agents/ri_command_agent.py
#	src/control_backend/agents/ri_communication_agent.py
#	src/control_backend/api/v1/endpoints/command.py
#	src/control_backend/main.py
#	test/integration/api/endpoints/test_command_endpoint.py
2025-11-05 12:16:18 +01:00
Twirre Meulenbelt
5c228df109 fix: allow Whisper to generate more tokens based on audio length
Before, it sometimes cut off the transcription too early.

ref: N25B-209
2025-11-05 10:41:11 +01:00
c7bdb5aeda chore: run linter and formatter 2025-11-04 21:00:12 +01:00
270df83fab Merge branch 'dev' into refactor/logging 2025-11-04 20:54:03 +01:00
a98018ddda refactor: agents inherit logger from BaseAgent
Created a class `BaseAgent`, from which all agents inherit. They get
assigned a logger with a nice name (something like
`control_backend.agents.AgentName`).

The BDI core takes care of its own logger, as bdi is still a module.

ref: N25B-241
2025-11-04 20:48:55 +01:00
Twirre Meulenbelt
8e4d8f9d1e Merge remote-tracking branch 'origin/dev' into demo
# Conflicts:
#	src/control_backend/agents/bdi/behaviours/receive_llm_resp_behaviour.py
#	src/control_backend/agents/llm/llm.py
#	src/control_backend/agents/ri_command_agent.py
#	src/control_backend/agents/transcription/speech_recognizer.py
2025-11-02 21:07:50 +01:00
48c9746417 style: apply ruff check and format
Made sure all ruff checks pass and formatted all files.

ref: N25B-224
2025-11-02 19:45:01 +01:00
d43cb9394a refactor: improve logging and module structure
Changed some folders to not be modules and organized some `__init__.py`
files.

ref: N25B-223
2025-11-02 11:32:21 +01:00
d66fe07438 refactor: rename logging_config.yaml -> .logging_config.yaml 2025-10-31 21:26:08 +01:00
d5de644828 feat: add colored and formatted logging
Add a custom logging setup function to add custom levels and custom
formatters (partly for future use with extended logging functionality).
Also implemented a basic colored formatter to make our logs nicer.

Also improved the handling of logging in external libraries, so now we
should only get WARNings or above.

ref: N25B-233
2025-10-31 21:22:32 +01:00
Björn Otgaar
1234517d8f fix: merge refactor/zmq-internal-socket-behaviour into feat/cb2ui-robot-connections. (And fixed all ruff/ test issues to commit)
ref: None
2025-10-31 14:16:11 +01:00
20a49eb553 fix: endpoints don't create sockets
ref: N25B-217
2025-10-31 10:36:21 +01:00
Björn Otgaar
30453be4b2 fix: ruff checks is now in order:)
ref: N25B-205
2025-10-30 16:41:35 +01:00
Björn Otgaar
af3e4ae56a fix: adjusted ping data on ping_stream, and made it so that communication agent is more robust and quick in ping communication.
ref: N25B-142
2025-10-30 13:07:01 +01:00
10deb4bece fix: separate thread for proxy
ref: N25B-217
2025-10-30 12:52:18 +01:00
b92471ff1c refactor: ZMQ context and proxy
Use ZMQ's global context instance and setup an XPUB/XSUB proxy intermediary to allow for easier multi-pubs.

close: N25B-217
2025-10-30 11:40:14 +01:00
Twirre Meulenbelt
86938f79c0 feat: end to end connected for demo
Includes the Transcription agent. Involved updating the RI agent to receive messages from other agents, sending speech commands to the RI agent, and some performance optimizations.

ref: N25B-216
2025-10-30 10:42:25 +01:00
Björn Otgaar
4f2d45fb44 feat: fixed socket typing for communication agent and ping router- automatically try to reconnect with robot.
ref: N25B-151
2025-10-29 21:55:23 +01:00