diff --git a/historic-analysis/export_metrics.py b/historic-analysis/export_metrics.py index 8c0ca67..6df3e40 100644 --- a/historic-analysis/export_metrics.py +++ b/historic-analysis/export_metrics.py @@ -437,11 +437,11 @@ def calculate_daily_metrics(self, messages, conversations): user_msg_id = message.get('messageId') user = message.get('user') ai_responses = self._ai_responses_by_parent.get(user_msg_id, ()) - + for ai_msg in ai_responses: tokens_by_model[ai_msg['model']]['input'] += token_count - if user and ai_responses: - tokens_by_user[user]['input'] += token_count + if user: + tokens_by_user[user]['input'] += token_count * len(ai_responses) elif message.get('model'): tokens_by_model[model_name]['output'] += token_count diff --git a/historic-analysis/mariadb-init/init.sql b/historic-analysis/mariadb-init/init.sql index 0551ab0..b8a20a4 100644 --- a/historic-analysis/mariadb-init/init.sql +++ b/historic-analysis/mariadb-init/init.sql @@ -1,4 +1,8 @@ --- Drop and recreate database +-- WARNING: this script is intended for first-time MariaDB volume init only. +-- The `mariadb-init` directory is executed by the official MariaDB image +-- exclusively when the data directory is empty, so it is safe in that +-- context. Do NOT run this manually against a populated volume — it will +-- DROP the metrics database and wipe all historical data. DROP DATABASE IF EXISTS metrics; CREATE DATABASE metrics; CREATE USER IF NOT EXISTS 'metrics'@'%' IDENTIFIED BY 'metrics';