Commit Graph

263 Commits

Author SHA1 Message Date
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
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
df6a39866b fix: fix unit tests with new feat
ref: N25B-151
2025-10-29 22:05:13 +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
657c300bc7 Merge branch 'feat/transcription-agent' into 'dev'
Create transcriber agent

See merge request ics/sp/2025/n25b/pepperplus-cb!15
2025-10-29 15:51:43 +00: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
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
2da80010b5 Merge branch 'feat/belief-collector' into 'dev'
Feat: Implement belief collector

See merge request ics/sp/2025/n25b/pepperplus-cb!14
2025-10-29 14:38:52 +00: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
baa0c73469 Merge branch 'feat/belief-from-text' into 'dev'
implemented basic belief-from-text extractor including demo version

See merge request ics/sp/2025/n25b/pepperplus-cb!13
2025-10-29 14:31:36 +00: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
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