holado 0.18.16.dev1__tar.gz → 0.18.16.dev2__tar.gz

{holado-0.18.16.dev1 → holado-0.18.16.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: holado
-Version: 0.18.16.dev1
+Version: 0.18.16.dev2
 Summary: HolAdo framework
 Project-URL: Homepage, https://gitlab.com/holado_framework/python
 Project-URL: Issues, https://gitlab.com/holado_framework/python/-/issues

holado-0.18.16.dev2/packaging/VERSION

@@ -0,0 +1 @@
+0.18.16.dev2

{holado-0.18.16.dev1 → holado-0.18.16.dev2}/src/holado_report/campaign/campaign_manager.py

@@ -374,12 +374,12 @@ class CampaignManager(object):
         
         return file_modified_dt
 
-    def get_qa_data(self, qa_report_type, since, until=None, with_details=False):
+    def get_qa_data(self, qa_report_type, since, until=None, round_nb_decimal=None, with_details=False):
         match qa_report_type:
             case QAReportType.NumberByQAStatus:
                 return self.__get_qa_data_nb_by_qa_status(since=since, until=until, with_details=with_details)
             case QAReportType.RatioOfFailedAndSuccess:
-                return self.__get_qa_data_ratio_failed_success(since=since, until=until, with_details=with_details)
+                return self.__get_qa_data_ratio_failed_success(since=since, until=until, round_nb_decimal=round_nb_decimal, with_details=with_details)
             case _:
                 raise TechnicalException(f"Unmanaged QA report type '{qa_report_type}'")
 
@@ -415,7 +415,10 @@ class CampaignManager(object):
 
         return res
 
-    def __get_qa_data_ratio_failed_success(self, since, until=None, with_details=False):
+    def __get_qa_data_ratio_failed_success(self, since, until=None, round_nb_decimal=None, with_details=False):
+        if round_nb_decimal is None:
+            round_nb_decimal = 1
+
         # Compute counters
         ratio_failed, ratio_success, ratio_by_status = 0, 0, Counter()
         all_history = self.get_scenario_history(since=since, until=until)
@@ -427,10 +430,12 @@ class CampaignManager(object):
 
             if with_details:
                 ratio_by_status += Counter(x['status'] for x in sce_hist)
-        mean_run_nb = statistics.mean(len(x['history']) for x in all_history)
+        mean_run_nb = statistics.mean(len(x['history']) for x in all_history) if all_history else 0
 
         # Compute QA data
-        res = {'failed': ratio_failed, 'success': ratio_success, 'mean_run_number': mean_run_nb}
+        res = {'Failed': round(ratio_failed, round_nb_decimal),
+               'Success': round(ratio_success, round_nb_decimal),
+               'Mean run number': round(mean_run_nb, round_nb_decimal)}
         if with_details:
             res['details'] = dict(ratio_by_status)
 

{holado-0.18.16.dev1 → holado-0.18.16.dev2}/src/holado_test/tools/scripts/reporting_qa.py

@@ -6,6 +6,7 @@
 # ///
 
 import datetime
+
 from prettytable import PrettyTable, TableStyle, HRuleStyle
 import os
 import logging
@@ -30,14 +31,19 @@ def _initialize():
     return res
 
 
-def generate_qa_report(qa_report_type, period_unit, period_number, since, until, path_out):
+def generate_qa_report(qa_report_type, period_unit, period_number, since, until, round_nb_decimal, path_out):
     from holado.common.context.session_context import SessionContext
     from holado_python.common.enums import ArithmeticOperator
     from holado_python.common.tools.datetime import DateTime, DurationUnit
     from holado_core.common.exceptions.technical_exception import TechnicalException
 
+    if since is not None and isinstance(since, str):
+        since = DateTime.str_2_datetime(since)
+    if until is not None and isinstance(until, str):
+        until = DateTime.str_2_datetime(until)
+
     # Compute base datetimes
-    dt_now = DateTime.now() if until is None else until
+    dt_now = DateTime.now(tz=None) if until is None else until
     dt_now_start, dt_format = None, None
     match period_unit:
         case DurationUnit.Month:
@@ -60,9 +66,11 @@ def generate_qa_report(qa_report_type, period_unit, period_number, since, until,
     dt_start, dt_end = dt_now_start, dt_now
     qa_data_history = []
     while True:
-        data = {period_unit.name: DateTime.datetime_2_str(dt_start, dt_format)}
-        data.update( SessionContext.instance().test_server_client.get_qa_data(qa_report_type=qa_report_type, since=dt_start, until=dt_end) )
-        qa_data_history.append(data)
+        # Note: If 'until' is a period start, dt_start is equal to dt_end => Skip this empty period
+        if dt_start < dt_end:
+            data = {period_unit.name: DateTime.datetime_2_str(dt_start, dt_format)}
+            data.update( SessionContext.instance().test_server_client.get_qa_data(qa_report_type=qa_report_type, since=dt_start, until=dt_end, round_nb_decimal=round_nb_decimal) )
+            qa_data_history.append(data)
 
         dt_end = dt_start
         dt_start = DateTime.apply_delta_on_datetime(dt_end, ArithmeticOperator.Subtraction, 1, period_unit)
@@ -78,11 +86,15 @@ def generate_qa_report(qa_report_type, period_unit, period_number, since, until,
         else:
             raise TechnicalException("Unexpected case")
 
+    # Sort received data
+    fields_order = ['Month', 'Week', 'Day', 'Failed', 'NewlyFailed', 'Random', 'Success', 'Mean run number']
+    field_names = list(sorted(qa_data_history[0].keys(), key=lambda k: fields_order.index(k)))
+
     # Format data as a table
     table = PrettyTable()
-    table.field_names = list(qa_data_history[0].keys())
+    table.field_names = field_names
     for row_data in qa_data_history:
-        table.add_row(list(row_data.values()))
+        table.add_row([row_data[k] for k in field_names])
 
     # Output table as string
     table.set_style(TableStyle.ORGMODE)
@@ -119,12 +131,14 @@ if __name__ == "__main__":
                         help='Report since this datetime')
     parser.add_argument('-du', '--datetime-until', dest='datetime_until', type=str, default=None,
                         help='Report until this datetime')
+    parser.add_argument('-r', '--round-nb-decimal', dest='round_nb_decimal', type=int, default=1,
+                        help='Round number of decimal')
     parser.add_argument('-o', '--path-out', dest='path_out', default=None,
                         help='Output file path (relative or absolute)')
     args = parser.parse_args()
 
     qa_report_type = QAReportType[args.qa_report_type]
-    period_unit = DurationUnit[args.period_unit]
+    period_unit = DurationUnit(args.period_unit)
     if args.path_out is not None:
         path_out = args.path_out if os.path.isabs(args.path_out) else os.path.join(user_work_dir, args.path_out)
     else:
@@ -133,5 +147,5 @@ if __name__ == "__main__":
     generate_qa_report(qa_report_type=qa_report_type,
                        period_unit=period_unit, period_number=args.period_number,
                        since=args.datetime_since, until=args.datetime_until,
-                       path_out=path_out)
+                       round_nb_decimal=args.round_nb_decimal, path_out=path_out)
 

{holado-0.18.16.dev1 → holado-0.18.16.dev2}/src/holado_test/tools/test_server/client/rest/test_server_client.py

@@ -151,7 +151,7 @@ class TestServerClient(RestClient):
         else:
             return self.get(f"campaign/scenario/history")
 
-    def get_qa_data(self, qa_report_type, since, until=None, with_details=False):
+    def get_qa_data(self, qa_report_type, since, until=None, round_nb_decimal=None, with_details=False):
         if isinstance(qa_report_type, QAReportType):
             qa_report_type = qa_report_type.name
         if isinstance(since, datetime):
@@ -162,6 +162,8 @@ class TestServerClient(RestClient):
             if isinstance(until, datetime):
                 until = DateTime.datetime_2_str(until)
             data['until'] = until
+        if round_nb_decimal is not None:
+            data['round_nb_decimal'] = round_nb_decimal
         if with_details is not None:
             data['with_details'] = with_details
 

{holado-0.18.16.dev1 → holado-0.18.16.dev2}/src/holado_test/tools/test_server/server/rest/api/report/__init__.py

@@ -30,9 +30,10 @@ class QaView(MethodView):
             qa_report_type = QAReportType[body['qa_report_type']]
             since = body['since']
             until = body.get('until', None)
+            round_nb_decimal = body.get('round_nb_decimal', None)
             with_details = body.get('with_details', False)
 
-            res = _get_session_context().server_manager.campaign_manager.get_qa_data(qa_report_type=qa_report_type, since=since, until=until, with_details=with_details)
+            res = _get_session_context().server_manager.campaign_manager.get_qa_data(qa_report_type=qa_report_type, since=since, until=until, round_nb_decimal=round_nb_decimal, with_details=with_details)
 
             return res
         except Exception as exc:

{holado-0.18.16.dev1 → holado-0.18.16.dev2}/src/holado_test/tools/test_server/server/rest/openapi.yaml

@@ -83,6 +83,10 @@ paths:
                   description: "Until which datetime (excluded)"
                   type: string
                   nullable: true
+                round_nb_decimal:
+                  description: "Number of decimal to round to float values"
+                  type: integer
+                  nullable: true
                 with_details:
                   description: "If details on qa statuses are added"
                   type: boolean

holado-0.18.16.dev1/packaging/VERSION

@@ -1 +0,0 @@
-0.18.16.dev1