CHANGES:

- /sorties displays average flighttime and average survival time now

Author: karel26

core/report/elements.py

@@ -5,6 +5,7 @@
 import inspect
 import numpy as np
 import os
+import pandas as pd
 import re
 import sys
 import traceback
@@ -16,6 +17,7 @@
 from datetime import timedelta, datetime
 from discord import ButtonStyle, Interaction
 from io import BytesIO
+from matplotlib.axes import Axes
 from matplotlib import pyplot as plt
 from psycopg.rows import dict_row
 from typing import Any, TYPE_CHECKING
@@ -32,6 +34,7 @@
 warnings.filterwarnings('ignore', category=UserWarning, module='matplotlib')
 
 __all__ = [
+    "df_to_table",
     "ReportElement",
     "EmbedElement",
     "Image",
@@ -68,6 +71,36 @@ def get_supported_fonts() -> set[str]:
     return _languages
 
 
+def df_to_table(ax: Axes, df: pd.DataFrame, *, col_labels: list[str] = None, fontsize: int | None = 10) -> Axes:
+    df = df.copy()
+    for col in df.select_dtypes(include='timedelta64[ns]').columns:
+        df[col] = df[col].dt.total_seconds().apply(utils.convert_time)
+
+    ax.axis('off')
+    ax.set_frame_on(False)
+    table = ax.table(
+        cellText=df.values,
+        colLabels=df.columns if col_labels is None else col_labels,
+        cellLoc='center',
+        loc='upper left',
+    )
+    table.auto_set_font_size(False)
+    table.set_fontsize(fontsize)
+    for i in range(len(df.columns)):
+        table.auto_set_column_width(i)
+    table.scale(1, 1.5)
+    for (row, col), cell in table.get_celld().items():
+        if row == 0:  # header row
+            cell.set_facecolor('#4c9f44')  # dark green
+            cell.set_text_props(weight='bold', color='white')
+        else:
+            # alternate row colors for readability
+            bg = '#e8f5e9' if row % 2 else '#ffffff'
+            cell.set_facecolor(bg)
+            cell.set_text_props(color='black')
+    return ax
+
+
 class ReportElement(ABC):
     def __init__(self, env: ReportEnv):
         self.env = env
@@ -232,9 +265,17 @@ def __init__(self, env: ReportEnv, width: int, height: int, cols: int, rows: int
 
     def _plot(self):
         plt.subplots_adjust(wspace=self.wspace, hspace=self.hspace)
-        self.env.filename = f'{uuid.uuid4()}.png'
+
+        # ask the renderer for the tight bounding box (in pixels)
+        renderer = self.env.figure.canvas.get_renderer()
+        tight_bbox = self.env.figure.get_tightbbox(renderer)
+
+        # convert that pixel‑bbox to inches and resize the figure
+        fig_w, fig_h = tight_bbox.width, tight_bbox.height
+        self.env.figure.set_size_inches(fig_w, fig_h, forward=True)
 
         # Save with adjusted dimensions while maintaining aspect ratio
+        self.env.filename = f'{uuid.uuid4()}.png'
         self.env.buffer = BytesIO()
         self.env.figure.savefig(
             self.env.buffer,
@@ -244,10 +285,6 @@ def _plot(self):
         )
         self.env.buffer.seek(0)
 
-    async def _async_plot(self):
-        async with self.plot_lock:
-            self._plot()
-
     async def render(self, **kwargs):
         plt.style.use('dark_background')
         plt.rcParams['axes.facecolor'] = self.facecolor
@@ -296,7 +333,8 @@ async def render(self, **kwargs):
 
             # only render the graph if we don't have a rendered graph already attached as a file (image)
             if not self.env.filename:
-                await self._async_plot()
+                async with self.plot_lock:
+                    await asyncio.to_thread(self._plot)
             self.env.embed.set_image(url='attachment://' + os.path.basename(self.env.filename))
             footer = self.env.embed.footer.text or ''
             if footer is None:

plugins/competitive/commands.py

@@ -97,6 +97,7 @@ async def init_trueskill(self):
 
     async def update_ucid(self, conn: psycopg.AsyncConnection, old_ucid: str, new_ucid: str) -> None:
         await conn.execute('UPDATE trueskill SET player_ucid = %s WHERE player_ucid = %s', (new_ucid, old_ucid))
+        await conn.execute('UPDATE trueskill_hist SET player_ucid = %s WHERE player_ucid = %s', (new_ucid, old_ucid))
 
     async def _trueskill_player(self, interaction: discord.Interaction, user: discord.Member | str) -> None:
         if not user:

plugins/mission/listener.py

@@ -1022,7 +1022,7 @@ async def linkme(self, server: Server, player: Player, params: list[str]):
         player.verified = True
         async with self.apool.connection() as conn:
             async with conn.transaction():
-                # now check, if there was an old validated mapping for this discord_id (meaning the UCID has changed)
+                # now check if there was an old validated mapping for this discord_id (meaning the UCID has changed)
                 cursor = await conn.execute("SELECT ucid FROM players WHERE discord_id = %s and ucid != %s",
                                             (discord_id, player.ucid))
                 row = await cursor.fetchone()

plugins/missionstats/commands.py

@@ -121,7 +121,12 @@ async def sorties(self, interaction: discord.Interaction,
         await interaction.response.defer(ephemeral=True)
         report = Report(self.bot, self.plugin_name, 'sorties.json')
         env = await report.render(ucid=ucid, member_name=name, flt=period)
-        await interaction.followup.send(embed=env.embed, ephemeral=True)
+        try:
+            file = discord.File(fp=env.buffer, filename=env.filename)
+            await interaction.followup.send(embed=env.embed, file=file, ephemeral=True)
+        finally:
+            if env.buffer:
+                env.buffer.close()
 
     @command(description=_('Module statistics'))
     @app_commands.guild_only()

plugins/missionstats/reports.py

@@ -1,6 +1,7 @@
+import numpy as np
 import pandas as pd
 
-from core import report, ReportEnv, utils, Side, Coalition, get_translation
+from core import report, ReportEnv, utils, Side, Coalition, get_translation, df_to_table
 from dataclasses import dataclass
 from datetime import datetime
 from plugins.userstats.filter import StatisticsFilter
@@ -14,29 +15,37 @@ class Flight:
     start: datetime = None
     end: datetime = None
     plane: str = None
+    death: bool = False
 
 
-class Sorties(report.EmbedElement):
+class Sorties(report.GraphElement):
 
-    def __init__(self, env: ReportEnv) -> None:
-        super().__init__(env)
-        self.sorties = pd.DataFrame(columns=['plane', 'time'])
+    def __init__(self, env: ReportEnv, rows: int, cols: int, row: int | None = 0, col: int | None = 0,
+                 colspan: int | None = 1, rowspan: int | None = 1, polar: bool | None = False):
+        super().__init__(env, rows, cols, row, col, colspan, rowspan, polar)
+        self.sorties = pd.DataFrame(columns=['plane', 'time', 'death'])
 
     def add_flight(self, flight: Flight) -> Flight:
         if flight.start and flight.end and flight.plane:
-            self.sorties.loc[len(self.sorties.index)] = [flight.plane, flight.end - flight.start]
+            self.sorties.loc[len(self.sorties.index)] = [flight.plane, flight.end - flight.start, flight.death]
         return Flight()
 
     async def render(self, ucid: str, flt: StatisticsFilter) -> None:
-        sql = """
+        sql = f"""
             SELECT mission_id, init_type, init_cat, event, place, time 
             FROM missionstats s
-            WHERE event IN ('S_EVENT_BIRTH', 'S_EVENT_TAKEOFF', 'S_EVENT_LAND', 'S_EVENT_UNIT_LOST', 
-                            'S_EVENT_PLAYER_LEAVE_UNIT')
+            WHERE event IN (
+                'S_EVENT_BIRTH', 
+                'S_EVENT_TAKEOFF', 
+                'S_EVENT_LAND', 
+                'S_EVENT_UNIT_LOST', 
+                'S_EVENT_PLAYER_LEAVE_UNIT'
+            )
+            AND {flt.filter(self.env.bot)}
+            AND init_id = %s 
+            ORDER BY id
         """
         self.env.embed.title = flt.format(self.env.bot) + self.env.embed.title
-        sql += ' AND ' + flt.filter(self.env.bot)
-        sql += ' AND init_id = %s ORDER BY 6'
 
         async with self.apool.connection() as conn:
             async with conn.cursor(row_factory=dict_row) as cursor:
@@ -66,24 +75,39 @@ async def render(self, ucid: str, flt: StatisticsFilter) -> None:
                             flight.start = row['time']
                     elif row['event'] in ['S_EVENT_LAND', 'S_EVENT_UNIT_LOST', 'S_EVENT_PLAYER_LEAVE_UNIT']:
                         flight.end = row['time']
+                        if row['event'] == 'S_EVENT_UNIT_LOST':
+                            flight.death = True
                         flight = self.add_flight(flight)
                 df = self.sorties.groupby('plane').agg(
-                    count=('time', 'size'), total_time=('time', 'sum')).sort_values(by=['total_time'],
-                                                                                    ascending=False).reset_index()
-                planes = sorties = times = ''
-                for index, row in df.iterrows():
-                    planes += row['plane'] + '\n'
-                    sorties += str(row['count']) + '\n'
-                    times += utils.convert_time(row['total_time'].total_seconds()) + '\n'
-                if len(planes) == 0:
-                    self.add_field(name=_('No sorties found for this player.'), value='_ _')
-                else:
-                    self.add_field(name=_('Module'), value=planes)
-                    self.add_field(name=_('Sorties'), value=sorties)
-                    self.add_field(name=_('Total Flighttime'), value=times)
-                    self.embed.set_footer(
-                        text=_('Flighttime is the time you were airborne from takeoff to landing / leave or\n'
-                               'airspawn to landing / leave.'))
+                    count=('time', 'size'), total_time=('time', 'sum'), avg_time=('time', 'mean')
+                ).sort_values(by=['total_time'], ascending=False).reset_index()
+                if df.empty:
+                    self.axes.axis('off')
+                    self.axes.text(0.5, 0.5, _('No sorties found for this player.'), ha='center', va='center',
+                                   rotation=45, size=15, transform=self.axes.transAxes)
+                    return
+
+                # Sum the time of those flights per plane
+                survival_sum = self.sorties.groupby('plane')['time'].sum()
+
+                # Count how many deaths exist per plane
+                death_counts = self.sorties[self.sorties.death == True].groupby('plane').size()
+                interval_counts = death_counts - 1  # pairs = deaths‑1
+                interval_counts[interval_counts < 0] = np.nan  # protect against 0 deaths
+
+                # Average survival time
+                avg_survival = survival_sum / interval_counts
+
+                # Merge into the original dataframe
+                df = df.merge(avg_survival.rename('avg_survival'), on='plane', how='left')
+
+                self.axes = df_to_table(
+                    self.axes, df[['plane', 'count', 'total_time', 'avg_time', 'avg_survival']],
+                    col_labels=['Plane', 'Sorties', 'Total Flighttime', 'Avg. Flighttime', 'Avg. Survivaltime']
+                )
+                self.env.embed.set_footer(
+                    text=_('Flighttime is the time you were airborne from takeoff to landing / leave or\n'
+                           'airspawn to landing / leave.'))
 
 
 class MissionStats(report.EmbedElement):
@@ -214,15 +238,21 @@ async def render(self, ucid: str, module: str, flt: StatisticsFilter) -> None:
 
 class Refuelings(report.EmbedElement):
     async def render(self, ucid: str, flt: StatisticsFilter) -> None:
-        sql = "SELECT init_type, COUNT(*) FROM missionstats WHERE EVENT = 'S_EVENT_REFUELING_STOP'"
+        sql = f"""
+              SELECT init_type, COUNT(*) 
+              FROM missionstats 
+              WHERE EVENT = 'S_EVENT_REFUELING_STOP'
+              AND {flt.filter(self.env.bot)}
+              AND init_id = %s 
+              GROUP BY 1 
+              ORDER BY 2 DESC
+        """
         self.env.embed.title = flt.format(self.env.bot) + self.env.embed.title
-        sql += ' AND ' + flt.filter(self.env.bot)
-        sql += ' AND init_id = %s GROUP BY 1 ORDER BY 2 DESC'
 
         modules = []
         numbers = []
         async with self.apool.connection() as conn:
-            cursor = await conn.execute(sql, (ucid, ))
+            cursor = await conn.execute(sql, (ucid,))
             async for row in cursor:
                 modules.append(row[0])
                 numbers.append(str(row[1]))

plugins/missionstats/reports/sorties.json

@@ -4,7 +4,22 @@
   "elements":
   [
     {
-      "class": "plugins.missionstats.reports.Sorties"
+      "type": "Graph",
+      "params": {
+        "width": 1,
+        "height": 1,
+        "rows": 1,
+        "cols": 1,
+        "elements": [
+          {
+            "class": "plugins.missionstats.reports.Sorties",
+            "params": {
+              "row": 0,
+              "col": 0
+            }
+          }
+        ]
+      }
     }
   ]
 }

plugins/monitoring/serverstats.py

@@ -536,7 +536,7 @@ async def render(self, server_name: str | None, interval: str | None = '1 month'
 
         # Merge data with all possible hours (left join) and fill missing user counts with 0
         merged_df = pd.merge(all_hours, df, on='time', how='left')
-        merged_df['users'] = merged_df['users'].fillna(0)
+        merged_df['users'] = merged_df['users'].astype(float).fillna(0)
 
         # Step 4: Create the bar plot
         barplot = sns.barplot(x='time', y='users', data=merged_df, ax=self.axes, color='dodgerblue')