Merge pull request #150 from martius-lab/various

Various

comprl-hockey-agent/requirements.txt

@@ -1,3 +1,3 @@
 numpy
 comprl @ git+https://github.com/martius-lab/teamproject-competition-server.git#egg=comprl&subdirectory=comprl
-hockey @ git+https://[email protected]/martius-lab/laser-hockey-env.git@cc48daa135e2cca3e620b90431e57870f61d043c
+hockey @ git+https://[email protected]/martius-lab/hockey-env.git

comprl-hockey-agent/run_client.py

@@ -15,7 +15,7 @@ class RandomAgent(Agent):
     def get_step(self, observation: list[float]) -> list[float]:
         return np.random.uniform(-1, 1, 4).tolist()
 
-    def on_start_game(self, game_id: int) -> None:
+    def on_start_game(self, game_id) -> None:
         print("game started")
 
     def on_end_game(self, result: bool, stats: list[float]) -> None:
@@ -45,8 +45,8 @@ def get_step(self, observation: list[float]) -> list[float]:
         action = self.hockey_agent.act(observation).tolist()
         return action
 
-    def on_start_game(self, game_id: int) -> None:
-        print(f"Game started (ID: {game_id})")
+    def on_start_game(self, game_id) -> None:
+        print(f"Game started")
 
     def on_end_game(self, result: bool, stats: list[float]) -> None:
         text_result = "won" if result else "lost"

comprl-hockey-game/comprl-hockey.def

@@ -11,7 +11,7 @@ from: ubuntu:24.04
     echo "deb http://archive.ubuntu.com/ubuntu noble universe" >> /etc/apt/sources.list
     apt-get update
 
-    apt-get install -y python3-dev python3-pip python3-full swig git
+    apt-get install -y curl python3-dev python3-pip python3-full swig git
 
     git clone https://github.com/martius-lab/teamproject-competition-server \
         --depth 1 -b "{{ COMPRL_GIT_BRANCH }}" /comprl
@@ -30,6 +30,7 @@ from: ubuntu:24.04
 
 %environment
     export COMPRL_CONFIG_PATH="/comprl-config/config.toml"
+    export NTFY_TOPIC="comprl-server-monitor"
 
 
 %runscript
@@ -38,10 +39,14 @@ from: ubuntu:24.04
 
 
 %startscript
+    curl -d "Start comprl.server" ntfy.sh/${NTFY_TOPIC}
+
     . /venv/bin/activate
     # assumes that the config is bound at that path
     python -m comprl.server --config "${COMPRL_CONFIG_PATH}"
 
+    curl -H "Priority: urgent" -H "Tags: warning" -d "comprl.server terminated. Exit code: $?" ntfy.sh/${NTFY_TOPIC}
+
 
 %help
     Running the container with `instance start` will run the comprl server.
@@ -58,10 +63,15 @@ from: ubuntu:24.04
     export AGENT_TYPE=strong
 
 %appstart agent
+    curl -d "Start agent ${AGENT_TYPE}" ntfy.sh/${NTFY_TOPIC}
+
     . /venv/bin/activate
     cd /comprl/comprl-hockey-agent
     python ./run_client.py --args --agent "${AGENT_TYPE}"
 
+    curl -H "Priority: urgent" -H "Tags: warning" -d "Agent terminated. Exit code: $?" ntfy.sh/${NTFY_TOPIC}
+
+
 %apphelp agent
     Run an example agent (using `apptainer instance start --app agent ...`).
     You need to provide the access token via the environment variable

comprl-hockey-game/prepare_database.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# extract databasepath from config.toml
+DB_PATH=$(python -c "
+import tomllib
+with open('config.toml', 'rb') as f:
+    config = tomllib.load(f)
+print(config['CompetitionServer']['database_path'])
+")
+
+if [ -e "${DB_PATH}" ]; then
+    echo "Database ${DB_PATH} already exists."
+    exit 1
+fi
+
+
+# create database
+python -m comprl.scripts.create_database ./config.toml
+
+python ../comprl-web-reflex/create_database_tables.py "${DB_PATH}"
+
+# add bot users
+comprl-users add "${DB_PATH}" bot-weak --role bot --password $(uuidgen)
+comprl-users add "${DB_PATH}" bot-strong --role bot --password $(uuidgen)

comprl-hockey-game/requirements.txt

@@ -1,3 +1,3 @@
 comprl
 numpy
-hockey @ git+https://[email protected]/martius-lab/laser-hockey-env.git@cc48daa135e2cca3e620b90431e57870f61d043c
+hockey @ git+https://[email protected]/martius-lab/hockey-env.git

comprl-web-reflex/comprl-web-reflex.def

@@ -12,7 +12,7 @@ from: python:3.12
     export DEBIAN_FRONTEND=noninteractive
 
     apt-get update
-    apt-get install -y git caddy redis-server
+    apt-get install -y git caddy redis-server curl
 
     git clone https://github.com/martius-lab/teamproject-competition-server --depth 1 -b "{{ COMPRL_GIT_BRANCH }}" /comprl
 
@@ -49,9 +49,14 @@ from: python:3.12
 %environment
     export REDIS_URL=redis://localhost
     export COMPRL_CONFIG_PATH="/comprl-config/config.toml"
+    export NTFY_TOPIC="comprl-server-monitor"
 
 %startscript
+    curl -d "Start comprl web interface" ntfy.sh/${NTFY_TOPIC}
+
     . /venv/bin/activate
     redis-server --daemonize yes
     cd /comprl/comprl-web-reflex
     reflex run --env prod "$@"
+
+    curl -H "Priority: urgent" -H "Tags: warning" -d "comprl web interface terminated. Exit code: $?" ntfy.sh/${NTFY_TOPIC}