Commit Graph

183 Commits

Author SHA1 Message Date
Björn Otgaar
feb6875a4c fix: make sure that the communication agent reboots propperly.
ref: N25B-256
2025-11-06 14:16:55 +01: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
Pim Hutting
6235fcdaf4 Merge branch 'refactor/logging' into 'dev'
Restructure logging

See merge request ics/sp/2025/n25b/pepperplus-cb!21
2025-11-05 15:31:06 +00: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
d9fef22090 Merge branch 'dev' into refactor/logging 2025-11-05 15:09:14 +01:00
4d38850a1d Merge branch 'demo' into 'dev'
End to end connected for demo

See merge request ics/sp/2025/n25b/pepperplus-cb!17
2025-11-05 14:01:41 +00: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
Twirre Meulenbelt
1b58549c2a test: fix expected test value after changing audio token allowance
ref: N25B-209
2025-11-05 12:41:48 +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
12abf49f55 Merge branch 'refactor/zmq-internal-socket-behaviour' into 'dev'
Refactored ZMQ context implementation

See merge request ics/sp/2025/n25b/pepperplus-cb!16
2025-11-05 11:35:26 +00: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
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
feff037d3a chore: add new handler in logging config
Not used yet, will be in the future.
2025-11-05 10:38:44 +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
Björn Otgaar
da30c392aa Merge branch 'fix/skip-checking-auto-commits' into 'dev'
Automated commit detection

See merge request ics/sp/2025/n25b/pepperplus-cb!20
2025-11-03 14:35:40 +00:00
cb5457b6be feat: check for squash commits
ref: N25B-241
2025-11-03 15:29:06 +01:00
360f601d00 feat: chore doesn't need ref
If we detect a chore commit, we don't check for the correct ref/close
footer.

ref: N25B-241
2025-11-03 15:23:11 +01:00
e53792b67c Merge branch 'fix/skip-checking-auto-commits' of git.science.uu.nl:ics/sp/2025/n25b/pepperplus-cb into fix/skip-checking-auto-commits 2025-11-03 14:58:56 +01:00
3c8cee54eb fix: pattern matching instead of file existence
The previous method of detecting automated commits was error-prone,
specifically when using VSCode to commit changes. This new method uses a
simple Regex pattern match to see if the commit message matches any
known auto-generated commits.

ref: N25B-241
2025-11-03 14:57:44 +01:00
0d5e198cad fix: pattern matching instead of file existence
The previous method of detecting automated commits was error-prone,
specifically when using VSCode to commit changes. This new method uses a
simple Regex pattern match to see if the commit message matches any
known auto-generated commits.

ref: N25B-241
2025-11-03 14:51:18 +01:00
020bf55772 fix: automated commit detection
ref: N25B-241
2025-11-02 22:02:32 +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
Twirre
c6edad0bb4 Merge branch 'build/fix-pre-commit' into 'dev'
Fix pre-commit

See merge request ics/sp/2025/n25b/pepperplus-cb!18
2025-11-02 19:56:31 +00:00
Twirre Meulenbelt
e025b14610 docs: add suggested fix for potential issue
ref: N25B-241
2025-11-02 20:54:38 +01:00
Twirre Meulenbelt
e5bf6fd1cc docs: update README instructions for git hooks
Removed old advice from the README to configure git to add pre-commit hooks manually. We now have `pre-commit` for this, and they conflict. Added the command to install commit message hooks.

ref: N25B-241
2025-11-02 20:40:32 +01:00
Twirre Meulenbelt
460dc5dce8 Merge remote-tracking branch 'origin/dev' into build/fix-pre-commit 2025-11-02 20:24:33 +01:00
Twirre
53d36dec2f Merge branch 'style/fix-linting-formatting' into 'dev'
Make `dev` pass code style guidelines

See merge request ics/sp/2025/n25b/pepperplus-cb!19
2025-11-02 19:19:37 +00: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
e5782b421f build: fix pre-commit
Moved the git hooks into shell scripts and placed them into the
pre-commit configuration. Also extended robustness of the hooks.

ref: N25B-241
2025-11-02 18:45:57 +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
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
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