Twirre Meulenbelt
64db25c974
Merge remote-tracking branch 'origin/dev' into refactor/config-file
...
# Conflicts:
# src/control_backend/agents/ri_communication_agent.py
# src/control_backend/core/config.py
# src/control_backend/main.py
2025-11-19 17:30:48 +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
Pim Hutting
98dd2637c0
Apply 1 suggestion(s) to 1 file(s)
...
Co-authored-by: Twirre <s.a.meulenbelt@students.uu.nl >
2025-11-19 11:50:17 +00:00
Pim Hutting
1372fe89f6
Apply 1 suggestion(s) to 1 file(s)
...
Co-authored-by: Twirre <s.a.meulenbelt@students.uu.nl >
2025-11-19 11:50:07 +00: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
41993a902b
chore: remove caplog from test cases
2025-11-17 16:04:54 +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
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
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
Pim Hutting
e1918325e2
chore: making tests pass after merge
...
I had to make use of monkeypatch to simulate using the config file
ref: N25B-236
2025-11-09 14:45:08 +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
be5dc7f04b
fix: fixed integration tests due to new change
...
ref: N25B-256
2025-11-06 14:26:02 +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
8638523980
fix: fixed new tests and merged dev into branch
...
ref: N25B-256
2025-11-05 16:29:56 +01:00
9e7119481c
fix: tests pass
...
ref: N25B-241
ref: N25B-242
2025-11-05 16:08:28 +01:00
Twirre Meulenbelt
1b58549c2a
test: fix expected test value after changing audio token allowance
...
ref: N25B-209
2025-11-05 12:41:48 +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
2c867adce2
fix: go back to the working ri command endpoint test
...
Merged the wrong version because it seemed to solve the same problem. It did not. Now using the one I commited two commits ago.
ref: N25B-217
2025-11-05 12:22:42 +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
b008562554
fix: tests
...
To work with the new zmq instance context.
ref: N25B-217
2025-11-05 12:08:07 +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
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
Björn Otgaar
30453be4b2
fix: ruff checks is now in order:)
...
ref: N25B-205
2025-10-30 16:41:35 +01:00
Twirre Meulenbelt
4ffe3b2071
fix: make VAD unit tests work after changes
...
Namely, the Streamer has to be marked ready.
ref: N25B-216
2025-10-30 16:40:45 +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
Björn Otgaar
df6a39866b
fix: fix unit tests with new feat
...
ref: N25B-151
2025-10-29 22:05:13 +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
a00d7c25db
test: I was forced to do this
...
ref: all
2025-10-29 16:49:00 +01:00
Twirre Meulenbelt
246b2b7ddf
test: I was forced to do this
...
ref: all
2025-10-29 16:47:47 +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
Pim Hutting
3f7ec071b2
Merge remote-tracking branch 'origin/dev' into feat/belief-collector
2025-10-29 15:14:42 +01:00
Twirre Meulenbelt
2a5aa57589
test: make VAD integration tests work again with Transcription agent
...
ref: N25B-209
2025-10-29 14:53:07 +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
Björn Otgaar
59c2edc3c6
fix: small fix for testing ping timeouts
...
ref: N25B-205
2025-10-29 13:33:01 +01:00
814a928ae4
Merge remote-tracking branch 'origin/dev' into fix/bdi-correct-belief-management
2025-10-29 13:25:58 +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
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
Pim Hutting
f8dee6d878
test: added tests
...
[
See test_continuous_collect.py
]
[ref]: N25B-206
2025-10-29 09:58:56 +01:00
Twirre Meulenbelt
f73f510608
fix: make VAD unit tests work with minimal dependencies
...
By mocking PyTorch and ZMQ and adding the Numpy dependency.
ref: N25B-213
2025-10-28 18:13:00 +01:00