From 65c29081cc3debad9b77194cb917f5b04ea4ac72 Mon Sep 17 00:00:00 2001
From: Alexandre Flament <alex@al-f.net>
Date: Thu, 22 Apr 2021 12:14:11 +0200
Subject: [mod] update /stats

---
 searx/templates/oscar/stats.html | 86 ++++++++++++++++++++++++++++++----------
 1 file changed, 66 insertions(+), 20 deletions(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/stats.html b/searx/templates/oscar/stats.html
index 0573bf65f..0851343ce 100644
--- a/searx/templates/oscar/stats.html
+++ b/searx/templates/oscar/stats.html
@@ -16,30 +16,76 @@
 <div class="container-fluid">
     <h1>{{ _('Engine stats') }}</h1>
     <div class="row">
-        {% for stat_name,stat_category in stats %}
-        <div class="col-xs-12 col-sm-12 col-md-6">
-            <h3>{{ stat_name }}</h3>
-            <div class="container-fluid">
-                {% for engine in stat_category %}
-                <div class="row">
-                    <div class="col-sm-4 col-md-4">{{ engine.name }}</div>
-                    <div class="col-sm-8 col-md-8">
-                        <div class="progress">
-                            <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="{{ '%i'|format(engine.avg) }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ engine.percentage }}%;">
-                                {{ '%.02f'|format(engine.avg) }}
-                            </div>
-                        </div>
+        <div class="col-xs-12 col-sm-12 col-md-12">
+            <div class="table-responsive">
+                {% if not engine_stats.get('time') %}
+                    <div class="col-sm-12 col-md-12">
+                        {% include 'oscar/messages/no_data_available.html' %}
                     </div>
-                </div>
-                {% endfor %}
-                {% if not stat_category %}
-                <div class="col-sm-12 col-md-12">
-                    {% include 'oscar/messages/no_data_available.html' %}
-                </div>
+                {% else %}
+                    <table class="table table-hover table-condensed table-striped">
+                        <tr>
+                            <th scope="col" style="width:20rem;">{{ _("Engine name") }}</th>
+                            <th scope="col" style="width:7rem; text-align: right;">{{ _('Scores') }}</th>
+                            <th scope="col">{{ _('Number of results') }}</th>
+                            <th scope="col">{{ _('Response time') }}</th>
+                        </tr>
+                        {% for engine_stat in engine_stats.get('time', []) %}
+                        <tr>
+                            <td>{{ engine_stat.name }}</td>
+                            <td style="text-align: right;">
+                                <span aria-labelledby="{{engine_stat.name}}_score" >{{ engine_stat.score|round(1) }}</span>
+                                <div class="engine-tooltip text-left" role="tooltip" id="{{engine_name}}_score">{{- "" -}}
+                                    <p>{{ _('Scores per result') }}: {{ engine_stat.score_per_result | round(3) }}</p>
+                                </div>
+                            </td>
+                            <td>
+                                <span class="stacked-bar-chart-value">{{- engine_stat.result_count | int -}}</span>{{- "" -}}
+                                <span class="stacked-bar-chart" aria-labelledby="{{engine_stat.name}}_chart_result_count" aria-hidden="true">{{- "" -}}
+                                    <span style="width: calc(max(2px, 100%*{{ (engine_stat.result_count / engine_stats.max_result_count )|round(3) }}))" class="stacked-bar-chart-serie1"></span>{{- "" -}}
+                                </span>{{- "" -}}
+                            </td>
+                            <td>
+                                <span class="stacked-bar-chart-value">{{- engine_stat.total | round(1) -}}</span>{{- "" -}}
+                                <span class="stacked-bar-chart" aria-labelledby="{{engine_stat.name}}_chart" aria-hidden="true">{{- "" -}}
+                                    <span style="width: calc(max(2px, 100%*{{ (engine_stat.http / engine_stats.max_time )|round(3) }}))" class="stacked-bar-chart-serie1"></span>{{- "" -}}
+                                    <span style="width: calc(100%*{{ engine_stat.processing / engine_stats.max_time |round(3) }})" class="stacked-bar-chart-serie2"></span>{{- "" -}}
+                                </span>{{- "" -}}
+                                <div class="engine-tooltip text-left" role="tooltip" id="{{engine_name}}_chart">{{- "" -}}
+                                    <table class="table table-striped">
+                                        <tr>
+                                            <th scope="col"></th>
+                                            <th scope="col">{{ _('Total') }}</th>
+                                            <th scope="col">{{ _('HTTP') }}</th>
+                                            <th scope="col">{{ _('Processing') }}</th>
+                                        </tr>
+                                        <tr>
+                                            <th scope="col">{{ _('Median') }}</th>
+                                            <td>{{ engine_stat.total }}</td>
+                                            <td>{{ engine_stat.http }}</td>
+                                            <td>{{ engine_stat.processing }}</td>
+                                        </tr>
+                                        <tr>
+                                            <th scope="col">{{ _('P80') }}</th>
+                                            <td>{{ engine_stat.total_p80 }}</td>
+                                            <td>{{ engine_stat.http_p80 }}</td>
+                                            <td>{{ engine_stat.processing_p80 }}</td>
+                                        </tr>
+                                        <tr>
+                                            <th scope="col">{{ _('P95') }}</th>
+                                            <td>{{ engine_stat.total_p95 }}</td>
+                                            <td>{{ engine_stat.http_p95 }}</td>
+                                            <td>{{ engine_stat.processing_p95 }}</td>
+                                        </tr>
+                                    </table>
+                                </div>
+                            </td>
+                        </tr>
+                        {% endfor %}
+                    </table>
                 {% endif %}
             </div>
         </div>
-        {% endfor %}
     </div>
 </div>
 {% endblock %}
-- 
cgit v1.2.3


From 09e7ecdce22733be82bb141355c646ddec538714 Mon Sep 17 00:00:00 2001
From: Alexandre Flament <alex@al-f.net>
Date: Thu, 22 Apr 2021 17:47:53 +0200
Subject: [mod] /stats : add reliability column and sort by column links

---
 searx/templates/oscar/stats.html | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/stats.html b/searx/templates/oscar/stats.html
index 0851343ce..149522226 100644
--- a/searx/templates/oscar/stats.html
+++ b/searx/templates/oscar/stats.html
@@ -1,6 +1,5 @@
 {% extends "oscar/base.html" %}
 {% block styles %}
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/charts.min.css') }}" type="text/css" />
     <style>
         #engine-times {
           --labels-size: 20rem;
@@ -12,6 +11,15 @@
     </style>
 {% endblock %}
 {% block title %}{{ _('stats') }} - {% endblock %}
+
+{%- macro th_sort(column_order, column_name) -%}
+    {% if column_order==sort_order %}
+        {{ column_name }} {{ icon('chevron-down') }}
+    {% else %}
+        <a href="{{ url_for('stats', sort=column_order) }}">{{ column_name }}
+    {% endif %}
+{%- endmacro -%}
+
 {% block content %}
 <div class="container-fluid">
     <h1>{{ _('Engine stats') }}</h1>
@@ -25,27 +33,33 @@
                 {% else %}
                     <table class="table table-hover table-condensed table-striped">
                         <tr>
-                            <th scope="col" style="width:20rem;">{{ _("Engine name") }}</th>
-                            <th scope="col" style="width:7rem; text-align: right;">{{ _('Scores') }}</th>
-                            <th scope="col">{{ _('Number of results') }}</th>
-                            <th scope="col">{{ _('Response time') }}</th>
+                            <th scope="col" style="width:20rem;">{{ th_sort('name', _("Engine name")) }}</th>
+                            <th scope="col" style="width:7rem; text-align: right;">{{ th_sort('score', _('Scores')) }}</th>
+                            <th scope="col">{{ th_sort('result_count', _('Result count')) }}</th>
+                            <th scope="col">{{ th_sort('time', _('Response time')) }}</th>
+                            <th scope="col" style="text-align: right;">{{ th_sort('reliability', _('Reliability')) }}</th>
                         </tr>
                         {% for engine_stat in engine_stats.get('time', []) %}
                         <tr>
                             <td>{{ engine_stat.name }}</td>
                             <td style="text-align: right;">
+                                {% if engine_stat.score %}
                                 <span aria-labelledby="{{engine_stat.name}}_score" >{{ engine_stat.score|round(1) }}</span>
                                 <div class="engine-tooltip text-left" role="tooltip" id="{{engine_name}}_score">{{- "" -}}
                                     <p>{{ _('Scores per result') }}: {{ engine_stat.score_per_result | round(3) }}</p>
                                 </div>
+                                {% endif %}
                             </td>
                             <td>
+                                {%- if engine_stat.result_count -%}
                                 <span class="stacked-bar-chart-value">{{- engine_stat.result_count | int -}}</span>{{- "" -}}
                                 <span class="stacked-bar-chart" aria-labelledby="{{engine_stat.name}}_chart_result_count" aria-hidden="true">{{- "" -}}
                                     <span style="width: calc(max(2px, 100%*{{ (engine_stat.result_count / engine_stats.max_result_count )|round(3) }}))" class="stacked-bar-chart-serie1"></span>{{- "" -}}
-                                </span>{{- "" -}}
+                                </span>
+                                {%- endif -%}
                             </td>
                             <td>
+                                {%- if engine_stat.total -%}
                                 <span class="stacked-bar-chart-value">{{- engine_stat.total | round(1) -}}</span>{{- "" -}}
                                 <span class="stacked-bar-chart" aria-labelledby="{{engine_stat.name}}_chart" aria-hidden="true">{{- "" -}}
                                     <span style="width: calc(max(2px, 100%*{{ (engine_stat.http / engine_stats.max_time )|round(3) }}))" class="stacked-bar-chart-serie1"></span>{{- "" -}}
@@ -79,7 +93,9 @@
                                         </tr>
                                     </table>
                                 </div>
+                                {%- endif -%}
                             </td>
+                            <td style="text-align: right;"> {{ engine_reliabilities.get(engine_stat.name, {}).get('reliablity') }}</td>
                         </tr>
                         {% endfor %}
                     </table>
-- 
cgit v1.2.3


From 7032f7521c344592dc68f89027c98cdec46d7055 Mon Sep 17 00:00:00 2001
From: Alexandre Flament <alex@al-f.net>
Date: Fri, 23 Apr 2021 11:01:54 +0200
Subject: [mod] /stats: simple theme implementation

---
 searx/templates/oscar/stats.html  |  18 ++-----
 searx/templates/simple/stats.html | 100 ++++++++++++++++++++++++++++++++------
 2 files changed, 88 insertions(+), 30 deletions(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/stats.html b/searx/templates/oscar/stats.html
index 149522226..b83714020 100644
--- a/searx/templates/oscar/stats.html
+++ b/searx/templates/oscar/stats.html
@@ -1,15 +1,5 @@
 {% extends "oscar/base.html" %}
-{% block styles %}
-    <style>
-        #engine-times {
-          --labels-size: 20rem;
-        }
 
-        #engine-times th {
-            text-align: right;
-        }
-    </style>
-{% endblock %}
 {% block title %}{{ _('stats') }} - {% endblock %}
 
 {%- macro th_sort(column_order, column_name) -%}
@@ -45,7 +35,7 @@
                             <td style="text-align: right;">
                                 {% if engine_stat.score %}
                                 <span aria-labelledby="{{engine_stat.name}}_score" >{{ engine_stat.score|round(1) }}</span>
-                                <div class="engine-tooltip text-left" role="tooltip" id="{{engine_name}}_score">{{- "" -}}
+                                <div class="engine-tooltip text-left" role="tooltip" id="{{engine_stat.name}}_score">{{- "" -}}
                                     <p>{{ _('Scores per result') }}: {{ engine_stat.score_per_result | round(3) }}</p>
                                 </div>
                                 {% endif %}
@@ -53,7 +43,7 @@
                             <td>
                                 {%- if engine_stat.result_count -%}
                                 <span class="stacked-bar-chart-value">{{- engine_stat.result_count | int -}}</span>{{- "" -}}
-                                <span class="stacked-bar-chart" aria-labelledby="{{engine_stat.name}}_chart_result_count" aria-hidden="true">{{- "" -}}
+                                <span class="stacked-bar-chart" aria-hidden="true">{{- "" -}}
                                     <span style="width: calc(max(2px, 100%*{{ (engine_stat.result_count / engine_stats.max_result_count )|round(3) }}))" class="stacked-bar-chart-serie1"></span>{{- "" -}}
                                 </span>
                                 {%- endif -%}
@@ -61,11 +51,11 @@
                             <td>
                                 {%- if engine_stat.total -%}
                                 <span class="stacked-bar-chart-value">{{- engine_stat.total | round(1) -}}</span>{{- "" -}}
-                                <span class="stacked-bar-chart" aria-labelledby="{{engine_stat.name}}_chart" aria-hidden="true">{{- "" -}}
+                                <span class="stacked-bar-chart" aria-labelledby="{{engine_stat.name}}_time" aria-hidden="true">{{- "" -}}
                                     <span style="width: calc(max(2px, 100%*{{ (engine_stat.http / engine_stats.max_time )|round(3) }}))" class="stacked-bar-chart-serie1"></span>{{- "" -}}
                                     <span style="width: calc(100%*{{ engine_stat.processing / engine_stats.max_time |round(3) }})" class="stacked-bar-chart-serie2"></span>{{- "" -}}
                                 </span>{{- "" -}}
-                                <div class="engine-tooltip text-left" role="tooltip" id="{{engine_name}}_chart">{{- "" -}}
+                                <div class="engine-tooltip text-left" role="tooltip" id="{{engine_stat.name}}_time">{{- "" -}}
                                     <table class="table table-striped">
                                         <tr>
                                             <th scope="col"></th>
diff --git a/searx/templates/simple/stats.html b/searx/templates/simple/stats.html
index 462ab4aa9..eecd88903 100644
--- a/searx/templates/simple/stats.html
+++ b/searx/templates/simple/stats.html
@@ -1,4 +1,15 @@
+{% from 'simple/macros.html' import icon %}
+
 {% extends "simple/base.html" %}
+
+{%- macro th_sort(column_order, column_name) -%}
+    {% if column_order==sort_order %}
+        {{ column_name }} {{ icon('arrow-dropdown') }}
+    {% else %}
+        <a href="{{ url_for('stats', sort=column_order) }}">{{ column_name }}
+    {% endif %}
+{%- endmacro -%}
+
 {% block head %} {% endblock %}
 {% block content %}
 
@@ -6,20 +17,77 @@
 
 <h2>{{ _('Engine stats') }}</h2>
 
-{% for stat_name,stat_category in stats %}
-<div class="left">
-    <table>
-        <tr colspan="3">
-            <th>{{ stat_name }}</th>
-        </tr>
-        {% for engine in stat_category %}
-        <tr>
-            <td>{{ engine.name }}</td>
-            <td>{{ '%.02f'|format(engine.avg) }}</td>
-            <td class="percentage"><div style="width: {{ engine.percentage }}%">&nbsp;</div></td>
-        </tr>
-        {% endfor %}
-    </table>
-</div>
-{% endfor %}
+{% if not engine_stats.get('time') %}
+{{ _('There is currently no data available. ') }}
+{% else %}
+<table style="max-width: 1280px; margin: 0 auto;">
+    <tr>
+        <th scope="col" style="width:20rem;">{{ th_sort('name', _("Engine name")) }}</th>
+        <th scope="col" style="width:7rem; text-align: right;">{{ th_sort('score', _('Scores')) }}</th>
+        <th scope="col">{{ th_sort('result_count', _('Result count')) }}</th>
+        <th scope="col">{{ th_sort('time', _('Response time')) }}</th>
+        <th scope="col" style="text-align: right;">{{ th_sort('reliability', _('Reliability')) }}</th>
+    </tr>
+    {% for engine_stat in engine_stats.get('time', []) %}
+    <tr>
+        <td>{{ engine_stat.name }}</td>
+        <td style="text-align: right;">
+            {% if engine_stat.score %}
+            <span aria-labelledby="{{engine_stat.name}}_score" >{{ engine_stat.score|round(1) }}</span>
+            <div class="engine-tooltip" role="tooltip" id="{{engine_stat.name}}_score">{{- "" -}}
+                <p>{{ _('Scores per result') }}: {{ engine_stat.score_per_result | round(3) }}</p>
+            </div>
+            {% endif %}
+        </td>
+        <td>
+            {%- if engine_stat.result_count -%}
+            <span class="stacked-bar-chart-value">{{- engine_stat.result_count | int -}}</span>{{- "" -}}
+            <span class="stacked-bar-chart" aria-hidden="true">{{- "" -}}
+                <span style="width: calc(max(2px, 100%*{{ (engine_stat.result_count / engine_stats.max_result_count )|round(3) }}))" class="stacked-bar-chart-serie1"></span>{{- "" -}}
+            </span>
+            {%- endif -%}
+        </td>
+        <td>
+            {%- if engine_stat.total -%}
+            <span class="stacked-bar-chart-value">{{- engine_stat.total | round(1) -}}</span>{{- "" -}}
+            <span class="stacked-bar-chart" aria-labelledby="{{engine_stat.name}}_time" aria-hidden="true">{{- "" -}}
+                <span style="width: calc(max(2px, 100%*{{ (engine_stat.http / engine_stats.max_time )|round(3) }}))" class="stacked-bar-chart-serie1"></span>{{- "" -}}
+                <span style="width: calc(100%*{{ engine_stat.processing / engine_stats.max_time |round(3) }})" class="stacked-bar-chart-serie2"></span>{{- "" -}}
+            </span>{{- "" -}}
+            <div class="engine-tooltip" role="tooltip" id="{{engine_stat.name}}_time">{{- "" -}}
+                <table>
+                    <tr>
+                        <th scope="col"></th>
+                        <th scope="col">{{ _('Total') }}</th>
+                        <th scope="col">{{ _('HTTP') }}</th>
+                        <th scope="col">{{ _('Processing') }}</th>
+                    </tr>
+                    <tr>
+                        <th scope="col">{{ _('Median') }}</th>
+                        <td>{{ engine_stat.total }}</td>
+                        <td>{{ engine_stat.http }}</td>
+                        <td>{{ engine_stat.processing }}</td>
+                    </tr>
+                    <tr>
+                        <th scope="col">{{ _('P80') }}</th>
+                        <td>{{ engine_stat.total_p80 }}</td>
+                        <td>{{ engine_stat.http_p80 }}</td>
+                        <td>{{ engine_stat.processing_p80 }}</td>
+                    </tr>
+                    <tr>
+                        <th scope="col">{{ _('P95') }}</th>
+                        <td>{{ engine_stat.total_p95 }}</td>
+                        <td>{{ engine_stat.http_p95 }}</td>
+                        <td>{{ engine_stat.processing_p95 }}</td>
+                    </tr>
+                </table>
+            </div>
+            {%- endif -%}
+        </td>
+        <td style="text-align: right;"> {{ engine_reliabilities.get(engine_stat.name, {}).get('reliablity') }}</td>
+    </tr>
+    {% endfor %}
+</table>
+{% endif %}
+
 {% endblock %}
-- 
cgit v1.2.3