Commit Graph

188 Commits

Author SHA1 Message Date
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
Björn Otgaar
669d0190d6 feat: started ping router and internal messaging for pings
ref: N25B-151
2025-10-29 19:22:06 +01:00
Twirre Meulenbelt
2fae230977 feat: incomplete working pipeline
ref: all
2025-10-29 16:43:23 +01:00
Twirre Meulenbelt
696e91a9d3 Merge remote-tracking branch 'origin/dev' into feat/transcription-agent
# Conflicts:
#	src/control_backend/core/config.py
2025-10-29 15:40:19 +01:00
Twirre Meulenbelt
c56fe3e46d Merge remote-tracking branch 'origin/dev' into feat/belief-collector
# Conflicts:
#	src/control_backend/main.py
2025-10-29 15:37:55 +01:00
Twirre Meulenbelt
792d360fa4 chore: remove test agent again
ref: N25B-208
2025-10-29 15:30:53 +01:00
Twirre Meulenbelt
d05276b081 Merge remote-tracking branch 'origin/feat/belief-from-text' into feat/belief-from-text
# Conflicts:
#	src/control_backend/agents/bdi/test_agent.py
#	src/control_backend/main.py
2025-10-29 15:29:00 +01:00
Twirre Meulenbelt
889ec1db51 chore: fix merge conflicts and small items
ref: N25B-208
2025-10-29 15:28:15 +01:00
Pim Hutting
3f7ec071b2 Merge remote-tracking branch 'origin/dev' into feat/belief-collector 2025-10-29 15:14:42 +01:00
Twirre Meulenbelt
7744852e88 Merge remote-tracking branch 'origin/dev' into feat/belief-from-text
# Conflicts:
#	src/control_backend/main.py
2025-10-29 15:12:18 +01:00
Storm
041edd4c1e feat: implement demo version for demo
ref: N25B-208
2025-10-29 14:53:14 +01:00
Twirre Meulenbelt
155c761daa Merge remote-tracking branch 'origin/dev' into feat/transcription-agent
# Conflicts:
#	src/control_backend/core/config.py
2025-10-29 14:00:57 +01:00
Twirre Meulenbelt
7779d3a41c style: another tiny style fixes 2025-10-29 13:58:10 +01:00
Twirre Meulenbelt
5f2fd11a33 style: tiny style fixes 2025-10-29 13:55:18 +01:00
JobvAlewijk
91df16ebbc build: merge bdi improvements
ref: N25B-197
2025-10-29 13:44:57 +01:00
Björn Otgaar
b83a362abe fix: wait for req socket send to make sure we dont stay stuck - if there's no REP this would be awaited forever.
ref: N25B-205
2025-10-29 13:31:24 +01:00
814a928ae4 Merge remote-tracking branch 'origin/dev' into fix/bdi-correct-belief-management 2025-10-29 13:25:58 +01:00
2da02946ed chore: remove manual testing function
ref: N25B-197
2025-10-29 13:21:55 +01:00
JobvAlewijk
3661b2a1e6 fix: local host
ref: N25B-208
2025-10-29 13:03:57 +01:00
JobvAlewijk
c7a2effa78 style: linted everything
ref: N25B-207
2025-10-29 13:01:00 +01:00
Twirre Meulenbelt
bec3e57658 feat: limit transcription output length based on input
Using heuristics. Also adds documentation and initial unit tests.

ref: N25B-209
2025-10-29 12:49:24 +01:00
JobvAlewijk
af789bd459 feat: norms and goals to llm
base goals and norms can be defined in llm_instructions.py
cleaned the code

ref: N25B-215
2025-10-29 12:45:13 +01:00
Twirre Meulenbelt
4d6bac7e2b Merge remote-tracking branch 'origin/dev' into feat/transcription-agent 2025-10-29 12:20:09 +01:00
3b7aeafe5e fix: correct belief management
There was an issue in how we treated beliefs, specifically with multiple beliefs of the same name but different arguments. This is fixed with this commit.

Also implemented correct updating of the "responded" belief, when the user_said belief is updated (when we get a new user message, we state that we have not yet responded to that message)

ref: N25B-197
2025-10-29 11:23:56 +01:00
Pim Hutting
baeef6142d fix: beliefs now adhere to expected format
[
    -before user_said belief was a list of lists of strings, now it's a list of strings
]

[ref]: N25B-206
2025-10-29 11:20:20 +01:00
JobvAlewijk
f163e0ee6c build: merge of VAD
ref: N25B-213
2025-10-29 10:32:43 +01:00
Pim Hutting
f8dee6d878 test: added tests
[
    See test_continuous_collect.py
]

[ref]: N25B-206
2025-10-29 09:58:56 +01:00
Twirre Meulenbelt
2bb008994b feat: implement transcriber agent
Uses speech fragments of the VAD agent, emits transcribed text over SPADE's default communication channel to no recipient for now.

ref: N25B-209
2025-10-28 21:57:25 +01:00
Twirre Meulenbelt
7085719d2f Merge remote-tracking branch 'origin/dev' into feat/transcription-agent 2025-10-28 21:51:09 +01:00
JobvAlewijk
6846a18b3b build: merge
merge with riAgent

ref: N25B-208
2025-10-28 15:03:47 +01:00
Twirre Meulenbelt
7a96920db5 Merge remote-tracking branch 'origin/dev' into feat/vad-agent 2025-10-28 14:55:10 +01:00
Pim Hutting
2efce93a37 fix: made beliefs a dict of lists
[
    Before it was a list of a dict of lists of lists of strings
    now it is a dict of lists of lists of strings as prescribed by architecture (knowledge base)
    *also added some tests, but will have to add some more
]

[ref]: N25B-206
2025-10-28 14:17:07 +01:00
Björn Otgaar
fd11e63b78 Revert "fix: unit test refactoring with conftest and more mocks"
This reverts commit 423309e063.
2025-10-28 14:16:39 +01:00